cc: Adding ETC1 support to UIResourceBitmap and ResourceProvider

cc/resources/ui_resource_bitmap.cc

 // Copyright 2013 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 "cc/resources/ui_resource_bitmap.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace cc {
 
 void UIResourceBitmap::Create(const skia::RefPtr<SkPixelRef>& pixel_ref,
                               UIResourceFormat format,
-                              UIResourceWrapMode wrap_mode,
                               gfx::Size size) {
   DCHECK(size.width());
   DCHECK(size.height());
   DCHECK(pixel_ref);
   DCHECK(pixel_ref->isImmutable());
   format_ = format;
-  wrap_mode_ = wrap_mode;
   size_ = size;
   pixel_ref_ = pixel_ref;
+
+  // Wrap mode defaults to CLAMP_TO_EDGE.
+  wrap_mode_ = CLAMP_TO_EDGE;
 }
 
-UIResourceBitmap::UIResourceBitmap(const SkBitmap& skbitmap,
-                                   UIResourceWrapMode wrap_mode) {
+UIResourceBitmap::UIResourceBitmap(const SkBitmap& skbitmap) {
   DCHECK_EQ(skbitmap.config(), SkBitmap::kARGB_8888_Config);
   DCHECK_EQ(skbitmap.width(), skbitmap.rowBytesAsPixels());
   DCHECK(skbitmap.isImmutable());
 
   skia::RefPtr<SkPixelRef> pixel_ref = skia::SharePtr(skbitmap.pixelRef());
   Create(pixel_ref,
          UIResourceBitmap::RGBA8,
-         wrap_mode,
          gfx::Size(skbitmap.width(), skbitmap.height()));
 }
 
+UIResourceBitmap::UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref,
+                                   UIResourceFormat format,
+                                   gfx::Size size) {
+  Create(pixel_ref, format, size);
+}
+
 UIResourceBitmap::~UIResourceBitmap() {}
 
 AutoLockUIResourceBitmap::AutoLockUIResourceBitmap(
     const UIResourceBitmap& bitmap) : bitmap_(bitmap) {
   bitmap_.pixel_ref_->lockPixels();
 }
 
 AutoLockUIResourceBitmap::~AutoLockUIResourceBitmap() {
   bitmap_.pixel_ref_->unlockPixels();
 }
 
 const uint8_t* AutoLockUIResourceBitmap::GetPixels() const {
   return static_cast<const uint8_t*>(bitmap_.pixel_ref_->pixels());
 }
 
 }  // namespace cc