Simplify media query handling for stylesheets.

sky/engine/core/css/MediaQueryEvaluator.cpp

 /*
  * CSS Media Query Evaluator
  *
  * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 23 matching lines @@
 #include "gen/sky/core/MediaFeatureNames.h"
 #include "gen/sky/core/MediaFeatures.h"
 #include "gen/sky/core/MediaTypeNames.h"
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
 #include "sky/engine/core/css/CSSAspectRatioValue.h"
 #include "sky/engine/core/css/CSSHelper.h"
 #include "sky/engine/core/css/CSSPrimitiveValue.h"
 #include "sky/engine/core/css/CSSToLengthConversionData.h"
 #include "sky/engine/core/css/MediaList.h"
 #include "sky/engine/core/css/MediaQuery.h"
+#include "sky/engine/core/css/MediaQueryExp.h"
 #include "sky/engine/core/css/MediaValuesDynamic.h"
 #include "sky/engine/core/css/PointerProperties.h"
-#include "sky/engine/core/css/resolver/MediaQueryResult.h"
 #include "sky/engine/core/dom/NodeRenderStyle.h"
 #include "sky/engine/core/frame/FrameHost.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/frame/UseCounter.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/core/rendering/style/RenderStyle.h"
 #include "sky/engine/platform/PlatformScreen.h"
 #include "sky/engine/platform/geometry/FloatRect.h"
@@ skipping 52 matching lines @@
     return mediaTypeToMatch.isEmpty()
         || equalIgnoringCase(mediaTypeToMatch, MediaTypeNames::all)
         || equalIgnoringCase(mediaTypeToMatch, mediaType());
 }
 
 static bool applyRestrictor(MediaQuery::Restrictor r, bool value)
 {
     return r == MediaQuery::Not ? !value : value;
 }
 
-bool MediaQueryEvaluator::eval(const MediaQuery* query, MediaQueryResultList* viewportDependentMediaQueryResults) const
+bool MediaQueryEvaluator::eval(const MediaQuery* query) const
 {
     if (!mediaTypeMatch(query->mediaType()))
         return applyRestrictor(query->restrictor(), false);
 
     const ExpressionHeapVector& expressions = query->expressions();
     // Iterate through expressions, stop if any of them eval to false (AND semantics).
     size_t i = 0;
     for (; i < expressions.size(); ++i) {
-        bool exprResult = eval(expressions.at(i).get());
-        if (viewportDependentMediaQueryResults && expressions.at(i)->isViewportDependent())
-            viewportDependentMediaQueryResults->append(adoptRef(new MediaQueryResult(*expressions.at(i), exprResult)));
-        if (!exprResult)
+        if (!eval(expressions.at(i).get()))
             break;
     }
 
     // Assume true if we are at the end of the list, otherwise assume false.
     return applyRestrictor(query->restrictor(), expressions.size() == i);
 }
 
-bool MediaQueryEvaluator::eval(const MediaQuerySet* querySet, MediaQueryResultList* viewportDependentMediaQueryResults) const
+bool MediaQueryEvaluator::eval(const MediaQuerySet* querySet) const
 {
     if (!querySet)
         return true;
 
     const Vector<OwnPtr<MediaQuery> >& queries = querySet->queryVector();
     if (!queries.size())
         return true; // Empty query list evaluates to true.
 
     // Iterate over queries, stop if any of them eval to true (OR semantics).
     bool result = false;
     for (size_t i = 0; i < queries.size() && !result; ++i)
-        result = eval(queries[i].get(), viewportDependentMediaQueryResults);
+        result = eval(queries[i].get());
 
     return result;
 }
 
 template<typename T>
 bool compareValue(T a, T b, MediaFeaturePrefix op)
 {
     switch (op) {
     case MinPrefix:
         return a >= b;
@@ skipping 479 matching lines @@
     // Call the media feature evaluation function. Assume no prefix and let
     // trampoline functions override the prefix if prefix is used.
     EvalFunc func = gFunctionMap->get(expr->mediaFeature().impl());
     if (func)
         return func(expr->expValue(), NoPrefix, *m_mediaValues);
 
     return false;
 }
 
 } // namespace