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

Side by Side Diff: cc/raster/gpu_raster_buffer_provider.cc

Issue 2258833002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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/playback/transform_display_item.h ('k') | cc/raster/one_copy_raster_buffer_provider.cc » ('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 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/raster/gpu_raster_buffer_provider.h" 5 #include "cc/raster/gpu_raster_buffer_provider.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 GpuRasterBufferProvider::~GpuRasterBufferProvider() { 175 GpuRasterBufferProvider::~GpuRasterBufferProvider() {
176 DCHECK(pending_raster_buffers_.empty()); 176 DCHECK(pending_raster_buffers_.empty());
177 } 177 }
178 178
179 std::unique_ptr<RasterBuffer> GpuRasterBufferProvider::AcquireBufferForRaster( 179 std::unique_ptr<RasterBuffer> GpuRasterBufferProvider::AcquireBufferForRaster(
180 const Resource* resource, 180 const Resource* resource,
181 uint64_t resource_content_id, 181 uint64_t resource_content_id,
182 uint64_t previous_content_id) { 182 uint64_t previous_content_id) {
183 bool resource_has_previous_content = 183 bool resource_has_previous_content =
184 resource_content_id && resource_content_id == previous_content_id; 184 resource_content_id && resource_content_id == previous_content_id;
185 return base::WrapUnique(new RasterBufferImpl( 185 return base::MakeUnique<RasterBufferImpl>(
186 this, resource_provider_, resource->id(), async_worker_context_enabled_, 186 this, resource_provider_, resource->id(), async_worker_context_enabled_,
187 resource_has_previous_content)); 187 resource_has_previous_content);
188 } 188 }
189 189
190 void GpuRasterBufferProvider::ReleaseBufferForRaster( 190 void GpuRasterBufferProvider::ReleaseBufferForRaster(
191 std::unique_ptr<RasterBuffer> buffer) { 191 std::unique_ptr<RasterBuffer> buffer) {
192 // Nothing to do here. RasterBufferImpl destructor cleans up after itself. 192 // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
193 } 193 }
194 194
195 void GpuRasterBufferProvider::OrderingBarrier() { 195 void GpuRasterBufferProvider::OrderingBarrier() {
196 TRACE_EVENT0("cc", "GpuRasterBufferProvider::OrderingBarrier"); 196 TRACE_EVENT0("cc", "GpuRasterBufferProvider::OrderingBarrier");
197 197
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 gl->OrderingBarrierCHROMIUM(); 280 gl->OrderingBarrierCHROMIUM();
281 281
282 // Generate sync token after the barrier for cross context synchronization. 282 // Generate sync token after the barrier for cross context synchronization.
283 gpu::SyncToken resource_sync_token; 283 gpu::SyncToken resource_sync_token;
284 gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, resource_sync_token.GetData()); 284 gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, resource_sync_token.GetData());
285 resource_lock->set_sync_token(resource_sync_token); 285 resource_lock->set_sync_token(resource_sync_token);
286 resource_lock->set_synchronized(!async_worker_context_enabled_); 286 resource_lock->set_synchronized(!async_worker_context_enabled_);
287 } 287 }
288 288
289 } // namespace cc 289 } // namespace cc
OLDNEW
« no previous file with comments | « cc/playback/transform_display_item.h ('k') | cc/raster/one_copy_raster_buffer_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698