summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 03:56:07 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-04 03:56:07 +0000
commit85167c7673eec9a00a7d4daab61620c802567191 (patch)
tree7a51e95b0f0a0e9e312608250319d61ca56ed2a2 /cc/test
parentd1e47321daf1b0e929d47dced30cdd267650135b (diff)
downloadchromium_src-85167c7673eec9a00a7d4daab61620c802567191.zip
chromium_src-85167c7673eec9a00a7d4daab61620c802567191.tar.gz
chromium_src-85167c7673eec9a00a7d4daab61620c802567191.tar.bz2
cc: Give ownership of render passes to the renderer when drawing a frame.
Instead of giving const pointers to the renderer, we should provide it with non-const pointers, and expect it to consume the render passes that we provide it. In ubercomp, the delegating renderer will pass ownership of the passes to the CompositorFrame. Covered by existing tests, no change in behaviour. BUG=152337 R=enne,piman NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11419269 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/layer_tree_test_common.cc2
-rw-r--r--cc/test/layer_tree_test_common.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index f24d8e6..ab8d901 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -117,7 +117,7 @@ bool MockLayerTreeHostImpl::prepareToDraw(FrameData& frame)
return result;
}
-void MockLayerTreeHostImpl::drawLayers(const FrameData& frame)
+void MockLayerTreeHostImpl::drawLayers(FrameData& frame)
{
LayerTreeHostImpl::drawLayers(frame);
m_testHooks->drawLayersOnThread(this);
diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
index 64fee75a..90b3a98 100644
--- a/cc/test/layer_tree_test_common.h
+++ b/cc/test/layer_tree_test_common.h
@@ -153,7 +153,7 @@ public:
virtual void beginCommit() OVERRIDE;
virtual void commitComplete() OVERRIDE;
virtual bool prepareToDraw(FrameData&) OVERRIDE;
- virtual void drawLayers(const FrameData&) OVERRIDE;
+ virtual void drawLayers(FrameData&) OVERRIDE;
// Make these public.
typedef std::vector<cc::LayerImpl*> LayerList;