Title: [173827] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 173827
- Author
- [email protected]
- Date
- 2014-09-22 03:29:43 -0700 (Mon, 22 Sep 2014)
Log Message
Merge r173767 - REGRESSION(r173464): It broke the !ENABLE(PICTURE_SIZES) build
https://bugs.webkit.org/show_bug.cgi?id=136942
Reviewed by Simon Fraser.
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::parseAttribute):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (173826 => 173827)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-22 09:56:28 UTC (rev 173826)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-22 10:29:43 UTC (rev 173827)
@@ -1,3 +1,13 @@
+2014-09-19 Eva Balazsfalvi <[email protected]>
+
+ REGRESSION(r173464): It broke the !ENABLE(PICTURE_SIZES) build
+ https://bugs.webkit.org/show_bug.cgi?id=136942
+
+ Reviewed by Simon Fraser.
+
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::parseAttribute):
+
2014-09-17 Philippe Normand <[email protected]>
[GStreamer] Cannot play Vimeo video
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLImageElement.cpp (173826 => 173827)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLImageElement.cpp 2014-09-22 09:56:28 UTC (rev 173826)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/HTMLImageElement.cpp 2014-09-22 10:29:43 UTC (rev 173827)
@@ -143,11 +143,11 @@
if (renderer() && renderer()->isRenderImage())
toRenderImage(renderer())->updateAltText();
} else if (name == srcAttr || name == srcsetAttr) {
- ImageCandidate candidate = bestFitSourceForImageAttributes(document().deviceScaleFactor(), fastGetAttribute(srcAttr), fastGetAttribute(srcsetAttr)
+ unsigned sourceSize = 0;
#if ENABLE(PICTURE_SIZES)
- , SourceSizeList::parseSizesAttribute(fastGetAttribute(sizesAttr), document().renderView(), document().frame())
+ sourceSize = SourceSizeList::parseSizesAttribute(fastGetAttribute(sizesAttr), document().renderView(), document().frame());
#endif
- );
+ ImageCandidate candidate = bestFitSourceForImageAttributes(document().deviceScaleFactor(), fastGetAttribute(srcAttr), fastGetAttribute(srcsetAttr), sourceSize);
setBestFitURLAndDPRFromImageCandidate(candidate);
m_imageLoader.updateFromElementIgnoringPreviousError();
} else if (name == usemapAttr) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
