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

Side by Side Diff: Source/core/frame/RemoteFrame.cpp

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Handle shared-renderer case. Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/html/HTMLAppletElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/frame/RemoteFrame.h" 6 #include "core/frame/RemoteFrame.h"
7 7
8 #include "core/frame/RemoteFrameView.h" 8 #include "core/frame/RemoteFrameView.h"
9 #include "core/rendering/RenderPart.h" 9 #include "core/html/HTMLFrameOwnerElement.h"
10 10
11 namespace WebCore { 11 namespace WebCore {
12 12
13 inline RemoteFrame::RemoteFrame(FrameHost* host, HTMLFrameOwnerElement* ownerEle ment) 13 inline RemoteFrame::RemoteFrame(FrameHost* host, HTMLFrameOwnerElement* ownerEle ment)
14 : Frame(host, ownerElement) 14 : Frame(host, ownerElement)
15 { 15 {
16 } 16 }
17 17
18 PassRefPtr<RemoteFrame> RemoteFrame::create(FrameHost* host, HTMLFrameOwnerEleme nt* ownerElement) 18 PassRefPtr<RemoteFrame> RemoteFrame::create(FrameHost* host, HTMLFrameOwnerEleme nt* ownerElement)
19 { 19 {
20 RefPtr<RemoteFrame> frame = adoptRef(new RemoteFrame(host, ownerElement)); 20 RefPtr<RemoteFrame> frame = adoptRef(new RemoteFrame(host, ownerElement));
21 return frame.release(); 21 return frame.release();
22 } 22 }
23 23
24 RemoteFrame::~RemoteFrame() 24 RemoteFrame::~RemoteFrame()
25 { 25 {
26 setView(nullptr); 26 setView(nullptr);
27 } 27 }
28 28
29 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view) 29 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view)
30 { 30 {
31 m_view = view; 31 m_view = view;
32 } 32 }
33 33
34 void RemoteFrame::createView() 34 void RemoteFrame::createView()
35 { 35 {
36 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this); 36 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this);
37 setView(view); 37 setView(view);
38 38
39 if (ownerRenderer()) 39 if (ownerRenderer()) {
40 ownerRenderer()->setWidget(view); 40 ASSERT(ownerElement());
41 ownerElement()->setWidget(view);
42 }
41 } 43 }
42 44
43 } // namespace WebCore 45 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/html/HTMLAppletElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698