Revert 254567 "don't create SkDevice directly, use SkBitmap or (..."

trunk/src/cc/resources/resource_provider.cc

 // Copyright 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 "cc/resources/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 477 matching lines @@
                                resource()->size.height(),
                                stride);
       raster_bitmap_.setPixels(mapped_buffer_);
       break;
     case LUMINANCE_8:
     case RGB_565:
     case ETC1:
       NOTREACHED();
       break;
   }
-  raster_canvas_ = skia::AdoptRef(new SkCanvas(raster_bitmap_));
+  skia::RefPtr<SkBitmapDevice> device =
+      skia::AdoptRef(new SkBitmapDevice(raster_bitmap_));
+  raster_canvas_ = skia::AdoptRef(new SkCanvas(device.get()));
   raster_bitmap_generation_id_ = raster_bitmap_.getGenerationID();
   return raster_canvas_.get();
 }
 
 bool ResourceProvider::BitmapRasterBuffer::DoUnlockForWrite() {
   raster_canvas_.clear();
 
   // getGenerationID returns a non-zero, unique value corresponding to the
   // pixels in bitmap. Hence, a change since DoLockForWrite was called means the
   // bitmap has changed.
@@ skipping 1669 matching lines @@
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->ContextGL() : NULL;
 }
 
 class GrContext* ResourceProvider::GrContext() const {
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
 }  // namespace cc