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

Side by Side Diff: cc/resources/zero_copy_raster_worker_pool.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. Created 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/resources/zero_copy_raster_worker_pool.h" 5 #include "cc/resources/zero_copy_raster_worker_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/debug/trace_event_argument.h" 10 #include "base/debug/trace_event_argument.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "cc/debug/traced_value.h" 12 #include "cc/debug/traced_value.h"
13 #include "cc/resources/raster_buffer.h" 13 #include "cc/resources/raster_buffer.h"
14 #include "cc/resources/resource.h" 14 #include "cc/resources/resource.h"
15 #include "third_party/skia/include/utils/SkNullCanvas.h" 15 #include "third_party/skia/include/utils/SkNullCanvas.h"
16 16
17 namespace cc { 17 namespace cc {
18 namespace { 18 namespace {
19 19
20 class RasterBufferImpl : public RasterBuffer { 20 class RasterBufferImpl : public RasterBuffer {
21 public: 21 public:
22 RasterBufferImpl(ResourceProvider* resource_provider, 22 RasterBufferImpl(ResourceProvider* resource_provider,
23 const Resource* resource) 23 const Resource* resource)
24 : lock_(resource_provider, resource->id()), 24 : lock_(resource_provider, resource->id()),
25 resource_(resource), 25 resource_(resource),
26 buffer_(NULL) {} 26 buffer_(nullptr) {}
27 27
28 // Overridden from RasterBuffer: 28 // Overridden from RasterBuffer:
29 virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override { 29 virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override {
30 buffer_ = lock_.gpu_memory_buffer(); 30 buffer_ = lock_.gpu_memory_buffer();
31 if (!buffer_) 31 if (!buffer_)
32 return skia::AdoptRef(SkCreateNullCanvas()); 32 return skia::AdoptRef(SkCreateNullCanvas());
33 33
34 RasterWorkerPool::AcquireBitmapForBuffer(&bitmap_, 34 RasterWorkerPool::AcquireBitmapForBuffer(&bitmap_,
35 buffer_, 35 buffer_,
36 resource_->format(), 36 resource_->format(),
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 new base::debug::TracedValue(); 213 new base::debug::TracedValue();
214 214
215 state->BeginArray("tasks_pending"); 215 state->BeginArray("tasks_pending");
216 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) 216 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set)
217 state->AppendBoolean(raster_pending_[task_set]); 217 state->AppendBoolean(raster_pending_[task_set]);
218 state->EndArray(); 218 state->EndArray();
219 return state; 219 return state;
220 } 220 }
221 221
222 } // namespace cc 222 } // namespace cc
OLDNEW
« cc/resources/texture_uploader_unittest.cc ('K') | « cc/resources/video_resource_updater_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698