| Index: sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp
|
| diff --git a/sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp b/sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp
|
| index a8701d65c4a1c4ff67edc03ccba92a6da7ccc7b2..f914e69df5f590078db88d1f3ea3a13792d16fcd 100644
|
| --- a/sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp
|
| +++ b/sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp
|
| @@ -38,7 +38,6 @@
|
| #include "core/page/scrolling/ScrollingCoordinator.h"
|
| #include "core/rendering/RenderLayerStackingNode.h"
|
| #include "core/rendering/RenderLayerStackingNodeIterator.h"
|
| -#include "core/rendering/RenderPart.h"
|
| #include "core/rendering/RenderVideo.h"
|
| #include "core/rendering/RenderView.h"
|
| #include "core/rendering/compositing/CompositedLayerMapping.h"
|
| @@ -342,12 +341,6 @@ bool RenderLayerCompositor::allocateOrClearCompositedLayerMapping(RenderLayer* l
|
| if (layer->hasCompositedLayerMapping() && layer->compositedLayerMapping()->updateRequiresOwnBackingStoreForIntrinsicReasons())
|
| compositedLayerMappingChanged = true;
|
|
|
| - if (compositedLayerMappingChanged && layer->renderer()->isRenderPart()) {
|
| - RenderLayerCompositor* innerCompositor = frameContentsCompositor(toRenderPart(layer->renderer()));
|
| - if (innerCompositor && innerCompositor->staleInCompositingMode())
|
| - innerCompositor->updateRootLayerAttachment();
|
| - }
|
| -
|
| if (compositedLayerMappingChanged)
|
| layer->clipper().clearClipRectsIncludingDescendants(PaintingClipRects);
|
|
|
| @@ -477,32 +470,6 @@ String RenderLayerCompositor::layerTreeAsText(LayerTreeFlags flags)
|
| return layerTreeText;
|
| }
|
|
|
| -RenderLayerCompositor* RenderLayerCompositor::frameContentsCompositor(RenderPart* renderer)
|
| -{
|
| - return 0;
|
| -}
|
| -
|
| -// FIXME: What does this function do? It needs a clearer name.
|
| -bool RenderLayerCompositor::parentFrameContentLayers(RenderPart* renderer)
|
| -{
|
| - RenderLayerCompositor* innerCompositor = frameContentsCompositor(renderer);
|
| - if (!innerCompositor || !innerCompositor->staleInCompositingMode() || innerCompositor->rootLayerAttachment() != RootLayerAttachedViaEnclosingFrame)
|
| - return false;
|
| -
|
| - RenderLayer* layer = renderer->layer();
|
| - if (!layer->hasCompositedLayerMapping())
|
| - return false;
|
| -
|
| - CompositedLayerMapping* compositedLayerMapping = layer->compositedLayerMapping();
|
| - GraphicsLayer* hostingLayer = compositedLayerMapping->parentForSublayers();
|
| - GraphicsLayer* rootLayer = innerCompositor->rootGraphicsLayer();
|
| - if (hostingLayer->children().size() != 1 || hostingLayer->children()[0] != rootLayer) {
|
| - hostingLayer->removeAllChildren();
|
| - hostingLayer->addChild(rootLayer);
|
| - }
|
| - return true;
|
| -}
|
| -
|
| static void fullyInvalidatePaintRecursive(RenderLayer* layer)
|
| {
|
| if (layer->compositingState() == PaintsIntoOwnBacking) {
|
|
|