diff options
author | simonhong@chromium.org <simonhong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-30 21:13:12 +0000 |
---|---|---|
committer | simonhong@chromium.org <simonhong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-30 21:13:12 +0000 |
commit | 4d1f02075c869c11f2e5e2977c6cbf740e812a75 (patch) | |
tree | 9e81e7d9155d873b4ce04a0134d79c6dc5364edf /cc/test | |
parent | b4a4e13af270a5309fa37424cbc9ac5aefc7f803 (diff) | |
download | chromium_src-4d1f02075c869c11f2e5e2977c6cbf740e812a75.zip chromium_src-4d1f02075c869c11f2e5e2977c6cbf740e812a75.tar.gz chromium_src-4d1f02075c869c11f2e5e2977c6cbf740e812a75.tar.bz2 |
cc: Replace ScopedPtrVector<RenderPass> with RenderPassList
R=enne@chromium.org
BUG=NONE
TEST=NONE(No functional change)
Review URL: https://codereview.chromium.org/354373002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
-rw-r--r-- | cc/test/fake_delegated_renderer_layer_impl.cc | 2 | ||||
-rw-r--r-- | cc/test/fake_delegated_renderer_layer_impl.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cc/test/fake_delegated_renderer_layer_impl.cc b/cc/test/fake_delegated_renderer_layer_impl.cc index d59eac5..b7d3254 100644 --- a/cc/test/fake_delegated_renderer_layer_impl.cc +++ b/cc/test/fake_delegated_renderer_layer_impl.cc @@ -52,7 +52,7 @@ void NoopReturnCallback(const ReturnedResourceArray& returned) {} void FakeDelegatedRendererLayerImpl::SetFrameDataForRenderPasses( float device_scale_factor, - ScopedPtrVector<RenderPass>* pass_list) { + RenderPassList* pass_list) { scoped_ptr<DelegatedFrameData> delegated_frame(new DelegatedFrameData); delegated_frame->device_scale_factor = device_scale_factor; delegated_frame->render_pass_list.swap(*pass_list); diff --git a/cc/test/fake_delegated_renderer_layer_impl.h b/cc/test/fake_delegated_renderer_layer_impl.h index 0a071a5..157f5d6 100644 --- a/cc/test/fake_delegated_renderer_layer_impl.h +++ b/cc/test/fake_delegated_renderer_layer_impl.h @@ -21,13 +21,13 @@ class FakeDelegatedRendererLayerImpl : public DelegatedRendererLayerImpl { OVERRIDE; int ChildId() const { return ChildIdForTesting(); } - const ScopedPtrVector<RenderPass>& RenderPassesInDrawOrder() const { + const RenderPassList& RenderPassesInDrawOrder() const { return RenderPassesInDrawOrderForTesting(); } ResourceProvider::ResourceIdSet Resources() const; void SetFrameDataForRenderPasses(float device_scale_factor, - ScopedPtrVector<RenderPass>* pass_list); + RenderPassList* pass_list); protected: FakeDelegatedRendererLayerImpl(LayerTreeImpl* tree_impl, int id); |