Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(923)

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: Revised method for widget lifetime management. Created 7 years, 1 month 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 | « no previous file | Source/core/frame/FrameView.cpp » ('j') | Source/core/html/HTMLObjectElement.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Frame.cpp
diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp
index 869c7b02933ef1aeb3d4e2f75cf7804a4e2d4b99..555b3c1f127fdcc36ea04fda605592207b8b7aa0 100644
--- a/Source/core/frame/Frame.cpp
+++ b/Source/core/frame/Frame.cpp
@@ -480,11 +480,10 @@ 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()) {
+ owner->setWidget(frameView);
view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOff);
+ }
}
String Frame::layerTreeAsText(unsigned flags) const
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | Source/core/html/HTMLObjectElement.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698