Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Side by Side Diff: cc/tiles/gpu_image_decode_controller.cc

Issue 2273193002: Make compositor_frame.h NOT include base/trace_event/trace_event.h (Closed)
Patch Set: Rebase again + presubmit fix Created 4 years, 3 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/test/ordered_texture_map.cc ('k') | cc/tiles/software_image_decode_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/tiles/gpu_image_decode_controller.h" 5 #include "cc/tiles/gpu_image_decode_controller.h"
6 6
7 #include <inttypes.h> 7 #include <inttypes.h>
8 8
9 #include "base/memory/discardable_memory_allocator.h" 9 #include "base/memory/discardable_memory_allocator.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/metrics/histogram_macros.h" 11 #include "base/metrics/histogram_macros.h"
12 #include "base/numerics/safe_math.h" 12 #include "base/numerics/safe_math.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/threading/thread_task_runner_handle.h" 14 #include "base/threading/thread_task_runner_handle.h"
15 #include "base/trace_event/memory_dump_manager.h"
15 #include "cc/debug/devtools_instrumentation.h" 16 #include "cc/debug/devtools_instrumentation.h"
16 #include "cc/output/context_provider.h" 17 #include "cc/output/context_provider.h"
17 #include "cc/raster/tile_task.h" 18 #include "cc/raster/tile_task.h"
18 #include "cc/resources/resource_format_utils.h" 19 #include "cc/resources/resource_format_utils.h"
19 #include "cc/tiles/mipmap_util.h" 20 #include "cc/tiles/mipmap_util.h"
20 #include "gpu/command_buffer/client/context_support.h" 21 #include "gpu/command_buffer/client/context_support.h"
21 #include "gpu/command_buffer/client/gles2_interface.h" 22 #include "gpu/command_buffer/client/gles2_interface.h"
22 #include "gpu_image_decode_controller.h" 23 #include "gpu_image_decode_controller.h"
23 #include "skia/ext/texture_handle.h" 24 #include "skia/ext/texture_handle.h"
24 #include "third_party/skia/include/core/SkCanvas.h" 25 #include "third_party/skia/include/core/SkCanvas.h"
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 bool GpuImageDecodeController::DiscardableIsLockedForTesting( 1129 bool GpuImageDecodeController::DiscardableIsLockedForTesting(
1129 const DrawImage& image) { 1130 const DrawImage& image) {
1130 base::AutoLock lock(lock_); 1131 base::AutoLock lock(lock_);
1131 auto found = persistent_cache_.Peek(image.image()->uniqueID()); 1132 auto found = persistent_cache_.Peek(image.image()->uniqueID());
1132 DCHECK(found != persistent_cache_.end()); 1133 DCHECK(found != persistent_cache_.end());
1133 ImageData* image_data = found->second.get(); 1134 ImageData* image_data = found->second.get();
1134 return image_data->decode.is_locked(); 1135 return image_data->decode.is_locked();
1135 } 1136 }
1136 1137
1137 } // namespace cc 1138 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/ordered_texture_map.cc ('k') | cc/tiles/software_image_decode_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698