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

Side by Side Diff: content/browser/frame_host/render_frame_host_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: remove dep patch 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 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_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "content/browser/accessibility/browser_accessibility_manager.h" 17 #include "content/browser/accessibility/browser_accessibility_manager.h"
18 #include "content/browser/site_instance_impl.h" 18 #include "content/browser/site_instance_impl.h"
19 #include "content/common/accessibility_mode_enums.h" 19 #include "content/common/accessibility_mode_enums.h"
20 #include "content/common/ax_content_node_data.h" 20 #include "content/common/ax_content_node_data.h"
21 #include "content/common/content_export.h" 21 #include "content/common/content_export.h"
22 #include "content/common/frame_message_enums.h" 22 #include "content/common/frame_message_enums.h"
23 #include "content/common/frame_replication_state.h" 23 #include "content/common/frame_replication_state.h"
24 #include "content/common/image_downloader/image_downloader.mojom.h" 24 #include "content/common/image_downloader/image_downloader.mojom.h"
25 #include "content/common/mojo/service_registry_impl.h" 25 #include "content/common/mojo/service_registry_impl.h"
26 #include "content/common/navigation_params.h" 26 #include "content/common/navigation_params.h"
27 #include "content/public/browser/render_frame_host.h" 27 #include "content/public/browser/render_frame_host.h"
28 #include "content/public/common/javascript_message_type.h" 28 #include "content/public/common/javascript_message_type.h"
29 #include "net/http/http_response_headers.h" 29 #include "net/http/http_response_headers.h"
30 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
30 #include "third_party/WebKit/public/web/WebTextDirection.h" 31 #include "third_party/WebKit/public/web/WebTextDirection.h"
31 #include "third_party/WebKit/public/web/WebTreeScopeType.h" 32 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
32 #include "ui/accessibility/ax_node_data.h" 33 #include "ui/accessibility/ax_node_data.h"
33 #include "ui/base/page_transition_types.h" 34 #include "ui/base/page_transition_types.h"
34 35
35 #if defined(OS_ANDROID) 36 #if defined(OS_ANDROID)
36 #include "content/browser/mojo/service_registry_android.h" 37 #include "content/browser/mojo/service_registry_android.h"
37 #endif 38 #endif
38 39
39 class GURL; 40 class GURL;
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // Tracks whether the RenderFrame for this RenderFrameHost has been created in 203 // Tracks whether the RenderFrame for this RenderFrameHost has been created in
203 // the renderer process. This is currently only used for subframes. 204 // the renderer process. This is currently only used for subframes.
204 // TODO(creis): Use this for main frames as well when RVH goes away. 205 // TODO(creis): Use this for main frames as well when RVH goes away.
205 void SetRenderFrameCreated(bool created); 206 void SetRenderFrameCreated(bool created);
206 207
207 // Called for renderer-created windows to resume requests from this frame, 208 // Called for renderer-created windows to resume requests from this frame,
208 // after they are blocked in RenderWidgetHelper::CreateNewWindow. 209 // after they are blocked in RenderWidgetHelper::CreateNewWindow.
209 void Init(); 210 void Init();
210 211
211 int routing_id() const { return routing_id_; } 212 int routing_id() const { return routing_id_; }
212 void OnCreateChildFrame(int new_routing_id, 213 void OnCreateChildFrame(
213 blink::WebTreeScopeType scope, 214 int new_routing_id,
214 const std::string& frame_name, 215 blink::WebTreeScopeType scope,
215 blink::WebSandboxFlags sandbox_flags); 216 const std::string& frame_name,
217 blink::WebSandboxFlags sandbox_flags,
218 const blink::WebFrameOwnerProperties& frame_owner_properties);
alexmos 2015/09/02 21:42:09 I think you need to update some unit tests as well
lazyboy 2015/09/15 19:30:56 Done.
216 219
217 RenderViewHostImpl* render_view_host() { return render_view_host_; } 220 RenderViewHostImpl* render_view_host() { return render_view_host_; }
218 RenderFrameHostDelegate* delegate() { return delegate_; } 221 RenderFrameHostDelegate* delegate() { return delegate_; }
219 FrameTreeNode* frame_tree_node() { return frame_tree_node_; } 222 FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
220 223
221 // Returns this RenderFrameHost's loading state. This method is only used by 224 // Returns this RenderFrameHost's loading state. This method is only used by
222 // FrameTreeNode. The proper way to check whether a frame is loading is to 225 // FrameTreeNode. The proper way to check whether a frame is loading is to
223 // call FrameTreeNode::IsLoading. 226 // call FrameTreeNode::IsLoading.
224 bool is_loading() const { return is_loading_; } 227 bool is_loading() const { return is_loading_; }
225 228
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 IPC::Message* reply_msg); 539 IPC::Message* reply_msg);
537 void OnTextSurroundingSelectionResponse(const base::string16& content, 540 void OnTextSurroundingSelectionResponse(const base::string16& content,
538 size_t start_offset, 541 size_t start_offset,
539 size_t end_offset); 542 size_t end_offset);
540 void OnDidAccessInitialDocument(); 543 void OnDidAccessInitialDocument();
541 void OnDidChangeOpener(int32 opener_routing_id); 544 void OnDidChangeOpener(int32 opener_routing_id);
542 void OnDidChangeName(const std::string& name); 545 void OnDidChangeName(const std::string& name);
543 void OnDidAssignPageId(int32 page_id); 546 void OnDidAssignPageId(int32 page_id);
544 void OnDidChangeSandboxFlags(int32 frame_routing_id, 547 void OnDidChangeSandboxFlags(int32 frame_routing_id,
545 blink::WebSandboxFlags flags); 548 blink::WebSandboxFlags flags);
549 void OnDidChangeScrollingMode(
550 int32 frame_routing_id,
551 blink::WebFrameOwnerProperties::ScrollingMode mode);
552 void OnDidChangeMarginWidth(int32 frame_routing_id, int margin_width);
553 void OnDidChangeMarginHeight(int32 frame_routing_id, int margin_height);
546 void OnUpdateTitle(const base::string16& title, 554 void OnUpdateTitle(const base::string16& title,
547 blink::WebTextDirection title_direction); 555 blink::WebTextDirection title_direction);
548 void OnUpdateEncoding(const std::string& encoding); 556 void OnUpdateEncoding(const std::string& encoding);
549 void OnBeginNavigation(const CommonNavigationParams& common_params, 557 void OnBeginNavigation(const CommonNavigationParams& common_params,
550 const BeginNavigationParams& begin_params, 558 const BeginNavigationParams& begin_params,
551 scoped_refptr<ResourceRequestBody> body); 559 scoped_refptr<ResourceRequestBody> body);
552 void OnDispatchLoad(); 560 void OnDispatchLoad();
553 void OnAccessibilityEvents( 561 void OnAccessibilityEvents(
554 const std::vector<AccessibilityHostMsg_EventParams>& params, 562 const std::vector<AccessibilityHostMsg_EventParams>& params,
555 int reset_token); 563 int reset_token);
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 788
781 // NOTE: This must be the last member. 789 // NOTE: This must be the last member.
782 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 790 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
783 791
784 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 792 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
785 }; 793 };
786 794
787 } // namespace content 795 } // namespace content
788 796
789 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 797 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698