Title: [166306] branches/safari-537.75-branch/Source/WebCore
- Revision
- 166306
- Author
- matthew_han...@apple.com
- Date
- 2014-03-26 12:20:58 -0700 (Wed, 26 Mar 2014)
Log Message
Remove extraneous ! from merge of r166304.
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (166305 => 166306)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-26 19:17:16 UTC (rev 166305)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-26 19:20:58 UTC (rev 166306)
@@ -1,5 +1,9 @@
2014-03-26 Matthew Hanson <matthew_han...@apple.com>
+ Remove extraneous ! from merge of r166304.
+
+2014-03-26 Matthew Hanson <matthew_han...@apple.com>
+
Merge r166304.
2014-03-26 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (166305 => 166306)
--- branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 19:17:16 UTC (rev 166305)
+++ branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 19:20:58 UTC (rev 166306)
@@ -1675,7 +1675,7 @@
{
RenderObject* renderObject = renderer();
- if (!renderObject->isRenderImage() || !renderObject->isMedia() || 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
