Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(808)

Side by Side Diff: Source/core/rendering/compositing/GraphicsLayerUpdater.cpp

Issue 187193002: Fix an issue that subtitle is not shown for native fullscreen video that is inside an iframe (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase virtual/android/fullscreen test expectations Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2014 Google Inc. All rights reserved. 3 * Copyright (C) 2014 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/rendering/compositing/GraphicsLayerUpdater.h" 28 #include "core/rendering/compositing/GraphicsLayerUpdater.h"
29 29
30 #include "core/html/HTMLMediaElement.h"
30 #include "core/rendering/RenderLayer.h" 31 #include "core/rendering/RenderLayer.h"
31 #include "core/rendering/RenderLayerReflectionInfo.h" 32 #include "core/rendering/RenderLayerReflectionInfo.h"
32 #include "core/rendering/RenderPart.h" 33 #include "core/rendering/RenderPart.h"
33 #include "core/rendering/RenderView.h" 34 #include "core/rendering/RenderView.h"
34 #include "core/rendering/compositing/CompositedLayerMapping.h" 35 #include "core/rendering/compositing/CompositedLayerMapping.h"
35 #include "core/rendering/compositing/RenderLayerCompositor.h" 36 #include "core/rendering/compositing/RenderLayerCompositor.h"
36 #include "public/platform/Platform.h" 37 #include "public/platform/Platform.h"
37 38
38 namespace WebCore { 39 namespace WebCore {
39 40
41 bool shouldAppendLayer(const RenderLayer& layer)
42 {
43 if (!RuntimeEnabledFeatures::overlayFullscreenVideoEnabled())
44 return true;
45 Node* node = layer.renderer()->node();
46 if (isHTMLMediaElement(*node) && toHTMLMediaElement(node)->isFullscreen())
47 return false;
48 return true;
49 }
50
40 GraphicsLayerUpdater::GraphicsLayerUpdater(RenderView& renderView) 51 GraphicsLayerUpdater::GraphicsLayerUpdater(RenderView& renderView)
41 : m_renderView(renderView) 52 : m_renderView(renderView)
42 , m_pixelsWithoutPromotingAllTransitions(0.0) 53 , m_pixelsWithoutPromotingAllTransitions(0.0)
43 , m_pixelsAddedByPromotingAllTransitions(0.0) 54 , m_pixelsAddedByPromotingAllTransitions(0.0)
44 { 55 {
45 } 56 }
46 57
47 GraphicsLayerUpdater::~GraphicsLayerUpdater() 58 GraphicsLayerUpdater::~GraphicsLayerUpdater()
48 { 59 {
49 } 60 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 overflowControlLayer->removeFromParent(); 126 overflowControlLayer->removeFromParent();
116 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer); 127 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer);
117 } 128 }
118 129
119 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp ing->layerForScrollCorner()) { 130 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp ing->layerForScrollCorner()) {
120 overflowControlLayer->removeFromParent(); 131 overflowControlLayer->removeFromParent();
121 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer); 132 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer);
122 } 133 }
123 } 134 }
124 135
125 childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->childF orSuperlayers()); 136 if (shouldAppendLayer(layer))
137 childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->ch ildForSuperlayers());
126 } 138 }
127 139
128 if (!depth) { 140 if (!depth) {
129 int percentageIncreaseInPixels = static_cast<int>(m_pixelsAddedByPromoti ngAllTransitions / m_pixelsWithoutPromotingAllTransitions * 100); 141 int percentageIncreaseInPixels = static_cast<int>(m_pixelsAddedByPromoti ngAllTransitions / m_pixelsWithoutPromotingAllTransitions * 100);
130 blink::Platform::current()->histogramCustomCounts("Renderer.PixelIncreas eFromTransitions", percentageIncreaseInPixels, 0, 1000, 50); 142 blink::Platform::current()->histogramCustomCounts("Renderer.PixelIncreas eFromTransitions", percentageIncreaseInPixels, 0, 1000, 50);
131 } 143 }
132 } 144 }
133 145
134 // This just updates layer geometry without changing the hierarchy. 146 // This just updates layer geometry without changing the hierarchy.
135 void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer) 147 void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer)
(...skipping 29 matching lines...) Expand all
165 mapping->updateGraphicsLayerGeometry(); 177 mapping->updateGraphicsLayerGeometry();
166 178
167 if (!layer.parent()) 179 if (!layer.parent())
168 layer.compositor()->updateRootLayerPosition(); 180 layer.compositor()->updateRootLayerPosition();
169 181
170 if (mapping->hasUnpositionedOverflowControlsLayers()) 182 if (mapping->hasUnpositionedOverflowControlsLayers())
171 layer.scrollableArea()->positionOverflowControls(); 183 layer.scrollableArea()->positionOverflowControls();
172 } 184 }
173 185
174 } // namespace WebCore 186 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698