cc/surfaces/surface_aggregator.cc - Issue 895853003: Update from https://crrev.com/314320

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: cc/surfaces/surface_aggregator.cc

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

Patch Set: Created 5 years, 10 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/surfaces/onscreen_display_client.cc ('k') | cc/surfaces/surface_display_output_surface.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/surfaces/surface_aggregator.h"	5 #include "cc/surfaces/surface_aggregator.h"

6	6

7 #include <map>	7 #include <map>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/containers/hash_tables.h"	10 #include "base/containers/hash_tables.h"

11 #include "base/debug/trace_event.h"

12 #include "base/logging.h"	11 #include "base/logging.h"

	12 #include "base/trace_event/trace_event.h"

13 #include "cc/base/math_util.h"	13 #include "cc/base/math_util.h"

14 #include "cc/output/compositor_frame.h"	14 #include "cc/output/compositor_frame.h"

15 #include "cc/output/delegated_frame_data.h"	15 #include "cc/output/delegated_frame_data.h"

16 #include "cc/quads/draw_quad.h"	16 #include "cc/quads/draw_quad.h"

17 #include "cc/quads/render_pass_draw_quad.h"	17 #include "cc/quads/render_pass_draw_quad.h"

18 #include "cc/quads/shared_quad_state.h"	18 #include "cc/quads/shared_quad_state.h"

19 #include "cc/quads/surface_draw_quad.h"	19 #include "cc/quads/surface_draw_quad.h"

20 #include "cc/surfaces/surface.h"	20 #include "cc/surfaces/surface.h"

21 #include "cc/surfaces/surface_factory.h"	21 #include "cc/surfaces/surface_factory.h"

22 #include "cc/surfaces/surface_manager.h"	22 #include "cc/surfaces/surface_manager.h"

(...skipping 467 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
490 void SurfaceAggregator::ReleaseResources(SurfaceId surface_id) {	490 void SurfaceAggregator::ReleaseResources(SurfaceId surface_id) {

491 SurfaceToResourceChildIdMap::iterator it =	491 SurfaceToResourceChildIdMap::iterator it =

492 surface_id_to_resource_child_id_.find(surface_id);	492 surface_id_to_resource_child_id_.find(surface_id);

493 if (it != surface_id_to_resource_child_id_.end()) {	493 if (it != surface_id_to_resource_child_id_.end()) {

494 provider_->DestroyChild(it->second);	494 provider_->DestroyChild(it->second);

495 surface_id_to_resource_child_id_.erase(it);	495 surface_id_to_resource_child_id_.erase(it);

496 }	496 }

497 }	497 }

498	498

499 } // namespace cc	499 } // namespace cc

OLD	NEW