Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 4 insertions, 15 deletions

diff --git a/Source/WebCore/css/CSSMediaRule.h b/Source/WebCore/css/CSSMediaRule.h
index 878359484..7735b1262 100644
--- a/Source/WebCore/css/CSSMediaRule.h
+++ b/Source/WebCore/css/CSSMediaRule.h
@@ -23,15 +23,14 @@
 #ifndef CSSMediaRule_h
 #define CSSMediaRule_h
 
-#include "CSSRule.h"
+#include "CSSGroupingRule.h"
 #include "MediaList.h"
 
 namespace WebCore {
 
-class CSSRuleList;
 class StyleRuleMedia;
 
-class CSSMediaRule : public CSSRule {
+class CSSMediaRule : public CSSGroupingRule {
 public:
     static PassRefPtr<CSSMediaRule> create(StyleRuleMedia* rule, CSSStyleSheet* sheet) { return adoptRef(new CSSMediaRule(rule, sheet)); }
 
@@ -39,26 +38,16 @@ public:
 
     virtual CSSRule::Type type() const OVERRIDE { return MEDIA_RULE; }
     virtual void reattach(StyleRuleBase*) OVERRIDE;
-    virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
     virtual String cssText() const OVERRIDE;
 
     MediaList* media() const;
-    CSSRuleList* cssRules() const;
-
-    unsigned insertRule(const String& rule, unsigned index, ExceptionCode&);
-    void deleteRule(unsigned index, ExceptionCode&);
-        
-    // For CSSRuleList
-    unsigned length() const;
-    CSSRule* item(unsigned index) const;
 
 private:
     CSSMediaRule(StyleRuleMedia*, CSSStyleSheet*);
+
+    MediaQuerySet* mediaQueries() const;
     
-    RefPtr<StyleRuleMedia> m_mediaRule;
     mutable RefPtr<MediaList> m_mediaCSSOMWrapper;
-    mutable Vector<RefPtr<CSSRule> > m_childRuleCSSOMWrappers;
-    mutable OwnPtr<CSSRuleList> m_ruleListCSSOMWrapper;
 };
 
 } // namespace WebCore