Apply merge from @fsamuel.

content/renderer/browser_plugin/browser_plugin_backing_store.cc

 // Copyright (c) 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 "content/renderer/browser_plugin/browser_plugin_backing_store.h"
 
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
@@ skipping 16 matching lines @@
   bitmap_.allocPixels();
   canvas_.reset(new SkCanvas(bitmap_));
 }
 
 BrowserPluginBackingStore::~BrowserPluginBackingStore() {
 }
 
 void BrowserPluginBackingStore::PaintToBackingStore(
     const gfx::Rect& bitmap_rect,
     const std::vector<gfx::Rect>& copy_rects,
-    TransportDIB* dib) {
+    void* bitmap) {
   if (bitmap_rect.IsEmpty())
     return;
 
   gfx::Rect pixel_bitmap_rect = gfx::ToFlooredRectDeprecated(
       gfx::ScaleRect(bitmap_rect, scale_factor_));
 
   const int width = pixel_bitmap_rect.width();
   const int height = pixel_bitmap_rect.height();
 
   if (width <= 0 || width > kMaxSize ||
       height <= 0 || height > kMaxSize)
     return;
 
-  if (!dib)
+  if (!bitmap)
     return;
 
   SkPaint copy_paint;
   copy_paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
   SkBitmap sk_bitmap;
   sk_bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-  sk_bitmap.setPixels(dib->memory());
+  sk_bitmap.setPixels(bitmap);
   for (size_t i = 0; i < copy_rects.size(); i++) {
     const gfx::Rect& pixel_copy_rect = gfx::ToEnclosingRect(
         gfx::ScaleRect(copy_rects[i], scale_factor_));
     int x = pixel_copy_rect.x() - pixel_bitmap_rect.x();
     int y = pixel_copy_rect.y() - pixel_bitmap_rect.y();
     SkIRect srcrect = SkIRect::MakeXYWH(x, y,
         pixel_copy_rect.width(),
         pixel_copy_rect.height());
 
     SkRect dstrect = SkRect::MakeXYWH(
@@ skipping 20 matching lines @@
   int h = pixel_rect.height() + abs(pixel_delta.y());
   SkIRect rect = SkIRect::MakeXYWH(x, y, w, h);
   bitmap_.scrollRect(&rect, pixel_delta.x(), pixel_delta.y());
 }
 
 void BrowserPluginBackingStore::Clear(SkColor clear_color) {
   canvas_->clear(clear_color);
 }
 
 }  // namespace content