Source/core/layout/compositing/LayerCompositor.cpp - Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/layout/compositing/LayerCompositor.cpp

Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Better rebasing. Created 5 years, 10 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:

Index: Source/core/layout/compositing/LayerCompositor.cpp

diff --git a/Source/core/layout/compositing/LayerCompositor.cpp b/Source/core/layout/compositing/LayerCompositor.cpp

index 3377e833f4597f9d3ac1ec6d3abf7c1792edd94b..05db7ef1786f3bacf45358fcd9e02b44cfc7a917 100644

--- a/Source/core/layout/compositing/LayerCompositor.cpp

+++ b/Source/core/layout/compositing/LayerCompositor.cpp

@@ -446,7 +446,7 @@ bool LayerCompositor::allocateOrClearCompositedLayerMapping(Layer* layer, const

// its replica GraphicsLayer. In practice this should never happen because reflectee and reflection

// are both either composited, or not composited.

if (layer->isReflection()) {

- Layer* sourceLayer = toLayoutLayerModelObject(layer->renderer()->parent())->layer();

+ Layer* sourceLayer = toLayoutBoxModelObject(layer->renderer()->parent())->layer();

if (sourceLayer->hasCompositedLayerMapping()) {

ASSERT(sourceLayer->compositedLayerMapping()->mainGraphicsLayer()->replicaLayer() == layer->compositedLayerMapping()->mainGraphicsLayer());

sourceLayer->compositedLayerMapping()->mainGraphicsLayer()->setReplicatedByLayer(0);