Title: [120327] trunk
Revision
120327
Author
[email protected]
Date
2012-06-14 08:34:05 -0700 (Thu, 14 Jun 2012)

Log Message

Web Inspector: Selector list start position is not extracted for style rules inside @media rules
https://bugs.webkit.org/show_bug.cgi?id=89094

Reviewed by Pavel Feldman.

Source/WebCore:

Selector list start is now marked inside the "ruleset" rule rather than separately, before its invocation(s).

* css/CSSGrammar.y:

LayoutTests:

* inspector/audits/audits-panel-functional.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (120326 => 120327)


--- trunk/LayoutTests/ChangeLog	2012-06-14 14:57:10 UTC (rev 120326)
+++ trunk/LayoutTests/ChangeLog	2012-06-14 15:34:05 UTC (rev 120327)
@@ -1,3 +1,12 @@
+2012-06-14  Alexander Pavlov  <[email protected]>
+
+        Web Inspector: Selector list start position is not extracted for style rules inside @media rules
+        https://bugs.webkit.org/show_bug.cgi?id=89094
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/audits/audits-panel-functional.html:
+
 2012-06-14  Mikhail Pozdnyakov  <[email protected]>
 
         [EFL] Tests rebaselining after r120167, r120246

Modified: trunk/LayoutTests/inspector/audits/audits-panel-functional.html (120326 => 120327)


--- trunk/LayoutTests/inspector/audits/audits-panel-functional.html	2012-06-14 14:57:10 UTC (rev 120326)
+++ trunk/LayoutTests/inspector/audits/audits-panel-functional.html	2012-06-14 15:34:05 UTC (rev 120327)
@@ -2,11 +2,17 @@
 <html>
 <head>
 <style>
+@media all {
+
+/* This is a comment to use some space before the unused rule */
+
 .unused {
     color: green;
     -webkit-opacity: 1;
     opacity: 1;
 }
+
+}
 </style>
 <script>
 JSON = {};

Modified: trunk/Source/WebCore/ChangeLog (120326 => 120327)


--- trunk/Source/WebCore/ChangeLog	2012-06-14 14:57:10 UTC (rev 120326)
+++ trunk/Source/WebCore/ChangeLog	2012-06-14 15:34:05 UTC (rev 120327)
@@ -1,3 +1,14 @@
+2012-06-14  Alexander Pavlov  <[email protected]>
+
+        Web Inspector: Selector list start position is not extracted for style rules inside @media rules
+        https://bugs.webkit.org/show_bug.cgi?id=89094
+
+        Reviewed by Pavel Feldman.
+
+        Selector list start is now marked inside the "ruleset" rule rather than separately, before its invocation(s).
+
+        * css/CSSGrammar.y:
+
 2012-06-14  Eric Penner  <[email protected]>
 
         [chromium] Fix race condition where animations start, finish and are deleted on the composite thread, all before the start even arrives on the main thread.

Modified: trunk/Source/WebCore/css/CSSGrammar.y (120326 => 120327)


--- trunk/Source/WebCore/css/CSSGrammar.y	2012-06-14 14:57:10 UTC (rev 120326)
+++ trunk/Source/WebCore/css/CSSGrammar.y	2012-06-14 15:34:05 UTC (rev 120327)
@@ -415,9 +415,7 @@
  ;
 
 valid_rule:
-    before_ruleset ruleset {
-        $$ = $2;
-    }
+    ruleset
   | media
   | page
   | font_face
@@ -845,7 +843,7 @@
     }
   ;
 
-before_ruleset:
+before_selector_list:
     /* empty */ {
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markSelectorListStart();
@@ -860,9 +858,9 @@
   ;
 
 ruleset:
-    selector_list before_rule_opening_brace '{' maybe_space_before_declaration declaration_list closing_brace {
+    before_selector_list selector_list before_rule_opening_brace '{' maybe_space_before_declaration declaration_list closing_brace {
         CSSParser* p = static_cast<CSSParser*>(parser);
-        $$ = p->createStyleRule($1);
+        $$ = p->createStyleRule($2);
     }
   ;
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to