cc/output/direct_renderer.cc - Issue 1128733002: Update from https://crrev.com/328418

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/output/direct_renderer.cc

Issue 1128733002: Update from https://crrev.com/328418 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 7 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:

Index: cc/output/direct_renderer.cc

diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc

index 16034ea85e901d0adf55726d8994b4ddb9bcb166..df2b73a60531fdceea64f8a25e7ff8f0bf3a647d 100644

--- a/cc/output/direct_renderer.cc

+++ b/cc/output/direct_renderer.cc

@@ -157,7 +157,7 @@ void DirectRenderer::DecideRenderPassAllocationsForFrame(

RenderPassTextureSize(render_passes_in_draw_order[i])));

std::vector<RenderPassId> passes_to_delete;

- base::ScopedPtrHashMap<RenderPassId, ScopedResource>::const_iterator

+ base::ScopedPtrHashMap<RenderPassId, scoped_ptr<ScopedResource>>::const_iterator

pass_iter;

for (pass_iter = render_pass_textures_.begin();

pass_iter != render_pass_textures_.end();

« no previous file with comments | « cc/output/direct_renderer.h ('k') | cc/surfaces/surface_aggregator.h » ('j') | no next file with comments »