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

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

Issue 2837593002: Nuked WebFrameImplBase. (Closed)
Patch Set: Replaced non-null params with refs. 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 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 25 matching lines...) Expand all
36 #include "core/frame/LocalFrame.h" 36 #include "core/frame/LocalFrame.h"
37 #include "platform/geometry/FloatRect.h" 37 #include "platform/geometry/FloatRect.h"
38 #include "platform/heap/SelfKeepAlive.h" 38 #include "platform/heap/SelfKeepAlive.h"
39 #include "platform/wtf/Compiler.h" 39 #include "platform/wtf/Compiler.h"
40 #include "platform/wtf/text/WTFString.h" 40 #include "platform/wtf/text/WTFString.h"
41 #include "public/platform/WebFileSystemType.h" 41 #include "public/platform/WebFileSystemType.h"
42 #include "public/web/WebLocalFrame.h" 42 #include "public/web/WebLocalFrame.h"
43 #include "web/LocalFrameClientImpl.h" 43 #include "web/LocalFrameClientImpl.h"
44 #include "web/UserMediaClientImpl.h" 44 #include "web/UserMediaClientImpl.h"
45 #include "web/WebExport.h" 45 #include "web/WebExport.h"
46 #include "web/WebFrameImplBase.h"
47 #include "web/WebFrameWidgetBase.h" 46 #include "web/WebFrameWidgetBase.h"
48 #include "web/WebInputMethodControllerImpl.h" 47 #include "web/WebInputMethodControllerImpl.h"
49 48
50 #include <memory> 49 #include <memory>
51 50
52 namespace blink { 51 namespace blink {
53 52
54 class ChromePrintContext; 53 class ChromePrintContext;
55 class IntSize; 54 class IntSize;
56 class KURL; 55 class KURL;
(...skipping 20 matching lines...) Expand all
77 enum class WebFrameLoadType; 76 enum class WebFrameLoadType;
78 struct FrameLoadRequest; 77 struct FrameLoadRequest;
79 struct WebContentSecurityPolicyViolation; 78 struct WebContentSecurityPolicyViolation;
80 struct WebPrintParams; 79 struct WebPrintParams;
81 80
82 template <typename T> 81 template <typename T>
83 class WebVector; 82 class WebVector;
84 83
85 // Implementation of WebFrame, note that this is a reference counted object. 84 // Implementation of WebFrame, note that this is a reference counted object.
86 class WEB_EXPORT WebLocalFrameImpl final 85 class WEB_EXPORT WebLocalFrameImpl final
87 : public WebFrameImplBase, 86 : public GarbageCollectedFinalized<WebLocalFrameImpl>,
88 NON_EXPORTED_BASE(public WebLocalFrame) { 87 NON_EXPORTED_BASE(public WebLocalFrame) {
89 public: 88 public:
90 // WebFrame methods: 89 // WebFrame methods:
91 // TODO(dcheng): Fix sorting here; a number of method have been moved to 90 // TODO(dcheng): Fix sorting here; a number of method have been moved to
92 // WebLocalFrame but not correctly updated here. 91 // WebLocalFrame but not correctly updated here.
93 void Close() override; 92 void Close() override;
94 WebString AssignedName() const override; 93 WebString AssignedName() const override;
95 void SetName(const WebString&) override; 94 void SetName(const WebString&) override;
96 WebVector<WebIconURL> IconURLs(int icon_types_mask) const override; 95 WebVector<WebIconURL> IconURLs(int icon_types_mask) const override;
97 void SetSharedWorkerRepositoryClient( 96 void SetSharedWorkerRepositoryClient(
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 void PrintPagesWithBoundaries(WebCanvas*, const WebSize&) override; 231 void PrintPagesWithBoundaries(WebCanvas*, const WebSize&) override;
233 232
234 void DispatchMessageEventWithOriginCheck( 233 void DispatchMessageEventWithOriginCheck(
235 const WebSecurityOrigin& intended_target_origin, 234 const WebSecurityOrigin& intended_target_origin,
236 const WebDOMEvent&) override; 235 const WebDOMEvent&) override;
237 236
238 WebRect SelectionBoundsRect() const override; 237 WebRect SelectionBoundsRect() const override;
239 238
240 WebString LayerTreeAsText(bool show_debug_info = false) const override; 239 WebString LayerTreeAsText(bool show_debug_info = false) const override;
241 240
242 WebFrameImplBase* ToImplBase() override { return this; }
243
244 // WebLocalFrame methods: 241 // WebLocalFrame methods:
245 void SetAutofillClient(WebAutofillClient*) override; 242 void SetAutofillClient(WebAutofillClient*) override;
246 WebAutofillClient* AutofillClient() override; 243 WebAutofillClient* AutofillClient() override;
247 void SetDevToolsAgentClient(WebDevToolsAgentClient*) override; 244 void SetDevToolsAgentClient(WebDevToolsAgentClient*) override;
248 WebDevToolsAgent* DevToolsAgent() override; 245 WebDevToolsAgent* DevToolsAgent() override;
249 WebLocalFrameImpl* LocalRoot() override; 246 WebLocalFrameImpl* LocalRoot() override;
250 void SendPings(const WebURL& destination_url) override; 247 void SendPings(const WebURL& destination_url) override;
251 bool DispatchBeforeUnloadEvent(bool) override; 248 bool DispatchBeforeUnloadEvent(bool) override;
252 WebURLRequest RequestFromHistoryItem(const WebHistoryItem&, 249 WebURLRequest RequestFromHistoryItem(const WebHistoryItem&,
253 WebCachePolicy) const override; 250 WebCachePolicy) const override;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 void UsageCountChromeLoadTimes(const WebString& metric) override; 311 void UsageCountChromeLoadTimes(const WebString& metric) override;
315 base::SingleThreadTaskRunner* TimerTaskRunner() override; 312 base::SingleThreadTaskRunner* TimerTaskRunner() override;
316 base::SingleThreadTaskRunner* LoadingTaskRunner() override; 313 base::SingleThreadTaskRunner* LoadingTaskRunner() override;
317 base::SingleThreadTaskRunner* UnthrottledTaskRunner() override; 314 base::SingleThreadTaskRunner* UnthrottledTaskRunner() override;
318 WebInputMethodControllerImpl* GetInputMethodController() const override; 315 WebInputMethodControllerImpl* GetInputMethodController() const override;
319 316
320 void ExtractSmartClipData(WebRect rect_in_viewport, 317 void ExtractSmartClipData(WebRect rect_in_viewport,
321 WebString& clip_text, 318 WebString& clip_text,
322 WebString& clip_html) override; 319 WebString& clip_html) override;
323 320
324 // WebFrameImplBase methods: 321 void InitializeCoreFrame(Page&, FrameOwner*, const AtomicString& name);
325 void InitializeCoreFrame(Page&, 322 LocalFrame* GetFrame() const { return frame_.Get(); }
326 FrameOwner*,
327 const AtomicString& name) override;
328 LocalFrame* GetFrame() const override { return frame_.Get(); }
329 323
330 void WillBeDetached(); 324 void WillBeDetached();
331 void WillDetachParent(); 325 void WillDetachParent();
332 326
333 static WebLocalFrameImpl* Create(WebTreeScopeType, 327 static WebLocalFrameImpl* Create(WebTreeScopeType,
334 WebFrameClient*, 328 WebFrameClient*,
335 blink::InterfaceProvider*, 329 blink::InterfaceProvider*,
336 blink::InterfaceRegistry*, 330 blink::InterfaceRegistry*,
337 WebFrame* opener); 331 WebFrame* opener);
338 static WebLocalFrameImpl* CreateProvisional(WebFrameClient*, 332 static WebLocalFrameImpl* CreateProvisional(WebFrameClient*,
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 518
525 DEFINE_TYPE_CASTS(WebLocalFrameImpl, 519 DEFINE_TYPE_CASTS(WebLocalFrameImpl,
526 WebFrame, 520 WebFrame,
527 frame, 521 frame,
528 frame->IsWebLocalFrame(), 522 frame->IsWebLocalFrame(),
529 frame.IsWebLocalFrame()); 523 frame.IsWebLocalFrame());
530 524
531 } // namespace blink 525 } // namespace blink
532 526
533 #endif 527 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameImplBase.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698