diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 00:21:37 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 00:21:37 +0000 |
| commit | 1442d7f4cb20dc35f0a138fce93186eaa688e4ea (patch) | |
| tree | 1a7eae282a7736913e486088609345346a808e7b /cc/surfaces/surface_aggregator.h | |
| parent | 86cfc58a8c741776ba1127190aa3e68dfecaa905 (diff) | |
| download | chromium_src-1442d7f4cb20dc35f0a138fce93186eaa688e4ea.zip chromium_src-1442d7f4cb20dc35f0a138fce93186eaa688e4ea.tar.gz chromium_src-1442d7f4cb20dc35f0a138fce93186eaa688e4ea.tar.bz2 | |
Make Surface::GetEligibleFrame const
The frame shouldn't be modified by the aggregator, or else it will be broken if GetEligibleFrame is called again.
Also modify ScopedPtrVector::const_iterator to make it const-correct.
BUG=
Review URL: https://codereview.chromium.org/417843003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/surfaces/surface_aggregator.h')
| -rw-r--r-- | cc/surfaces/surface_aggregator.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h index 02dc478..ec36b4b 100644 --- a/cc/surfaces/surface_aggregator.h +++ b/cc/surfaces/surface_aggregator.h @@ -47,7 +47,9 @@ class CC_SURFACES_EXPORT SurfaceAggregator { SurfaceId surface_id); void CopyPasses(const RenderPassList& source_pass_list, SurfaceId surface_id); - bool TakeResources(Surface* surface, DelegatedFrameData* frame_data); + bool TakeResources(Surface* surface, + const DelegatedFrameData* frame_data, + RenderPassList* render_pass_list); int ChildIdForSurface(Surface* surface); SurfaceManager* manager_; |