Rebaseline LayoutTests/fast/css/font-face-unicode-range.html

           LayoutTests/fast/css/font-face-implicit-local-font.html 

This is an companion to http://codereview.chromium.org/16516
(update third_party/WebKit to r7607)

BUG=6021


Review URL: http://codereview.chromium.org/16525

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7611 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 97 insertions, 5 deletions

diff --git a/DEPS b/DEPS
index 060f7c5..6c8f803 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@63",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@7592",
+    "/trunk/deps/third_party/WebKit@7607",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@7525",
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.checksum
index 280e6e3..b99f809 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.checksum
@@ -1 +1 @@
-ebcb2efc85aeba73e27c5f0e133b9f0b
\ No newline at end of file
+8a54b8883017fef18b8ca02263cfc2ed
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.png
index 12e8998..f4a3a23 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.txt
new file mode 100644
index 0000000..3b450dc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-implicit-local-font-expected.txt
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 773x39
+          text run at (0,0) width 458: "This tests that when @font-face rules with unicode-range are specified for a "
+          text run at (458,0) width 315: "font that exists on the system, the system font is used"
+          text run at (0,20) width 104: "for all characters "
+          text run at (104,20) width 145: "not explictly overridden."
+      RenderBlock {P} at (0,56) size 784x20
+        RenderText {#text} at (0,0) size 483x19
+          text run at (0,0) width 419: "In the next line, the digits should be in Times, but the letters should be "
+          text run at (419,0) width 64: "in Courier."
+      RenderBlock (anonymous) at (0,92) size 784x27
+        RenderInline {SPAN} at (0,0) size 274x27
+          RenderText {#text} at (0,0) size 274x27
+            text run at (0,0) width 274: "ABCDEFGHIJ 1234567890"
+        RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.checksum
index 03facec..32a611b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.checksum
@@ -1 +1 @@
-e551cf6f8103cddfebc1878d8d8015ad
\ No newline at end of file
+d62f950f5c4b7ec1e362985ceb7a9d5c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.png
index fb19ac3..7009e77 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.txt
new file mode 100644
index 0000000..0027350
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-unicode-range-expected.txt
@@ -0,0 +1,72 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 257x19
+          text run at (0,0) width 257: "Each box should contain two identical lines"
+      RenderBlock {DIV} at (0,36) size 784x90 [border: (1px solid #000000)]
+        RenderBlock {P} at (9,17) size 766x20
+          RenderText {#text} at (0,0) size 275x19
+            text run at (0,0) width 275: "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        RenderBlock {P} at (9,53) size 766x20
+          RenderInline {SPAN} at (0,0) size 16x16
+            RenderText {#text} at (0,2) size 16x16
+              text run at (0,2) width 16: "A"
+          RenderText {#text} at (16,0) size 259x19
+            text run at (16,0) width 259: "BCDEFGHIJKLMNOPQRSTUVWXYZ"
+      RenderBlock {DIV} at (0,134) size 784x90 [border: (1px solid #000000)]
+        RenderBlock {P} at (9,17) size 766x20
+          RenderText {#text} at (0,0) size 357x19
+            text run at (0,0) width 357: "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        RenderBlock {P} at (9,53) size 766x20
+          RenderInline {SPAN} at (0,0) size 240x16
+            RenderText {#text} at (0,2) size 240x16
+              text run at (0,2) width 240: "ABCDEFGHIJKLMNO"
+          RenderText {#text} at (240,0) size 117x19
+            text run at (240,0) width 117: "PQRSTUVWXYZ"
+      RenderBlock {DIV} at (0,232) size 784x90 [border: (1px solid #000000)]
+        RenderBlock {P} at (9,17) size 766x20
+          RenderText {#text} at (0,0) size 286x19
+            text run at (0,0) width 286: "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        RenderBlock {P} at (9,53) size 766x20
+          RenderText {#text} at (0,0) size 11x19
+            text run at (0,0) width 11: "A"
+          RenderInline {SPAN} at (0,0) size 48x16
+            RenderText {#text} at (11,2) size 48x16
+              text run at (11,2) width 48: "BCD"
+          RenderText {#text} at (59,0) size 227x19
+            text run at (59,0) width 227: "EFGHIJKLMNOPQRSTUVWXYZ"
+      RenderBlock {DIV} at (0,330) size 784x90 [border: (1px solid #000000)]
+        RenderBlock {P} at (9,17) size 766x20
+          RenderText {#text} at (0,0) size 303x19
+            text run at (0,0) width 303: "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        RenderBlock {P} at (9,53) size 766x20
+          RenderText {#text} at (0,0) size 141x19
+            text run at (0,0) width 141: "ABCDEFGHIJKLMN"
+          RenderInline {SPAN} at (0,0) size 30x18
+            RenderText {#text} at (141,1) size 30x18
+              text run at (141,1) width 30: "OPQ"
+          RenderInline {SPAN} at (0,0) size 112x16
+            RenderText {#text} at (171,2) size 112x16
+              text run at (171,2) width 112: "RSTUVWX"
+          RenderText {#text} at (283,0) size 20x19
+            text run at (283,0) width 20: "YZ"
+      RenderBlock {DIV} at (0,428) size 784x90 [border: (1px solid #000000)]
+        RenderBlock {P} at (9,17) size 766x20
+          RenderText {#text} at (0,0) size 293x19
+            text run at (0,0) width 293: "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        RenderBlock {P} at (9,53) size 766x20
+          RenderText {#text} at (0,0) size 153x19
+            text run at (0,0) width 153: "ABCDEFGHIJKLMNO"
+          RenderInline {SPAN} at (0,0) size 120x16
+            RenderText {#text} at (153,2) size 32x16
+              text run at (153,2) width 32: "PQ"
+            RenderInline {SPAN} at (0,0) size 40x18
+              RenderText {#text} at (185,1) size 40x18
+                text run at (185,1) width 40: "RSTU"
+            RenderText {#text} at (225,2) size 48x16
+              text run at (225,2) width 48: "VWX"
+          RenderText {#text} at (273,0) size 20x19
+            text run at (273,0) width 20: "YZ"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 0d6f120..9fabeb1 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -321,8 +321,8 @@ WIN : LayoutTests/svg/custom/font-face-cascade-order.svg = FAIL
 // Bug: 1007391
 // These hit a not-implemented code-path in @font-face code
 // Fixing this should not be required for beta.
-LINUX WIN : LayoutTests/fast/css/font-face-implicit-local-font.html = FAIL
-LINUX WIN : LayoutTests/fast/css/font-face-unicode-range.html = FAIL
+LINUX : LayoutTests/fast/css/font-face-implicit-local-font.html = FAIL
+LINUX : LayoutTests/fast/css/font-face-unicode-range.html = FAIL
 
 // Bug: 1110028
 // The v8 bindings allow shadowing of all properties on the global object.  If you use