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

trunk/src/android_webview/native/java_browser_view_renderer_helper.cc

 // Copyright (c) 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 "android_webview/native/java_browser_view_renderer_helper.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/public/browser/draw_sw.h"
 #include "base/debug/trace_event.h"
 #include "jni/JavaBrowserViewRendererHelper_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/utils/SkCanvasStateUtils.h"
 
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {
 
 namespace {
 
 // Provides software rendering functions from the Android glue layer.
@@ skipping 125 matching lines @@
   }
 
   void* pixels = NULL;
   if (AndroidBitmap_lockPixels(env, jbitmap.obj(), &pixels) < 0) {
     LOG(ERROR) << "Error locking java bitmap pixels.";
     return false;
   }
 
   bool succeeded;
   {
-    SkImageInfo info =
-        SkImageInfo::MakeN32Premul(bitmap_info.width, bitmap_info.height);
     SkBitmap bitmap;
-    bitmap.installPixels(info, pixels, bitmap_info.stride);
+    bitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                     bitmap_info.width,
+                     bitmap_info.height,
+                     bitmap_info.stride);
+    bitmap.setPixels(pixels);
 
-    SkCanvas canvas(bitmap);
+    SkBitmapDevice device(bitmap);
+    SkCanvas canvas(&device);
     canvas.translate(-scroll_x, -scroll_y);
     succeeded = renderer.Run(&canvas);
   }
 
   if (AndroidBitmap_unlockPixels(env, jbitmap.obj()) < 0) {
     LOG(ERROR) << "Error unlocking java bitmap pixels.";
     return false;
   }
 
   return succeeded;
 }
 
 }  // namespace android_webview