OLD | NEW |
---|---|
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 |
11 namespace blink { | 11 namespace blink { |
12 | 12 |
13 inline RemoteFrame::RemoteFrame(FrameClient* client, FrameHost* host, FrameOwner * owner) | 13 inline RemoteFrame::RemoteFrame(FrameClient* client, FrameHost* host, FrameOwner * owner) |
14 : Frame(client, host, owner) | 14 : Frame(client, host, owner) |
15 { | 15 { |
16 } | 16 } |
17 | 17 |
18 PassRefPtr<RemoteFrame> RemoteFrame::create(FrameClient* client, FrameHost* host , FrameOwner* owner) | 18 PassRefPtrWillBeRawPtr<RemoteFrame> RemoteFrame::create(FrameClient* client, Fra meHost* host, FrameOwner* owner) |
19 { | 19 { |
20 RefPtr<RemoteFrame> frame = adoptRef(new RemoteFrame(client, host, owner)); | 20 RefPtrWillBeRawPtr<RemoteFrame> frame = adoptRefWillBeNoop(new RemoteFrame(c lient, host, owner)); |
21 return frame.release(); | 21 return frame.release(); |
haraken
2014/09/08 07:25:58
return adoptRefWillBeNoop(...)
sof
2014/09/08 21:17:46
Done.
| |
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(); |
(...skipping 11 matching lines...) Expand all Loading... | |
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 |
OLD | NEW |