Reporing invalid CSS selectors.

Source/core/css/CSSParser.h

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 - 2010  Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 61 matching lines @@
 class CSSParser {
     friend inline int cssyylex(void*, CSSParser*);
 
 public:
     class SourceDataHandler;
     enum ErrorType {
         NoError,
         PropertyDeclarationError,
         InvalidPropertyValueError,
         InvalidPropertyError,
+        InvalidSelectorError,
+        InvalidRuleError,
         GeneralError
     };
 
     CSSParser(const CSSParserContext&, UseCounter* = 0);
 
     ~CSSParser();
 
     void parseSheet(StyleSheetContents*, const String&, int startLineNumber = 0, SourceDataHandler* = 0, bool = false);
     PassRefPtr<StyleRuleBase> parseRule(StyleSheetContents*, const String&);
     PassRefPtr<StyleKeyframe> parseKeyframeRule(StyleSheetContents*, const String&);
@@ skipping 269 matching lines @@
 
     unsigned m_numParsedPropertiesBeforeMarginBox;
 
     int m_inParseShorthand;
     CSSPropertyID m_currentShorthand;
     bool m_implicitShorthand;
 
     bool m_hasFontFaceOnlyValues;
     bool m_hadSyntacticallyValidCSSRule;
     bool m_logErrors;
-    bool m_ignoreErrorsInDeclaration;
+    bool m_ignoreErrors;
 
     bool m_inFilterRule;
 
     AtomicString m_defaultNamespace;
 
     // tokenizer methods and data
     size_t m_parsedTextPrefixLength;
     size_t m_parsedTextSuffixLength;
     SourceDataHandler* m_sourceDataHandler;
 
     void startRuleHeader(CSSRuleSourceData::Type);
     void endRuleHeader();
     void startSelector();
     void endSelector();
     void startRuleBody();
     void endRuleBody(bool discard = false);
     void startProperty();
     void endProperty(bool isImportantFound, bool isPropertyParsed, ErrorType = NoError);
     void startEndUnknownRule();
+
+    void endInvalidRuleHeader();
     void reportError(const CSSParserLocation&, ErrorType = GeneralError);
+    void resumeErrorLogging() { m_ignoreErrors = false; }
 
     inline int lex(void* yylval) { return (this->*m_lexFunc)(yylval); }
 
     int token() { return m_token; }
 
     void tokenToLowerCase(const CSSParserString& token);
 
 #if ENABLE(CSS_DEVICE_ADAPTATION)
     void markViewportRuleBodyStart() { m_inViewport = true; }
     void markViewportRuleBodyEnd() { m_inViewport = false; }
     StyleRuleBase* createViewportRule();
 #endif
 
     PassRefPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
     PassRefPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*);
     PassRefPtr<CSSPrimitiveValue> createPrimitiveVariableNameValue(CSSParserValue*);
 
     static KURL completeURL(const CSSParserContext&, const String& url);
 
     CSSParserLocation currentLocation();
-    CSSParserLocation getSource(const CSSParserLocation& begin, const CSSParserLocation& end) const;
 
 private:
     enum PropertyType {
         PropertyExplicit,
         PropertyImplicit
     };
 
     class ImplicitScope {
         WTF_MAKE_NONCOPYABLE(ImplicitScope);
     public:
@@ skipping 139 matching lines @@
     const String* m_source;
     union {
         LChar* ptr8;
         UChar* ptr16;
     } m_tokenStart;
     unsigned m_length;
     int m_token;
     int m_lineNumber;
     int m_tokenStartLineNumber;
     int m_lastSelectorLineNumber;
+    CSSRuleSourceData::Type m_ruleHeaderType;
+    unsigned m_ruleHeaderStartOffset;
+    int m_ruleHeaderStartLineNumber;
 
     bool m_allowImportRules;
     bool m_allowNamespaceDeclarations;
 
 #if ENABLE(CSS_DEVICE_ADAPTATION)
     bool parseViewportProperty(CSSPropertyID propId, bool important);
     bool parseViewportShorthand(CSSPropertyID propId, CSSPropertyID first, CSSPropertyID second, bool important);
 
     bool inViewport() const { return m_inViewport; }
     bool m_inViewport;
@@ skipping 89 matching lines @@
         if (!(--m_parser->m_inParseShorthand))
             m_parser->m_currentShorthand = CSSPropertyInvalid;
     }
 
 private:
     CSSParser* m_parser;
 };
 
 struct CSSParserLocation {
     int lineNumber;
-    CSSParserString content;
-
-    CSSParserLocation trimTrailingWhitespace() const;
+    CSSParserString token;
 };
 
 class CSSParser::SourceDataHandler {
 public:
     virtual void startRuleHeader(CSSRuleSourceData::Type, unsigned offset) = 0;
     virtual void endRuleHeader(unsigned offset) = 0;
     virtual void startSelector(unsigned offset) = 0;
     virtual void endSelector(unsigned offset) = 0;
     virtual void startRuleBody(unsigned offset) = 0;
     virtual void endRuleBody(unsigned offset, bool error) = 0;
@@ skipping 37 matching lines @@
 }
 
 inline int cssyylex(void* yylval, CSSParser* parser)
 {
     return parser->lex(yylval);
 }
 
 } // namespace WebCore
 
 #endif // CSSParser_h