Title: [167241] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 167241
- Author
- [email protected]
- Date
- 2014-04-14 04:25:51 -0700 (Mon, 14 Apr 2014)
Log Message
Merge r166304 - REGRESSION(r162679): Poster image visible under the video
https://bugs.webkit.org/show_bug.cgi?id=130783
Reviewed by Simon Fraser.
In the listed revision, we started checking for isRenderImage()
instead of isImage(). RenderMedias return 'true' for the first
but 'false' for the second. Change the if() statement to check
for isRenderMedia() in addition to !isRenderImage().
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::isDirectlyCompositedImage):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (167240 => 167241)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-14 11:21:49 UTC (rev 167240)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-14 11:25:51 UTC (rev 167241)
@@ -1,3 +1,18 @@
+2014-03-26 Jer Noble <[email protected]>
+
+ REGRESSION(r162679): Poster image visible under the video
+ https://bugs.webkit.org/show_bug.cgi?id=130783
+
+ Reviewed by Simon Fraser.
+
+ In the listed revision, we started checking for isRenderImage()
+ instead of isImage(). RenderMedias return 'true' for the first
+ but 'false' for the second. Change the if() statement to check
+ for isRenderMedia() in addition to !isRenderImage().
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::isDirectlyCompositedImage):
+
2014-03-21 Oliver Hunt <[email protected]>
Fix a crash when assigning an object to document.location
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderLayerBacking.cpp (167240 => 167241)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-04-14 11:21:49 UTC (rev 167240)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-04-14 11:25:51 UTC (rev 167241)
@@ -1865,7 +1865,7 @@
// that require painting. Direct compositing saves backing store.
bool RenderLayerBacking::isDirectlyCompositedImage() const
{
- if (!renderer().isRenderImage() || m_owningLayer.hasBoxDecorationsOrBackground() || renderer().hasClip())
+ if (!renderer().isRenderImage() || renderer().isMedia() || m_owningLayer.hasBoxDecorationsOrBackground() || renderer().hasClip())
return false;
RenderImage& imageRenderer = toRenderImage(renderer());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
