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

Side by Side Diff: content/test/layouttest_support.cc

Issue 2493293002: RenderWidget: make routing_id be a parameter of the ctor (Closed)
Patch Set: Add a release for asan bots. Created 4 years, 1 month 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
« no previous file with comments | « content/renderer/render_widget_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/public/test/layouttest_support.h" 5 #include "content/public/test/layouttest_support.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 base::LazyInstance<FrameProxyCreationCallback>::Leaky 83 base::LazyInstance<FrameProxyCreationCallback>::Leaky
84 g_frame_test_proxy_callback = LAZY_INSTANCE_INITIALIZER; 84 g_frame_test_proxy_callback = LAZY_INSTANCE_INITIALIZER;
85 85
86 using WebViewTestProxyType = 86 using WebViewTestProxyType =
87 test_runner::WebViewTestProxy<RenderViewImpl, 87 test_runner::WebViewTestProxy<RenderViewImpl,
88 CompositorDependencies*, 88 CompositorDependencies*,
89 const mojom::CreateViewParams&>; 89 const mojom::CreateViewParams&>;
90 using WebWidgetTestProxyType = 90 using WebWidgetTestProxyType =
91 test_runner::WebWidgetTestProxy<RenderWidget, 91 test_runner::WebWidgetTestProxy<RenderWidget,
92 int32_t,
92 CompositorDependencies*, 93 CompositorDependencies*,
93 blink::WebPopupType, 94 blink::WebPopupType,
94 const ScreenInfo&, 95 const ScreenInfo&,
95 bool, 96 bool,
96 bool, 97 bool,
97 bool>; 98 bool>;
98 using WebFrameTestProxyType = 99 using WebFrameTestProxyType =
99 test_runner::WebFrameTestProxy<RenderFrameImpl, 100 test_runner::WebFrameTestProxy<RenderFrameImpl,
100 const RenderFrameImpl::CreateParams&>; 101 const RenderFrameImpl::CreateParams&>;
101 102
102 RenderViewImpl* CreateWebViewTestProxy(CompositorDependencies* compositor_deps, 103 RenderViewImpl* CreateWebViewTestProxy(CompositorDependencies* compositor_deps,
103 const mojom::CreateViewParams& params) { 104 const mojom::CreateViewParams& params) {
104 WebViewTestProxyType* render_view_proxy = 105 WebViewTestProxyType* render_view_proxy =
105 new WebViewTestProxyType(compositor_deps, params); 106 new WebViewTestProxyType(compositor_deps, params);
106 if (g_view_test_proxy_callback == 0) 107 if (g_view_test_proxy_callback == 0)
107 return render_view_proxy; 108 return render_view_proxy;
108 g_view_test_proxy_callback.Get().Run(render_view_proxy, render_view_proxy); 109 g_view_test_proxy_callback.Get().Run(render_view_proxy, render_view_proxy);
109 return render_view_proxy; 110 return render_view_proxy;
110 } 111 }
111 112
112 RenderWidget* CreateWebWidgetTestProxy(CompositorDependencies* compositor_deps, 113 RenderWidget* CreateWebWidgetTestProxy(int32_t routing_id,
114 CompositorDependencies* compositor_deps,
113 blink::WebPopupType popup_type, 115 blink::WebPopupType popup_type,
114 const ScreenInfo& screen_info, 116 const ScreenInfo& screen_info,
115 bool swapped_out, 117 bool swapped_out,
116 bool hidden, 118 bool hidden,
117 bool never_visible) { 119 bool never_visible) {
118 WebWidgetTestProxyType* render_widget_proxy = 120 WebWidgetTestProxyType* render_widget_proxy = new WebWidgetTestProxyType(
119 new WebWidgetTestProxyType(compositor_deps, popup_type, screen_info, 121 routing_id, compositor_deps, popup_type, screen_info, swapped_out, hidden,
120 swapped_out, hidden, never_visible); 122 never_visible);
121 return render_widget_proxy; 123 return render_widget_proxy;
122 } 124 }
123 125
124 void RenderWidgetInitialized(RenderWidget* render_widget) { 126 void RenderWidgetInitialized(RenderWidget* render_widget) {
125 WebWidgetTestProxyType* render_widget_proxy = 127 WebWidgetTestProxyType* render_widget_proxy =
126 static_cast<WebWidgetTestProxyType*>(render_widget); 128 static_cast<WebWidgetTestProxyType*>(render_widget);
127 if (!g_widget_test_proxy_callback.Get().is_null()) { 129 if (!g_widget_test_proxy_callback.Get().is_null()) {
128 g_widget_test_proxy_callback.Get().Run(render_widget->GetWebWidget(), 130 g_widget_test_proxy_callback.Get().Run(render_widget->GetWebWidget(),
129 render_widget_proxy); 131 render_widget_proxy);
130 } 132 }
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 1134
1133 void ForceTextInputStateUpdateForRenderFrame(RenderFrame* frame) { 1135 void ForceTextInputStateUpdateForRenderFrame(RenderFrame* frame) {
1134 if (auto* render_widget = 1136 if (auto* render_widget =
1135 static_cast<RenderFrameImpl*>(frame)->GetRenderWidget()) { 1137 static_cast<RenderFrameImpl*>(frame)->GetRenderWidget()) {
1136 render_widget->UpdateTextInputState(ShowIme::IF_NEEDED, 1138 render_widget->UpdateTextInputState(ShowIme::IF_NEEDED,
1137 ChangeSource::FROM_NON_IME); 1139 ChangeSource::FROM_NON_IME);
1138 } 1140 }
1139 } 1141 }
1140 1142
1141 } // namespace content 1143 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_widget_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698