Fixing inconsistency with Media Query append/deleteMedium.

Source/core/css/MediaList.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2006, 2008, 2009, 2010, 2012 Apple Inc. 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 18 matching lines @@
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class CSSRule;
 class CSSStyleSheet;
 class Document;
 class MediaList;
 class MediaQuery;
 
+enum MediaQueryParserMode {
+    MediaQueryNormalMode,
+    MediaQueryForwardCompatibleSyntaxMode,
+    MediaQueryStrictMode,
+};
+
 class MediaQuerySet : public RefCounted<MediaQuerySet> {
 public:
     static PassRefPtr<MediaQuerySet> create()
     {
         return adoptRef(new MediaQuerySet());
     }
     static PassRefPtr<MediaQuerySet> create(const String& mediaString)
     {
-        return adoptRef(new MediaQuerySet(mediaString, false));
+        return adoptRef(new MediaQuerySet(mediaString, MediaQueryNormalMode));
     }
     static PassRefPtr<MediaQuerySet> createAllowingDescriptionSyntax(const String& mediaString)
     {
-        return adoptRef(new MediaQuerySet(mediaString, true));
+        return adoptRef(new MediaQuerySet(mediaString, MediaQueryForwardCompatibleSyntaxMode));
     }
     ~MediaQuerySet();
 
-    bool parse(const String&);
+    bool set(const String&);
     bool add(const String&);
     bool remove(const String&);
 
     void addMediaQuery(PassOwnPtr<MediaQuery>);
 
     const Vector<OwnPtr<MediaQuery> >& queryVector() const { return m_queries; }
 
     int lastLine() const { return m_lastLine; }
     void setLastLine(int lastLine) { m_lastLine = lastLine; }
 
     String mediaText() const;
 
     PassRefPtr<MediaQuerySet> copy() const { return adoptRef(new MediaQuerySet(*this)); }
 
     void reportMemoryUsage(MemoryObjectInfo*) const;
 
 private:
     MediaQuerySet();
-    MediaQuerySet(const String& mediaQuery, bool fallbackToDescription);
+    MediaQuerySet(const String& mediaQuery, MediaQueryParserMode);
     MediaQuerySet(const MediaQuerySet&);
 
-    PassOwnPtr<MediaQuery> parseMediaQuery(const String&);
+    PassOwnPtr<MediaQuery> parseMediaQuery(const String&, MediaQueryParserMode);
+    void parseMediaQueryList(const String&, MediaQueryParserMode, Vector<OwnPtr<MediaQuery> >& result);
 
-    unsigned m_fallbackToDescriptor : 1; // true if failed media query parsing should fallback to media description parsing.
-    signed m_lastLine : 31;
+    MediaQueryParserMode m_parserMode;

[apavlov, 2013/05/29 15:44:36]

Should this occupy 2 bits, and m_lastLine (added by me, it seems) 30 bits?

[kenneth.r.christiansen, 2013/05/29 15:52:56]

Sounds fine. Let me do that change

+    unsigned m_lastLine : 31;
     Vector<OwnPtr<MediaQuery> > m_queries;
 };
 
 class MediaList : public RefCounted<MediaList> {
 public:
     static PassRefPtr<MediaList> create(MediaQuerySet* mediaQueries, CSSStyleSheet* parentSheet)
     {
         return adoptRef(new MediaList(mediaQueries, parentSheet));
     }
     static PassRefPtr<MediaList> create(MediaQuerySet* mediaQueries, CSSRule* parentRule)
     {
         return adoptRef(new MediaList(mediaQueries, parentRule));
     }
 
     ~MediaList();
 
     unsigned length() const { return m_mediaQueries->queryVector().size(); }
     String item(unsigned index) const;
     void deleteMedium(const String& oldMedium, ExceptionCode&);
     void appendMedium(const String& newMedium, ExceptionCode&);
 
     String mediaText() const { return m_mediaQueries->mediaText(); }
-    void setMediaText(const String&, ExceptionCode&);
+    void setMediaText(const String&);
 
     // Not part of CSSOM.
     CSSRule* parentRule() const { return m_parentRule; }
     CSSStyleSheet* parentStyleSheet() const { return m_parentStyleSheet; }
     void clearParentStyleSheet() { ASSERT(m_parentStyleSheet); m_parentStyleSheet = 0; }
     void clearParentRule() { ASSERT(m_parentRule); m_parentRule = 0; }
     const MediaQuerySet* queries() const { return m_mediaQueries.get(); }
 
     void reattach(MediaQuerySet*);
 
     void reportMemoryUsage(MemoryObjectInfo*) const;
 
 private:
     MediaList();
     MediaList(MediaQuerySet*, CSSStyleSheet* parentSheet);
     MediaList(MediaQuerySet*, CSSRule* parentRule);
 
     RefPtr<MediaQuerySet> m_mediaQueries;
     CSSStyleSheet* m_parentStyleSheet;
     CSSRule* m_parentRule;
 };
 
 // Adds message to inspector console whenever dpi or dpcm values are used for "screen" media.
 void reportMediaQueryWarningIfNeeded(Document*, const MediaQuerySet*);
 
 } // namespace
 
 #endif