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

Side by Side Diff: sky/engine/core/rendering/compositing/GraphicsLayerTreeBuilder.cpp

Issue 689373003: Remove most of the media stack. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/GraphicsLayerTreeBuilder.h" 28 #include "core/rendering/compositing/GraphicsLayerTreeBuilder.h"
29 29
30 #include "core/html/HTMLMediaElement.h"
31 #include "core/rendering/RenderLayer.h" 30 #include "core/rendering/RenderLayer.h"
32 #include "core/rendering/RenderView.h" 31 #include "core/rendering/RenderView.h"
33 #include "core/rendering/compositing/CompositedLayerMapping.h" 32 #include "core/rendering/compositing/CompositedLayerMapping.h"
34 #include "core/rendering/compositing/RenderLayerCompositor.h" 33 #include "core/rendering/compositing/RenderLayerCompositor.h"
35 34
36 namespace blink { 35 namespace blink {
37 36
38 GraphicsLayerTreeBuilder::GraphicsLayerTreeBuilder() 37 GraphicsLayerTreeBuilder::GraphicsLayerTreeBuilder()
39 { 38 {
40 } 39 }
41 40
42 GraphicsLayerTreeBuilder::~GraphicsLayerTreeBuilder() 41 GraphicsLayerTreeBuilder::~GraphicsLayerTreeBuilder()
43 { 42 {
44 } 43 }
45 44
46 static bool shouldAppendLayer(const RenderLayer& layer)
47 {
48 if (!RuntimeEnabledFeatures::overlayFullscreenVideoEnabled())
49 return true;
50 Node* node = layer.renderer()->node();
51 if (node && isHTMLMediaElement(*node) && toHTMLMediaElement(node)->isFullscr een())
52 return false;
53 return true;
54 }
55
56 void GraphicsLayerTreeBuilder::rebuild(RenderLayer& layer, AncestorInfo info) 45 void GraphicsLayerTreeBuilder::rebuild(RenderLayer& layer, AncestorInfo info)
57 { 46 {
58 // Make the layer compositing if necessary, and set up clipping and content layers. 47 // Make the layer compositing if necessary, and set up clipping and content layers.
59 // Note that we can only do work here that is independent of whether the des cendant layers 48 // Note that we can only do work here that is independent of whether the des cendant layers
60 // have been processed. computeCompositingRequirements() will already have d one the paint invalidation if necessary. 49 // have been processed. computeCompositingRequirements() will already have d one the paint invalidation if necessary.
61 50
62 layer.stackingNode()->updateLayerListsIfNeeded(); 51 layer.stackingNode()->updateLayerListsIfNeeded();
63 52
64 const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping(); 53 const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping();
65 CompositedLayerMapping* currentCompositedLayerMapping = layer.compositedLaye rMapping(); 54 CompositedLayerMapping* currentCompositedLayerMapping = layer.compositedLaye rMapping();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 overflowControlLayer->removeFromParent(); 96 overflowControlLayer->removeFromParent();
108 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer); 97 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer);
109 } 98 }
110 99
111 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp ing->layerForScrollCorner()) { 100 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp ing->layerForScrollCorner()) {
112 overflowControlLayer->removeFromParent(); 101 overflowControlLayer->removeFromParent();
113 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer); 102 currentCompositedLayerMapping->parentForSublayers()->addChild(ov erflowControlLayer);
114 } 103 }
115 } 104 }
116 105
117 if (shouldAppendLayer(layer)) 106 info.childLayersOfEnclosingCompositedLayer->append(currentCompositedLaye rMapping->childForSuperlayers());
118 info.childLayersOfEnclosingCompositedLayer->append(currentComposited LayerMapping->childForSuperlayers());
119 } 107 }
120 108
121 if (layer.scrollParent() 109 if (layer.scrollParent()
122 && layer.scrollParent()->hasCompositedLayerMapping() 110 && layer.scrollParent()->hasCompositedLayerMapping()
123 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl owControls() 111 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl owControls()
124 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye r) 112 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye r)
125 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()- >compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi tedLayer)); 113 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()- >compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi tedLayer));
126 } 114 }
127 115
128 } 116 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698