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..21fbe7aec2826a9dcc6ebf9e8cf82cfdde0cb8fb 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,13 +104,9 @@ 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(); } |
+ // TODO(mustaq): regroup these to WebFrame or WebRemoteFrame |
dcheng
2017/04/26 11:45:34
I don't understand this TODO. What's your followup
mustaq
2017/04/26 18:12:48
These were TODO for this CL. Done: moved them to n
|
+ void InitializeCoreFrame(Page&, FrameOwner*, const AtomicString& name); |
+ RemoteFrame* GetFrame() const { return frame_.Get(); } |
void SetCoreFrame(RemoteFrame*); |