webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 17 insertions, 28 deletions

diff --git a/Source/WebCore/css/MediaQuery.h b/Source/WebCore/css/MediaQuery.h
index cea7d2007..cf2942e94 100644
--- a/Source/WebCore/css/MediaQuery.h
+++ b/Source/WebCore/css/MediaQuery.h
@@ -16,7 +16,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -26,50 +26,39 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MediaQuery_h
-#define MediaQuery_h
+#pragma once
 
-#include <wtf/PassOwnPtr.h>
+#include "MediaQueryExpression.h"
 #include <wtf/Vector.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
 
 namespace WebCore {
-class MediaQueryExp;
 
 class MediaQuery {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    enum Restrictor {
-        Only, Not, None
-    };
+    enum Restrictor { Only, Not, None };
 
-    typedef Vector<OwnPtr<MediaQueryExp>> ExpressionVector;
-
-    MediaQuery(Restrictor, const String& mediaType, PassOwnPtr<Vector<OwnPtr<MediaQueryExp>>> exprs);
-    ~MediaQuery();
+    MediaQuery(Restrictor, const String& mediaType, Vector<MediaQueryExpression>&&);
 
     Restrictor restrictor() const { return m_restrictor; }
-    const Vector<OwnPtr<MediaQueryExp>>& expressions() const { return *m_expressions; }
-    String mediaType() const { return m_mediaType; }
-    bool operator==(const MediaQuery& other) const;
-    String cssText() const;
+    const Vector<MediaQueryExpression>& expressions() const { return m_expressions; }
+    const String& mediaType() const { return m_mediaType; }
     bool ignored() const { return m_ignored; }
 
-    PassOwnPtr<MediaQuery> copy() const { return adoptPtr(new MediaQuery(*this)); }
+    const String& cssText() const;
 
- private:
-    MediaQuery(const MediaQuery&);
+    bool operator==(const MediaQuery& other) const;
 
-    Restrictor m_restrictor;
-    String m_mediaType;
-    OwnPtr<ExpressionVector> m_expressions;
-    bool m_ignored;
-    String m_serializationCache;
+    void shrinkToFit() { m_expressions.shrinkToFit(); }
 
+private:
     String serialize() const;
+
+    Restrictor m_restrictor;
+    String m_mediaType;
+    Vector<MediaQueryExpression> m_expressions;
+    bool m_ignored { false };
+    mutable String m_serializationCache;
 };
 
 } // namespace
-
-#endif