From 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Wed, 17 Dec 2008 18:05:15 -0800 Subject: Code drop from //branches/cupcake/...@124589 --- WebCore/css/MediaQueryEvaluator.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'WebCore/css/MediaQueryEvaluator.h') diff --git a/WebCore/css/MediaQueryEvaluator.h b/WebCore/css/MediaQueryEvaluator.h index 5f4ab50..5ae8fec 100644 --- a/WebCore/css/MediaQueryEvaluator.h +++ b/WebCore/css/MediaQueryEvaluator.h @@ -31,7 +31,8 @@ #include "PlatformString.h" namespace WebCore { -class Page; +class CSSStyleSelector; +class Frame; class RenderStyle; class MediaList; class MediaQueryExp; @@ -66,7 +67,7 @@ public: /** Creates evaluator which evaluates full media queries */ - MediaQueryEvaluator(const String& acceptedMediaType, Page* page, RenderStyle* style); + MediaQueryEvaluator(const String& acceptedMediaType, Frame*, RenderStyle*); ~MediaQueryEvaluator(); @@ -74,14 +75,14 @@ public: bool mediaTypeMatchSpecific(const char* mediaTypeToMatch) const; /** Evaluates a list of media queries */ - bool eval(const MediaList* query) const; + bool eval(const MediaList*, CSSStyleSelector* = 0) const; /** Evaluates media query subexpression, ie "and (media-feature: value)" part */ - bool eval(const MediaQueryExp* expr) const; + bool eval(const MediaQueryExp*) const; private: String m_mediaType; - Page* m_page; // not owned + Frame* m_frame; // not owned RenderStyle* m_style; // not owned bool m_expResult; }; -- cgit v1.1