Diff
Modified: trunk/LayoutTests/ChangeLog (134505 => 134506)
--- trunk/LayoutTests/ChangeLog 2012-11-14 00:16:11 UTC (rev 134505)
+++ trunk/LayoutTests/ChangeLog 2012-11-14 00:33:45 UTC (rev 134506)
@@ -1,3 +1,17 @@
+2012-11-13 Dimitri Glazkov <dglaz...@chromium.org>
+
+ Unreviewed, rolling out r134377.
+ http://trac.webkit.org/changeset/134377
+ https://bugs.webkit.org/show_bug.cgi?id=101133
+
+ Caused a mysterious Android Clang build failure, needs
+ investigation before landing again.
+
+ * fast/forms/number/number-content-url-crash-expected.txt: Removed.
+ * fast/forms/number/number-content-url-crash.html: Removed.
+ * fast/forms/search/search-content-url-crash-expected.txt: Removed.
+ * fast/forms/search/search-content-url-crash.html: Removed.
+
2012-11-13 James Robinson <jam...@chromium.org>
Rebaselines for filtering changes due to chromium r167479
Deleted: trunk/LayoutTests/fast/forms/number/number-content-url-crash-expected.txt (134505 => 134506)
--- trunk/LayoutTests/fast/forms/number/number-content-url-crash-expected.txt 2012-11-14 00:16:11 UTC (rev 134505)
+++ trunk/LayoutTests/fast/forms/number/number-content-url-crash-expected.txt 2012-11-14 00:33:45 UTC (rev 134506)
@@ -1 +0,0 @@
- PASS
Deleted: trunk/LayoutTests/fast/forms/number/number-content-url-crash.html (134505 => 134506)
--- trunk/LayoutTests/fast/forms/number/number-content-url-crash.html 2012-11-14 00:16:11 UTC (rev 134505)
+++ trunk/LayoutTests/fast/forms/number/number-content-url-crash.html 2012-11-14 00:33:45 UTC (rev 134506)
@@ -1,19 +0,0 @@
-<!doctype html>
-<head>
-<style>
-input::-webkit-textfield-decoration-container {
- content: url("") !important;
-}
-</style>
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-</head>
-<body>
-<!-- [bug 101133] https://bugs.webkit.org/show_bug.cgi?id=101133 -->
-<!-- Crash when replacing parts of text inputs with content: url(...) -->
-<!-- If this test passes, we can see juast "PASS". -->
-<input type="number">
-PASS
-</body>
Deleted: trunk/LayoutTests/fast/forms/search/search-content-url-crash-expected.txt (134505 => 134506)
--- trunk/LayoutTests/fast/forms/search/search-content-url-crash-expected.txt 2012-11-14 00:16:11 UTC (rev 134505)
+++ trunk/LayoutTests/fast/forms/search/search-content-url-crash-expected.txt 2012-11-14 00:33:45 UTC (rev 134506)
@@ -1 +0,0 @@
- PASS
Deleted: trunk/LayoutTests/fast/forms/search/search-content-url-crash.html (134505 => 134506)
--- trunk/LayoutTests/fast/forms/search/search-content-url-crash.html 2012-11-14 00:16:11 UTC (rev 134505)
+++ trunk/LayoutTests/fast/forms/search/search-content-url-crash.html 2012-11-14 00:33:45 UTC (rev 134506)
@@ -1,19 +0,0 @@
-<!doctype html>
-<head>
-<style>
-input::-webkit-textfield-decoration-container {
- content: url("") !important;
-}
-</style>
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-</head>
-<body>
-<!-- [bug 101133] https://bugs.webkit.org/show_bug.cgi?id=101133 -->
-<!-- Crash when replacing parts of text inputs with content: url(...) -->
-<!-- If this test passes, we can see juast "PASS". -->
-<input type="search">
-PASS
-</body>
Modified: trunk/Source/WebCore/ChangeLog (134505 => 134506)
--- trunk/Source/WebCore/ChangeLog 2012-11-14 00:16:11 UTC (rev 134505)
+++ trunk/Source/WebCore/ChangeLog 2012-11-14 00:33:45 UTC (rev 134506)
@@ -1,3 +1,17 @@
+2012-11-13 Dimitri Glazkov <dglaz...@chromium.org>
+
+ Unreviewed, rolling out r134377.
+ http://trac.webkit.org/changeset/134377
+ https://bugs.webkit.org/show_bug.cgi?id=101133
+
+ Caused a mysterious Android Clang build failure, needs
+ investigation before landing again.
+
+ * css/html.css:
+ (input::-webkit-textfield-decoration-container):
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::attach):
+
2012-11-13 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r134482.
Modified: trunk/Source/WebCore/css/html.css (134505 => 134506)
--- trunk/Source/WebCore/css/html.css 2012-11-14 00:16:11 UTC (rev 134505)
+++ trunk/Source/WebCore/css/html.css 2012-11-14 00:33:45 UTC (rev 134506)
@@ -436,7 +436,6 @@
display: -webkit-box;
-webkit-box-align: center;
-webkit-user-modify: read-only !important;
- content: none !important;
}
input[type="search"]::-webkit-textfield-decoration-container {
Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (134505 => 134506)
--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-11-14 00:16:11 UTC (rev 134505)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-11-14 00:33:45 UTC (rev 134506)
@@ -426,9 +426,6 @@
void TextFieldInputType::attach()
{
InputType::attach();
- // If container exists, the container should not have any content data.
- ASSERT(!m_container || !m_container->renderStyle() || !m_container->renderStyle()->hasContent());
-
element()->fixPlaceholderRenderer(m_placeholder.get(), m_container ? m_container.get() : m_innerText.get());
}
