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

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

Issue 2136413002: Update Surface ID Terminology (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed webkit_unit_tests 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/test/test_render_view_host.h" 5 #include "content/test/test_render_view_host.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 did_swap_compositor_frame_ = true; 198 did_swap_compositor_frame_ = true;
199 } 199 }
200 200
201 bool TestRenderWidgetHostView::LockMouse() { 201 bool TestRenderWidgetHostView::LockMouse() {
202 return false; 202 return false;
203 } 203 }
204 204
205 void TestRenderWidgetHostView::UnlockMouse() { 205 void TestRenderWidgetHostView::UnlockMouse() {
206 } 206 }
207 207
208 uint32_t TestRenderWidgetHostView::GetSurfaceIdNamespace() { 208 uint32_t TestRenderWidgetHostView::GetSurfaceClientId() {
209 // See constructor. If a test needs this, its harness needs to construct an 209 // See constructor. If a test needs this, its harness needs to construct an
210 // ImageTransportFactory. 210 // ImageTransportFactory.
211 DCHECK(surface_id_allocator_); 211 DCHECK(surface_id_allocator_);
212 return surface_id_allocator_->id_namespace(); 212 return surface_id_allocator_->client_id();
213 } 213 }
214 214
215 TestRenderViewHost::TestRenderViewHost( 215 TestRenderViewHost::TestRenderViewHost(
216 SiteInstance* instance, 216 SiteInstance* instance,
217 std::unique_ptr<RenderWidgetHostImpl> widget, 217 std::unique_ptr<RenderWidgetHostImpl> widget,
218 RenderViewHostDelegate* delegate, 218 RenderViewHostDelegate* delegate,
219 int32_t main_frame_routing_id, 219 int32_t main_frame_routing_id,
220 bool swapped_out) 220 bool swapped_out)
221 : RenderViewHostImpl(instance, 221 : RenderViewHostImpl(instance,
222 std::move(widget), 222 std::move(widget),
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 328
329 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { 329 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
330 return contents()->GetMainFrame(); 330 return contents()->GetMainFrame();
331 } 331 }
332 332
333 TestWebContents* RenderViewHostImplTestHarness::contents() { 333 TestWebContents* RenderViewHostImplTestHarness::contents() {
334 return static_cast<TestWebContents*>(web_contents()); 334 return static_cast<TestWebContents*>(web_contents());
335 } 335 }
336 336
337 } // namespace content 337 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698