third_party/WebKit/Source/core/layout/LayoutBox.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/LayoutBox.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/inspector/InspectorResourceAgent.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp

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

index 47f7087b0e3522e3141ba63bf441640ce821f7a0..2fa21490c395ad603d9c59bc25b8a45755963403 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp

@@ -543,7 +543,7 @@ void LayoutBox::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignmen

newRect = getScrollableArea()->scrollIntoView(rect, alignX, alignY, scrollType);

} else if (!parentBox && canBeProgramaticallyScrolled()) {

if (FrameView* frameView = this->frameView()) {

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

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

if (!isDisallowedAutoscroll(ownerElement, frameView)) {

if (makeVisibleInVisualViewport) {

frameView->getScrollableArea()->scrollIntoView(rect, alignX, alignY, scrollType);

@@ -855,8 +855,8 @@ IntSize LayoutBox::calculateAutoscrollDirection(const IntPoint& pointInRootFrame

LayoutBox* LayoutBox::findAutoscrollable(LayoutObject* layoutObject)

{

while (layoutObject && !(layoutObject->isBox() && toLayoutBox(layoutObject)->canAutoscroll())) {

- if (!layoutObject->parent() && layoutObject->node() == layoutObject->document() && layoutObject->document().ownerElement())

- layoutObject = layoutObject->document().ownerElement()->layoutObject();

+ if (!layoutObject->parent() && layoutObject->node() == layoutObject->document() && layoutObject->document().localOwner())

+ layoutObject = layoutObject->document().localOwner()->layoutObject();

else

layoutObject = layoutObject->parent();

}