Title: [179928] trunk/Source/WebCore
- Revision
- 179928
- Author
- [email protected]
- Date
- 2015-02-11 08:41:13 -0800 (Wed, 11 Feb 2015)
Log Message
REGRESSION(r179476): It broke the !ENABLE(PICTURE_SIZES) build
https://bugs.webkit.org/show_bug.cgi?id=141327
Reviewed by Csaba Osztrogonác.
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
Put #if around use of m_sizesAttribute.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (179927 => 179928)
--- trunk/Source/WebCore/ChangeLog 2015-02-11 16:12:13 UTC (rev 179927)
+++ trunk/Source/WebCore/ChangeLog 2015-02-11 16:41:13 UTC (rev 179928)
@@ -1,3 +1,14 @@
+2015-02-11 Darin Adler <[email protected]>
+
+ REGRESSION(r179476): It broke the !ENABLE(PICTURE_SIZES) build
+ https://bugs.webkit.org/show_bug.cgi?id=141327
+
+ Reviewed by Csaba Osztrogonác.
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
+ Put #if around use of m_sizesAttribute.
+
2015-02-11 Commit Queue <[email protected]>
Unreviewed, rolling out r179921.
Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (179927 => 179928)
--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-02-11 16:12:13 UTC (rev 179927)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-02-11 16:41:13 UTC (rev 179928)
@@ -107,7 +107,10 @@
// Resolve between src and srcSet if we have them.
if (!m_srcSetAttribute.isEmpty()) {
- unsigned sourceSize = parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame());
+ unsigned sourceSize = 0;
+#if ENABLE(PICTURE_SIZES)
+ sourceSize = parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame());
+#endif
ImageCandidate imageCandidate = bestFitSourceForImageAttributes(m_deviceScaleFactor, m_urlToLoad, m_srcSetAttribute, sourceSize);
setUrlToLoad(imageCandidate.string.toString(), true);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
