content/browser/compositor/surface_utils.cc - Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h

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: content/browser/compositor/surface_utils.cc

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)

Patch Set: Fix Android build Created 4 years, 2 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 | « content/browser/compositor/software_output_device_mac.mm ('k') | content/browser/gpu/browser_gpu_memory_buffer_manager.cc » ('j') | ui/gfx/gpu_memory_buffer.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "content/browser/compositor/surface_utils.h"	5 #include "content/browser/compositor/surface_utils.h"

6	6

	7 #include "base/bind.h"

7 #include "base/callback_helpers.h"	8 #include "base/callback_helpers.h"

8 #include "base/memory/ref_counted.h"	9 #include "base/memory/ref_counted.h"

9 #include "build/build_config.h"	10 #include "build/build_config.h"

10 #include "cc/output/copy_output_result.h"	11 #include "cc/output/copy_output_result.h"

11 #include "cc/resources/single_release_callback.h"	12 #include "cc/resources/single_release_callback.h"

12 #include "cc/surfaces/surface_id_allocator.h"	13 #include "cc/surfaces/surface_id_allocator.h"

13 #include "components/display_compositor/gl_helper.h"	14 #include "components/display_compositor/gl_helper.h"

14 #include "skia/ext/image_operations.h"	15 #include "skia/ext/image_operations.h"

15 #include "third_party/skia/include/core/SkCanvas.h"	16 #include "third_party/skia/include/core/SkCanvas.h"

16 #include "third_party/skia/include/core/SkColorFilter.h"	17 #include "third_party/skia/include/core/SkColorFilter.h"

(...skipping 184 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
201 return;	202 return;

202 }	203 }

203	204

204 DCHECK(result->HasBitmap());	205 DCHECK(result->HasBitmap());

205 // Software path	206 // Software path

206 PrepareBitmapCopyOutputResult(output_size_in_pixel, color_type, callback,	207 PrepareBitmapCopyOutputResult(output_size_in_pixel, color_type, callback,

207 std::move(result));	208 std::move(result));

208 }	209 }

209	210

210 } // namespace content	211 } // namespace content

OLD	NEW