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

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

Issue 2748263002: Move cc::DisplayItemList and related classes into cc/paint/ (Closed)
Patch Set: Merge branch 'master' into ccpaint Created 3 years, 9 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/raster/bitmap_raster_buffer_provider.cc ('k') | cc/raster/image_hijack_canvas.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 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
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
15 #include "cc/base/histograms.h" 15 #include "cc/base/histograms.h"
16 #include "cc/paint/paint_canvas.h" 16 #include "cc/paint/paint_canvas.h"
17 #include "cc/playback/image_hijack_canvas.h" 17 #include "cc/raster/image_hijack_canvas.h"
18 #include "cc/playback/raster_source.h" 18 #include "cc/raster/raster_source.h"
19 #include "cc/raster/scoped_gpu_raster.h" 19 #include "cc/raster/scoped_gpu_raster.h"
20 #include "cc/resources/resource.h" 20 #include "cc/resources/resource.h"
21 #include "gpu/command_buffer/client/context_support.h" 21 #include "gpu/command_buffer/client/context_support.h"
22 #include "gpu/command_buffer/client/gles2_interface.h" 22 #include "gpu/command_buffer/client/gles2_interface.h"
23 #include "third_party/skia/include/core/SkMultiPictureDraw.h" 23 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
24 #include "third_party/skia/include/core/SkPictureRecorder.h" 24 #include "third_party/skia/include/core/SkPictureRecorder.h"
25 #include "third_party/skia/include/core/SkSurface.h" 25 #include "third_party/skia/include/core/SkSurface.h"
26 #include "third_party/skia/include/gpu/GrContext.h" 26 #include "third_party/skia/include/gpu/GrContext.h"
27 27
28 namespace cc { 28 namespace cc {
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 gl->OrderingBarrierCHROMIUM(); 270 gl->OrderingBarrierCHROMIUM();
271 271
272 // Generate sync token after the barrier for cross context synchronization. 272 // Generate sync token after the barrier for cross context synchronization.
273 gpu::SyncToken resource_sync_token; 273 gpu::SyncToken resource_sync_token;
274 gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, resource_sync_token.GetData()); 274 gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, resource_sync_token.GetData());
275 resource_lock->set_sync_token(resource_sync_token); 275 resource_lock->set_sync_token(resource_sync_token);
276 resource_lock->set_synchronized(!async_worker_context_enabled_); 276 resource_lock->set_synchronized(!async_worker_context_enabled_);
277 } 277 }
278 278
279 } // namespace cc 279 } // namespace cc
OLDNEW
« no previous file with comments | « cc/raster/bitmap_raster_buffer_provider.cc ('k') | cc/raster/image_hijack_canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698