OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/tile_task_worker_pool.h" | 5 #include "cc/raster/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/raster_source.h" |
11 #include "cc/raster/texture_compressor.h" | |
11 #include "skia/ext/refptr.h" | 12 #include "skia/ext/refptr.h" |
12 #include "third_party/skia/include/core/SkCanvas.h" | 13 #include "third_party/skia/include/core/SkCanvas.h" |
13 #include "third_party/skia/include/core/SkDrawFilter.h" | 14 #include "third_party/skia/include/core/SkDrawFilter.h" |
14 #include "third_party/skia/include/core/SkSurface.h" | 15 #include "third_party/skia/include/core/SkSurface.h" |
15 | 16 |
16 namespace cc { | 17 namespace cc { |
17 namespace { | 18 namespace { |
18 | 19 |
19 class TaskSetFinishedTaskImpl : public TileTask { | 20 class TaskSetFinishedTaskImpl : public TileTask { |
20 public: | 21 public: |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
134 } | 135 } |
135 | 136 |
136 InsertNodeForTask(graph, raster_task, priority, dependencies); | 137 InsertNodeForTask(graph, raster_task, priority, dependencies); |
137 } | 138 } |
138 | 139 |
139 static bool IsSupportedPlaybackToMemoryFormat(ResourceFormat format) { | 140 static bool IsSupportedPlaybackToMemoryFormat(ResourceFormat format) { |
140 switch (format) { | 141 switch (format) { |
141 case RGBA_4444: | 142 case RGBA_4444: |
142 case RGBA_8888: | 143 case RGBA_8888: |
143 case BGRA_8888: | 144 case BGRA_8888: |
145 case ETC1: | |
144 return true; | 146 return true; |
145 case ALPHA_8: | 147 case ALPHA_8: |
146 case LUMINANCE_8: | 148 case LUMINANCE_8: |
147 case RGB_565: | 149 case RGB_565: |
148 case ETC1: | |
149 case RED_8: | 150 case RED_8: |
150 return false; | 151 return false; |
151 } | 152 } |
152 NOTREACHED(); | 153 NOTREACHED(); |
153 return false; | 154 return false; |
154 } | 155 } |
155 | 156 |
156 class SkipImageFilter : public SkDrawFilter { | 157 class SkipImageFilter : public SkDrawFilter { |
157 public: | 158 public: |
158 bool filter(SkPaint* paint, Type type) override { | 159 bool filter(SkPaint* paint, Type type) override { |
(...skipping 15 matching lines...) Expand all Loading... | |
174 const gfx::Rect& canvas_playback_rect, | 175 const gfx::Rect& canvas_playback_rect, |
175 float scale, | 176 float scale, |
176 bool include_images) { | 177 bool include_images) { |
177 TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory"); | 178 TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory"); |
178 | 179 |
179 DCHECK(IsSupportedPlaybackToMemoryFormat(format)) << format; | 180 DCHECK(IsSupportedPlaybackToMemoryFormat(format)) << format; |
180 | 181 |
181 // Uses kPremul_SkAlphaType since the result is not known to be opaque. | 182 // Uses kPremul_SkAlphaType since the result is not known to be opaque. |
182 SkImageInfo info = | 183 SkImageInfo info = |
183 SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType); | 184 SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType); |
184 SkColorType buffer_color_type = ResourceFormatToSkColorType(format); | 185 bool needs_conversion = |
reveman
2015/09/30 09:55:15
Can we instead include the non-conversion case in
christiank
2015/11/26 15:35:35
I can't think of an obvious way to do this. I stil
reveman
2015/11/27 16:46:49
fyi, I don't we ever convert from rgba to bgra in
| |
185 bool needs_copy = buffer_color_type != info.colorType(); | 186 SkColorTypeToResourceFormat(info.colorType()) != format; |
186 | 187 |
187 // Use unknown pixel geometry to disable LCD text. | 188 // Use unknown pixel geometry to disable LCD text. |
188 SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry); | 189 SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry); |
189 if (raster_source->CanUseLCDText()) { | 190 if (raster_source->CanUseLCDText()) { |
190 // LegacyFontHost will get LCD text and skia figures out what type to use. | 191 // LegacyFontHost will get LCD text and skia figures out what type to use. |
191 surface_props = SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType); | 192 surface_props = SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType); |
192 } | 193 } |
193 | 194 |
194 if (!stride) | 195 if (!stride) |
195 stride = info.minRowBytes(); | 196 stride = info.minRowBytes(); |
196 DCHECK_GT(stride, 0u); | 197 DCHECK_GT(stride, 0u); |
197 | 198 |
198 skia::RefPtr<SkDrawFilter> image_filter; | 199 skia::RefPtr<SkDrawFilter> image_filter; |
199 if (!include_images) | 200 if (!include_images) |
200 image_filter = skia::AdoptRef(new SkipImageFilter); | 201 image_filter = skia::AdoptRef(new SkipImageFilter); |
201 | 202 |
202 if (!needs_copy) { | 203 if (!needs_conversion) { |
203 skia::RefPtr<SkSurface> surface = skia::AdoptRef( | 204 skia::RefPtr<SkSurface> surface = skia::AdoptRef( |
204 SkSurface::NewRasterDirect(info, memory, stride, &surface_props)); | 205 SkSurface::NewRasterDirect(info, memory, stride, &surface_props)); |
205 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas()); | 206 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas()); |
206 canvas->setDrawFilter(image_filter.get()); | 207 canvas->setDrawFilter(image_filter.get()); |
207 raster_source->PlaybackToCanvas(canvas.get(), canvas_bitmap_rect, | 208 raster_source->PlaybackToCanvas(canvas.get(), canvas_bitmap_rect, |
208 canvas_playback_rect, scale); | 209 canvas_playback_rect, scale); |
209 return; | 210 return; |
210 } | 211 } |
211 | 212 |
212 skia::RefPtr<SkSurface> surface = | 213 skia::RefPtr<SkSurface> surface = |
213 skia::AdoptRef(SkSurface::NewRaster(info, &surface_props)); | 214 skia::AdoptRef(SkSurface::NewRaster(info, &surface_props)); |
214 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas()); | 215 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas()); |
215 canvas->setDrawFilter(image_filter.get()); | 216 canvas->setDrawFilter(image_filter.get()); |
216 // TODO(reveman): Improve partial raster support by reducing the size of | 217 // TODO(reveman): Improve partial raster support by reducing the size of |
217 // playback rect passed to PlaybackToCanvas. crbug.com/519070 | 218 // playback rect passed to PlaybackToCanvas. crbug.com/519070 |
218 raster_source->PlaybackToCanvas(canvas.get(), canvas_bitmap_rect, | 219 raster_source->PlaybackToCanvas(canvas.get(), canvas_bitmap_rect, |
219 canvas_bitmap_rect, scale); | 220 canvas_bitmap_rect, scale); |
220 | 221 |
221 { | 222 { |
222 TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory::ConvertPixels"); | 223 TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory::ConvertPixels"); |
223 | 224 |
224 SkImageInfo dst_info = | 225 scoped_ptr<TextureCompressor> texture_compressor; |
reveman
2015/09/30 09:55:15
nit: move to case where it's used
christiank
2015/11/26 15:35:35
Done.
| |
225 SkImageInfo::Make(info.width(), info.height(), buffer_color_type, | 226 switch (format) { |
226 info.alphaType(), info.profileType()); | 227 case ETC1: |
227 // TODO(kaanb): The GL pipeline assumes a 4-byte alignment for the | 228 texture_compressor = |
228 // bitmap data. There will be no need to call SkAlign4 once crbug.com/293728 | 229 TextureCompressor::Create(TextureCompressor::kFormatETC1); |
christiank
2015/09/30 07:49:42
reveman (cited from 1197423003):
"hm, I think we s
reveman
2015/09/30 09:55:15
Creating it here each time is fine for now. Ideall
| |
229 // is fixed. | 230 texture_compressor->Compress(reinterpret_cast<const uint8_t*>( |
230 const size_t dst_row_bytes = SkAlign4(dst_info.minRowBytes()); | 231 surface->peekPixels(nullptr, nullptr)), |
231 DCHECK_EQ(0u, dst_row_bytes % 4); | 232 reinterpret_cast<uint8_t*>(memory), |
232 bool success = canvas->readPixels(dst_info, memory, dst_row_bytes, 0, 0); | 233 size.width(), size.height(), |
233 DCHECK_EQ(true, success); | 234 TextureCompressor::kQualityHigh); |
235 return; | |
236 case RGBA_8888: | |
237 case RGBA_4444: | |
238 case BGRA_8888: | |
239 case ALPHA_8: | |
240 case LUMINANCE_8: | |
241 case RGB_565: | |
242 case RED_8: | |
243 SkImageInfo dst_info = SkImageInfo::Make( | |
244 info.width(), info.height(), ResourceFormatToSkColorType(format), | |
245 info.alphaType(), info.profileType()); | |
246 // TODO(kaanb): The GL pipeline assumes a 4-byte alignment for the | |
247 // bitmap data. There will be no need to call SkAlign4 once | |
248 // crbug.com/293728 | |
249 // is fixed. | |
250 const size_t dst_row_bytes = SkAlign4(dst_info.minRowBytes()); | |
251 DCHECK_EQ(0u, dst_row_bytes % 4); | |
252 bool success = | |
253 canvas->readPixels(dst_info, memory, dst_row_bytes, 0, 0); | |
254 DCHECK_EQ(true, success); | |
255 return; | |
256 } | |
257 | |
258 NOTREACHED(); | |
234 } | 259 } |
235 } | 260 } |
236 | 261 |
237 } // namespace cc | 262 } // namespace cc |
OLD | NEW |