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

Unified Diff: components/html_viewer/html_frame_properties.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_properties.h
diff --git a/components/html_viewer/html_frame_properties.h b/components/html_viewer/html_frame_properties.h
index 8944d463665466d7d1e7256673dea5dce1d7ebc3..f24206cdab68cd6110ea7d15ef5793c7b4aab3db 100644
--- a/components/html_viewer/html_frame_properties.h
+++ b/components/html_viewer/html_frame_properties.h
@@ -11,6 +11,7 @@
namespace blink {
class WebFrame;
+struct WebFrameOwnerProperties;
enum class WebSandboxFlags : int;
class WebString;
enum class WebTreeScopeType;
@@ -28,6 +29,7 @@ extern const char kPropertyFrameName[];
extern const char kPropertyFrameOrigin[];
extern const char kPropertyFrameSandboxFlags[];
extern const char kPropertyFrameTreeScope[];
+extern const char kPropertyFrameOwnerProperties[];
mojo::Array<uint8_t> FrameNameToClientProperty(const blink::WebString& name);
blink::WebString FrameNameFromClientProperty(
@@ -43,9 +45,15 @@ mojo::Array<uint8_t> FrameSandboxFlagsToClientProperty(
bool FrameSandboxFlagsFromClientProperty(const mojo::Array<uint8_t>& new_data,
blink::WebSandboxFlags* flags);
+mojo::Array<uint8_t> FrameOwnerPropertiesToClientProperty(
+ const blink::WebFrameOwnerProperties& owner_properties);
+
url::Origin FrameOrigin(blink::WebFrame* frame);
mojo::Array<uint8_t> FrameOriginToClientProperty(blink::WebFrame* frame);
url::Origin FrameOriginFromClientProperty(const mojo::Array<uint8_t>& data);
+bool FrameOwnerPropertiesFromClientProperty(
+ const mojo::Array<uint8_t>& data,
+ blink::WebFrameOwnerProperties* owner_properties);
// Convenience to add |value| to |client_properties| if non-null.
void AddToClientPropertiesIfValid(

Powered by Google App Engine
This is Rietveld 408576698