Unreviewed, rolling out r203799.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Aug 2016 22:42:34 +0000 (22:42 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Aug 2016 22:42:34 +0000 (22:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160467

Decided on a different solution (Requested by jonlee_ on
#webkit).

Reverted changeset:

"Captions do not render in PiP window when element is hidden"
https://bugs.webkit.org/show_bug.cgi?id=160265
http://trac.webkit.org/changeset/203799

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204047 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/html/shadow/MediaControlElements.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderLayer.h

index 34e4c1f..f1ff937 100644 (file)
@@ -1,3 +1,17 @@
+2016-08-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r203799.
+        https://bugs.webkit.org/show_bug.cgi?id=160467
+
+        Decided on a different solution (Requested by jonlee_ on
+        #webkit).
+
+        Reverted changeset:
+
+        "Captions do not render in PiP window when element is hidden"
+        https://bugs.webkit.org/show_bug.cgi?id=160265
+        http://trac.webkit.org/changeset/203799
+
 2016-08-02  Alex Christensen  <achristensen@webkit.org>
 
         Remove unused functions in URL
index 431d8b1..ea29deb 100644 (file)
@@ -1372,7 +1372,7 @@ RefPtr<Image> MediaControlTextTrackContainerElement::createTextTrackRepresentati
     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));
 }
index f4c815d..f38cf09 100644 (file)
@@ -4274,7 +4274,7 @@ void RenderLayer::paintLayerContents(GraphicsContext& context, const LayerPainti
     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;
index 3e4f96b..ee93292 100644 (file)
@@ -457,7 +457,6 @@ public:
         PaintLayerPaintingRootBackgroundOnly            = 1 << 11,
         PaintLayerPaintingSkipRootBackground            = 1 << 12,
         PaintLayerPaintingChildClippingMaskPhase        = 1 << 13,
-        PaintLayerIgnoreVisibility                      = 1 << 14,
         PaintLayerPaintingCompositingAllPhases          = PaintLayerPaintingCompositingBackgroundPhase | PaintLayerPaintingCompositingForegroundPhase
     };