Allow one-copy task tile worker pool to use compressed textures.

cc/raster/tile_task_worker_pool.cc

Index: cc/raster/tile_task_worker_pool.cc
diff --git a/cc/raster/tile_task_worker_pool.cc b/cc/raster/tile_task_worker_pool.cc
index e1e6ac38616ffa3ecdbb88253ccc2a6d2a4db187..23efc8f95275fe839b33c63ec4692012c052e5f9 100644
--- a/cc/raster/tile_task_worker_pool.cc
+++ b/cc/raster/tile_task_worker_pool.cc
@@ -8,6 +8,7 @@
 
 #include "base/trace_event/trace_event.h"
 #include "cc/playback/display_list_raster_source.h"
+#include "cc/raster/texture_compressor.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDrawFilter.h"
@@ -141,11 +142,11 @@ static bool IsSupportedPlaybackToMemoryFormat(ResourceFormat format) {
     case RGBA_4444:
     case RGBA_8888:
     case BGRA_8888:
+    case ETC1:
       return true;
     case ALPHA_8:
     case LUMINANCE_8:
     case RGB_565:
-    case ETC1:
     case RED_8:
       return false;
   }
@@ -182,8 +183,8 @@ void TileTaskWorkerPool::PlaybackToMemory(
   // Uses kPremul_SkAlphaType since the result is not known to be opaque.
   SkImageInfo info =
       SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType);
-  SkColorType buffer_color_type = ResourceFormatToSkColorType(format);
-  bool needs_copy = buffer_color_type != info.colorType();
+  bool needs_conversion =
+      SkColorTypeToResourceFormat(info.colorType()) != format;
 
   // Use unknown pixel geometry to disable LCD text.
   SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry);
@@ -200,7 +201,7 @@ void TileTaskWorkerPool::PlaybackToMemory(
   if (!include_images)
     image_filter = skia::AdoptRef(new SkipImageFilter);
 
-  if (!needs_copy) {
+  if (!needs_conversion) {
     skia::RefPtr<SkSurface> surface = skia::AdoptRef(
         SkSurface::NewRasterDirect(info, memory, stride, &surface_props));
     skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas());
@@ -222,11 +223,33 @@ void TileTaskWorkerPool::PlaybackToMemory(
   {
     TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory::ConvertPixels");
 
-    SkImageInfo dst_info =
-        SkImageInfo::Make(info.width(), info.height(), buffer_color_type,
-                          info.alphaType(), info.profileType());
-    bool rv = canvas->readPixels(dst_info, memory, stride, 0, 0);
-    DCHECK(rv);
+    switch (format) {
+      case ETC1: {
+        scoped_ptr<TextureCompressor> texture_compressor =
+            TextureCompressor::Create(TextureCompressor::kFormatETC1);
+        texture_compressor->Compress(reinterpret_cast<const uint8_t*>(
+                                         surface->peekPixels(nullptr, nullptr)),
+                                     reinterpret_cast<uint8_t*>(memory),
+                                     size.width(), size.height(),
+                                     TextureCompressor::kQualityHigh);
+        return;
+      }
+      case RGBA_8888:

[reveman, 2015/11/30 16:41:45]

nit: some of these are not valid here (e.g. RGB_565). we we add a NOTREACHED()
to the ones that should not be handled here (not supported by
ResourceFormatToSkColorType?)

[christiank, 2015/12/01 15:01:07]

Done.

+      case RGBA_4444:
+      case BGRA_8888:
+      case ALPHA_8:
+      case LUMINANCE_8:
+      case RGB_565:
+      case RED_8:
+        SkImageInfo dst_info = SkImageInfo::Make(
+            info.width(), info.height(), ResourceFormatToSkColorType(format),
+            info.alphaType(), info.profileType());
+        bool rv = canvas->readPixels(dst_info, memory, stride, 0, 0);
+        DCHECK(rv);
+        return;
+    }
+
+    NOTREACHED();
   }
 }