OLD | NEW |
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/resources/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/debug/trace_event.h" | |
11 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.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/resources/raster_buffer.h" |
16 #include "cc/resources/raster_source.h" | 16 #include "cc/resources/raster_source.h" |
17 #include "cc/resources/resource.h" | 17 #include "cc/resources/resource.h" |
18 #include "cc/resources/resource_provider.h" | 18 #include "cc/resources/resource_provider.h" |
19 #include "cc/resources/scoped_gpu_raster.h" | 19 #include "cc/resources/scoped_gpu_raster.h" |
20 #include "cc/resources/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" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 tile->raster_source()->PlaybackToCanvas(canvas.get(), tile->content_rect(), | 140 tile->raster_source()->PlaybackToCanvas(canvas.get(), tile->content_rect(), |
141 tile->contents_scale()); | 141 tile->contents_scale()); |
142 canvas->restore(); | 142 canvas->restore(); |
143 | 143 |
144 // Add the canvas and recorded picture to |multi_picture_draw_|. | 144 // Add the canvas and recorded picture to |multi_picture_draw_|. |
145 skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording()); | 145 skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording()); |
146 multi_picture_draw_.add(sk_surface->getCanvas(), picture.get()); | 146 multi_picture_draw_.add(sk_surface->getCanvas(), picture.get()); |
147 } | 147 } |
148 | 148 |
149 } // namespace cc | 149 } // namespace cc |
OLD | NEW |