1 files changed, 19 insertions, 6 deletions
diff --git a/chromium/third_party/blink/renderer/core/css/parser/media_query_parser.h b/chromium/third_party/blink/renderer/core/css/parser/media_query_parser.h
index 0da7b89eb18..a956c975641 100644
--- a/chromium/third_party/blink/renderer/core/css/parser/media_query_parser.h
+++ b/chromium/third_party/blink/renderer/core/css/parser/media_query_parser.h
@@ -19,6 +19,7 @@
 namespace blink {
 
 class MediaQuerySet;
+class CSSParserContext;
 
 class MediaQueryData {
   STACK_ALLOCATED();
@@ -30,10 +31,14 @@ class MediaQueryData {
   String media_feature_;
   bool media_type_set_;
 
+  // A fake CSSParserContext for use counter only.
+  // TODO(xiaochengh): Plumb the real CSSParserContext from the document.
+  const CSSParserContext& fake_context_;
+
  public:
   MediaQueryData();
   void Clear();
-  void AddExpression(CSSParserTokenRange&);
+  void AddExpression(CSSParserTokenRange&, const ExecutionContext*);
   bool LastExpressionValid();
   void RemoveLastExpression();
   void SetMediaType(const String&);
@@ -57,12 +62,19 @@ class CORE_EXPORT MediaQueryParser {
   STACK_ALLOCATED();
 
  public:
-  static scoped_refptr<MediaQuerySet> ParseMediaQuerySet(const String&);
-  static scoped_refptr<MediaQuerySet> ParseMediaQuerySet(CSSParserTokenRange);
-  static scoped_refptr<MediaQuerySet> ParseMediaCondition(CSSParserTokenRange);
+  static scoped_refptr<MediaQuerySet> ParseMediaQuerySet(
+      const String&,
+      const ExecutionContext*);
+  static scoped_refptr<MediaQuerySet> ParseMediaQuerySet(
+      CSSParserTokenRange,
+      const ExecutionContext*);
+  static scoped_refptr<MediaQuerySet> ParseMediaCondition(
+      CSSParserTokenRange,
+      const ExecutionContext*);
   static scoped_refptr<MediaQuerySet> ParseMediaQuerySetInMode(
       CSSParserTokenRange,
-      CSSParserMode);
+      CSSParserMode,
+      const ExecutionContext*);
 
  private:
   enum ParserType {
@@ -70,7 +82,7 @@ class CORE_EXPORT MediaQueryParser {
     kMediaConditionParser,
   };
 
-  MediaQueryParser(ParserType, CSSParserMode);
+  MediaQueryParser(ParserType, CSSParserMode, const ExecutionContext*);
   virtual ~MediaQueryParser();
 
   scoped_refptr<MediaQuerySet> ParseImpl(CSSParserTokenRange);
@@ -125,6 +137,7 @@ class CORE_EXPORT MediaQueryParser {
   scoped_refptr<MediaQuerySet> query_set_;
   MediaQueryBlockWatcher block_watcher_;
   CSSParserMode mode_;
+  const ExecutionContext* execution_context_;
 
   const static State kReadRestrictor;
   const static State kReadMediaNot;