am 3c54ece0: am 5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp

[android-x86/external-webkit.git] / WebCore / css / MediaQueryExp.h

diff --git a/WebCore/css/MediaQueryExp.h b/WebCore/css/MediaQueryExp.h
index 3036d04..24f2207 100644 (file)
--- a/WebCore/css/MediaQueryExp.h
+++ b/WebCore/css/MediaQueryExp.h
@@ -2,6 +2,7 @@
  * CSS Media Query
  *
  * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -36,8 +37,7 @@
 namespace WebCore {
 class CSSParserValueList;
 
-class MediaQueryExp
-{
+class MediaQueryExp : public FastAllocBase {
 public:
     MediaQueryExp(const AtomicString& mediaFeature, CSSParserValueList* values);
     ~MediaQueryExp();
@@ -46,12 +46,15 @@ public:
 
     CSSValue* value() const { return m_value.get(); }
 
-    bool operator==(const MediaQueryExp& other) const  {
+    bool operator==(const MediaQueryExp& other) const
+    {
         return (other.m_mediaFeature == m_mediaFeature)
             && ((!other.m_value && !m_value)
                 || (other.m_value && m_value && other.m_value->cssText() == m_value->cssText()));
     }
 
+    bool isValid() const { return m_isValid; }
+
     bool isViewportDependent() const { return m_mediaFeature == MediaFeatureNames::widthMediaFeature || 
                                               m_mediaFeature == MediaFeatureNames::heightMediaFeature ||
                                               m_mediaFeature == MediaFeatureNames::min_widthMediaFeature ||
@@ -62,9 +65,14 @@ public:
                                               m_mediaFeature == MediaFeatureNames::aspect_ratioMediaFeature ||
                                               m_mediaFeature == MediaFeatureNames::min_aspect_ratioMediaFeature ||
                                               m_mediaFeature == MediaFeatureNames::max_aspect_ratioMediaFeature;  }
+
+    String serialize() const;
+
 private:
     AtomicString m_mediaFeature;
     RefPtr<CSSValue> m_value;
+    bool m_isValid;
+    String m_serializationCache;
 };
 
 } // namespace