cc: Fix incomplete changes to add ETC1 support

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <map>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/layer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
+#include "cc/resources/etc1_pixel_ref.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "cc/resources/ui_resource_bitmap.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ skipping 274 matching lines @@
                                 GL_ETC1_RGB8_OES,
                                 size.width(),
                                 size.height(),
                                 0,
                                 data_size,
                                 data);
   context->shallowFlushCHROMIUM();
   return texture_id;
 }
 
+cc::UIResourceId CompositorImpl::GenerateCompressedUIResource(gfx::Size& size,
+                                                              int data_size,
+                                                              void* data) {
+  scoped_ptr<uint8_t[]> pixels(static_cast<uint8_t*>(data));
+  skia::RefPtr<cc::ETC1PixelRef> etc1_pixel_ref =
+      skia::AdoptRef(new cc::ETC1PixelRef(pixels.Pass()));
+  cc::UIResourceBitmap ui_bitmap(etc1_pixel_ref, size);
+  return GenerateUIResource(ui_bitmap);
+}
+
 void CompositorImpl::DeleteTexture(blink::WebGLId texture_id) {
   blink::WebGraphicsContext3D* context =
       ImageTransportFactoryAndroid::GetInstance()->GetContext3D();
   if (context->isContextLost() || !context->makeContextCurrent())
     return;
   context->deleteTexture(texture_id);
   context->shallowFlushCHROMIUM();
 }
 
 bool CompositorImpl::CopyTextureToBitmap(blink::WebGLId texture_id,
@@ skipping 153 matching lines @@
     case ANDROID_BITMAP_FORMAT_RGBA_8888:
       return GL_UNSIGNED_BYTE;
       break;
     case ANDROID_BITMAP_FORMAT_RGB_565:
     default:
       return GL_UNSIGNED_SHORT_5_6_5;
   }
 }
 
 } // namespace content