Title: [185130] trunk/Source/WebCore
- Revision
- 185130
- Author
- d...@apple.com
- Date
- 2015-06-02 15:23:36 -0700 (Tue, 02 Jun 2015)
Log Message
No need to guard the sizes attribute against PICTURE_SIZES in preload scanner.
https://bugs.webkit.org/show_bug.cgi?id=145573
<rdar://problem/21210038>
Reviewed by Myles Maxfield.
The PICTURE_SIZES feature flag doesn't need to be used to
guard preloading of the sizes attribute.
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::StartTagScanner::processAttributes): Deleted.
(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (185129 => 185130)
--- trunk/Source/WebCore/ChangeLog 2015-06-02 22:14:23 UTC (rev 185129)
+++ trunk/Source/WebCore/ChangeLog 2015-06-02 22:23:36 UTC (rev 185130)
@@ -1,3 +1,18 @@
+2015-06-02 Dean Jackson <d...@apple.com>
+
+ No need to guard the sizes attribute against PICTURE_SIZES in preload scanner.
+ https://bugs.webkit.org/show_bug.cgi?id=145573
+ <rdar://problem/21210038>
+
+ Reviewed by Myles Maxfield.
+
+ The PICTURE_SIZES feature flag doesn't need to be used to
+ guard preloading of the sizes attribute.
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttributes): Deleted.
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): Deleted.
+
2015-06-02 Anders Carlsson <ander...@apple.com>
Use UUIDs for WebSQL database filenames instead of a sequential number
Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (185129 => 185130)
--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-06-02 22:14:23 UTC (rev 185129)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-06-02 22:23:36 UTC (rev 185130)
@@ -112,11 +112,7 @@
// Resolve between src and srcSet if we have them and the tag is img.
if (m_tagId == TagId::Img && !m_srcSetAttribute.isEmpty()) {
float sourceSize = 0;
-#if ENABLE(PICTURE_SIZES)
sourceSize = parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame());
-#else
- UNUSED_PARAM(document);
-#endif
ImageCandidate imageCandidate = bestFitSourceForImageAttributes(m_deviceScaleFactor, m_urlToLoad, m_srcSetAttribute, sourceSize);
setUrlToLoad(imageCandidate.string.toString(), true);
}
@@ -155,10 +151,8 @@
setUrlToLoad(attributeValue);
else if (match(attributeName, srcsetAttr) && m_srcSetAttribute.isNull())
m_srcSetAttribute = attributeValue;
-#if ENABLE(PICTURE_SIZES)
else if (match(attributeName, sizesAttr) && m_sizesAttribute.isNull())
m_sizesAttribute = attributeValue;
-#endif
else if (match(attributeName, crossoriginAttr) && !attributeValue.isNull())
m_crossOriginMode = stripLeadingAndTrailingHTMLSpaces(attributeValue);
} else if (m_tagId == TagId::Link) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
