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

Side by Side Diff: third_party/WebKit/Source/web/WebRemoteFrameImpl.h

Issue 2837593002: Nuked WebFrameImplBase. (Closed)
Patch Set: Switched to static methods. Created 3 years, 7 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
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 #ifndef WebRemoteFrameImpl_h 5 #ifndef WebRemoteFrameImpl_h
6 #define WebRemoteFrameImpl_h 6 #define WebRemoteFrameImpl_h
7 7
8 #include "core/frame/RemoteFrame.h" 8 #include "core/frame/RemoteFrame.h"
9 #include "platform/heap/SelfKeepAlive.h" 9 #include "platform/heap/SelfKeepAlive.h"
10 #include "platform/wtf/Compiler.h" 10 #include "platform/wtf/Compiler.h"
11 #include "public/platform/WebInsecureRequestPolicy.h" 11 #include "public/platform/WebInsecureRequestPolicy.h"
12 #include "public/web/WebRemoteFrame.h" 12 #include "public/web/WebRemoteFrame.h"
13 #include "public/web/WebRemoteFrameClient.h" 13 #include "public/web/WebRemoteFrameClient.h"
14 #include "web/RemoteFrameClientImpl.h" 14 #include "web/RemoteFrameClientImpl.h"
15 #include "web/WebExport.h" 15 #include "web/WebExport.h"
16 #include "web/WebFrameImplBase.h"
17 16
18 namespace blink { 17 namespace blink {
19 18
20 class FrameOwner; 19 class FrameOwner;
21 class RemoteFrame; 20 class RemoteFrame;
22 enum class WebFrameLoadType; 21 enum class WebFrameLoadType;
23 class WebAssociatedURLLoader; 22 class WebAssociatedURLLoader;
24 struct WebAssociatedURLLoaderOptions; 23 struct WebAssociatedURLLoaderOptions;
25 24
26 class WEB_EXPORT WebRemoteFrameImpl final 25 class WEB_EXPORT WebRemoteFrameImpl final
27 : public WebFrameImplBase, 26 : public GarbageCollectedFinalized<WebRemoteFrameImpl>,
28 NON_EXPORTED_BASE(public WebRemoteFrame) { 27 NON_EXPORTED_BASE(public WebRemoteFrame) {
29 public: 28 public:
30 static WebRemoteFrameImpl* Create(WebTreeScopeType, 29 static WebRemoteFrameImpl* Create(WebTreeScopeType,
31 WebRemoteFrameClient*, 30 WebRemoteFrameClient*,
32 WebFrame* opener = nullptr); 31 WebFrame* opener = nullptr);
33 ~WebRemoteFrameImpl() override; 32 ~WebRemoteFrameImpl() override;
34 33
35 // WebFrame methods: 34 // WebFrame methods:
36 void Close() override; 35 void Close() override;
37 WebString AssignedName() const override; 36 WebString AssignedName() const override;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 bool IsPrintScalingDisabledForPlugin(const WebNode&) override; 97 bool IsPrintScalingDisabledForPlugin(const WebNode&) override;
99 void PrintPagesWithBoundaries(WebCanvas*, const WebSize&) override; 98 void PrintPagesWithBoundaries(WebCanvas*, const WebSize&) override;
100 void DispatchMessageEventWithOriginCheck( 99 void DispatchMessageEventWithOriginCheck(
101 const WebSecurityOrigin& intended_target_origin, 100 const WebSecurityOrigin& intended_target_origin,
102 const WebDOMEvent&) override; 101 const WebDOMEvent&) override;
103 102
104 WebRect SelectionBoundsRect() const override; 103 WebRect SelectionBoundsRect() const override;
105 104
106 WebString LayerTreeAsText(bool show_debug_info = false) const override; 105 WebString LayerTreeAsText(bool show_debug_info = false) const override;
107 106
108 WebFrameImplBase* ToImplBase() { return this; } 107 // TODO(mustaq): regroup these to WebFrame or WebRemoteFrame
dcheng 2017/04/26 11:45:34 I don't understand this TODO. What's your followup
mustaq 2017/04/26 18:12:48 These were TODO for this CL. Done: moved them to n
109 108 void InitializeCoreFrame(Page&, FrameOwner*, const AtomicString& name);
110 // WebFrameImplBase methods: 109 RemoteFrame* GetFrame() const { return frame_.Get(); }
111 void InitializeCoreFrame(Page&,
112 FrameOwner*,
113 const AtomicString& name) override;
114 RemoteFrame* GetFrame() const override { return frame_.Get(); }
115 110
116 void SetCoreFrame(RemoteFrame*); 111 void SetCoreFrame(RemoteFrame*);
117 112
118 WebRemoteFrameClient* Client() const { return client_; } 113 WebRemoteFrameClient* Client() const { return client_; }
119 114
120 static WebRemoteFrameImpl* FromFrame(RemoteFrame&); 115 static WebRemoteFrameImpl* FromFrame(RemoteFrame&);
121 116
122 // WebRemoteFrame methods: 117 // WebRemoteFrame methods:
123 WebLocalFrame* CreateLocalChild(WebTreeScopeType, 118 WebLocalFrame* CreateLocalChild(WebTreeScopeType,
124 const WebString& name, 119 const WebString& name,
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 176
182 DEFINE_TYPE_CASTS(WebRemoteFrameImpl, 177 DEFINE_TYPE_CASTS(WebRemoteFrameImpl,
183 WebFrame, 178 WebFrame,
184 frame, 179 frame,
185 frame->IsWebRemoteFrame(), 180 frame->IsWebRemoteFrame(),
186 frame.IsWebRemoteFrame()); 181 frame.IsWebRemoteFrame());
187 182
188 } // namespace blink 183 } // namespace blink
189 184
190 #endif // WebRemoteFrameImpl_h 185 #endif // WebRemoteFrameImpl_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698