Apply merge from @fsamuel.

content/renderer/browser_plugin/browser_plugin_backing_store.h

 // 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.
 
 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_BACKING_STORE_H__
 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_BACKING_STORE_H__
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 20 matching lines @@
 // These are called in response to changes in the guest relayed via
 // BrowserPluginMsg_UpdateRect. See BrowserPlugin::UpdateRect.
 class BrowserPluginBackingStore {
  public:
   BrowserPluginBackingStore(const gfx::Size& size, float scale_factor);
   virtual ~BrowserPluginBackingStore();
 
   void PaintToBackingStore(
       const gfx::Rect& bitmap_rect,
       const std::vector<gfx::Rect>& copy_rects,
-      TransportDIB* dib);
+      void* bitmap);
 
   void ScrollBackingStore(const gfx::Vector2d& delta,
                           const gfx::Rect& clip_rect,
                           const gfx::Size& view_size);
 
   void Clear(SkColor clear_color);
 
   const gfx::Size& GetSize() const { return size_; }
 
   const SkBitmap& GetBitmap() const { return bitmap_; }
 
   float GetScaleFactor() const { return scale_factor_; }
 
  private:
   gfx::Size size_;
   SkBitmap bitmap_;
   scoped_ptr<SkCanvas> canvas_;
   float scale_factor_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginBackingStore);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_BACKING_STORE_H__