Changeset 150791 in webkit

Timestamp:

May 28, 2013 12:21:02 AM (11 years ago)

Author:

sergio@webkit.org

Message:

Web Inspector: Enable CSS logging
​https://bugs.webkit.org/show_bug.cgi?id=113401

Reviewed by Benjamin Poulain.

From Blink r149265 by <​serya@chromium.org>

Source/WebCore:

CSS logging was disabled in r147028 to prevent message overflow in
the inspector console. This change restores it by modifying the
CSS grammar in order to reduce as much consecutive errors as
possible in 'declaration_list' and 'decl_list' rules.

This way, for rules like 'x { color: ### }' only the first '#'
will be reported as error (instead of 3 identical errors).

The rule 'declaration' still produces multiple errors, because it
does not eat as much errors as possible. So in order not to create
a complex risky patch we just disable logging in the parser for
that rule.

• css/CSSGrammar.y.in:
• css/CSSParser.cpp:

(WebCore::CSSParser::CSSParser):
(WebCore::CSSParser::parseSheet):
(WebCore::CSSParser::syntaxError):
(WebCore::CSSParser::isLoggingErrors):
(WebCore::CSSParser::rewriteSpecifiers):

• css/CSSParser.h:

(CSSParser):

LayoutTests:

Unskipped console-css-warnings.html now that it's working.

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSGrammar.y.in (modified) (3 diffs)
• Source/WebCore/css/CSSParser.cpp (modified) (5 diffs)
• Source/WebCore/css/CSSParser.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-28  Sergio Villar Senin  <svillar@igalia.com>
+
+        Web Inspector: Enable CSS logging
+        https://bugs.webkit.org/show_bug.cgi?id=113401
+
+        Reviewed by Benjamin Poulain.
+
+        From Blink r149265 by <serya@chromium.org>
+
+        Unskipped console-css-warnings.html now that it's working.
+
+        * TestExpectations:
+
 2013-05-27  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -9 +9 @@
 webkit.org/b/109570 media/track/regions-webvtt [ Skip ]
 
-# pending CSS grammar refactoring
-webkit.org/b/113401 inspector/console/console-css-warnings.html [ Skip ]
-
 # media/video-seek-after-end.html is flaky
 webkit.org/b/116293 media/video-seek-after-end.html [ Pass Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-28  Sergio Villar Senin  <svillar@igalia.com>
+
+        Web Inspector: Enable CSS logging
+        https://bugs.webkit.org/show_bug.cgi?id=113401
+
+        Reviewed by Benjamin Poulain.
+
+        From Blink r149265 by <serya@chromium.org>
+
+        CSS logging was disabled in r147028 to prevent message overflow in
+        the inspector console. This change restores it by modifying the
+        CSS grammar in order to reduce as much consecutive errors as
+        possible in 'declaration_list' and 'decl_list' rules.
+
+        This way, for rules like 'x { color: ### }' only the first '#'
+        will be reported as error (instead of 3 identical errors).
+
+        The rule 'declaration' still produces multiple errors, because it
+        does not eat as much errors as possible. So in order not to create
+        a complex risky patch we just disable logging in the parser for
+        that rule.
+
+        * css/CSSGrammar.y.in:
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::CSSParser):
+        (WebCore::CSSParser::parseSheet):
+        (WebCore::CSSParser::syntaxError):
+        (WebCore::CSSParser::isLoggingErrors):
+        (WebCore::CSSParser::rewriteSpecifiers):
+        * css/CSSParser.h:
+        (CSSParser):
+
 2013-05-27  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/css/CSSGrammar.y.in

@@ -1533 +1533 @@
         $$ = $1;
     }
-    | errors decl_list_recovery {
-        parser->syntaxError($1, CSSParser::PropertyDeclarationError);
+    | decl_list_recovery {
         $$ = false;
     }
-    | decl_list errors decl_list_recovery {
-        parser->syntaxError($2, CSSParser::PropertyDeclarationError);
+    | decl_list decl_list_recovery {
         $$ = $1;
     }
@@ -1556 +1554 @@
         $$ = false;
     }
-    | errors decl_list_recovery ';' maybe_space {
-        parser->syntaxError($1, CSSParser::PropertyDeclarationError);
+    | decl_list_recovery ';' maybe_space {
         parser->markPropertyStart();
         $$ = false;
@@ -1567 +1564 @@
             $$ = $2;
     }
-    | decl_list errors decl_list_recovery ';' maybe_space {
+    | decl_list decl_list_recovery ';' maybe_space {
+        parser->markPropertyStart();
+        $$ = $1;
+    }
+    ;
+
+decl_list_recovery:
+    error error_location {
         parser->syntaxError($2, CSSParser::PropertyDeclarationError);
-        parser->markPropertyStart();
-        $$ = $1;
-    }
-    ;
-
-decl_list_recovery:
-    invalid_block_list error
-    | /* empty */
+    }
+    | decl_list_recovery invalid_block
+    | decl_list_recovery error
     ;
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -325 +325 @@
     , m_hadSyntacticallyValidCSSRule(false)
     , m_logErrors(false)
+    , m_ignoreErrorsInDeclaration(false)
 #if ENABLE(CSS_SHADERS)
     , m_inFilterRule(false)
@@ -461 +462 @@
 
     m_logErrors = logErrors && sheet->singleOwnerDocument() && !sheet->baseURL().isEmpty() && sheet->singleOwnerDocument()->page();
+    m_ignoreErrorsInDeclaration = false;
     m_lineNumber = startLineNumber;
     setupParser("", string, "");
@@ -468 +470 @@
     m_ruleSourceDataResult = 0;
     m_rule = 0;
+    m_ignoreErrorsInDeclaration = false;
     m_logErrors = false;
 }
@@ -11499 +11502 @@
 
     logError(builder.toString(), location.lineNumber);
+
+    m_ignoreErrorsInDeclaration = true;
 }
 
 bool CSSParser::isLoggingErrors()
 {
-    // FIXME: return logging back (https://bugs.webkit.org/show_bug.cgi?id=113401).
-    return false;
+    return m_logErrors && !m_ignoreErrorsInDeclaration;
 }
 
@@ -11950 +11954 @@
 void CSSParser::markPropertyStart()
 {
+    m_ignoreErrorsInDeclaration = false;
     if (!isExtractingSourceData())
         return;

trunk/Source/WebCore/css/CSSParser.h

@@ -398 +398 @@
     bool m_hadSyntacticallyValidCSSRule;
     bool m_logErrors;
+    bool m_ignoreErrorsInDeclaration;
 
 #if ENABLE(CSS_SHADERS)