Revert of Create MediaValuesCached and TokenPreloadScanner on the parser thread

third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
  * 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.
@@ skipping 424 matching lines @@
     float m_sourceSize;
     bool m_sourceSizeSet;
     FetchRequest::DeferOption m_defer;
     CrossOriginAttributeValue m_crossOrigin;
     RefPtrWillBeMember<MediaValuesCached> m_mediaValues;
     bool m_referrerPolicySet;
     ReferrerPolicy m_referrerPolicy;
     IntegrityMetadataSet m_integrityMetadata;
 };
 
-TokenPreloadScanner::TokenPreloadScanner(const KURL& documentURL, PassOwnPtr<CachedDocumentParameters> documentParameters, const MediaValuesCached::MediaValuesCachedData& mediaValuesCachedData)
+TokenPreloadScanner::TokenPreloadScanner(const KURL& documentURL, PassOwnPtr<CachedDocumentParameters> documentParameters)
     : m_documentURL(documentURL)
     , m_inStyle(false)
     , m_inPicture(false)
     , m_isAppCacheEnabled(false)
     , m_isCSPEnabled(false)
     , m_templateCount(0)
     , m_documentParameters(documentParameters)
-    , m_mediaValues(MediaValuesCached::create(mediaValuesCachedData))
 {
     ASSERT(m_documentParameters.get());
-    ASSERT(m_mediaValues.get());
+    ASSERT(m_documentParameters->mediaValues.get());
 }
 
 TokenPreloadScanner::~TokenPreloadScanner()
 {
 }
 
 TokenPreloadScannerCheckpoint TokenPreloadScanner::createCheckpoint()
 {
     TokenPreloadScannerCheckpoint checkpoint = m_checkpoints.size();
     m_checkpoints.append(Checkpoint(m_predictedBaseElementURL, m_inStyle, m_isAppCacheEnabled, m_isCSPEnabled, m_templateCount));
@@ skipping 16 matching lines @@
 void TokenPreloadScanner::scan(const HTMLToken& token, const SegmentedString& source, PreloadRequestStream& requests)
 {
     scanCommon(token, source, requests);
 }
 
 void TokenPreloadScanner::scan(const CompactHTMLToken& token, const SegmentedString& source, PreloadRequestStream& requests)
 {
     scanCommon(token, source, requests);
 }
 
-static void handleMetaViewport(const String& attributeValue, const CachedDocumentParameters* documentParameters, MediaValuesCached* mediaValues)
+static void handleMetaViewport(const String& attributeValue, CachedDocumentParameters* documentParameters)
 {
     if (!documentParameters->viewportMetaEnabled)
         return;
     ViewportDescription description(ViewportDescription::ViewportMeta);
     HTMLMetaElement::getViewportDescriptionFromContentAttribute(attributeValue, description, nullptr, documentParameters->viewportMetaZeroValuesQuirk);
-    FloatSize initialViewport(mediaValues->deviceWidth(), mediaValues->deviceHeight());
+    FloatSize initialViewport(documentParameters->mediaValues->deviceWidth(), documentParameters->mediaValues->deviceHeight());
     PageScaleConstraints constraints = description.resolve(initialViewport, documentParameters->defaultViewportMinWidth);
-    mediaValues->setViewportHeight(constraints.layoutSize.height());
-    mediaValues->setViewportWidth(constraints.layoutSize.width());
+    documentParameters->mediaValues->setViewportHeight(constraints.layoutSize.height());
+    documentParameters->mediaValues->setViewportWidth(constraints.layoutSize.width());
 }
 
 static void handleMetaReferrer(const String& attributeValue, CachedDocumentParameters* documentParameters, CSSPreloadScanner* cssScanner)
 {
     if (attributeValue.isEmpty() || attributeValue.isNull() || !SecurityPolicy::referrerPolicyFromString(attributeValue, &documentParameters->referrerPolicy)) {
         documentParameters->referrerPolicy = ReferrerPolicyDefault;
     }
     cssScanner->setReferrerPolicy(documentParameters->referrerPolicy);
 }
 
 template <typename Token>
-static void handleMetaNameAttribute(const Token& token, CachedDocumentParameters* documentParameters, MediaValuesCached* mediaValues, CSSPreloadScanner* cssScanner)
+static void handleMetaNameAttribute(const Token& token, CachedDocumentParameters* documentParameters, CSSPreloadScanner* cssScanner)
 {
     const typename Token::Attribute* nameAttribute = token.getAttributeItem(nameAttr);
     if (!nameAttribute)
         return;
 
     String nameAttributeValue(nameAttribute->value);
     const typename Token::Attribute* contentAttribute = token.getAttributeItem(contentAttr);
     if (!contentAttribute)
         return;
 
     String contentAttributeValue(contentAttribute->value);
     if (equalIgnoringCase(nameAttributeValue, "viewport")) {
-        handleMetaViewport(contentAttributeValue, documentParameters, mediaValues);
+        handleMetaViewport(contentAttributeValue, documentParameters);
         return;
     }
 
     if (equalIgnoringCase(nameAttributeValue, "referrer")) {
         handleMetaReferrer(contentAttributeValue, documentParameters, cssScanner);
     }
 }
 
 template <typename Token>
 void TokenPreloadScanner::scanCommon(const Token& token, const SegmentedString& source, PreloadRequestStream& requests)
@@ skipping 63 matching lines @@
                 if (equalIgnoringCase(equivAttributeValue, "content-security-policy")) {
                     m_isCSPEnabled = true;
                 } else if (equalIgnoringCase(equivAttributeValue, "accept-ch")) {
                     const typename Token::Attribute* contentAttribute = token.getAttributeItem(contentAttr);
                     if (contentAttribute)
                         m_clientHintsPreferences.updateFromAcceptClientHintsHeader(String(contentAttribute->value), nullptr);
                 }
                 return;
             }
 
-            handleMetaNameAttribute(token, m_documentParameters.get(), m_mediaValues.get(), &m_cssScanner);
+            handleMetaNameAttribute(token, m_documentParameters.get(), &m_cssScanner);
         }
 
         if (match(tagImpl, pictureTag)) {
             m_inPicture = true;
             m_pictureData = PictureData();
             return;
         }
 
-        StartTagScanner scanner(tagImpl, m_mediaValues);
+        StartTagScanner scanner(tagImpl, m_documentParameters->mediaValues);
         scanner.processAttributes(token.attributes());
         if (m_inPicture)
             scanner.handlePictureSourceURL(m_pictureData);
         OwnPtr<PreloadRequest> request = scanner.createPreloadRequest(m_predictedBaseElementURL, source, m_clientHintsPreferences, m_pictureData, m_documentParameters->referrerPolicy);
         if (request)
             requests.append(request.release());
         return;
     }
     default: {
         return;
     }
     }
 }
 
 template<typename Token>
 void TokenPreloadScanner::updatePredictedBaseURL(const Token& token)
 {
     ASSERT(m_predictedBaseElementURL.isEmpty());
     if (const typename Token::Attribute* hrefAttribute = token.getAttributeItem(hrefAttr)) {
         KURL url(m_documentURL, stripLeadingAndTrailingHTMLSpaces(hrefAttribute->value));
         m_predictedBaseElementURL = url.isValid() ? url.copy() : KURL();
     }
 }
 
-HTMLPreloadScanner::HTMLPreloadScanner(const HTMLParserOptions& options, const KURL& documentURL, PassOwnPtr<CachedDocumentParameters> documentParameters, const MediaValuesCached::MediaValuesCachedData& mediaValuesCachedData)
-    : m_scanner(documentURL, documentParameters, mediaValuesCachedData)
+HTMLPreloadScanner::HTMLPreloadScanner(const HTMLParserOptions& options, const KURL& documentURL, PassOwnPtr<CachedDocumentParameters> documentParameters)
+    : m_scanner(documentURL, documentParameters)
     , m_tokenizer(HTMLTokenizer::create(options))
 {
 }
 
 HTMLPreloadScanner::~HTMLPreloadScanner()
 {
 }
 
 void HTMLPreloadScanner::appendToEnd(const SegmentedString& source)
 {
@@ skipping 15 matching lines @@
     while (m_tokenizer->nextToken(m_source, m_token)) {
         if (m_token.type() == HTMLToken::StartTag)
             m_tokenizer->updateStateFor(attemptStaticStringCreation(m_token.name(), Likely8Bit));
         m_scanner.scan(m_token, m_source, requests);
         m_token.clear();
     }
 
     preloader->takeAndPreload(requests);
 }
 
-CachedDocumentParameters::CachedDocumentParameters(Document* document)
+CachedDocumentParameters::CachedDocumentParameters(Document* document, PassRefPtrWillBeRawPtr<MediaValuesCached> givenMediaValues)
 {
     ASSERT(isMainThread());
     ASSERT(document);
     doHtmlPreloadScanning = !document->settings() || document->settings()->doHtmlPreloadScanning();
+    if (givenMediaValues)
+        mediaValues = givenMediaValues;
+    else
+        mediaValues = MediaValuesCached::create(*document);
+    ASSERT(mediaValues->isSafeToSendToAnotherThread());
     defaultViewportMinWidth = document->viewportDefaultMinWidth();
     viewportMetaZeroValuesQuirk = document->settings() && document->settings()->viewportMetaZeroValuesQuirk();
     viewportMetaEnabled = document->settings() && document->settings()->viewportMetaEnabled();
     referrerPolicy = ReferrerPolicyDefault;
 }
 
 } // namespace blink