Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(560)

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.h

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move setSandboxFlags call Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8098610279f737c08eff50829401ee29eb3e86ce..e43370cf7396330a78d8a6ba9d6a5ed150439280 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.h
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
@@ -234,11 +234,12 @@ public:
v8::Local<v8::Value> createTestInterface(const AtomicString& name);
// WebLocalFrame methods:
- void initializeToReplaceRemoteFrame(WebRemoteFrame*, const WebString& name, WebSandboxFlags) override;
+ void initializeToReplaceRemoteFrame(WebRemoteFrame*, const WebString& name, WebSandboxFlags, const WebFrameOwnerProperties&) override;
void setAutofillClient(WebAutofillClient*) override;
WebAutofillClient* autofillClient() override;
void setDevToolsAgentClient(WebDevToolsAgentClient*) override;
WebDevToolsAgent* devToolsAgent() override;
+ void setFrameOwnerProperties(const WebFrameOwnerProperties&) override;
void sendPings(const WebNode& contextNode, const WebURL& destinationURL) override;
WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebURLRequest::CachePolicy)
const override;

Powered by Google App Engine
This is Rietveld 408576698