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

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

Issue 2837593002: Nuked WebFrameImplBase. (Closed)
Patch Set: 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/WebLocalFrameImpl.h
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.h b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
index cf1f229ebd2d98377ee9839e46b095d6ccf58bd3..bcc5efd0d5abeacd00e64bb208e05e8b3717f902 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.h
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
@@ -43,7 +43,6 @@
#include "web/LocalFrameClientImpl.h"
#include "web/UserMediaClientImpl.h"
#include "web/WebExport.h"
-#include "web/WebFrameImplBase.h"
#include "web/WebFrameWidgetBase.h"
#include "web/WebInputMethodControllerImpl.h"
@@ -84,7 +83,7 @@ class WebVector;
// Implementation of WebFrame, note that this is a reference counted object.
class WEB_EXPORT WebLocalFrameImpl final
- : public WebFrameImplBase,
+ : public GarbageCollectedFinalized<WebLocalFrameImpl>,
NON_EXPORTED_BASE(public WebLocalFrame) {
public:
// WebFrame methods:
@@ -239,8 +238,6 @@ class WEB_EXPORT WebLocalFrameImpl final
WebString LayerTreeAsText(bool show_debug_info = false) const override;
- WebFrameImplBase* ToImplBase() override { return this; }
-
// WebLocalFrame methods:
void SetAutofillClient(WebAutofillClient*) override;
WebAutofillClient* AutofillClient() override;
@@ -321,10 +318,9 @@ class WEB_EXPORT WebLocalFrameImpl final
WebString& clip_text,
WebString& clip_html) override;
- // WebFrameImplBase methods:
- void InitializeCoreFrame(Page&,
- FrameOwner*,
- const AtomicString& name) override;
+ // TODO(mustaq): regroup these to WebFrame or WebLocalFrame
+ void InitializeCoreFrame(Page&) override;
+ void InitializeCoreFrame(Page&, FrameOwner*, const AtomicString& name);
LocalFrame* GetFrame() const override { return frame_.Get(); }
void WillBeDetached();

Powered by Google App Engine
This is Rietveld 408576698