REGRESSION (r157443): Search fields with a non-white background don’t have a round...
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Feb 2014 00:59:56 +0000 (00:59 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Feb 2014 00:59:56 +0000 (00:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=126295

Reviewed by Ryosuke Niwa.

Source/WebCore:

Reverted r157443 and improved comment.

* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::isControlStyled):

LayoutTests:

Reverted r157443.

* fast/forms/search/search-field-background-color-expected.txt: Removed.
* fast/forms/search/search-field-background-color.html: Removed.
* platform/efl/fast/forms/search: Removed.
* platform/efl/fast/forms/search/search-field-background-color-expected.png: Removed.
* platform/efl/fast/forms/search/search-size-with-decorations-expected.png: Removed.
* platform/efl/fast/forms/search/search-size-with-decorations-expected.txt: Removed.
* platform/mac/fast/forms/search-styled-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164145 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/forms/search/search-field-background-color-expected.txt [deleted file]
LayoutTests/fast/forms/search/search-field-background-color.html [deleted file]
LayoutTests/platform/efl/fast/forms/search/search-field-background-color-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/search/search-size-with-decorations-expected.png [deleted file]
LayoutTests/platform/efl/fast/forms/search/search-size-with-decorations-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/search-styled-expected.txt
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderTheme.cpp

index 4293b60..6f482c9 100644 (file)
@@ -1,3 +1,20 @@
+2014-02-14  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r157443): Search fields with a non-white background don’t have a round bezel
+        https://bugs.webkit.org/show_bug.cgi?id=126295
+
+        Reviewed by Ryosuke Niwa.
+
+        Reverted r157443.
+
+        * fast/forms/search/search-field-background-color-expected.txt: Removed.
+        * fast/forms/search/search-field-background-color.html: Removed.
+        * platform/efl/fast/forms/search: Removed.
+        * platform/efl/fast/forms/search/search-field-background-color-expected.png: Removed.
+        * platform/efl/fast/forms/search/search-size-with-decorations-expected.png: Removed.
+        * platform/efl/fast/forms/search/search-size-with-decorations-expected.txt: Removed.
+        * platform/mac/fast/forms/search-styled-expected.txt:
+
 2014-02-14  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Activate CSS Region Tests on Windows
diff --git a/LayoutTests/fast/forms/search/search-field-background-color-expected.txt b/LayoutTests/fast/forms/search/search-field-background-color-expected.txt
deleted file mode 100644 (file)
index 27a8a89..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-PASS getComputedStyle(test, null).getPropertyValue('background-color') is color
-The following search field should have red background.
-
-
diff --git a/LayoutTests/fast/forms/search/search-field-background-color.html b/LayoutTests/fast/forms/search/search-field-background-color.html
deleted file mode 100644 (file)
index f5fb9f0..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-<style>
-    input { background: red; }
-</style>
-</head>
-
-<body>
-<p>The following search field should have red background.</p>
-<input type="search" id="test">
-
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText(true);
-
-    var test = document.getElementById("test");
-    var color = 'rgb(255, 0, 0)';
-    shouldBe("getComputedStyle(test, null).getPropertyValue('background-color')", "color");
-</script>
-
-</body>
-</html>
diff --git a/LayoutTests/platform/efl/fast/forms/search/search-field-background-color-expected.png b/LayoutTests/platform/efl/fast/forms/search/search-field-background-color-expected.png
deleted file mode 100644 (file)
index 5f3344b..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/search/search-field-background-color-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/search/search-size-with-decorations-expected.png b/LayoutTests/platform/efl/fast/forms/search/search-size-with-decorations-expected.png
deleted file mode 100644 (file)
index 5c88349..0000000
Binary files a/LayoutTests/platform/efl/fast/forms/search/search-size-with-decorations-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/efl/fast/forms/search/search-size-with-decorations-expected.txt b/LayoutTests/platform/efl/fast/forms/search/search-size-with-decorations-expected.txt
deleted file mode 100644 (file)
index 3ade044..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x240
-  RenderBlock {HTML} at (0,0) size 800x240
-    RenderBody {BODY} at (8,8) size 784x224
-      RenderTextControl {INPUT} at (2,2) size 208x28 [bgcolor=#FFFFFF]
-        RenderFlexibleBox {DIV} at (4,6) size 201x18
-          RenderBlock {DIV} at (0,9) size 0x0
-          RenderBlock {DIV} at (0,0) size 185x18
-          RenderBlock {DIV} at (185,1) size 16x16
-      RenderText {#text} at (212,8) size 4x17
-        text run at (212,8) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderTextControl {INPUT} at (2,34) size 208x28 [bgcolor=#FFFFFF]
-        RenderFlexibleBox {DIV} at (4,6) size 201x18
-          RenderBlock {DIV} at (0,9) size 0x0
-          RenderBlock {DIV} at (0,0) size 185x18
-          RenderBlock {DIV} at (185,1) size 16x16
-      RenderText {#text} at (212,40) size 4x17
-        text run at (212,40) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderTextControl {INPUT} at (2,66) size 226x28 [bgcolor=#FFFFFF]
-        RenderFlexibleBox {DIV} at (4,6) size 219x18
-          RenderBlock {DIV} at (0,1) size 18x16
-          RenderBlock {DIV} at (18,0) size 185x18
-          RenderBlock {DIV} at (203,1) size 16x16
-      RenderText {#text} at (230,72) size 4x17
-        text run at (230,72) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderTextControl {INPUT} at (2,98) size 226x28 [bgcolor=#FFFFFF]
-        RenderFlexibleBox {DIV} at (4,6) size 219x18
-          RenderBlock {DIV} at (0,1) size 18x16
-          RenderBlock {DIV} at (18,0) size 185x18
-          RenderBlock {DIV} at (203,1) size 16x16
-      RenderText {#text} at (230,104) size 4x17
-        text run at (230,104) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderTextControl {INPUT} at (2,130) size 226x28 [bgcolor=#FFFFFF]
-        RenderFlexibleBox {DIV} at (4,6) size 219x18
-          RenderBlock {DIV} at (0,1) size 18x16
-          RenderBlock {DIV} at (18,0) size 185x18
-          RenderBlock {DIV} at (203,1) size 16x16
-      RenderText {#text} at (230,136) size 4x17
-        text run at (230,136) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderTextControl {INPUT} at (2,162) size 226x28 [bgcolor=#FFFFFF]
-        RenderFlexibleBox {DIV} at (4,6) size 219x18
-          RenderBlock {DIV} at (0,1) size 18x16
-          RenderBlock {DIV} at (18,0) size 185x18
-          RenderBlock {DIV} at (203,1) size 16x16
-      RenderText {#text} at (230,168) size 4x17
-        text run at (230,168) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderTextControl {INPUT} at (2,194) size 406x28 [bgcolor=#FFFFFF]
-        RenderFlexibleBox {DIV} at (4,6) size 399x18
-          RenderBlock {DIV} at (0,1) size 18x16
-          RenderBlock {DIV} at (18,0) size 365x18
-          RenderBlock {DIV} at (383,1) size 16x16
-      RenderText {#text} at (0,0) size 0x0
-layer at (14,16) size 185x18
-  RenderBlock {DIV} at (0,0) size 185x18
-layer at (14,48) size 185x18
-  RenderBlock {DIV} at (0,0) size 185x18
-    RenderText {#text} at (0,0) size 180x17
-      text run at (0,0) width 180: "12345678901234567890"
-layer at (32,80) size 185x18
-  RenderBlock {DIV} at (0,0) size 185x18
-layer at (32,112) size 185x18
-  RenderBlock {DIV} at (0,0) size 185x18
-    RenderText {#text} at (0,0) size 180x17
-      text run at (0,0) width 180: "12345678901234567890"
-layer at (32,144) size 185x18
-  RenderBlock {DIV} at (0,0) size 185x18
-layer at (32,176) size 185x18
-  RenderBlock {DIV} at (0,0) size 185x18
-    RenderText {#text} at (0,0) size 180x17
-      text run at (0,0) width 180: "12345678901234567890"
-layer at (32,208) size 365x18
-  RenderBlock {DIV} at (0,0) size 365x18
-    RenderText {#text} at (0,0) size 360x17
-      text run at (0,0) width 360: "1234567890123456789012345678901234567890"
index 9d0c4f4..d1f310d 100644 (file)
@@ -1,17 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x41
-  RenderBlock {HTML} at (0,0) size 800x41
-    RenderBody {BODY} at (8,8) size 784x25
-      RenderTextControl {INPUT} at (2,2) size 220x21 [bgcolor=#FFFFFF] [border: (1px solid #BDC7D8)]
-        RenderFlexibleBox {DIV} at (18,4) size 198x13
+layer at (0,0) size 800x39
+  RenderBlock {HTML} at (0,0) size 800x39
+    RenderBody {BODY} at (8,8) size 784x23
+      RenderTextControl {INPUT} at (2,2) size 158x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+        RenderFlexibleBox {DIV} at (3,3) size 152x13
           RenderBlock {DIV} at (0,1) size 22x11
-          RenderBlock {DIV} at (22,0) size 163x13
-          RenderBlock {DIV} at (185,1) size 13x11
+          RenderBlock {DIV} at (22,0) size 117x13
+          RenderBlock {DIV} at (139,1) size 13x11
       RenderText {#text} at (0,0) size 0x0
-layer at (50,14) size 163x13
-  RenderBlock {DIV} at (40,4) size 163x13 [color=#A9A9A9]
+layer at (35,13) size 117x13
+  RenderBlock {DIV} at (25,3) size 117x13 [color=#A9A9A9]
     RenderText {#text} at (0,0) size 92x13
       text run at (0,0) width 92: "Search for Events"
-layer at (50,14) size 163x13
-  RenderBlock {DIV} at (0,0) size 163x13
+layer at (35,13) size 117x13
+  RenderBlock {DIV} at (0,0) size 117x13
index 58acc35..ccf5e75 100644 (file)
@@ -1,3 +1,15 @@
+2014-02-14  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (r157443): Search fields with a non-white background don’t have a round bezel
+        https://bugs.webkit.org/show_bug.cgi?id=126295
+
+        Reviewed by Ryosuke Niwa.
+
+        Reverted r157443 and improved comment.
+
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::isControlStyled):
+
 2014-02-14  Brian Burg  <bburg@apple.com>
 
         Web Replay: AtomicString replay input names should be stored in a thread-local table
index fef868e..2919cb8 100644 (file)
@@ -684,7 +684,7 @@ bool RenderTheme::isControlStyled(const RenderStyle* style, const BorderData& bo
     case ContinuousCapacityLevelIndicatorPart:
     case DiscreteCapacityLevelIndicatorPart:
     case RatingLevelIndicatorPart:
-    case SearchFieldPart:
+    // FIXME: SearchFieldPart should be included here when making search fields style-able.
     case TextFieldPart:
     case TextAreaPart:
         // Test the style to see if the UA border and background match.