projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
css
/
MediaQueryEvaluator.h
diff --git
a/src/third_party/WebKit/Source/core/css/MediaQueryEvaluator.h
b/src/third_party/WebKit/Source/core/css/MediaQueryEvaluator.h
index
7465c76
..
9bfbf15
100644
(file)
--- a/
src/third_party/WebKit/Source/core/css/MediaQueryEvaluator.h
+++ b/
src/third_party/WebKit/Source/core/css/MediaQueryEvaluator.h
@@
-33,10
+33,10
@@
namespace blink {
class LocalFrame;
namespace blink {
class LocalFrame;
+class MediaQuery;
class MediaQueryExp;
class MediaQueryResult;
class MediaQuerySet;
class MediaQueryExp;
class MediaQueryResult;
class MediaQuerySet;
-class RenderStyle;
class MediaValues;
typedef WillBeHeapVector<RefPtrWillBeMember<MediaQueryResult> > MediaQueryResultList;
class MediaValues;
typedef WillBeHeapVector<RefPtrWillBeMember<MediaQueryResult> > MediaQueryResultList;
@@
-57,30
+57,33
@@
class MediaQueryEvaluator {
public:
// Creates evaluator which evaluates only simple media queries
// Evaluator returns true for "all", and returns value of \mediaFeatureResult
public:
// Creates evaluator which evaluates only simple media queries
// Evaluator returns true for "all", and returns value of \mediaFeatureResult
- // for any media features
+ // 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
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
+ // for any media features
.
MediaQueryEvaluator(const char* acceptedMediaType, bool mediaFeatureResult = false);
MediaQueryEvaluator(const char* acceptedMediaType, bool mediaFeatureResult = false);
- // Creates evaluator which evaluates full media queries
+ // Creates evaluator which evaluates full media queries
.
explicit MediaQueryEvaluator(LocalFrame*);
explicit MediaQueryEvaluator(LocalFrame*);
- // Creates evaluator which evaluates in a thread-safe manner a subset of media values
+ // Creates evaluator which evaluates in a thread-safe manner a subset of media values
.
explicit MediaQueryEvaluator(const MediaValues&);
~MediaQueryEvaluator();
bool mediaTypeMatch(const String& mediaTypeToMatch) const;
explicit MediaQueryEvaluator(const MediaValues&);
~MediaQueryEvaluator();
bool mediaTypeMatch(const String& mediaTypeToMatch) const;
- // Evaluates a list of media queries
+ // Evaluates a list of media queries
.
bool eval(const MediaQuerySet*, MediaQueryResultList* = 0) const;
bool eval(const MediaQuerySet*, MediaQueryResultList* = 0) const;
- // Evaluates media query subexpression, ie "and (media-feature: value)" part
+ // Evaluates media query.
+ bool eval(const MediaQuery*, MediaQueryResultList*) const;
+
+ // Evaluates media query subexpression, ie "and (media-feature: value)" part.
bool eval(const MediaQueryExp*) const;
private:
bool eval(const MediaQueryExp*) const;
private: