| Index: Source/core/frame/RemoteFrame.h
|
| diff --git a/Source/core/frame/RemoteFrame.h b/Source/core/frame/RemoteFrame.h
|
| index 83c7a2ff884707fe5ace2f090eacfdfc6ee8cace..511ef5c761b70774e6fe5896f30c227d19de1477 100644
|
| --- a/Source/core/frame/RemoteFrame.h
|
| +++ b/Source/core/frame/RemoteFrame.h
|
| @@ -14,6 +14,7 @@ class Event;
|
| class RemoteDOMWindow;
|
| class RemoteFrameClient;
|
| class RemoteFrameView;
|
| +class WebLayer;
|
| class WindowProxyManager;
|
|
|
| class RemoteFrame: public Frame {
|
| @@ -24,19 +25,23 @@ public:
|
|
|
| // Frame overrides:
|
| void trace(Visitor*) override;
|
| - virtual bool isRemoteFrame() const override { return true; }
|
| - virtual DOMWindow* domWindow() const override;
|
| + bool isRemoteFrame() const override { return true; }
|
| + DOMWindow* domWindow() const override;
|
| WindowProxy* windowProxy(DOMWrapperWorld&) override;
|
| - virtual void navigate(Document& originDocument, const KURL&, bool lockBackForwardList) override;
|
| - virtual void reload(ReloadPolicy, ClientRedirectPolicy) override;
|
| - virtual void detach() override;
|
| - virtual RemoteSecurityContext* securityContext() const override;
|
| + void navigate(Document& originDocument, const KURL&, bool lockBackForwardList) override;
|
| + void reload(ReloadPolicy, ClientRedirectPolicy) override;
|
| + void detach() override;
|
| + RemoteSecurityContext* securityContext() const override;
|
| void printNavigationErrorMessage(const Frame&, const char* reason) override { }
|
| + void disconnectOwnerElement() override;
|
|
|
| // FIXME: Remove this method once we have input routing in the browser
|
| // process. See http://crbug.com/339659.
|
| void forwardInputEvent(Event*);
|
|
|
| + void setRemotePlatformLayer(WebLayer*);
|
| + WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; }
|
| +
|
| void setView(PassRefPtrWillBeRawPtr<RemoteFrameView>);
|
| void createView();
|
|
|
| @@ -51,6 +56,7 @@ private:
|
| RefPtr<RemoteSecurityContext> m_securityContext;
|
| RefPtrWillBeMember<RemoteDOMWindow> m_domWindow;
|
| OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager;
|
| + WebLayer* m_remotePlatformLayer;
|
| };
|
|
|
| inline RemoteFrameView* RemoteFrame::view() const
|
|
|