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

trunk/src/cc/output/gl_renderer.cc

 // Copyright 2010 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/output/gl_renderer.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <string>
@@ skipping 77 matching lines @@
         bitmap_(bitmap),
         content_rect_(content_rect),
         contents_scale_(contents_scale) {
     DCHECK(picture_pile_);
     DCHECK(bitmap_);
   }
 
   // Overridden from internal::Task:
   virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE {
     TRACE_EVENT0("cc", "OnDemandRasterTaskImpl::RunOnWorkerThread");
-    SkCanvas canvas(*bitmap_);
+    SkBitmapDevice device(*bitmap_);
+    SkCanvas canvas(&device);
     picture_pile_->RasterToBitmap(
         &canvas, content_rect_, contents_scale_, NULL);
   }
 
  protected:
   virtual ~OnDemandRasterTaskImpl() {}
 
  private:
   PicturePileImpl* picture_pile_;
   SkBitmap* bitmap_;
@@ skipping 2927 matching lines @@
   is_scissor_enabled_ = false;
   GLC(gl_, gl_->Disable(GL_SCISSOR_TEST));
   scissor_rect_needs_reset_ = true;
 }
 
 bool GLRenderer::IsContextLost() {
   return output_surface_->context_provider()->IsContextLost();
 }
 
 }  // namespace cc