Title: [203962] branches/safari-602-branch/Source/WebCore
- Revision
- 203962
- Author
- [email protected]
- Date
- 2016-07-31 23:51:14 -0700 (Sun, 31 Jul 2016)
Log Message
Merge r203799. rdar://problem/27556788
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203961 => 203962)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-01 06:00:56 UTC (rev 203961)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-01 06:51:14 UTC (rev 203962)
@@ -1,3 +1,24 @@
+2016-07-31 Babak Shafiei <[email protected]>
+
+ Merge r203799. rdar://problem/27556788
+
+ 2016-07-27 Eric Carlson <[email protected]>
+
+ Captions do not render in PiP window when element is hidden
+ https://bugs.webkit.org/show_bug.cgi?id=160265
+ <rdar://problem/27556788>
+
+ Reviewed by Simon Fraser.
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::createTextTrackRepresentationImage): Pass new flag so
+ caption layers are always rendered.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayerContents): Paint non-visible layers when PaintLayerIgnoreVisibility
+ flag is set.
+ * rendering/RenderLayer.h: Define PaintLayerIgnoreVisibility.
+
2016-07-29 Babak Shafiei <[email protected]>
Merge r203904. rdar://problem/27610935
Modified: branches/safari-602-branch/Source/WebCore/html/shadow/MediaControlElements.cpp (203961 => 203962)
--- branches/safari-602-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-08-01 06:00:56 UTC (rev 203961)
+++ branches/safari-602-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2016-08-01 06:51:14 UTC (rev 203962)
@@ -1372,7 +1372,7 @@
if (!buffer)
return nullptr;
- layer->paint(buffer->context(), paintingRect, LayoutSize(), PaintBehaviorFlattenCompositingLayers, nullptr, RenderLayer::PaintLayerPaintingCompositingAllPhases);
+ layer->paint(buffer->context(), paintingRect, LayoutSize(), PaintBehaviorFlattenCompositingLayers, nullptr, RenderLayer::PaintLayerPaintingCompositingAllPhases | RenderLayer::PaintLayerIgnoreVisibility);
return ImageBuffer::sinkIntoImage(WTFMove(buffer));
}
Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp (203961 => 203962)
--- branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp 2016-08-01 06:00:56 UTC (rev 203961)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp 2016-08-01 06:51:14 UTC (rev 203962)
@@ -4274,7 +4274,7 @@
bool shouldPaintOutline = isSelfPaintingLayer && !isPaintingOverlayScrollbars
&& ((isPaintingScrollingContent && isPaintingCompositedBackground)
|| (!isPaintingScrollingContent && isPaintingCompositedForeground));
- bool shouldPaintContent = m_hasVisibleContent && isSelfPaintingLayer && !isPaintingOverlayScrollbars;
+ bool shouldPaintContent = (m_hasVisibleContent || paintFlags & PaintLayerIgnoreVisibility) && isSelfPaintingLayer && !isPaintingOverlayScrollbars;
if (localPaintFlags & PaintLayerPaintingRootBackgroundOnly && !renderer().isRenderView() && !renderer().isDocumentElementRenderer())
return;
Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.h (203961 => 203962)
--- branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.h 2016-08-01 06:00:56 UTC (rev 203961)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.h 2016-08-01 06:51:14 UTC (rev 203962)
@@ -457,6 +457,7 @@
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
