Revert 223162 "Update the nine patch layer to use UI resources"

trunk/src/cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 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/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/basictypes.h"
@@ skipping 2600 matching lines @@
     const LayerTreeDebugState& new_debug_state) {
   if (LayerTreeDebugState::Equal(debug_state_, new_debug_state))
     return;
   if (debug_state_.continuous_painting != new_debug_state.continuous_painting)
     paint_time_counter_->ClearHistory();
 
   debug_state_ = new_debug_state;
   SetFullRootLayerDamage();
 }
 
-void LayerTreeHostImpl::CreateUIResource(UIResourceId uid,
-                                         const UIResourceBitmap& bitmap) {
+void LayerTreeHostImpl::CreateUIResource(
+    UIResourceId uid,
+    scoped_refptr<UIResourceBitmap> bitmap) {
   DCHECK_GT(uid, 0);
-  DCHECK_EQ(bitmap.GetFormat(), UIResourceBitmap::RGBA8);
+  DCHECK_EQ(bitmap->GetFormat(), UIResourceBitmap::RGBA8);
 
   GLint wrap_mode = 0;
-  switch (bitmap.GetWrapMode()) {
+  switch (bitmap->GetWrapMode()) {
     case UIResourceBitmap::CLAMP_TO_EDGE:
       wrap_mode = GL_CLAMP_TO_EDGE;
       break;
     case UIResourceBitmap::REPEAT:
       wrap_mode = GL_REPEAT;
       break;
   }
 
   // Allow for multiple creation requests with the same UIResourceId.  The
   // previous resource is simply deleted.
   ResourceProvider::ResourceId id = ResourceIdForUIResource(uid);
   if (id)
     DeleteUIResource(uid);
   id = resource_provider_->CreateResource(
-      bitmap.GetSize(),
+      bitmap->GetSize(),
       resource_provider_->best_texture_format(),
       wrap_mode,
       ResourceProvider::TextureUsageAny);
 
   ui_resource_map_[uid] = id;
   resource_provider_->SetPixels(id,
-                                bitmap.GetPixels(),
-                                gfx::Rect(bitmap.GetSize()),
-                                gfx::Rect(bitmap.GetSize()),
+                                reinterpret_cast<uint8_t*>(bitmap->GetPixels()),
+                                gfx::Rect(bitmap->GetSize()),
+                                gfx::Rect(bitmap->GetSize()),
                                 gfx::Vector2d(0, 0));
   MarkUIResourceNotEvicted(uid);
 }
 
 void LayerTreeHostImpl::DeleteUIResource(UIResourceId uid) {
   ResourceProvider::ResourceId id = ResourceIdForUIResource(uid);
   if (id) {
     resource_provider_->DeleteResource(id);
     ui_resource_map_.erase(uid);
   }
@@ skipping 33 matching lines @@
   std::set<UIResourceId>::iterator found_in_evicted =
       evicted_ui_resources_.find(uid);
   if (found_in_evicted == evicted_ui_resources_.end())
     return;
   evicted_ui_resources_.erase(found_in_evicted);
   if (evicted_ui_resources_.empty())
     client_->OnCanDrawStateChanged(CanDraw());
 }
 
 }  // namespace cc