third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp - Issue 1942623002: Rename Document::ownerElement to localOwner and fix main frame checks.

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: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

Issue 1942623002: Rename Document::ownerElement to localOwner and fix main frame checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed const changes and some gratuitous checks Created 4 years, 7 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinder.cpp ('k') | third_party/WebKit/Source/core/loader/SinkDocument.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

index fd0887dabae0fa636e08dacc1b7e654cbd00ba46..8a5e5b8a42de264d2a1ea828b8ffe88c97fd6920 100644

--- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

+++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

@@ -115,7 +115,7 @@ void PaintLayerCompositor::setCompositingModeEnabled(bool enable)

// Schedule an update in the parent frame so the <iframe>'s layer in the owner

// document matches the compositing state here.

- if (HTMLFrameOwnerElement* ownerElement = m_layoutView.document().ownerElement())

+ if (HTMLFrameOwnerElement* ownerElement = m_layoutView.document().localOwner())

ownerElement->setNeedsCompositingUpdate();

}

@@ -1119,7 +1119,7 @@ void PaintLayerCompositor::attachRootLayer(RootLayerAttachment attachment)

break;

}

case RootLayerAttachedViaEnclosingFrame: {

- HTMLFrameOwnerElement* ownerElement = m_layoutView.document().ownerElement();

+ HTMLFrameOwnerElement* ownerElement = m_layoutView.document().localOwner();

ASSERT(ownerElement);

// The layer will get hooked up via CompositedLayerMapping::updateGraphicsLayerConfiguration()

// for the frame's layoutObject in the parent document.

@@ -1145,7 +1145,7 @@ void PaintLayerCompositor::detachRootLayer()

else

m_rootContentLayer->removeFromParent();

- if (HTMLFrameOwnerElement* ownerElement = m_layoutView.document().ownerElement())

+ if (HTMLFrameOwnerElement* ownerElement = m_layoutView.document().localOwner())

ownerElement->setNeedsCompositingUpdate();

break;

}