Source/core/frame/Frame.cpp - Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM

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/frame/Frame.cpp

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: ASSERT on ownerElement->widget() == this causes many tests to fail. Created 7 years 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/frame/Frame.cpp

diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp

index e887c79381531e99ad68c1bf0db2da5cd8f0a416..c1195455e2d7dc94c6839e402b01b41ec3678c98 100644

--- a/Source/core/frame/Frame.cpp

+++ b/Source/core/frame/Frame.cpp

@@ -498,11 +498,11 @@ void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor

if (isMainFrame)

frameView->setParentVisible(true);

- if (ownerRenderer())

- ownerRenderer()->setWidget(frameView);

- if (HTMLFrameOwnerElement* owner = ownerElement())

+ if (HTMLFrameOwnerElement* owner = ownerElement()) {

+ if (ownerRenderer())

+ owner->setWidget(frameView);

view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOff);

+ }

}

String Frame::layerTreeAsText(unsigned flags) const