Changeset 179928 in webkit

Timestamp:

Feb 11, 2015, 8:41:13 AM (12 years ago)

Author:

Darin Adler

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/parser/HTMLPreloadScanner.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-11  Darin Adler  <darin@apple.com>
+
+        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  <commit-queue@webkit.org>
 

trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

@@ -108 +108 @@
         // 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);