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

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

Issue 1144693002: cc: Move files out of cc/resources/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resources: android Created 5 years, 7 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.h ('k') | cc/raster/gpu_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/gpu_rasterizer.h" 5 #include "cc/raster/gpu_rasterizer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/trace_event/trace_event.h" 11 #include "base/trace_event/trace_event.h"
12 #include "cc/debug/devtools_instrumentation.h" 12 #include "cc/debug/devtools_instrumentation.h"
13 #include "cc/debug/frame_viewer_instrumentation.h" 13 #include "cc/debug/frame_viewer_instrumentation.h"
14 #include "cc/output/context_provider.h" 14 #include "cc/output/context_provider.h"
15 #include "cc/resources/raster_buffer.h" 15 #include "cc/playback/raster_source.h"
16 #include "cc/resources/raster_source.h" 16 #include "cc/raster/raster_buffer.h"
17 #include "cc/raster/scoped_gpu_raster.h"
17 #include "cc/resources/resource.h" 18 #include "cc/resources/resource.h"
18 #include "cc/resources/resource_provider.h" 19 #include "cc/resources/resource_provider.h"
19 #include "cc/resources/scoped_gpu_raster.h" 20 #include "cc/tiles/tile_manager.h"
20 #include "cc/resources/tile_manager.h"
21 #include "gpu/command_buffer/client/gles2_interface.h" 21 #include "gpu/command_buffer/client/gles2_interface.h"
22 #include "third_party/skia/include/core/SkMultiPictureDraw.h" 22 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
23 #include "third_party/skia/include/core/SkPictureRecorder.h" 23 #include "third_party/skia/include/core/SkPictureRecorder.h"
24 #include "third_party/skia/include/core/SkSurface.h" 24 #include "third_party/skia/include/core/SkSurface.h"
25 #include "third_party/skia/include/gpu/GrContext.h" 25 #include "third_party/skia/include/gpu/GrContext.h"
26 26
27 namespace cc { 27 namespace cc {
28 28
29 GpuRasterizer::GpuRasterizer(ContextProvider* context_provider, 29 GpuRasterizer::GpuRasterizer(ContextProvider* context_provider,
30 ResourceProvider* resource_provider, 30 ResourceProvider* resource_provider,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 return; 76 return;
77 77
78 SkMultiPictureDraw multi_picture_draw; 78 SkMultiPictureDraw multi_picture_draw;
79 multi_picture_draw.add(sk_surface->getCanvas(), picture.get()); 79 multi_picture_draw.add(sk_surface->getCanvas(), picture.get());
80 multi_picture_draw.draw(msaa_sample_count_ > 0); 80 multi_picture_draw.draw(msaa_sample_count_ > 0);
81 write_lock->ReleaseSkSurface(); 81 write_lock->ReleaseSkSurface();
82 } 82 }
83 } 83 }
84 84
85 } // namespace cc 85 } // namespace cc
OLDNEW
« no previous file with comments | « cc/raster/gpu_rasterizer.h ('k') | cc/raster/gpu_tile_task_worker_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698