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

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

Issue 551973005: Streamline frame detach (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
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/html/HTMLFrameOwnerElement.h" 9 #include "core/html/HTMLFrameOwnerElement.h"
10 10
(...skipping 11 matching lines...) Expand all
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::detach() 29 void RemoteFrame::detach()
30 { 30 {
31 detachChildren(); 31 detachChildren();
32 m_host = 0; 32 Frame::detach();
33 } 33 }
34 34
35 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view) 35 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view)
36 { 36 {
37 m_view = view; 37 m_view = view;
38 } 38 }
39 39
40 void RemoteFrame::createView() 40 void RemoteFrame::createView()
41 { 41 {
42 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this); 42 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this);
43 setView(view); 43 setView(view);
44 44
45 if (ownerRenderer()) { 45 if (ownerRenderer()) {
46 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); 46 HTMLFrameOwnerElement* owner = deprecatedLocalOwner();
47 ASSERT(owner); 47 ASSERT(owner);
48 owner->setWidget(view); 48 owner->setWidget(view);
49 } 49 }
50 } 50 }
51 51
52 } // namespace blink 52 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698