Source/core/layout/compositing/CompositedLayerMapping.h - 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/CompositedLayerMapping.h

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/CompositedLayerMapping.h

diff --git a/Source/core/layout/compositing/CompositedLayerMapping.h b/Source/core/layout/compositing/CompositedLayerMapping.h

index 64bd7c6c7a8fadf0f193bd81da4ca19da9c071ef..b8af502c0f508de17eab696c92b1f39f611c83e9 100644

--- a/Source/core/layout/compositing/CompositedLayerMapping.h

+++ b/Source/core/layout/compositing/CompositedLayerMapping.h

@@ -220,7 +220,7 @@ private:

PassOwnPtr<GraphicsLayer> createGraphicsLayer(CompositingReasons);

bool toggleScrollbarLayerIfNeeded(OwnPtr<GraphicsLayer>&, bool needsLayer, CompositingReasons);

- LayoutLayerModelObject* renderer() const { return m_owningLayer.renderer(); }

+ LayoutBoxModelObject* renderer() const { return m_owningLayer.renderer(); }

LayerCompositor* compositor() const { return m_owningLayer.compositor(); }

void updateInternalHierarchy();