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

Side by Side Diff: content/renderer/render_frame_impl.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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 15 matching lines...) Expand all
26 #include "content/renderer/renderer_webcookiejar_impl.h" 26 #include "content/renderer/renderer_webcookiejar_impl.h"
27 #include "ipc/ipc_message.h" 27 #include "ipc/ipc_message.h"
28 #include "media/blink/webmediaplayer_delegate.h" 28 #include "media/blink/webmediaplayer_delegate.h"
29 #include "media/blink/webmediaplayer_params.h" 29 #include "media/blink/webmediaplayer_params.h"
30 #include "mojo/application/public/interfaces/service_provider.mojom.h" 30 #include "mojo/application/public/interfaces/service_provider.mojom.h"
31 #include "mojo/application/public/interfaces/shell.mojom.h" 31 #include "mojo/application/public/interfaces/shell.mojom.h"
32 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClie nt.h" 32 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClie nt.h"
33 #include "third_party/WebKit/public/web/WebAXObject.h" 33 #include "third_party/WebKit/public/web/WebAXObject.h"
34 #include "third_party/WebKit/public/web/WebDataSource.h" 34 #include "third_party/WebKit/public/web/WebDataSource.h"
35 #include "third_party/WebKit/public/web/WebFrameClient.h" 35 #include "third_party/WebKit/public/web/WebFrameClient.h"
36 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
36 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" 37 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
37 #include "third_party/WebKit/public/web/WebMeaningfulLayout.h" 38 #include "third_party/WebKit/public/web/WebMeaningfulLayout.h"
38 #include "third_party/WebKit/public/web/WebPageSerializerClient.h" 39 #include "third_party/WebKit/public/web/WebPageSerializerClient.h"
39 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h" 40 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
40 #include "ui/gfx/range/range.h" 41 #include "ui/gfx/range/range.h"
41 42
42 #if defined(ENABLE_PLUGINS) 43 #if defined(ENABLE_PLUGINS)
43 #include "content/renderer/pepper/plugin_power_saver_helper.h" 44 #include "content/renderer/pepper/plugin_power_saver_helper.h"
44 #endif 45 #endif
45 46
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // the frame tree after the frame identified by 146 // the frame tree after the frame identified by
146 // |previous_sibling_routing_id|, or as the first child if 147 // |previous_sibling_routing_id|, or as the first child if
147 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is 148 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is
148 // semi-orphaned until it commits, at which point it replaces the proxy 149 // semi-orphaned until it commits, at which point it replaces the proxy
149 // identified by |proxy_routing_id|. The frame's opener is set to the frame 150 // identified by |proxy_routing_id|. The frame's opener is set to the frame
150 // identified by |opener_routing_id|. The frame is created as a child of the 151 // identified by |opener_routing_id|. The frame is created as a child of the
151 // RenderFrame identified by |parent_routing_id| or as the top-level frame if 152 // RenderFrame identified by |parent_routing_id| or as the top-level frame if
152 // the latter is MSG_ROUTING_NONE. Note: This is called only when 153 // the latter is MSG_ROUTING_NONE. Note: This is called only when
153 // RenderFrame is being created in response to IPC message from the browser 154 // RenderFrame is being created in response to IPC message from the browser
154 // process. All other frame creation is driven through Blink and Create. 155 // process. All other frame creation is driven through Blink and Create.
155 static void CreateFrame(int routing_id, 156 static void CreateFrame(
156 int proxy_routing_id, 157 int routing_id,
157 int opener_routing_id, 158 int proxy_routing_id,
158 int parent_routing_id, 159 int opener_routing_id,
159 int previous_sibling_routing_id, 160 int parent_routing_id,
160 const FrameReplicationState& replicated_state, 161 int previous_sibling_routing_id,
161 CompositorDependencies* compositor_deps, 162 const FrameReplicationState& replicated_state,
162 const FrameMsg_NewFrame_WidgetParams& params); 163 CompositorDependencies* compositor_deps,
164 const FrameMsg_NewFrame_WidgetParams& params,
165 const blink::WebFrameOwnerProperties& frameOwner_properties);
163 166
164 // Returns the RenderFrameImpl for the given routing ID. 167 // Returns the RenderFrameImpl for the given routing ID.
165 static RenderFrameImpl* FromRoutingID(int routing_id); 168 static RenderFrameImpl* FromRoutingID(int routing_id);
166 169
167 // Just like RenderFrame::FromWebFrame but returns the implementation. 170 // Just like RenderFrame::FromWebFrame but returns the implementation.
168 static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame); 171 static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame);
169 172
170 // Used by content_layouttest_support to hook into the creation of 173 // Used by content_layouttest_support to hook into the creation of
171 // RenderFrameImpls. 174 // RenderFrameImpls.
172 struct CreateParams { 175 struct CreateParams {
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 const blink::WebPopupMenuInfo& popup_menu_info, 397 const blink::WebPopupMenuInfo& popup_menu_info,
395 blink::WebExternalPopupMenuClient* popup_menu_client) override; 398 blink::WebExternalPopupMenuClient* popup_menu_client) override;
396 blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override; 399 blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override;
397 blink::WebServiceWorkerProvider* createServiceWorkerProvider( 400 blink::WebServiceWorkerProvider* createServiceWorkerProvider(
398 blink::WebLocalFrame* frame) override; 401 blink::WebLocalFrame* frame) override;
399 void didAccessInitialDocument(blink::WebLocalFrame* frame) override; 402 void didAccessInitialDocument(blink::WebLocalFrame* frame) override;
400 blink::WebFrame* createChildFrame( 403 blink::WebFrame* createChildFrame(
401 blink::WebLocalFrame* parent, 404 blink::WebLocalFrame* parent,
402 blink::WebTreeScopeType scope, 405 blink::WebTreeScopeType scope,
403 const blink::WebString& name, 406 const blink::WebString& name,
404 blink::WebSandboxFlags sandboxFlags) override; 407 blink::WebSandboxFlags sandboxFlags,
408 const blink::WebFrameOwnerProperties& frameOwnerProperties) override;
405 void didChangeOpener(blink::WebFrame* frame) override; 409 void didChangeOpener(blink::WebFrame* frame) override;
406 void frameDetached(blink::WebFrame* frame, DetachType type) override; 410 void frameDetached(blink::WebFrame* frame, DetachType type) override;
407 void frameFocused() override; 411 void frameFocused() override;
408 void willClose(blink::WebFrame* frame) override; 412 void willClose(blink::WebFrame* frame) override;
409 void didChangeName(blink::WebLocalFrame* frame, 413 void didChangeName(blink::WebLocalFrame* frame,
410 const blink::WebString& name) override; 414 const blink::WebString& name) override;
411 void didChangeSandboxFlags(blink::WebFrame* child_frame, 415 void didChangeSandboxFlags(blink::WebFrame* child_frame,
412 blink::WebSandboxFlags flags) override; 416 blink::WebSandboxFlags flags) override;
417 virtual void didChangeFrameOwnerProperties(
418 blink::WebFrame* child_frame,
419 const blink::WebFrameOwnerProperties& frame_owner_properties) override;
413 void didMatchCSS( 420 void didMatchCSS(
414 blink::WebLocalFrame* frame, 421 blink::WebLocalFrame* frame,
415 const blink::WebVector<blink::WebString>& newly_matching_selectors, 422 const blink::WebVector<blink::WebString>& newly_matching_selectors,
416 const blink::WebVector<blink::WebString>& stopped_matching_selectors) 423 const blink::WebVector<blink::WebString>& stopped_matching_selectors)
417 override; 424 override;
418 bool shouldReportDetailedMessageForSource( 425 bool shouldReportDetailedMessageForSource(
419 const blink::WebString& source) override; 426 const blink::WebString& source) override;
420 void didAddMessageToConsole(const blink::WebConsoleMessage& message, 427 void didAddMessageToConsole(const blink::WebConsoleMessage& message,
421 const blink::WebString& source_name, 428 const blink::WebString& source_name,
422 unsigned source_line, 429 unsigned source_line,
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 int start, int end, 713 int start, int end,
707 const std::vector<blink::WebCompositionUnderline>& underlines); 714 const std::vector<blink::WebCompositionUnderline>& underlines);
708 void OnExecuteNoValueEditCommand(const std::string& name); 715 void OnExecuteNoValueEditCommand(const std::string& name);
709 void OnExtendSelectionAndDelete(int before, int after); 716 void OnExtendSelectionAndDelete(int before, int after);
710 void OnReload(bool ignore_cache); 717 void OnReload(bool ignore_cache);
711 void OnTextSurroundingSelectionRequest(size_t max_length); 718 void OnTextSurroundingSelectionRequest(size_t max_length);
712 void OnSetAccessibilityMode(AccessibilityMode new_mode); 719 void OnSetAccessibilityMode(AccessibilityMode new_mode);
713 void OnSnapshotAccessibilityTree(int callback_id); 720 void OnSnapshotAccessibilityTree(int callback_id);
714 void OnUpdateOpener(int opener_routing_id); 721 void OnUpdateOpener(int opener_routing_id);
715 void OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags); 722 void OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags);
723 void OnSetFrameOwnerProperties(
724 const blink::WebFrameOwnerProperties& frame_owner_properties);
716 void OnClearFocus(); 725 void OnClearFocus();
717 void OnTextTrackSettingsChanged( 726 void OnTextTrackSettingsChanged(
718 const FrameMsg_TextTrackSettings_Params& params); 727 const FrameMsg_TextTrackSettings_Params& params);
719 void OnPostMessageEvent(const FrameMsg_PostMessage_Params& params); 728 void OnPostMessageEvent(const FrameMsg_PostMessage_Params& params);
720 #if defined(OS_ANDROID) 729 #if defined(OS_ANDROID)
721 void OnSelectPopupMenuItems(bool canceled, 730 void OnSelectPopupMenuItems(bool canceled,
722 const std::vector<int>& selected_indices); 731 const std::vector<int>& selected_indices);
723 #elif defined(OS_MACOSX) 732 #elif defined(OS_MACOSX)
724 void OnSelectPopupMenuItem(int selected_index); 733 void OnSelectPopupMenuItem(int selected_index);
725 void OnCopyToFindPboard(); 734 void OnCopyToFindPboard();
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 #endif 1071 #endif
1063 1072
1064 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1073 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1065 1074
1066 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1075 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1067 }; 1076 };
1068 1077
1069 } // namespace content 1078 } // namespace content
1070 1079
1071 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1080 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698