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

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

Issue 2171503005: Rename WebTestProxy to WebViewTestProxy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments Created 4 years, 5 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 (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"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "cc/test/pixel_test_output_surface.h" 15 #include "cc/test/pixel_test_output_surface.h"
16 #include "cc/test/test_delegating_output_surface.h" 16 #include "cc/test/test_delegating_output_surface.h"
17 #include "components/scheduler/test/renderer_scheduler_test_support.h" 17 #include "components/scheduler/test/renderer_scheduler_test_support.h"
18 #include "components/test_runner/test_common.h" 18 #include "components/test_runner/test_common.h"
19 #include "components/test_runner/web_frame_test_proxy.h" 19 #include "components/test_runner/web_frame_test_proxy.h"
20 #include "components/test_runner/web_test_proxy.h" 20 #include "components/test_runner/web_view_test_proxy.h"
21 #include "content/browser/bluetooth/bluetooth_device_chooser_controller.h" 21 #include "content/browser/bluetooth/bluetooth_device_chooser_controller.h"
22 #include "content/browser/renderer_host/render_process_host_impl.h" 22 #include "content/browser/renderer_host/render_process_host_impl.h"
23 #include "content/browser/renderer_host/render_widget_host_impl.h" 23 #include "content/browser/renderer_host/render_widget_host_impl.h"
24 #include "content/common/gpu/client/context_provider_command_buffer.h" 24 #include "content/common/gpu/client/context_provider_command_buffer.h"
25 #include "content/common/site_isolation_policy.h" 25 #include "content/common/site_isolation_policy.h"
26 #include "content/public/common/page_state.h" 26 #include "content/public/common/page_state.h"
27 #include "content/public/renderer/renderer_gamepad_provider.h" 27 #include "content/public/renderer/renderer_gamepad_provider.h"
28 #include "content/renderer/fetchers/manifest_fetcher.h" 28 #include "content/renderer/fetchers/manifest_fetcher.h"
29 #include "content/renderer/gpu/render_widget_compositor.h" 29 #include "content/renderer/gpu/render_widget_compositor.h"
30 #include "content/renderer/history_entry.h" 30 #include "content/renderer/history_entry.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 namespace content { 63 namespace content {
64 64
65 namespace { 65 namespace {
66 66
67 base::LazyInstance<ViewProxyCreationCallback>::Leaky 67 base::LazyInstance<ViewProxyCreationCallback>::Leaky
68 g_view_test_proxy_callback = LAZY_INSTANCE_INITIALIZER; 68 g_view_test_proxy_callback = LAZY_INSTANCE_INITIALIZER;
69 69
70 base::LazyInstance<FrameProxyCreationCallback>::Leaky 70 base::LazyInstance<FrameProxyCreationCallback>::Leaky
71 g_frame_test_proxy_callback = LAZY_INSTANCE_INITIALIZER; 71 g_frame_test_proxy_callback = LAZY_INSTANCE_INITIALIZER;
72 72
73 using WebTestProxyType = test_runner::WebTestProxy<RenderViewImpl, 73 using WebViewTestProxyType =
74 CompositorDependencies*, 74 test_runner::WebViewTestProxy<RenderViewImpl,
75 const ViewMsg_New_Params&>; 75 CompositorDependencies*,
76 const ViewMsg_New_Params&>;
76 using WebFrameTestProxyType = 77 using WebFrameTestProxyType =
77 test_runner::WebFrameTestProxy<RenderFrameImpl, 78 test_runner::WebFrameTestProxy<RenderFrameImpl,
78 const RenderFrameImpl::CreateParams&>; 79 const RenderFrameImpl::CreateParams&>;
79 80
80 RenderViewImpl* CreateWebTestProxy(CompositorDependencies* compositor_deps, 81 RenderViewImpl* CreateWebViewTestProxy(CompositorDependencies* compositor_deps,
81 const ViewMsg_New_Params& params) { 82 const ViewMsg_New_Params& params) {
82 WebTestProxyType* render_view_proxy = 83 WebViewTestProxyType* render_view_proxy =
83 new WebTestProxyType(compositor_deps, params); 84 new WebViewTestProxyType(compositor_deps, params);
84 if (g_view_test_proxy_callback == 0) 85 if (g_view_test_proxy_callback == 0)
85 return render_view_proxy; 86 return render_view_proxy;
86 g_view_test_proxy_callback.Get().Run(render_view_proxy, render_view_proxy); 87 g_view_test_proxy_callback.Get().Run(render_view_proxy, render_view_proxy);
87 return render_view_proxy; 88 return render_view_proxy;
88 } 89 }
89 90
90 RenderFrameImpl* CreateWebFrameTestProxy( 91 RenderFrameImpl* CreateWebFrameTestProxy(
91 const RenderFrameImpl::CreateParams& params) { 92 const RenderFrameImpl::CreateParams& params) {
92 WebFrameTestProxyType* render_frame_proxy = new WebFrameTestProxyType(params); 93 WebFrameTestProxyType* render_frame_proxy = new WebFrameTestProxyType(params);
93 if (g_frame_test_proxy_callback == 0) 94 if (g_frame_test_proxy_callback == 0)
(...skipping 11 matching lines...) Expand all
105 i != files.end(); 106 i != files.end();
106 ++i) { 107 ++i) {
107 SkTypeface* typeface = fontmgr->createFromFile(i->c_str()); 108 SkTypeface* typeface = fontmgr->createFromFile(i->c_str());
108 blink::WebFontRendering::addSideloadedFontForTesting(typeface); 109 blink::WebFontRendering::addSideloadedFontForTesting(typeface);
109 } 110 }
110 } 111 }
111 #endif // OS_WIN 112 #endif // OS_WIN
112 113
113 } // namespace 114 } // namespace
114 115
115 test_runner::WebTestProxyBase* GetWebTestProxyBase(RenderView* render_view) { 116 test_runner::WebViewTestProxyBase* GetWebViewTestProxyBase(
116 WebTestProxyType* render_view_proxy = 117 RenderView* render_view) {
117 static_cast<WebTestProxyType*>(render_view); 118 WebViewTestProxyType* render_view_proxy =
118 return static_cast<test_runner::WebTestProxyBase*>(render_view_proxy); 119 static_cast<WebViewTestProxyType*>(render_view);
120 return static_cast<test_runner::WebViewTestProxyBase*>(render_view_proxy);
119 } 121 }
120 122
121 test_runner::WebFrameTestProxyBase* GetWebFrameTestProxyBase( 123 test_runner::WebFrameTestProxyBase* GetWebFrameTestProxyBase(
122 RenderFrame* render_frame) { 124 RenderFrame* render_frame) {
123 WebFrameTestProxyType* render_frame_proxy = 125 WebFrameTestProxyType* render_frame_proxy =
124 static_cast<WebFrameTestProxyType*>(render_frame); 126 static_cast<WebFrameTestProxyType*>(render_frame);
125 return static_cast<test_runner::WebFrameTestProxyBase*>(render_frame_proxy); 127 return static_cast<test_runner::WebFrameTestProxyBase*>(render_frame_proxy);
126 } 128 }
127 129
128 void EnableWebTestProxyCreation( 130 void EnableWebTestProxyCreation(
129 const ViewProxyCreationCallback& view_proxy_creation_callback, 131 const ViewProxyCreationCallback& view_proxy_creation_callback,
130 const FrameProxyCreationCallback& frame_proxy_creation_callback) { 132 const FrameProxyCreationCallback& frame_proxy_creation_callback) {
131 g_view_test_proxy_callback.Get() = view_proxy_creation_callback; 133 g_view_test_proxy_callback.Get() = view_proxy_creation_callback;
132 g_frame_test_proxy_callback.Get() = frame_proxy_creation_callback; 134 g_frame_test_proxy_callback.Get() = frame_proxy_creation_callback;
133 RenderViewImpl::InstallCreateHook(CreateWebTestProxy); 135 RenderViewImpl::InstallCreateHook(CreateWebViewTestProxy);
134 RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy); 136 RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy);
135 } 137 }
136 138
137 void FetchManifestDoneCallback(std::unique_ptr<ManifestFetcher> fetcher, 139 void FetchManifestDoneCallback(std::unique_ptr<ManifestFetcher> fetcher,
138 const FetchManifestCallback& callback, 140 const FetchManifestCallback& callback,
139 const blink::WebURLResponse& response, 141 const blink::WebURLResponse& response,
140 const std::string& data) { 142 const std::string& data) {
141 // |fetcher| will be autodeleted here as it is going out of scope. 143 // |fetcher| will be autodeleted here as it is going out of scope.
142 callback.Run(response, data); 144 callback.Run(response, data);
143 } 145 }
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 return result; 496 return result;
495 } 497 }
496 498
497 void SchedulerRunIdleTasks(const base::Closure& callback) { 499 void SchedulerRunIdleTasks(const base::Closure& callback) {
498 scheduler::RendererScheduler* scheduler = 500 scheduler::RendererScheduler* scheduler =
499 content::RenderThreadImpl::current()->GetRendererScheduler(); 501 content::RenderThreadImpl::current()->GetRendererScheduler();
500 scheduler::RunIdleTasksForTesting(scheduler, callback); 502 scheduler::RunIdleTasksForTesting(scheduler, callback);
501 } 503 }
502 504
503 } // namespace content 505 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698