Chromium Code Reviews

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.
Jump to:
View unified diff | | 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 10 matching lines...)
21 } 21 }
22 22
23 RemoteFrame::~RemoteFrame() 23 RemoteFrame::~RemoteFrame()
24 { 24 {
25 setView(nullptr); 25 setView(nullptr);
26 } 26 }
27 27
28 void RemoteFrame::detach() 28 void RemoteFrame::detach()
29 { 29 {
30 detachChildren(); 30 detachChildren();
31 m_host = nullptr; 31 Frame::detach();
32 } 32 }
33 33
34 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view) 34 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view)
35 { 35 {
36 m_view = view; 36 m_view = view;
37 } 37 }
38 38
39 void RemoteFrame::createView() 39 void RemoteFrame::createView()
40 { 40 {
41 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this); 41 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this);
42 setView(view); 42 setView(view);
43 43
44 if (ownerRenderer()) { 44 if (ownerRenderer()) {
45 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); 45 HTMLFrameOwnerElement* owner = deprecatedLocalOwner();
46 ASSERT(owner); 46 ASSERT(owner);
47 owner->setWidget(view); 47 owner->setWidget(view);
48 } 48 }
49 } 49 }
50 50
51 } // namespace blink 51 } // namespace blink
OLDNEW

Powered by Google App Engine