Title: [166305] branches/safari-537.75-branch/Source/WebCore
- Revision
- 166305
- Author
- matthew_han...@apple.com
- Date
- 2014-03-26 12:17:16 -0700 (Wed, 26 Mar 2014)
Log Message
Merge r166304.
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (166304 => 166305)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-26 18:37:44 UTC (rev 166304)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-26 19:17:16 UTC (rev 166305)
@@ -1,3 +1,22 @@
+2014-03-26 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r166304.
+
+ 2014-03-26 Jer Noble <jer.no...@apple.com>
+
+ 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-24 Matthew Hanson <matthew_han...@apple.com>
Remove a commented line of code introduced by r166104.
Modified: branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (166304 => 166305)
--- branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 18:37:44 UTC (rev 166304)
+++ branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 19:17:16 UTC (rev 166305)
@@ -1675,7 +1675,7 @@
{
RenderObject* renderObject = renderer();
- if (!renderObject->isRenderImage() || m_owningLayer->hasBoxDecorationsOrBackground() || renderObject->hasClip())
+ if (!renderObject->isRenderImage() || !renderObject->isMedia() || m_owningLayer->hasBoxDecorationsOrBackground() || renderObject->hasClip())
return false;
RenderImage* imageRenderer = toRenderImage(renderObject);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
