| OLD | NEW |
| 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 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 } | 43 } |
| 44 | 44 |
| 45 GraphicsLayerTreeBuilder::~GraphicsLayerTreeBuilder() | 45 GraphicsLayerTreeBuilder::~GraphicsLayerTreeBuilder() |
| 46 { | 46 { |
| 47 } | 47 } |
| 48 | 48 |
| 49 static bool shouldAppendLayer(const Layer& layer) | 49 static bool shouldAppendLayer(const Layer& layer) |
| 50 { | 50 { |
| 51 if (!RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) | 51 if (!RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) |
| 52 return true; | 52 return true; |
| 53 Node* node = layer.renderer()->node(); | 53 Node* node = layer.layoutObject()->node(); |
| 54 if (node && isHTMLVideoElement(*node)) { | 54 if (node && isHTMLVideoElement(*node)) { |
| 55 HTMLVideoElement* element = toHTMLVideoElement(node); | 55 HTMLVideoElement* element = toHTMLVideoElement(node); |
| 56 // For WebRTC, video frame contains all the data and no hardware surface
is used. | 56 // For WebRTC, video frame contains all the data and no hardware surface
is used. |
| 57 // We should always append the layer in this case. | 57 // We should always append the layer in this case. |
| 58 if (element->isFullscreen() && !HTMLMediaElement::isMediaStreamURL(eleme
nt->sourceURL().string())) | 58 if (element->isFullscreen() && !HTMLMediaElement::isMediaStreamURL(eleme
nt->sourceURL().string())) |
| 59 return false; | 59 return false; |
| 60 } | 60 } |
| 61 return true; | 61 return true; |
| 62 } | 62 } |
| 63 | 63 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 94 if (hasCompositedLayerMapping && currentCompositedLayerMapping->foregrou
ndLayer()) | 94 if (hasCompositedLayerMapping && currentCompositedLayerMapping->foregrou
ndLayer()) |
| 95 infoForChildren.childLayersOfEnclosingCompositedLayer->append(curren
tCompositedLayerMapping->foregroundLayer()); | 95 infoForChildren.childLayersOfEnclosingCompositedLayer->append(curren
tCompositedLayerMapping->foregroundLayer()); |
| 96 } | 96 } |
| 97 | 97 |
| 98 LayerStackingNodeIterator iterator(*layer.stackingNode(), NormalFlowChildren
| PositiveZOrderChildren); | 98 LayerStackingNodeIterator iterator(*layer.stackingNode(), NormalFlowChildren
| PositiveZOrderChildren); |
| 99 while (LayerStackingNode* curNode = iterator.next()) | 99 while (LayerStackingNode* curNode = iterator.next()) |
| 100 rebuild(*curNode->layer(), infoForChildren); | 100 rebuild(*curNode->layer(), infoForChildren); |
| 101 | 101 |
| 102 if (hasCompositedLayerMapping) { | 102 if (hasCompositedLayerMapping) { |
| 103 bool parented = false; | 103 bool parented = false; |
| 104 if (layer.renderer()->isLayoutPart()) | 104 if (layer.layoutObject()->isLayoutPart()) |
| 105 parented = LayerCompositor::parentFrameContentLayers(toLayoutPart(la
yer.renderer())); | 105 parented = LayerCompositor::parentFrameContentLayers(toLayoutPart(la
yer.layoutObject())); |
| 106 | 106 |
| 107 if (!parented) | 107 if (!parented) |
| 108 currentCompositedLayerMapping->parentForSublayers()->setChildren(lay
erChildren); | 108 currentCompositedLayerMapping->parentForSublayers()->setChildren(lay
erChildren); |
| 109 | 109 |
| 110 // If the layer has a clipping layer the overflow controls layers will b
e siblings of the clipping layer. | 110 // If the layer has a clipping layer the overflow controls layers will b
e siblings of the clipping layer. |
| 111 // Otherwise, the overflow control layers are normal children. | 111 // Otherwise, the overflow control layers are normal children. |
| 112 // FIXME: Why isn't this handled in CLM updateInternalHierarchy? | 112 // FIXME: Why isn't this handled in CLM updateInternalHierarchy? |
| 113 if (!currentCompositedLayerMapping->hasClippingLayer() && !currentCompos
itedLayerMapping->hasScrollingLayer()) { | 113 if (!currentCompositedLayerMapping->hasClippingLayer() && !currentCompos
itedLayerMapping->hasScrollingLayer()) { |
| 114 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp
ing->layerForHorizontalScrollbar()) { | 114 if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapp
ing->layerForHorizontalScrollbar()) { |
| 115 overflowControlLayer->removeFromParent(); | 115 overflowControlLayer->removeFromParent(); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 132 } | 132 } |
| 133 | 133 |
| 134 if (layer.scrollParent() | 134 if (layer.scrollParent() |
| 135 && layer.scrollParent()->hasCompositedLayerMapping() | 135 && layer.scrollParent()->hasCompositedLayerMapping() |
| 136 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl
owControls() | 136 && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverfl
owControls() |
| 137 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye
r) | 137 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye
r) |
| 138 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); | 138 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()-
>compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi
tedLayer)); |
| 139 } | 139 } |
| 140 | 140 |
| 141 } | 141 } |
| OLD | NEW |