| 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; }
|
|
|
|
|