| 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 6247b62750c11ee7892264c09191e3a5baf31f71..4bcd318d06e848b7c435233dfbeddb6c9d65a560 100644
|
| --- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.h
|
| +++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.h
|
| @@ -145,7 +145,7 @@ public:
|
| WebFrameImplBase* toImplBase() { return this; }
|
|
|
| // WebFrameImplBase methods:
|
| - void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& fallbackName) override;
|
| + void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& uniqueName) override;
|
| RemoteFrame* frame() const override { return m_frame.get(); }
|
|
|
| void setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame>);
|
| @@ -155,14 +155,14 @@ public:
|
| static WebRemoteFrameImpl* fromFrame(RemoteFrame&);
|
|
|
| // WebRemoteFrame methods:
|
| - WebLocalFrame* createLocalChild(WebTreeScopeType, const WebString& name, WebSandboxFlags, WebFrameClient*, WebFrame* previousSibling, const WebFrameOwnerProperties&) override;
|
| - WebRemoteFrame* createRemoteChild(WebTreeScopeType, const WebString& name, WebSandboxFlags, WebRemoteFrameClient*) override;
|
| + WebLocalFrame* createLocalChild(WebTreeScopeType, const WebString& name, const WebString& uniqueName, WebSandboxFlags, WebFrameClient*, WebFrame* previousSibling, const WebFrameOwnerProperties&) override;
|
| + WebRemoteFrame* createRemoteChild(WebTreeScopeType, const WebString& name, const WebString& uniqueName, WebSandboxFlags, WebRemoteFrameClient*) override;
|
|
|
| void initializeFromFrame(WebLocalFrame*) const override;
|
|
|
| void setReplicatedOrigin(const WebSecurityOrigin&) const override;
|
| void setReplicatedSandboxFlags(WebSandboxFlags) const override;
|
| - void setReplicatedName(const WebString&) const override;
|
| + void setReplicatedName(const WebString& name, const WebString& uniqueName) const override;
|
| void setReplicatedShouldEnforceStrictMixedContentChecking(bool) const override;
|
| void DispatchLoadEventForFrameOwner() const override;
|
|
|
|
|