| Index: Source/core/html/parser/HTMLResourcePreloader.cpp
|
| diff --git a/Source/core/html/parser/HTMLResourcePreloader.cpp b/Source/core/html/parser/HTMLResourcePreloader.cpp
|
| index 0c1a17a714b774cd81fb305678fd725c4e7905de..a3d5bd0546b9cc5edc78d75478b820bfce9f076b 100644
|
| --- a/Source/core/html/parser/HTMLResourcePreloader.cpp
|
| +++ b/Source/core/html/parser/HTMLResourcePreloader.cpp
|
| @@ -30,10 +30,6 @@
|
| #include "core/loader/cache/CachedResourceInitiatorInfo.h"
|
| #include "core/loader/cache/CachedResourceLoader.h"
|
|
|
| -#include "core/css/MediaList.h"
|
| -#include "core/css/MediaQueryEvaluator.h"
|
| -#include "core/rendering/RenderObject.h"
|
| -
|
| namespace WebCore {
|
|
|
| bool PreloadRequest::isSafeToSendToAnotherThread() const
|
| @@ -41,7 +37,6 @@ bool PreloadRequest::isSafeToSendToAnotherThread() const
|
| return m_initiatorName.isSafeToSendToAnotherThread()
|
| && m_charset.isSafeToSendToAnotherThread()
|
| && m_resourceURL.isSafeToSendToAnotherThread()
|
| - && m_mediaAttribute.isSafeToSendToAnotherThread()
|
| && m_baseURL.isSafeToSendToAnotherThread();
|
| }
|
|
|
| @@ -73,21 +68,8 @@ void HTMLResourcePreloader::takeAndPreload(PreloadRequestStream& r)
|
| preload(it->release());
|
| }
|
|
|
| -static bool mediaAttributeMatches(Frame* frame, RenderStyle* renderStyle, const String& attributeValue)
|
| -{
|
| - RefPtr<MediaQuerySet> mediaQueries = MediaQuerySet::create(attributeValue);
|
| - MediaQueryEvaluator mediaQueryEvaluator("screen", frame, renderStyle);
|
| - return mediaQueryEvaluator.eval(mediaQueries.get());
|
| -}
|
| -
|
| void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload)
|
| {
|
| - ASSERT(m_document->frame());
|
| - ASSERT(m_document->renderer());
|
| - ASSERT(m_document->renderer()->style());
|
| - if (!preload->media().isEmpty() && !mediaAttributeMatches(m_document->frame(), m_document->renderer()->style(), preload->media()))
|
| - return;
|
| -
|
| CachedResourceRequest request = preload->resourceRequest(m_document);
|
| m_document->cachedResourceLoader()->preload(preload->resourceType(), request, preload->charset());
|
| }
|
|
|