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

Unified Diff: third_party/WebKit/Source/web/WebRemoteFrameImpl.h

Issue 2837593002: Nuked WebFrameImplBase. (Closed)
Patch Set: Replaced non-null params with refs. Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/WebRemoteFrameImpl.h
diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.h b/third_party/WebKit/Source/web/WebRemoteFrameImpl.h
index 07a066ada4dde51b601aae8ee1761a5feff05752..92037518aa7e38deb1d0ee765e4cc2fefa0e8cf8 100644
--- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.h
+++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.h
@@ -13,7 +13,6 @@
#include "public/web/WebRemoteFrameClient.h"
#include "web/RemoteFrameClientImpl.h"
#include "web/WebExport.h"
-#include "web/WebFrameImplBase.h"
namespace blink {
@@ -24,7 +23,7 @@ class WebAssociatedURLLoader;
struct WebAssociatedURLLoaderOptions;
class WEB_EXPORT WebRemoteFrameImpl final
- : public WebFrameImplBase,
+ : public GarbageCollectedFinalized<WebRemoteFrameImpl>,
NON_EXPORTED_BASE(public WebRemoteFrame) {
public:
static WebRemoteFrameImpl* Create(WebTreeScopeType,
@@ -105,20 +104,6 @@ class WEB_EXPORT WebRemoteFrameImpl final
WebString LayerTreeAsText(bool show_debug_info = false) const override;
- WebFrameImplBase* ToImplBase() { return this; }
-
- // WebFrameImplBase methods:
- void InitializeCoreFrame(Page&,
- FrameOwner*,
- const AtomicString& name) override;
- RemoteFrame* GetFrame() const override { return frame_.Get(); }
-
- void SetCoreFrame(RemoteFrame*);
-
- WebRemoteFrameClient* Client() const { return client_; }
-
- static WebRemoteFrameImpl* FromFrame(RemoteFrame&);
-
// WebRemoteFrame methods:
WebLocalFrame* CreateLocalChild(WebTreeScopeType,
const WebString& name,
@@ -157,6 +142,15 @@ class WEB_EXPORT WebRemoteFrameImpl final
void SetHasReceivedUserGesture() override;
v8::Local<v8::Object> GlobalProxy() const override;
+ void InitializeCoreFrame(Page&, FrameOwner*, const AtomicString& name);
+ RemoteFrame* GetFrame() const { return frame_.Get(); }
+
+ void SetCoreFrame(RemoteFrame*);
+
+ WebRemoteFrameClient* Client() const { return client_; }
+
+ static WebRemoteFrameImpl* FromFrame(RemoteFrame&);
+
DECLARE_TRACE();
private:
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.cpp ('k') | third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698