WebKit merge 41613:41660 (Chromium side).

Layout tests changes (and baselines):

* LayoutTests/fast/css/font-face-default-font.html
    Fixed by aa upstream.  The change was in the test itself.

* LayoutTests/fast/replaced/width100percent-searchfield.html
    Fixed by levin upstream -- the themeChromiumWin.css change.

* LayoutTests/fast/forms/input-appearance-height.html 
* LayoutTests/fast/repaint/search-field-cancel.html 
    Rebase needed due to themeChromiumWin.css change

* LayoutTests/fast/layers/normal-flow-hit-test.html
    A slightly different font seems to be used in chromium which
    casued some pixel differences in this test.    

* LayoutTests/fast/forms/placeholder-pseudo-style.html
* LayoutTests/fast/forms/search-placeholder-value-changed.html 
    New tests which needed chromium baselines due to differences
    in the search input box display.

* LayoutTests/fast/forms/placeholder-set-value.html
   Differences in fonts and search input boxes were the cause
   for the chromium baseline.


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

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

12 files changed, 87 insertions, 33 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
index c3ec6de6..986f5d6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-appearance-height-expected.txt
@@ -88,7 +88,7 @@ layer at (0,0) size 800x600
         RenderTextControl {INPUT} at (43,247) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderBlock {DIV} at (2,3) size 151x16
             RenderBlock {DIV} at (0,13) size 0x0
-            RenderBlock {DIV} at (148,13) size 0x0
+            RenderBlock {DIV} at (151,13) size 0x0
         RenderText {#text} at (0,0) size 0x0
 layer at (43,31) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
@@ -98,7 +98,7 @@ layer at (58,232) size 151x16
   RenderBlock {DIV} at (3,3) size 151x16
 layer at (73,256) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16
-layer at (53,278) size 148x16
-  RenderBlock {DIV} at (0,0) size 148x16
+layer at (53,278) size 151x16
+  RenderBlock {DIV} at (0,0) size 151x16
 layer at (47,170) size 129x16
   RenderBlock (relative positioned) {DIV} at (0,0) size 129x16
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.txt
index cc2ee52..7aae2a6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-pseudo-style-expected.txt
@@ -12,7 +12,7 @@ layer at (0,0) size 800x600
       RenderTextControl {INPUT} at (159,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderBlock {DIV} at (2,3) size 151x16
           RenderBlock {DIV} at (0,13) size 0x0
-          RenderBlock {DIV} at (148,13) size 0x0
+          RenderBlock {DIV} at (151,13) size 0x0
       RenderText {#text} at (314,21) size 4x19
         text run at (314,21) width 4: " "
       RenderTextControl {INPUT} at (318,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
@@ -30,8 +30,8 @@ layer at (10,31) size 151x16
   RenderBlock {DIV} at (2,3) size 151x16 [color=#640000]
     RenderText {#text} at (1,0) size 22x16
       text run at (1,0) width 22: "text"
-layer at (169,31) size 148x16
-  RenderBlock {DIV} at (0,0) size 148x16 [color=#640000]
+layer at (169,31) size 151x16
+  RenderBlock {DIV} at (0,0) size 151x16 [color=#640000]
     RenderText {#text} at (1,0) size 39x16
       text run at (1,0) width 39: "search"
 layer at (328,31) size 151x16
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.checksum
new file mode 100644
index 0000000..5979fad
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.checksum
@@ -0,0 +1 @@
+28196fa040065edb22dbbb6d30e821a1
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.png
new file mode 100644
index 0000000..3ab4872
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.txt
new file mode 100644
index 0000000..40781c8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/placeholder-set-value-expected.txt
@@ -0,0 +1,24 @@
+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 51x19

+          text run at (0,0) width 51: "Test for "

+        RenderInline {A} at (0,0) size 291x19 [color=#0000EE]

+          RenderText {#text} at (51,0) size 291x19

+            text run at (51,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=24508"

+        RenderText {#text} at (342,0) size 428x19

+          text run at (342,0) width 428: ". Search field does not redraw if value set, when it has placeholder text."

+      RenderBlock (anonymous) at (0,36) size 784x22

+        RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]

+          RenderBlock {DIV} at (2,3) size 151x16

+            RenderBlock {DIV} at (0,13) size 0x0

+            RenderBlock {DIV} at (151,13) size 0x0

+        RenderText {#text} at (0,0) size 0x0

+        RenderText {#text} at (0,0) size 0x0

+layer at (10,47) size 151x16

+  RenderBlock {DIV} at (0,0) size 151x16

+    RenderText {#text} at (1,0) size 51x16

+      text run at (1,0) width 51: "New text"

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.txt
index 5c994ad..6e53ac5 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/search-placeholder-value-changed-expected.txt
@@ -1,15 +1,15 @@
-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
-      RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-        RenderBlock {DIV} at (2,3) size 151x16
-          RenderBlock {DIV} at (0,13) size 0x0
-          RenderBlock {DIV} at (148,13) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-layer at (10,11) size 148x16
-  RenderBlock {DIV} at (0,0) size 148x16 [color=#A9A9A9]
-    RenderText {#text} at (1,0) size 73x16
-      text run at (1,0) width 73: "Test Passed"
+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

+      RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]

+        RenderBlock {DIV} at (2,3) size 151x16

+          RenderBlock {DIV} at (0,13) size 0x0

+          RenderBlock {DIV} at (151,13) size 0x0

+      RenderText {#text} at (0,0) size 0x0

+      RenderText {#text} at (0,0) size 0x0

+layer at (10,11) size 151x16

+  RenderBlock {DIV} at (0,0) size 151x16 [color=#A9A9A9]

+    RenderText {#text} at (1,0) size 73x16

+      text run at (1,0) width 73: "Test Passed"

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.checksum
new file mode 100644
index 0000000..dc50a64
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.checksum
@@ -0,0 +1 @@
+92cf133689e4002072767a9be7dd4e5d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.png
new file mode 100644
index 0000000..036b201
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.txt
new file mode 100644
index 0000000..a0cc344
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/layers/normal-flow-hit-test-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x325

+  RenderBlock {HTML} at (0,0) size 800x325

+    RenderBody {BODY} at (8,16) size 784x301

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 57x19

+          text run at (0,0) width 57: "Tests for "

+        RenderInline {A} at (0,0) size 291x19 [color=#0000EE]

+          RenderText {#text} at (57,0) size 291x19

+            text run at (57,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=24552"

+      RenderBlock (anonymous) at (0,36) size 784x125

+        RenderText {#text} at (120,105) size 4x19

+          text run at (120,105) width 4: " "

+        RenderInline {A} at (0,0) size 57x19 [color=#0000EE]

+          RenderText {#text} at (124,105) size 57x19

+            text run at (124,105) width 57: "Link here"

+        RenderText {#text} at (0,0) size 0x0

+      RenderBlock {DIV} at (0,281) size 784x20

+        RenderText {#text} at (0,0) size 162x19

+          text run at (0,0) width 162: "Found link node, so PASS"

+layer at (18,62) size 100x200

+  RenderBlock {DIV} at (10,10) size 100x100 [bgcolor=#808080]

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.txt
index bf47b13..0c3a4d3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/search-field-cancel-expected.txt
@@ -15,11 +15,11 @@ layer at (0,0) size 800x600
         RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]

           RenderBlock {DIV} at (2,3) size 151x16

             RenderBlock {DIV} at (0,13) size 0x0

-            RenderBlock {DIV} at (148,13) size 0x0

+            RenderBlock {DIV} at (151,13) size 0x0

         RenderText {#text} at (0,0) size 0x0

         RenderText {#text} at (0,0) size 0x0

         RenderText {#text} at (0,0) size 0x0

-layer at (10,47) size 148x16

-  RenderBlock {DIV} at (0,0) size 148x16

+layer at (10,47) size 151x16

+  RenderBlock {DIV} at (0,0) size 151x16

     RenderText {#text} at (1,0) size 58x16

       text run at (1,0) width 58: "some text"

diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index d41c7c0..36da578 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -1014,7 +1014,7 @@ XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE)
 
 # user agent style sheets
 
-USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css 
+USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/themeChromiumWin.css $(WebCore)/css/themeWinQuirks.css 
 
 ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG)
     USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/svg.css 
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 5a93686..4be71ac 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -256,12 +256,6 @@ DEFER : LayoutTests/fast/js/kde/function_arguments.html = FAIL
 // error in the header of the following test.
 DEFER SKIP : LayoutTests/fast/css/disabled-author-styles.html = FAIL
 
-// It looks like the upstream test is incorrectly using font-family: Times
-// instead of font-family: times new roman.  This broke when we recently moved
-// more of our font default settings to 'times new roman' from 'Times'.  This
-// should be fixed upstream.  https://bugs.webkit.org/show_bug.cgi?id=16348
-LINUX WIN : LayoutTests/fast/css/font-face-default-font.html = FAIL
-
 // We don't support dynamic fonts on Linux.
 // Once we have the sandbox working, we should re-evaluate this.
 DEFER LINUX : LayoutTests/fast/css/font-face-remote.html = FAIL
@@ -1460,8 +1454,8 @@ LINUX : LayoutTests/svg/custom/js-late-pattern-and-object-creation.svg = FAIL
 WIN : LayoutTests/svg/custom/struct-use-09-b.svg = FAIL
 
 // Merge 39913:39933 - regressions
-// See http://crbug.com/6482
-LINUX WIN : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL
+// Needs rebaseline (which was done for windows).
+LINUX : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL
 
 // Passes locally but Text diff fails on the buildbots
 LINUX : LayoutTests/svg/custom/path-getTotalLength.svg = FAIL PASS
@@ -1807,6 +1801,17 @@ WIN DEBUG : LayoutTests/transitions/transition-end-event-multiple-03.html = FAIL
 WIN DEBUG : LayoutTests/fast/dom/HTMLElement/innerHTML-selection-crash.html = CRASH PASS
 LINUX : LayoutTests/editing/selection/move-by-line-001.html = FAIL PASS
 
+// Newly added test from 41613:41650
+DEFER MAC LINUX WIN : LayoutTests/fast/canvas/canvas-gradient-addStop-error.html = FAIL
+
+// Newly added test from 41613:41650 -- relies on ScriptCallStack::state() -- dglazkov should fix.
+DEFER MAC LINUX WIN : LayoutTests/fast/js/console-non-string-values.html = FAIL
+
+// New failures from 41613:41650 -- They likely just need to be rebaselined
+// for Mac and Linux, since that is what was done for Windows.
+DEFER LINUX : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL
+DEFER MAC LINUX : LayoutTests/fast/layers/normal-flow-hit-test.html = FAIL
+DEFER MAC LINUX : LayoutTests/fast/forms/placeholder-set-value.html = FAIL
 
 // This hits a stack-overflow exception earlier in debug mode than in
 // release mode on Windows.