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

Unified Diff: components/html_viewer/html_frame.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: Address comments for tests + merge blink/cr changes. Created 5 years, 3 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: components/html_viewer/html_frame.h
diff --git a/components/html_viewer/html_frame.h b/components/html_viewer/html_frame.h
index fef256ab44ae835801a49a7b377a8c7420bd7ba0..5007f436ad0596b8c024244226d9fe53e7557c67 100644
--- a/components/html_viewer/html_frame.h
+++ b/components/html_viewer/html_frame.h
@@ -163,7 +163,8 @@ class HTMLFrame : public blink::WebFrameClient,
blink::WebLocalFrame* parent,
blink::WebTreeScopeType scope,
const blink::WebString& frame_ame,
- blink::WebSandboxFlags sandbox_flags);
+ blink::WebSandboxFlags sandbox_flags,
+ const blink::WebFrameOwnerProperties& frame_owner_properties);
virtual void frameDetached(blink::WebFrame* frame,
blink::WebFrameClient::DetachType type);
virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
« no previous file with comments | « no previous file | components/html_viewer/html_frame.cc » ('j') | components/html_viewer/html_frame_properties.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698