| Index: third_party/WebKit/Source/core/loader/LinkLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/LinkLoader.cpp b/third_party/WebKit/Source/core/loader/LinkLoader.cpp
|
| index eb58c35ce12e76d34fc70a3266582634b811175b..d777e1ce78fb3d41105ce841f52d18e2d1562e22 100644
|
| --- a/third_party/WebKit/Source/core/loader/LinkLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/LinkLoader.cpp
|
| @@ -302,7 +302,7 @@ static Resource* preloadIfNeeded(const LinkRelAttribute& relAttribute, const KUR
|
| }
|
|
|
| void LinkLoader::loadLinksFromHeader(const String& headerValue, const KURL& baseURL, Document* document, const NetworkHintsInterface& networkHintsInterface,
|
| - CanLoadResources canLoadResources, ViewportDescriptionWrapper* viewportDescriptionWrapper)
|
| + CanLoadResources canLoadResources, MediaPreloadPolicy mediaPolicy, ViewportDescriptionWrapper* viewportDescriptionWrapper)
|
| {
|
| if (!document || headerValue.isEmpty())
|
| return;
|
| @@ -311,6 +311,11 @@ void LinkLoader::loadLinksFromHeader(const String& headerValue, const KURL& base
|
| if (!header.valid() || header.url().isEmpty() || header.rel().isEmpty())
|
| continue;
|
|
|
| + if (mediaPolicy == OnlyLoadMedia && header.media().isEmpty())
|
| + continue;
|
| + if (mediaPolicy == OnlyLoadNonMedia && !header.media().isEmpty())
|
| + continue;
|
| +
|
| LinkRelAttribute relAttribute(header.rel());
|
| KURL url(baseURL, header.url());
|
| // Sanity check to avoid re-entrancy here.
|
|
|