webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 29 insertions, 39 deletions

diff --git a/Source/WebCore/css/MediaQueryEvaluator.h b/Source/WebCore/css/MediaQueryEvaluator.h
index c9ea5932f..eae5e947f 100644
--- a/Source/WebCore/css/MediaQueryEvaluator.h
+++ b/Source/WebCore/css/MediaQueryEvaluator.h
@@ -15,7 +15,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
@@ -25,66 +25,56 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MediaQueryEvaluator_h
-#define MediaQueryEvaluator_h
+#pragma once
 
-#include <wtf/text/WTFString.h>
+#include "MediaQueryExpression.h"
 
 namespace WebCore {
+
+class Document;
 class Frame;
-class MediaQueryExp;
 class MediaQuerySet;
 class RenderStyle;
 class StyleResolver;
 
-/**
- * Class that evaluates css media queries as defined in
- * CSS3 Module "Media Queries" (http://www.w3.org/TR/css3-mediaqueries/)
- * Special constructors are needed, if simple media queries are to be
- * evaluated without knowledge of the medium features. This can happen
- * for example when parsing UA stylesheets, if evaluation is done
- * right after parsing.
- *
- * the boolean parameter is used to approximate results of evaluation, if
- * the device characteristics are not known. This can be used to prune the loading
- * of stylesheets to only those which are probable to match.
- */
+struct MediaQueryResult {
+    MediaQueryExpression expression;
+    bool result;
+};
+
+// Some of the constructors are used for cases where the device characteristics are not known.
+// These  can be used to prune the loading of stylesheets to only those which are not already known to not match.
+
 class MediaQueryEvaluator {
-     WTF_MAKE_NONCOPYABLE(MediaQueryEvaluator); WTF_MAKE_FAST_ALLOCATED;
 public:
-    /** Creates evaluator which evaluates only simple media queries
-     *  Evaluator returns true for "all", and returns value of \mediaFeatureResult
-     *  for any media features
-     */
+    // Creates evaluator which evaluates only simple media queries.
+    // Evaluator returns true for "all", and returns value of \mediaFeatureResult for any media features.
     explicit MediaQueryEvaluator(bool mediaFeatureResult = false);
 
-    /** Creates evaluator which evaluates only simple media queries
-     *  Evaluator  returns true for acceptedMediaType and returns value of \mediafeatureResult
-     *  for any media features
-     */
+    // Creates evaluator which evaluates only simple media queries.
+    // Evaluator returns true for acceptedMediaType and returns value of \mediaFeatureResult for any media features.
     MediaQueryEvaluator(const String& acceptedMediaType, bool mediaFeatureResult = false);
 
-    /** Creates evaluator which evaluates full media queries
-     */
-    MediaQueryEvaluator(const String& acceptedMediaType, Frame*, RenderStyle*);
-
-    ~MediaQueryEvaluator();
+    // Creates evaluator which evaluates full media queries.
+    WEBCORE_EXPORT MediaQueryEvaluator(const String& acceptedMediaType, const Document&, const RenderStyle*);
 
     bool mediaTypeMatch(const String& mediaTypeToMatch) const;
     bool mediaTypeMatchSpecific(const char* mediaTypeToMatch) const;
 
-    /** Evaluates a list of media queries */
-    bool eval(const MediaQuerySet*, StyleResolver* = 0) const;
+    // Evaluates a list of media queries.
+    WEBCORE_EXPORT bool evaluate(const MediaQuerySet&, StyleResolver* = nullptr) const;
+
+    // Evaluates media query subexpression, ie "and (media-feature: value)" part.
+    bool evaluate(const MediaQueryExpression&) const;
 
-    /** Evaluates media query subexpression, ie "and (media-feature: value)" part */
-    bool eval(const MediaQueryExp*) const;
+    // Evaluates a list of media queries and fills in a vector with any viewport-dependent results found.
+    bool evaluate(const MediaQuerySet&, Vector<MediaQueryResult>&) const;
 
 private:
     String m_mediaType;
-    Frame* m_frame; // not owned
-    RefPtr<RenderStyle> m_style;
-    bool m_expResult;
+    Frame* m_frame { nullptr }; // not owned
+    const RenderStyle* m_style { nullptr };
+    bool m_fallbackResult { false };
 };
 
 } // namespace
-#endif