Title: [123746] trunk
- Revision
- 123746
- Author
- pfeld...@chromium.org
- Date
- 2012-07-26 08:08:14 -0700 (Thu, 26 Jul 2012)
Log Message
Web Inspector: Edits of styles declared after invalid selector are not applied
https://bugs.webkit.org/show_bug.cgi?id=92382
Reviewed by Vsevolod Vlasov.
Source/WebCore:
Now popping selectorless rules as well.
Test: inspector/styles/styles-edit-property-after-invalid-rule.html
* css/CSSParser.cpp:
(WebCore::CSSParser::createStyleRule):
LayoutTests:
Additional information of the change such as approach, rationale.
* inspector/styles/styles-edit-property-after-invalid-rule-expected.txt: Added.
* inspector/styles/styles-edit-property-after-invalid-rule.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (123745 => 123746)
--- trunk/LayoutTests/ChangeLog 2012-07-26 14:54:23 UTC (rev 123745)
+++ trunk/LayoutTests/ChangeLog 2012-07-26 15:08:14 UTC (rev 123746)
@@ -1,3 +1,15 @@
+2012-07-26 Pavel Feldman <pfeld...@chromium.org>
+
+ Web Inspector: Edits of styles declared after invalid selector are not applied
+ https://bugs.webkit.org/show_bug.cgi?id=92382
+
+ Reviewed by Vsevolod Vlasov.
+
+ Additional information of the change such as approach, rationale.
+
+ * inspector/styles/styles-edit-property-after-invalid-rule-expected.txt: Added.
+ * inspector/styles/styles-edit-property-after-invalid-rule.html: Added.
+
2012-07-26 Ádám Kallai <ka...@inf.u-szeged.hu>
[Qt] Unreviewed gardening. Added Qt5 specific expected results after r123670.
Added: trunk/LayoutTests/inspector/styles/styles-edit-property-after-invalid-rule-expected.txt (0 => 123746)
--- trunk/LayoutTests/inspector/styles/styles-edit-property-after-invalid-rule-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/styles/styles-edit-property-after-invalid-rule-expected.txt 2012-07-26 15:08:14 UTC (rev 123746)
@@ -0,0 +1,33 @@
+Tests that proper source lines are reported for the styles after unrecognizer / invalid selector.
+
+Initial value
+[expanded]
+element.style { ()
+
+======== Matched CSS Rules ========
+[expanded]
+media="screen" (styles-edit-property-after-invalid-rule.html)
+#container { (styles-edit-property-after-invalid-rule.html:10)
+padding: 15px;
+
+[expanded]
+div { (user agent stylesheet)
+display: block;
+
+
+After changing property
+[expanded]
+element.style { ()
+
+======== Matched CSS Rules ========
+[expanded]
+media="screen" (styles-edit-property-after-invalid-rule.html)
+#container { (styles-edit-property-after-invalid-rule.html:10)
+padding: 20px;
+
+[expanded]
+div { (user agent stylesheet)
+display: block;
+
+
+
Property changes on: trunk/LayoutTests/inspector/styles/styles-edit-property-after-invalid-rule-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/inspector/styles/styles-edit-property-after-invalid-rule.html (0 => 123746)
--- trunk/LayoutTests/inspector/styles/styles-edit-property-after-invalid-rule.html (rev 0)
+++ trunk/LayoutTests/inspector/styles/styles-edit-property-after-invalid-rule.html 2012-07-26 15:08:14 UTC (rev 123746)
@@ -0,0 +1,52 @@
+<html>
+<head>
+
+<style type="text/css" media="screen">
+/* Invalid selector */
+.navbar-search .search-query:-moz-placeholder {
+ color: #cccccc;
+}
+
+#container {
+ padding: 15px;
+}
+</style>
+
+<script src=""
+<script src=""
+<script>
+
+function test()
+{
+ InspectorTest.selectNodeAndWaitForStyles("container", step1);
+
+ function step1()
+ {
+ InspectorTest.addResult("Initial value");
+ InspectorTest.dumpSelectedElementStyles(true, false, true);
+
+ var treeItem = InspectorTest.getMatchedStylePropertyTreeItem("padding");
+ treeItem.applyStyleText("padding: 20px", true, false);
+ InspectorTest.waitForStyles("container", step2);
+ }
+
+ function step2()
+ {
+ InspectorTest.addResult("After changing property");
+ InspectorTest.dumpSelectedElementStyles(true, false, true);
+ InspectorTest.completeTest();
+ }
+}
+
+</script>
+</head>
+
+<body _onload_="runTest()">
+<p>
+Tests that proper source lines are reported for the styles after unrecognizer / invalid selector.
+</p>
+
+<div id="container"></div>
+
+</body>
+</html>
Property changes on: trunk/LayoutTests/inspector/styles/styles-edit-property-after-invalid-rule.html
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (123745 => 123746)
--- trunk/Source/WebCore/ChangeLog 2012-07-26 14:54:23 UTC (rev 123745)
+++ trunk/Source/WebCore/ChangeLog 2012-07-26 15:08:14 UTC (rev 123746)
@@ -1,3 +1,17 @@
+2012-07-26 Pavel Feldman <pfeld...@chromium.org>
+
+ Web Inspector: Edits of styles declared after invalid selector are not applied
+ https://bugs.webkit.org/show_bug.cgi?id=92382
+
+ Reviewed by Vsevolod Vlasov.
+
+ Now popping selectorless rules as well.
+
+ Test: inspector/styles/styles-edit-property-after-invalid-rule.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::createStyleRule):
+
2012-07-26 Joshua Netterfield <jnetterfi...@rim.com>
[WebGL] GraphicsContext3D::readPixels has extraneous code from GraphicsContext3D::readPixelsIMG
Modified: trunk/Source/WebCore/css/CSSParser.cpp (123745 => 123746)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-07-26 14:54:23 UTC (rev 123745)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-07-26 15:08:14 UTC (rev 123746)
@@ -9544,7 +9544,8 @@
result = rule.get();
m_parsedRules.append(rule.release());
processAndAddNewRuleToSourceTreeIfNeeded();
- }
+ } else
+ popRuleData();
clearProperties();
return result;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
