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

Unified Diff: components/html_viewer/replicated_frame_state.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/replicated_frame_state.h
diff --git a/components/html_viewer/replicated_frame_state.h b/components/html_viewer/replicated_frame_state.h
index eedc59cc8a678b2de91dbdaad89525f1f11cba48..fdf6d4f67156cb9b2910d3a28d1843e23073f395 100644
--- a/components/html_viewer/replicated_frame_state.h
+++ b/components/html_viewer/replicated_frame_state.h
@@ -6,6 +6,7 @@
#define COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_
#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
#include "third_party/WebKit/public/web/WebSandboxFlags.h"
#include "third_party/WebKit/public/web/WebTreeScopeType.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
@@ -25,6 +26,7 @@ struct ReplicatedFrameState {
url::Origin origin;
blink::WebSandboxFlags sandbox_flags;
blink::WebTreeScopeType tree_scope;
+ blink::WebFrameOwnerProperties owner_properties;
alexmos 2015/10/02 21:24:19 I'm not really familiar with html_viewer, but I'm
lazyboy 2015/10/05 22:16:08 I've reverted this change and added a TODO.
};
// Sets |state| from |properties|.

Powered by Google App Engine
This is Rietveld 408576698