Diff
Modified: trunk/LayoutTests/ChangeLog (153688 => 153689)
--- trunk/LayoutTests/ChangeLog 2013-08-03 10:15:12 UTC (rev 153688)
+++ trunk/LayoutTests/ChangeLog 2013-08-03 13:43:24 UTC (rev 153689)
@@ -1,3 +1,16 @@
+2013-08-03 Yoav Weiss <[email protected]>
+
+ PreloadScanner preloads external CSS with non-matching media attribute
+ https://bugs.webkit.org/show_bug.cgi?id=106198
+
+ Reviewed by Dean Jackson.
+
+ * http/tests/loading/preload-css-test-expected.txt: Added.
+ * http/tests/loading/preload-css-test.html: Added.
+ * http/tests/loading/resources/big_mq.css: Added.
+ * http/tests/loading/resources/small_mq.css: Added.
+ * http/tests/local/link-stylesheet-load-order-preload-expected.txt:
+
2013-08-02 Benjamin Poulain <[email protected]>
REGRESSION (r153005): Crash in SpaceSplitString::spaceSplitStringContainsValue on Facebook
Added: trunk/LayoutTests/http/tests/loading/preload-css-test-expected.txt (0 => 153689)
--- trunk/LayoutTests/http/tests/loading/preload-css-test-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/loading/preload-css-test-expected.txt 2013-08-03 13:43:24 UTC (rev 153689)
@@ -0,0 +1,8 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+Preload scanner should preload only the relevant MQ external CSS
+
+PASS PASS
Added: trunk/LayoutTests/http/tests/loading/preload-css-test.html (0 => 153689)
--- trunk/LayoutTests/http/tests/loading/preload-css-test.html (rev 0)
+++ trunk/LayoutTests/http/tests/loading/preload-css-test.html 2013-08-03 13:43:24 UTC (rev 153689)
@@ -0,0 +1,33 @@
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var results=[];
+function checkForPreload(url, shouldbe) {
+ var preloaded = internals.isPreloaded(url);
+ if ((preloaded && shouldbe) || (!preloaded && !shouldbe))
+ results.push("PASS\n");
+ else
+ results.push("FAIL\n");
+}
+function printResults(){
+ for(var i = 0; i < results.length; i++)
+ document.getElementsByTagName("body")[0].appendChild(document.createTextNode(results[i]));
+}
+
+</script>
+<script src=""
+<script>
+checkForPreload("resources/big_mq.css", true);
+checkForPreload("resources/small_mq.css", false);
+</script>
+<link href="" rel="stylesheet" media="screen and (min-width: 800px)">
+<link href="" rel="stylesheet" media="screen and (max-width: 799px)">
+<script src=""
+
+<body>
+<p>Preload scanner should preload only the relevant MQ external CSS</p>
+<script>
+printResults();
+</script>
Added: trunk/LayoutTests/http/tests/loading/resources/big_mq.css (0 => 153689)
--- trunk/LayoutTests/http/tests/loading/resources/big_mq.css (rev 0)
+++ trunk/LayoutTests/http/tests/loading/resources/big_mq.css 2013-08-03 13:43:24 UTC (rev 153689)
@@ -0,0 +1,2 @@
+
+
Added: trunk/LayoutTests/http/tests/loading/resources/small_mq.css (0 => 153689)
--- trunk/LayoutTests/http/tests/loading/resources/small_mq.css (rev 0)
+++ trunk/LayoutTests/http/tests/loading/resources/small_mq.css 2013-08-03 13:43:24 UTC (rev 153689)
@@ -0,0 +1,2 @@
+
+
Modified: trunk/LayoutTests/http/tests/local/link-stylesheet-load-order-preload-expected.txt (153688 => 153689)
--- trunk/LayoutTests/http/tests/local/link-stylesheet-load-order-preload-expected.txt 2013-08-03 10:15:12 UTC (rev 153688)
+++ trunk/LayoutTests/http/tests/local/link-stylesheet-load-order-preload-expected.txt 2013-08-03 13:43:24 UTC (rev 153689)
@@ -7,14 +7,14 @@
media-empty.css
media-all.css
media-screen.css
+media-screen-query-success.css
media-braille-screen.css
no-media-2.css
media-empty-2.css
media-all-2.css
media-screen-2.css
+media-screen-query-success-2.css
media-braille-screen-2.css
-media-screen-query-success.css
-media-screen-query-success-2.css
script-2.js
image.jpg
media-print.css
Modified: trunk/Source/WebCore/ChangeLog (153688 => 153689)
--- trunk/Source/WebCore/ChangeLog 2013-08-03 10:15:12 UTC (rev 153688)
+++ trunk/Source/WebCore/ChangeLog 2013-08-03 13:43:24 UTC (rev 153689)
@@ -1,3 +1,35 @@
+2013-08-03 Yoav Weiss <[email protected]>
+
+ PreloadScanner preloads external CSS with non-matching media attribute
+ https://bugs.webkit.org/show_bug.cgi?id=106198
+
+ Reviewed by Dean Jackson.
+
+ Test: http/tests/loading/preload-css-test.html
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ Remove m_linkMediaAttributeIsScreen
+ Remove MediaQueryEvaluator calls
+ Add m_mediaAttribute that gets the value of the "media" attribute
+ Pass m_mediaAttribute to PreloadRequest
+ (WebCore::TokenPreloadScanner::StartTagScanner::StartTagScanner):
+ (WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest):
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
+ (WebCore::TokenPreloadScanner::StartTagScanner::resourceType):
+ (WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload):
+ * html/parser/HTMLResourcePreloader.cpp:
+ Add MediaQueryEvaluator calls to see if "media" matches
+ Perform preload only to resource with a matching media (if media exists)
+ (WebCore::PreloadRequest::isSafeToSendToAnotherThread):
+ (WebCore::mediaAttributeMatches):
+ (WebCore::HTMLResourcePreloader::preload):
+ * html/parser/HTMLResourcePreloader.h:
+ Add a constructor with a mediaAttribute value
+ Add m_mediaAttribute & its getter.
+ (WebCore::PreloadRequest::create):
+ (WebCore::PreloadRequest::media):
+ (WebCore::PreloadRequest::PreloadRequest):
+
2013-08-03 Andreas Kling <[email protected]>
RenderBoxModelObject::firstLetterRemainingText should be a RenderTextFragment*.
Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (153688 => 153689)
--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2013-08-03 10:15:12 UTC (rev 153688)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2013-08-03 13:43:24 UTC (rev 153689)
@@ -34,8 +34,6 @@
#include "HTMLTokenizer.h"
#include "InputTypeNames.h"
#include "LinkRelAttribute.h"
-#include "MediaList.h"
-#include "MediaQueryEvaluator.h"
#include <wtf/MainThread.h>
namespace WebCore {
@@ -110,7 +108,6 @@
explicit StartTagScanner(TagId tagId)
: m_tagId(tagId)
, m_linkIsStyleSheet(false)
- , m_linkMediaAttributeIsScreen(true)
, m_inputIsImage(false)
{
}
@@ -142,7 +139,7 @@
if (!shouldPreload())
return nullptr;
- OwnPtr<PreloadRequest> request = PreloadRequest::create(initiatorFor(m_tagId), m_urlToLoad, predictedBaseURL, resourceType());
+ OwnPtr<PreloadRequest> request = PreloadRequest::create(initiatorFor(m_tagId), m_urlToLoad, predictedBaseURL, resourceType(), m_mediaAttribute);
request->setCrossOriginModeAllowsCookies(crossOriginModeAllowsCookies());
request->setCharset(charset());
return request.release();
@@ -179,7 +176,7 @@
else if (match(attributeName, relAttr))
m_linkIsStyleSheet = relAttributeIsStyleSheet(attributeValue);
else if (match(attributeName, mediaAttr))
- m_linkMediaAttributeIsScreen = linkMediaAttributeIsScreen(attributeValue);
+ m_mediaAttribute = attributeValue;
} else if (m_tagId == InputTagId) {
if (match(attributeName, srcAttr))
setUrlToLoad(attributeValue);
@@ -194,19 +191,6 @@
return rel.m_isStyleSheet && !rel.m_isAlternate && rel.m_iconType == InvalidIcon && !rel.m_isDNSPrefetch;
}
- static bool linkMediaAttributeIsScreen(const String& attributeValue)
- {
- if (attributeValue.isEmpty())
- return true;
- RefPtr<MediaQuerySet> mediaQueries = MediaQuerySet::createAllowingDescriptionSyntax(attributeValue);
-
- // Only preload screen media stylesheets. Used this way, the evaluator evaluates to true for any
- // rules containing complex queries (full evaluation is possible but it requires a frame and a style selector which
- // may be problematic here).
- MediaQueryEvaluator mediaQueryEvaluator("screen");
- return mediaQueryEvaluator.eval(mediaQueries.get());
- }
-
void setUrlToLoad(const String& attributeValue)
{
// We only respect the first src/href, per HTML5:
@@ -230,7 +214,7 @@
return CachedResource::Script;
if (m_tagId == ImgTagId || (m_tagId == InputTagId && m_inputIsImage))
return CachedResource::ImageResource;
- if (m_tagId == LinkTagId && m_linkIsStyleSheet && m_linkMediaAttributeIsScreen)
+ if (m_tagId == LinkTagId && m_linkIsStyleSheet)
return CachedResource::CSSStyleSheet;
ASSERT_NOT_REACHED();
return CachedResource::RawResource;
@@ -241,7 +225,7 @@
if (m_urlToLoad.isEmpty())
return false;
- if (m_tagId == LinkTagId && (!m_linkIsStyleSheet || !m_linkMediaAttributeIsScreen))
+ if (m_tagId == LinkTagId && !m_linkIsStyleSheet)
return false;
if (m_tagId == InputTagId && !m_inputIsImage)
@@ -260,7 +244,7 @@
String m_charset;
String m_crossOriginMode;
bool m_linkIsStyleSheet;
- bool m_linkMediaAttributeIsScreen;
+ String m_mediaAttribute;
bool m_inputIsImage;
};
Modified: trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp (153688 => 153689)
--- trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2013-08-03 10:15:12 UTC (rev 153688)
+++ trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2013-08-03 13:43:24 UTC (rev 153689)
@@ -29,6 +29,10 @@
#include "CachedResourceLoader.h"
#include "Document.h"
+#include "MediaList.h"
+#include "MediaQueryEvaluator.h"
+#include "RenderObject.h"
+
namespace WebCore {
bool PreloadRequest::isSafeToSendToAnotherThread() const
@@ -36,6 +40,7 @@
return m_initiator.isSafeToSendToAnotherThread()
&& m_charset.isSafeToSendToAnotherThread()
&& m_resourceURL.isSafeToSendToAnotherThread()
+ && m_mediaAttribute.isSafeToSendToAnotherThread()
&& m_baseURL.isSafeToSendToAnotherThread();
}
@@ -65,10 +70,24 @@
preload(it->release());
}
+static bool mediaAttributeMatches(Frame* frame, RenderStyle* renderStyle, const String& attributeValue)
+{
+ RefPtr<MediaQuerySet> mediaQueries = MediaQuerySet::createAllowingDescriptionSyntax(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());
}
+
}
Modified: trunk/Source/WebCore/html/parser/HTMLResourcePreloader.h (153688 => 153689)
--- trunk/Source/WebCore/html/parser/HTMLResourcePreloader.h 2013-08-03 10:15:12 UTC (rev 153688)
+++ trunk/Source/WebCore/html/parser/HTMLResourcePreloader.h 2013-08-03 13:43:24 UTC (rev 153689)
@@ -33,9 +33,14 @@
class PreloadRequest {
public:
+ static PassOwnPtr<PreloadRequest> create(const String& initiator, const String& resourceURL, const KURL& baseURL, CachedResource::Type resourceType, const String& mediaAttribute)
+ {
+ return adoptPtr(new PreloadRequest(initiator, resourceURL, baseURL, resourceType, mediaAttribute));
+ }
+
static PassOwnPtr<PreloadRequest> create(const String& initiator, const String& resourceURL, const KURL& baseURL, CachedResource::Type resourceType)
{
- return adoptPtr(new PreloadRequest(initiator, resourceURL, baseURL, resourceType));
+ return adoptPtr(new PreloadRequest(initiator, resourceURL, baseURL, resourceType, String()));
}
bool isSafeToSendToAnotherThread() const;
@@ -43,16 +48,18 @@
CachedResourceRequest resourceRequest(Document*);
const String& charset() const { return m_charset; }
+ const String& media() const { return m_mediaAttribute; }
void setCharset(const String& charset) { m_charset = charset.isolatedCopy(); }
void setCrossOriginModeAllowsCookies(bool allowsCookies) { m_crossOriginModeAllowsCookies = allowsCookies; }
CachedResource::Type resourceType() const { return m_resourceType; }
private:
- PreloadRequest(const String& initiator, const String& resourceURL, const KURL& baseURL, CachedResource::Type resourceType)
+ PreloadRequest(const String& initiator, const String& resourceURL, const KURL& baseURL, CachedResource::Type resourceType, const String& mediaAttribute)
: m_initiator(initiator)
, m_resourceURL(resourceURL.isolatedCopy())
, m_baseURL(baseURL.copy())
, m_resourceType(resourceType)
+ , m_mediaAttribute(mediaAttribute.isolatedCopy())
, m_crossOriginModeAllowsCookies(false)
{
}
@@ -64,6 +71,7 @@
KURL m_baseURL;
String m_charset;
CachedResource::Type m_resourceType;
+ String m_mediaAttribute;
bool m_crossOriginModeAllowsCookies;
};
