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

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

Issue 1405883002: cc: Remove the base RasterSource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge more Created 5 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 | « cc/raster/gpu_rasterizer.cc ('k') | cc/raster/one_copy_tile_task_worker_pool.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_tile_task_worker_pool.h" 5 #include "cc/raster/gpu_tile_task_worker_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "cc/playback/raster_source.h" 10 #include "cc/playback/display_list_raster_source.h"
11 #include "cc/raster/gpu_rasterizer.h" 11 #include "cc/raster/gpu_rasterizer.h"
12 #include "cc/raster/raster_buffer.h" 12 #include "cc/raster/raster_buffer.h"
13 #include "cc/raster/scoped_gpu_raster.h" 13 #include "cc/raster/scoped_gpu_raster.h"
14 #include "cc/resources/resource.h" 14 #include "cc/resources/resource.h"
15 #include "gpu/command_buffer/client/gles2_interface.h" 15 #include "gpu/command_buffer/client/gles2_interface.h"
16 #include "third_party/skia/include/core/SkMultiPictureDraw.h" 16 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
17 #include "third_party/skia/include/core/SkPictureRecorder.h" 17 #include "third_party/skia/include/core/SkPictureRecorder.h"
18 #include "third_party/skia/include/core/SkSurface.h" 18 #include "third_party/skia/include/core/SkSurface.h"
19 #include "third_party/skia/include/gpu/GrContext.h" 19 #include "third_party/skia/include/gpu/GrContext.h"
20 20
21 namespace cc { 21 namespace cc {
22 namespace { 22 namespace {
23 23
24 class RasterBufferImpl : public RasterBuffer { 24 class RasterBufferImpl : public RasterBuffer {
25 public: 25 public:
26 RasterBufferImpl(GpuRasterizer* rasterizer, 26 RasterBufferImpl(GpuRasterizer* rasterizer,
27 const Resource* resource, 27 const Resource* resource,
28 uint64_t resource_content_id, 28 uint64_t resource_content_id,
29 uint64_t previous_content_id) 29 uint64_t previous_content_id)
30 : rasterizer_(rasterizer), 30 : rasterizer_(rasterizer),
31 lock_(rasterizer->resource_provider(), resource->id()), 31 lock_(rasterizer->resource_provider(), resource->id()),
32 resource_has_previous_content_( 32 resource_has_previous_content_(
33 resource_content_id && resource_content_id == previous_content_id) { 33 resource_content_id && resource_content_id == previous_content_id) {
34 } 34 }
35 35
36 // Overridden from RasterBuffer: 36 // Overridden from RasterBuffer:
37 void Playback(const RasterSource* raster_source, 37 void Playback(const DisplayListRasterSource* raster_source,
38 const gfx::Rect& raster_full_rect, 38 const gfx::Rect& raster_full_rect,
39 const gfx::Rect& raster_dirty_rect, 39 const gfx::Rect& raster_dirty_rect,
40 uint64_t new_content_id, 40 uint64_t new_content_id,
41 float scale, 41 float scale,
42 bool include_images) override { 42 bool include_images) override {
43 TRACE_EVENT0("cc", "RasterBufferImpl::Playback"); 43 TRACE_EVENT0("cc", "RasterBufferImpl::Playback");
44 // GPU raster doesn't do low res tiles, so should always include images. 44 // GPU raster doesn't do low res tiles, so should always include images.
45 DCHECK(include_images); 45 DCHECK(include_images);
46 ContextProvider* context_provider = rasterizer_->resource_provider() 46 ContextProvider* context_provider = rasterizer_->resource_provider()
47 ->output_surface() 47 ->output_surface()
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 void GpuTileTaskWorkerPool::OnTaskSetFinished(TaskSet task_set) { 239 void GpuTileTaskWorkerPool::OnTaskSetFinished(TaskSet task_set) {
240 TRACE_EVENT1("cc", "GpuTileTaskWorkerPool::OnTaskSetFinished", "task_set", 240 TRACE_EVENT1("cc", "GpuTileTaskWorkerPool::OnTaskSetFinished", "task_set",
241 task_set); 241 task_set);
242 242
243 DCHECK(tasks_pending_[task_set]); 243 DCHECK(tasks_pending_[task_set]);
244 tasks_pending_[task_set] = false; 244 tasks_pending_[task_set] = false;
245 client_->DidFinishRunningTileTasks(task_set); 245 client_->DidFinishRunningTileTasks(task_set);
246 } 246 }
247 247
248 } // namespace cc 248 } // namespace cc
OLDNEW
« no previous file with comments | « cc/raster/gpu_rasterizer.cc ('k') | cc/raster/one_copy_tile_task_worker_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698