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

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

Issue 1467123003: Create base class for common functionality of Web{Local,Remote}Frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 5 years, 1 month 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 79165d02ad038a052f66da8c6e4812644b1aab55..ecc3356af9140a7fc1aeefbf4ce55b687823b789 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.h
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
@@ -38,6 +38,7 @@
#include "public/web/WebLocalFrame.h"
#include "web/FrameLoaderClientImpl.h"
#include "web/UserMediaClientImpl.h"
+#include "web/WebFrameImplBase.h"
#include "wtf/Compiler.h"
#include "wtf/OwnPtr.h"
#include "wtf/RefCounted.h"
@@ -72,7 +73,7 @@ struct WebPrintParams;
template <typename T> class WebVector;
// Implementation of WebFrame, note that this is a reference counted object.
-class WebLocalFrameImpl final : public RefCountedWillBeGarbageCollectedFinalized<WebLocalFrameImpl>, public WebLocalFrame {
+class WebLocalFrameImpl final : public WebFrameImplBase, public WebLocalFrame {
public:
// WebFrame methods:
bool isWebLocalFrame() const override;
@@ -227,6 +228,8 @@ public:
void registerTestInterface(const WebString& name, WebTestInterfaceFactory*) override;
+ WebFrameImplBase* toImplBase() override { return this; }
+
// Creates a test interface by name if available, returns an empty handle
// for unknown names.
v8::Local<v8::Value> createTestInterface(const AtomicString& name);
@@ -256,14 +259,16 @@ public:
void didCallIsSearchProviderInstalled() override;
void replaceSelection(const WebString&) override;
+ // WebFrameImplBase methods:
+ void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& fallbackName) override;
+ LocalFrame* frame() const override { return m_frame.get(); }
+
void willBeDetached();
void willDetachParent();
static WebLocalFrameImpl* create(WebTreeScopeType, WebFrameClient*);
~WebLocalFrameImpl() override;
- PassRefPtrWillBeRawPtr<LocalFrame> initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& fallbackName);
-
PassRefPtrWillBeRawPtr<LocalFrame> createChildFrame(const FrameLoadRequest&, const AtomicString& name, HTMLFrameOwnerElement*);
void didChangeContentsSize(const IntSize&);
@@ -318,7 +323,6 @@ public:
// Otherwise, disallow scrolling.
void setCanHaveScrollbars(bool) override;
- LocalFrame* frame() const { return m_frame.get(); }
WebFrameClient* client() const { return m_client; }
void setClient(WebFrameClient* client) { m_client = client; }
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698