Enable Media query evaluation in the preload scanner

Source/core/html/parser/HTMLPreloadScanner.h

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2010 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 15 matching lines @@
 
 #ifndef HTMLPreloadScanner_h
 #define HTMLPreloadScanner_h
 
 #include "core/html/parser/CSSPreloadScanner.h"
 #include "core/html/parser/CompactHTMLToken.h"
 #include "core/html/parser/HTMLToken.h"
 #include "platform/text/SegmentedString.h"
 #include "wtf/Vector.h"
 
+

[abarth-chromium, 2014/03/24 19:43:31]

This change looks spurious.

 namespace WebCore {
 
 typedef size_t TokenPreloadScannerCheckpoint;
 
 class HTMLParserOptions;
 class HTMLTokenizer;
 class SegmentedString;
+class MediaValues;
 
 class TokenPreloadScanner {
     WTF_MAKE_NONCOPYABLE(TokenPreloadScanner); WTF_MAKE_FAST_ALLOCATED;
 public:
-    TokenPreloadScanner(const KURL& documentURL, float deviceScaleFactor);
+    TokenPreloadScanner(const KURL& documentURL, float deviceScaleFactor, PassRefPtr<MediaValues>);
     ~TokenPreloadScanner();
 
     void scan(const HTMLToken&, const SegmentedString&, PreloadRequestStream& requests);
     void scan(const CompactHTMLToken&, const SegmentedString&, PreloadRequestStream& requests);
 
     void setPredictedBaseElementURL(const KURL& url) { m_predictedBaseElementURL = url; }
 
     // A TokenPreloadScannerCheckpoint is valid until the next call to rewindTo,
     // at which point all outstanding checkpoints are invalidated.
     TokenPreloadScannerCheckpoint createCheckpoint();
     void rewindTo(TokenPreloadScannerCheckpoint);
 
     bool isSafeToSendToAnotherThread()

[abarth-chromium, 2014/03/24 19:43:31]

We need to teach this function about m_mediaValues.  For example, m_mediaValues
contains a String, which means we'll need to call
m_mediaValues->isSafeToSendToAnotherThread(), which will need to call
isSafeToSendToAnotherThread() on m_mediaType.

     {
         return m_documentURL.isSafeToSendToAnotherThread()
             && m_predictedBaseElementURL.isSafeToSendToAnotherThread();
     }
 
 private:
     class StartTagScanner;
 
     template<typename Token>
     inline void scanCommon(const Token&, const SegmentedString&, PreloadRequestStream& requests);
@@ skipping 13 matching lines @@
         bool inStyle;
         size_t templateCount;
     };
 
     CSSPreloadScanner m_cssScanner;
     const KURL m_documentURL;
     KURL m_predictedBaseElementURL;
     bool m_inStyle;
     float m_deviceScaleFactor;
     size_t m_templateCount;
+    RefPtr<MediaValues> m_mediaValues;
 
     Vector<Checkpoint> m_checkpoints;
 };
 
 class HTMLPreloadScanner {
     WTF_MAKE_NONCOPYABLE(HTMLPreloadScanner); WTF_MAKE_FAST_ALLOCATED;
 public:
-    HTMLPreloadScanner(const HTMLParserOptions&, const KURL& documentURL, float deviceScaleFactor);
+    HTMLPreloadScanner(const HTMLParserOptions&, const KURL& documentURL, float deviceScaleFactor, PassRefPtr<MediaValues>);
     ~HTMLPreloadScanner();
 
     void appendToEnd(const SegmentedString&);
     void scan(HTMLResourcePreloader*, const KURL& documentBaseElementURL);
 
 private:
     TokenPreloadScanner m_scanner;
     SegmentedString m_source;
     HTMLToken m_token;
     OwnPtr<HTMLTokenizer> m_tokenizer;
 };
 
 }
 
 #endif