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

Side by Side 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, 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_
6 #define COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_ 6 #define COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_
7 7
8 #include "third_party/WebKit/public/platform/WebString.h" 8 #include "third_party/WebKit/public/platform/WebString.h"
9 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
9 #include "third_party/WebKit/public/web/WebSandboxFlags.h" 10 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
10 #include "third_party/WebKit/public/web/WebTreeScopeType.h" 11 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
11 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" 12 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
12 #include "third_party/mojo/src/mojo/public/cpp/bindings/map.h" 13 #include "third_party/mojo/src/mojo/public/cpp/bindings/map.h"
13 #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" 14 #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
14 #include "url/origin.h" 15 #include "url/origin.h"
15 16
16 namespace html_viewer { 17 namespace html_viewer {
17 18
18 // Stores state shared with other frames in the tree. 19 // Stores state shared with other frames in the tree.
19 struct ReplicatedFrameState { 20 struct ReplicatedFrameState {
20 public: 21 public:
21 ReplicatedFrameState(); 22 ReplicatedFrameState();
22 ~ReplicatedFrameState(); 23 ~ReplicatedFrameState();
23 24
24 blink::WebString name; 25 blink::WebString name;
25 url::Origin origin; 26 url::Origin origin;
26 blink::WebSandboxFlags sandbox_flags; 27 blink::WebSandboxFlags sandbox_flags;
27 blink::WebTreeScopeType tree_scope; 28 blink::WebTreeScopeType tree_scope;
29 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.
28 }; 30 };
29 31
30 // Sets |state| from |properties|. 32 // Sets |state| from |properties|.
31 void SetReplicatedFrameStateFromClientProperties( 33 void SetReplicatedFrameStateFromClientProperties(
32 const mojo::Map<mojo::String, mojo::Array<uint8_t>>& properties, 34 const mojo::Map<mojo::String, mojo::Array<uint8_t>>& properties,
33 ReplicatedFrameState* state); 35 ReplicatedFrameState* state);
34 36
35 // Sets |properties| from |state|. 37 // Sets |properties| from |state|.
36 void ClientPropertiesFromReplicatedFrameState( 38 void ClientPropertiesFromReplicatedFrameState(
37 const ReplicatedFrameState& state, 39 const ReplicatedFrameState& state,
38 mojo::Map<mojo::String, mojo::Array<uint8_t>>* properties); 40 mojo::Map<mojo::String, mojo::Array<uint8_t>>* properties);
39 41
40 } // namespace html_viewer 42 } // namespace html_viewer
41 43
42 #endif // COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_ 44 #endif // COMPONENTS_HTML_VIEWER_REPLICATED_FRAME_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698