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

Side by Side Diff: cc/test/fake_delegated_renderer_layer_impl.cc

Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « cc/test/fake_delegated_renderer_layer.cc ('k') | cc/test/fake_layer_tree_host_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "cc/test/fake_delegated_renderer_layer_impl.h" 5 #include "cc/test/fake_delegated_renderer_layer_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "cc/output/delegated_frame_data.h" 8 #include "cc/output/delegated_frame_data.h"
9 #include "cc/quads/draw_quad.h" 9 #include "cc/quads/draw_quad.h"
10 #include "cc/resources/returned_resource.h" 10 #include "cc/resources/returned_resource.h"
11 #include "cc/trees/layer_tree_impl.h" 11 #include "cc/trees/layer_tree_impl.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 FakeDelegatedRendererLayerImpl::FakeDelegatedRendererLayerImpl( 15 FakeDelegatedRendererLayerImpl::FakeDelegatedRendererLayerImpl(
16 LayerTreeImpl* tree_impl, 16 LayerTreeImpl* tree_impl,
17 int id) 17 int id)
18 : DelegatedRendererLayerImpl(tree_impl, id) { 18 : DelegatedRendererLayerImpl(tree_impl, id) {
19 } 19 }
20 20
21 FakeDelegatedRendererLayerImpl::~FakeDelegatedRendererLayerImpl() {} 21 FakeDelegatedRendererLayerImpl::~FakeDelegatedRendererLayerImpl() {}
22 22
23 scoped_ptr<LayerImpl> FakeDelegatedRendererLayerImpl::CreateLayerImpl( 23 scoped_ptr<LayerImpl> FakeDelegatedRendererLayerImpl::CreateLayerImpl(
24 LayerTreeImpl* tree_impl) { 24 LayerTreeImpl* tree_impl) {
25 return FakeDelegatedRendererLayerImpl::Create(tree_impl, id()); 25 return FakeDelegatedRendererLayerImpl::Create(
26 tree_impl, id()).PassAs<LayerImpl>();
26 } 27 }
27 28
28 static ResourceProvider::ResourceId AddResourceToFrame( 29 static ResourceProvider::ResourceId AddResourceToFrame(
29 ResourceProvider* resource_provider, 30 ResourceProvider* resource_provider,
30 DelegatedFrameData* frame, 31 DelegatedFrameData* frame,
31 ResourceProvider::ResourceId resource_id) { 32 ResourceProvider::ResourceId resource_id) {
32 TransferableResource resource; 33 TransferableResource resource;
33 resource.id = resource_id; 34 resource.id = resource_id;
34 resource.mailbox_holder.texture_target = 35 resource.mailbox_holder.texture_target =
35 resource_provider->TargetForTesting(resource_id); 36 resource_provider->TargetForTesting(resource_id);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 ++iter) { 70 ++iter) {
70 iter->IterateResources(add_resource_to_frame_callback); 71 iter->IterateResources(add_resource_to_frame_callback);
71 } 72 }
72 } 73 }
73 74
74 CreateChildIdIfNeeded(base::Bind(&NoopReturnCallback)); 75 CreateChildIdIfNeeded(base::Bind(&NoopReturnCallback));
75 SetFrameData(delegated_frame.get(), gfx::RectF()); 76 SetFrameData(delegated_frame.get(), gfx::RectF());
76 } 77 }
77 78
78 } // namespace cc 79 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_delegated_renderer_layer.cc ('k') | cc/test/fake_layer_tree_host_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698