Title: [203998] branches/safari-602-branch/Source/WebCore
- Revision
- 203998
- Author
- [email protected]
- Date
- 2016-08-01 16:45:12 -0700 (Mon, 01 Aug 2016)
Log Message
Roll out r203799. rdar://problem/27556788
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203997 => 203998)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-01 23:37:16 UTC (rev 203997)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-01 23:45:12 UTC (rev 203998)
@@ -1,5 +1,9 @@
2016-08-01 Babak Shafiei <[email protected]>
+ Roll out r203799.
+
+2016-08-01 Babak Shafiei <[email protected]>
+
Merge r203976. rdar://problem/27580049
2016-08-01 Antti Koivisto <[email protected]>
Modified: branches/safari-602-branch/Source/WebCore/html/shadow/MediaControlElements.cpp (203997 => 203998)
--- branches/safari-602-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-08-01 23:37:16 UTC (rev 203997)
+++ branches/safari-602-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-08-01 23:45:12 UTC (rev 203998)
@@ -1372,7 +1372,7 @@
if (!buffer)
return nullptr;
- layer->paint(buffer->context(), paintingRect, LayoutSize(), PaintBehaviorFlattenCompositingLayers, nullptr, RenderLayer::PaintLayerPaintingCompositingAllPhases | RenderLayer::PaintLayerIgnoreVisibility);
+ layer->paint(buffer->context(), paintingRect, LayoutSize(), PaintBehaviorFlattenCompositingLayers, nullptr, RenderLayer::PaintLayerPaintingCompositingAllPhases);
return ImageBuffer::sinkIntoImage(WTFMove(buffer));
}
Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp (203997 => 203998)
--- branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp 2016-08-01 23:37:16 UTC (rev 203997)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp 2016-08-01 23:45:12 UTC (rev 203998)
@@ -4274,7 +4274,7 @@
bool shouldPaintOutline = isSelfPaintingLayer && !isPaintingOverlayScrollbars
&& ((isPaintingScrollingContent && isPaintingCompositedBackground)
|| (!isPaintingScrollingContent && isPaintingCompositedForeground));
- bool shouldPaintContent = (m_hasVisibleContent || paintFlags & PaintLayerIgnoreVisibility) && isSelfPaintingLayer && !isPaintingOverlayScrollbars;
+ bool shouldPaintContent = m_hasVisibleContent && isSelfPaintingLayer && !isPaintingOverlayScrollbars;
if (localPaintFlags & PaintLayerPaintingRootBackgroundOnly && !renderer().isRenderView() && !renderer().isDocumentElementRenderer())
return;
Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.h (203997 => 203998)
--- branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.h 2016-08-01 23:37:16 UTC (rev 203997)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.h 2016-08-01 23:45:12 UTC (rev 203998)
@@ -457,7 +457,6 @@
PaintLayerPaintingRootBackgroundOnly = 1 << 11,
PaintLayerPaintingSkipRootBackground = 1 << 12,
PaintLayerPaintingChildClippingMaskPhase = 1 << 13,
- PaintLayerIgnoreVisibility = 1 << 14,
PaintLayerPaintingCompositingAllPhases = PaintLayerPaintingCompositingBackgroundPhase | PaintLayerPaintingCompositingForegroundPhase
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
