Gets BackingStoreSkia to work on windows.

content/browser/renderer_host/backing_store_skia.cc

 // Copyright (c) 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 "content/browser/renderer_host/backing_store_skia.h"
 
 #include "content/browser/renderer_host/render_process_host.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/canvas.h"
@@ skipping 42 matching lines @@
   const int height = bitmap_rect.height();
 
   if (width <= 0 || width > kMaxVideoLayerSize ||
       height <= 0 || height > kMaxVideoLayerSize)
     return;
 
   TransportDIB* dib = process->GetTransportDIB(bitmap);
   if (!dib)
     return;
 
+  SkBitmap b;
+#if defined(OS_WIN)
+  // Creating a platform canvas on windows results in attempting to map the

[brettw, 2011/07/01 22:26:22]

Actually your new code is better on all platforms. Can you just delete the old
code?

+  // memory again (by CreateDIBSection). We want to avoid that, so we directly
+  // create the bitmap.
+  b.setConfig(SkBitmap::kARGB_8888_Config, width, height);
+  b.setPixels(dib->memory());
+#else
   scoped_ptr<skia::PlatformCanvas> p_canvas(
       dib->GetPlatformCanvas(width, height));
+  b = skia::GetTopDevice(*p_canvas)->accessBitmap(false);
+#endif
   for (size_t i = 0; i < copy_rects.size(); i++) {
     const gfx::Rect& copy_rect = copy_rects[i];
     int x = copy_rect.x() - bitmap_rect.x();
     int y = copy_rect.y() - bitmap_rect.y();
     int w = copy_rect.width();
     int h = copy_rect.height();
     SkIRect srcrect = SkIRect::MakeXYWH(x, y, w, h);
     SkRect dstrect = SkRect::MakeXYWH(
         SkIntToScalar(copy_rect.x()), SkIntToScalar(copy_rect.y()),
         SkIntToScalar(w), SkIntToScalar(h));
-    SkBitmap b = skia::GetTopDevice(*p_canvas)->accessBitmap(false);
     canvas_.get()->drawBitmapRect(b, &srcrect, dstrect);
   }
 }
 
 void BackingStoreSkia::ScrollBackingStore(int dx, int dy,
                                           const gfx::Rect& clip_rect,
                                           const gfx::Size& view_size) {
   int x = std::min(clip_rect.x(), clip_rect.x() - dx);
   int y = std::min(clip_rect.y(), clip_rect.y() - dy);
   int w = clip_rect.width() + abs(dx);
@@ skipping 10 matching lines @@
     return false;
 
   SkBitmap bitmap = skia::GetTopDevice(*output)->accessBitmap(true);
   SkIRect skrect = SkIRect::MakeXYWH(rect.x(), rect.y(), width, height);
   SkBitmap b;
   if (!canvas_->readPixels(skrect, &b))
     return false;
   output->writePixels(b, rect.x(), rect.y());
   return true;
 }