| Index: third_party/WebKit/public/web/WebLocalFrame.h
|
| diff --git a/third_party/WebKit/public/web/WebLocalFrame.h b/third_party/WebKit/public/web/WebLocalFrame.h
|
| index e2bfa2084548d5820cf0e408666382032bf69c1c..4638c3ecc988873fe7064ef7bfdf2ba776182ebd 100644
|
| --- a/third_party/WebKit/public/web/WebLocalFrame.h
|
| +++ b/third_party/WebKit/public/web/WebLocalFrame.h
|
| @@ -52,13 +52,22 @@ public:
|
| // Used when we might swap from a remote frame to a local frame.
|
| // Creates a provisional, semi-attached frame that will be fully
|
| // swapped into the frame tree if it commits.
|
| - virtual void initializeToReplaceRemoteFrame(WebRemoteFrame*, const WebString& name, WebSandboxFlags) = 0;
|
| + virtual void initializeToReplaceRemoteFrame(WebRemoteFrame*, const WebString& name, WebSandboxFlags, const WebFrameOwnerProperties&) = 0;
|
|
|
| virtual void setAutofillClient(WebAutofillClient*) = 0;
|
| virtual WebAutofillClient* autofillClient() = 0;
|
| virtual void setDevToolsAgentClient(WebDevToolsAgentClient*) = 0;
|
| virtual WebDevToolsAgent* devToolsAgent() = 0;
|
|
|
| + // Basic properties ---------------------------------------------------
|
| +
|
| + // Updates the scrolling and margin properties in the frame's FrameOwner.
|
| + // This is used when this frame's parent is in another process and it
|
| + // dynamically updates these properties.
|
| + // TODO(dcheng): Currently, the update only takes effect on next frame
|
| + // navigation. This matches the in-process frame behavior.
|
| + virtual void setFrameOwnerProperties(const WebFrameOwnerProperties&) = 0;
|
| +
|
| // Navigation Ping --------------------------------------------------------
|
| virtual void sendPings(const WebNode& contextNode, const WebURL& destinationURL) = 0;
|
|
|
|
|