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

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: 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_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/WebScriptExecutionCallback.h" 38 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
38 #include "ui/gfx/range/range.h" 39 #include "ui/gfx/range/range.h"
39 40
40 #if defined(ENABLE_PLUGINS) 41 #if defined(ENABLE_PLUGINS)
41 #include "content/renderer/pepper/plugin_power_saver_helper.h" 42 #include "content/renderer/pepper/plugin_power_saver_helper.h"
42 #endif 43 #endif
43 44
44 #if defined(OS_ANDROID) 45 #if defined(OS_ANDROID)
45 #include "content/renderer/media/android/renderer_media_player_manager.h" 46 #include "content/renderer/media/android/renderer_media_player_manager.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 // Creates a new RenderFrame with |routing_id| as a child of the RenderFrame 137 // Creates a new RenderFrame with |routing_id| as a child of the RenderFrame
137 // identified by |parent_routing_id| or as the top-level frame if the latter 138 // identified by |parent_routing_id| or as the top-level frame if the latter
138 // is MSG_ROUTING_NONE. If |proxy_routing_id| is MSG_ROUTING_NONE, it creates 139 // is MSG_ROUTING_NONE. If |proxy_routing_id| is MSG_ROUTING_NONE, it creates
139 // the Blink WebLocalFrame and inserts it into the frame tree after the frame 140 // the Blink WebLocalFrame and inserts it into the frame tree after the frame
140 // identified by |previous_sibling_routing_id|, or as the first child if 141 // identified by |previous_sibling_routing_id|, or as the first child if
141 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is 142 // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is
142 // semi-orphaned until it commits, at which point it replaces the proxy 143 // semi-orphaned until it commits, at which point it replaces the proxy
143 // identified by |proxy_routing_id|. Note: This is called only when 144 // identified by |proxy_routing_id|. Note: This is called only when
144 // RenderFrame is being created in response to IPC message from the browser 145 // RenderFrame is being created in response to IPC message from the browser
145 // process. All other frame creation is driven through Blink and Create. 146 // process. All other frame creation is driven through Blink and Create.
146 static void CreateFrame(int routing_id, 147 static void CreateFrame(
147 int parent_routing_id, 148 int routing_id,
148 int previous_sibling_routing_id, 149 int parent_routing_id,
149 int proxy_routing_id, 150 int previous_sibling_routing_id,
150 const FrameReplicationState& replicated_state, 151 int proxy_routing_id,
151 CompositorDependencies* compositor_deps, 152 const FrameReplicationState& replicated_state,
152 const FrameMsg_NewFrame_WidgetParams& params); 153 CompositorDependencies* compositor_deps,
154 const FrameMsg_NewFrame_WidgetParams& params,
155 const blink::WebFrameOwnerProperties& frameOwner_properties);
153 156
154 // Returns the RenderFrameImpl for the given routing ID. 157 // Returns the RenderFrameImpl for the given routing ID.
155 static RenderFrameImpl* FromRoutingID(int routing_id); 158 static RenderFrameImpl* FromRoutingID(int routing_id);
156 159
157 // Just like RenderFrame::FromWebFrame but returns the implementation. 160 // Just like RenderFrame::FromWebFrame but returns the implementation.
158 static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame); 161 static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame);
159 162
160 // Used by content_layouttest_support to hook into the creation of 163 // Used by content_layouttest_support to hook into the creation of
161 // RenderFrameImpls. 164 // RenderFrameImpls.
162 struct CreateParams { 165 struct CreateParams {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 const blink::WebPopupMenuInfo& popup_menu_info, 382 const blink::WebPopupMenuInfo& popup_menu_info,
380 blink::WebExternalPopupMenuClient* popup_menu_client); 383 blink::WebExternalPopupMenuClient* popup_menu_client);
381 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); 384 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
382 virtual blink::WebServiceWorkerProvider* createServiceWorkerProvider( 385 virtual blink::WebServiceWorkerProvider* createServiceWorkerProvider(
383 blink::WebLocalFrame* frame); 386 blink::WebLocalFrame* frame);
384 virtual void didAccessInitialDocument(blink::WebLocalFrame* frame); 387 virtual void didAccessInitialDocument(blink::WebLocalFrame* frame);
385 virtual blink::WebFrame* createChildFrame( 388 virtual blink::WebFrame* createChildFrame(
386 blink::WebLocalFrame* parent, 389 blink::WebLocalFrame* parent,
387 blink::WebTreeScopeType scope, 390 blink::WebTreeScopeType scope,
388 const blink::WebString& name, 391 const blink::WebString& name,
389 blink::WebSandboxFlags sandboxFlags); 392 blink::WebSandboxFlags sandboxFlags,
393 const blink::WebFrameOwnerProperties& frameOwnerProperties);
390 virtual void didChangeOpener(blink::WebFrame* frame); 394 virtual void didChangeOpener(blink::WebFrame* frame);
391 virtual void frameDetached(blink::WebFrame* frame, DetachType type); 395 virtual void frameDetached(blink::WebFrame* frame, DetachType type);
392 virtual void frameFocused(); 396 virtual void frameFocused();
393 virtual void willClose(blink::WebFrame* frame); 397 virtual void willClose(blink::WebFrame* frame);
394 virtual void didChangeName(blink::WebLocalFrame* frame, 398 virtual void didChangeName(blink::WebLocalFrame* frame,
395 const blink::WebString& name); 399 const blink::WebString& name);
396 virtual void didChangeSandboxFlags(blink::WebFrame* child_frame, 400 virtual void didChangeSandboxFlags(blink::WebFrame* child_frame,
397 blink::WebSandboxFlags flags); 401 blink::WebSandboxFlags flags);
402 virtual void didChangeScrollingMode(
403 blink::WebFrame* child_frame,
404 blink::WebFrameOwnerProperties::ScrollingMode scrolling_mode);
405 virtual void didChangeMarginWidth(blink::WebFrame* child_frame,
406 int marginWidth);
407 virtual void didChangeMarginHeight(blink::WebFrame* child_frame,
408 int marginHeight);
398 virtual void didMatchCSS( 409 virtual void didMatchCSS(
399 blink::WebLocalFrame* frame, 410 blink::WebLocalFrame* frame,
400 const blink::WebVector<blink::WebString>& newly_matching_selectors, 411 const blink::WebVector<blink::WebString>& newly_matching_selectors,
401 const blink::WebVector<blink::WebString>& stopped_matching_selectors); 412 const blink::WebVector<blink::WebString>& stopped_matching_selectors);
402 virtual bool shouldReportDetailedMessageForSource( 413 virtual bool shouldReportDetailedMessageForSource(
403 const blink::WebString& source); 414 const blink::WebString& source);
404 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, 415 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
405 const blink::WebString& source_name, 416 const blink::WebString& source_name,
406 unsigned source_line, 417 unsigned source_line,
407 const blink::WebString& stack_trace); 418 const blink::WebString& stack_trace);
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
1036 #endif 1047 #endif
1037 1048
1038 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1049 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1039 1050
1040 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1051 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1041 }; 1052 };
1042 1053
1043 } // namespace content 1054 } // namespace content
1044 1055
1045 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1056 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698