| Index: third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp
|
| index 40c27a3953e91fcfd515d9a918da8e1e19689c1b..14ecba3af799fc287ea7b8df14d276a57f7e19fe 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp
|
| +++ b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp
|
| @@ -50,6 +50,7 @@
|
| #include "platform/Histogram.h"
|
| #include "platform/MIMETypeRegistry.h"
|
| #include "platform/TraceEvent.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -206,7 +207,7 @@ public:
|
| }
|
| }
|
|
|
| - PassOwnPtr<PreloadRequest> createPreloadRequest(const KURL& predictedBaseURL, const SegmentedString& source, const ClientHintsPreferences& clientHintsPreferences, const PictureData& pictureData, const ReferrerPolicy documentReferrerPolicy)
|
| + std::unique_ptr<PreloadRequest> createPreloadRequest(const KURL& predictedBaseURL, const SegmentedString& source, const ClientHintsPreferences& clientHintsPreferences, const PictureData& pictureData, const ReferrerPolicy documentReferrerPolicy)
|
| {
|
| PreloadRequest::RequestType requestType = PreloadRequest::RequestTypePreload;
|
| if (shouldPreconnect()) {
|
| @@ -240,7 +241,7 @@ public:
|
|
|
| // The element's 'referrerpolicy' attribute (if present) takes precedence over the document's referrer policy.
|
| ReferrerPolicy referrerPolicy = (m_referrerPolicy != ReferrerPolicyDefault) ? m_referrerPolicy : documentReferrerPolicy;
|
| - OwnPtr<PreloadRequest> request = PreloadRequest::create(initiatorFor(m_tagImpl), position, m_urlToLoad, predictedBaseURL, type, referrerPolicy, resourceWidth, clientHintsPreferences, requestType);
|
| + std::unique_ptr<PreloadRequest> request = PreloadRequest::create(initiatorFor(m_tagImpl), position, m_urlToLoad, predictedBaseURL, type, referrerPolicy, resourceWidth, clientHintsPreferences, requestType);
|
| request->setCrossOrigin(m_crossOrigin);
|
| request->setCharset(charset());
|
| request->setDefer(m_defer);
|
| @@ -480,7 +481,7 @@ private:
|
| IntegrityMetadataSet m_integrityMetadata;
|
| };
|
|
|
| -TokenPreloadScanner::TokenPreloadScanner(const KURL& documentURL, PassOwnPtr<CachedDocumentParameters> documentParameters, const MediaValuesCached::MediaValuesCachedData& mediaValuesCachedData)
|
| +TokenPreloadScanner::TokenPreloadScanner(const KURL& documentURL, std::unique_ptr<CachedDocumentParameters> documentParameters, const MediaValuesCached::MediaValuesCachedData& mediaValuesCachedData)
|
| : m_documentURL(documentURL)
|
| , m_inStyle(false)
|
| , m_inPicture(false)
|
| @@ -744,7 +745,7 @@ void TokenPreloadScanner::scanCommon(const Token& token, const SegmentedString&
|
| 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);
|
| + std::unique_ptr<PreloadRequest> request = scanner.createPreloadRequest(m_predictedBaseElementURL, source, m_clientHintsPreferences, m_pictureData, m_documentParameters->referrerPolicy);
|
| if (request)
|
| requests.append(std::move(request));
|
| return;
|
| @@ -765,7 +766,7 @@ void TokenPreloadScanner::updatePredictedBaseURL(const Token& token)
|
| }
|
| }
|
|
|
| -HTMLPreloadScanner::HTMLPreloadScanner(const HTMLParserOptions& options, const KURL& documentURL, PassOwnPtr<CachedDocumentParameters> documentParameters, const MediaValuesCached::MediaValuesCachedData& mediaValuesCachedData)
|
| +HTMLPreloadScanner::HTMLPreloadScanner(const HTMLParserOptions& options, const KURL& documentURL, std::unique_ptr<CachedDocumentParameters> documentParameters, const MediaValuesCached::MediaValuesCachedData& mediaValuesCachedData)
|
| : m_scanner(documentURL, std::move(documentParameters), mediaValuesCachedData)
|
| , m_tokenizer(HTMLTokenizer::create(options))
|
| {
|
|
|