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

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

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 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 (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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 g_frame_test_proxy_callback = LAZY_INSTANCE_INITIALIZER; 78 g_frame_test_proxy_callback = LAZY_INSTANCE_INITIALIZER;
79 79
80 using WebViewTestProxyType = 80 using WebViewTestProxyType =
81 test_runner::WebViewTestProxy<RenderViewImpl, 81 test_runner::WebViewTestProxy<RenderViewImpl,
82 CompositorDependencies*, 82 CompositorDependencies*,
83 const ViewMsg_New_Params&>; 83 const ViewMsg_New_Params&>;
84 using WebWidgetTestProxyType = 84 using WebWidgetTestProxyType =
85 test_runner::WebWidgetTestProxy<RenderWidget, 85 test_runner::WebWidgetTestProxy<RenderWidget,
86 CompositorDependencies*, 86 CompositorDependencies*,
87 blink::WebPopupType, 87 blink::WebPopupType,
88 const blink::WebScreenInfo&, 88 const ScreenInfo&,
89 bool, 89 bool,
90 bool, 90 bool,
91 bool>; 91 bool>;
92 using WebFrameTestProxyType = 92 using WebFrameTestProxyType =
93 test_runner::WebFrameTestProxy<RenderFrameImpl, 93 test_runner::WebFrameTestProxy<RenderFrameImpl,
94 const RenderFrameImpl::CreateParams&>; 94 const RenderFrameImpl::CreateParams&>;
95 95
96 RenderViewImpl* CreateWebViewTestProxy(CompositorDependencies* compositor_deps, 96 RenderViewImpl* CreateWebViewTestProxy(CompositorDependencies* compositor_deps,
97 const ViewMsg_New_Params& params) { 97 const ViewMsg_New_Params& params) {
98 WebViewTestProxyType* render_view_proxy = 98 WebViewTestProxyType* render_view_proxy =
99 new WebViewTestProxyType(compositor_deps, params); 99 new WebViewTestProxyType(compositor_deps, params);
100 if (g_view_test_proxy_callback == 0) 100 if (g_view_test_proxy_callback == 0)
101 return render_view_proxy; 101 return render_view_proxy;
102 g_view_test_proxy_callback.Get().Run(render_view_proxy, render_view_proxy); 102 g_view_test_proxy_callback.Get().Run(render_view_proxy, render_view_proxy);
103 return render_view_proxy; 103 return render_view_proxy;
104 } 104 }
105 105
106 RenderWidget* CreateWebWidgetTestProxy(CompositorDependencies* compositor_deps, 106 RenderWidget* CreateWebWidgetTestProxy(CompositorDependencies* compositor_deps,
107 blink::WebPopupType popup_type, 107 blink::WebPopupType popup_type,
108 const blink::WebScreenInfo& screen_info, 108 const ScreenInfo& screen_info,
109 bool swapped_out, 109 bool swapped_out,
110 bool hidden, 110 bool hidden,
111 bool never_visible) { 111 bool never_visible) {
112 WebWidgetTestProxyType* render_widget_proxy = 112 WebWidgetTestProxyType* render_widget_proxy =
113 new WebWidgetTestProxyType(compositor_deps, popup_type, screen_info, 113 new WebWidgetTestProxyType(compositor_deps, popup_type, screen_info,
114 swapped_out, hidden, never_visible); 114 swapped_out, hidden, never_visible);
115 return render_widget_proxy; 115 return render_widget_proxy;
116 } 116 }
117 117
118 void RenderWidgetInitialized(RenderWidget* render_widget) { 118 void RenderWidgetInitialized(RenderWidget* render_widget) {
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
1028 return result; 1028 return result;
1029 } 1029 }
1030 1030
1031 void SchedulerRunIdleTasks(const base::Closure& callback) { 1031 void SchedulerRunIdleTasks(const base::Closure& callback) {
1032 blink::scheduler::RendererScheduler* scheduler = 1032 blink::scheduler::RendererScheduler* scheduler =
1033 content::RenderThreadImpl::current()->GetRendererScheduler(); 1033 content::RenderThreadImpl::current()->GetRendererScheduler();
1034 blink::scheduler::RunIdleTasksForTesting(scheduler, callback); 1034 blink::scheduler::RunIdleTasksForTesting(scheduler, callback);
1035 } 1035 }
1036 1036
1037 } // namespace content 1037 } // namespace content
OLDNEW
« content/common/view_messages.h ('K') | « content/test/fuzzer/fuzzer_support.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698