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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Add tests, make plugin creation synchronous. 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:
View side-by-side diff with in-line comments
Download patch
« LayoutTests/plugins/plugin-persists.html ('K') | « Source/core/dom/Element.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | Source/core/html/HTMLFrameOwnerElement.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 7886475dc9376a359111fc0f84045272f6073f13..0fd060e59ca70048a640991dbdbe6fe171b6aacd 100644
--- a/Source/core/frame/Frame.cpp
+++ b/Source/core/frame/Frame.cpp
@@ -479,11 +479,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
« LayoutTests/plugins/plugin-persists.html ('K') | « Source/core/dom/Element.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | Source/core/html/HTMLFrameOwnerElement.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698