Simplify platform_canvas.h by recognizing that PlatformCanvas does not actually extend

content/renderer/webplugin_delegate_proxy.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/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(USE_X11)
 #include <cairo/cairo.h>
@@ skipping 611 matching lines @@
   transport_stores_[1].dib.reset();
 
   transport_stores_[0].canvas.reset();
   transport_stores_[1].canvas.reset();
   transport_store_painted_ = gfx::Rect();
   front_buffer_diff_ = gfx::Rect();
 }
 
 static size_t BitmapSizeForPluginRect(const gfx::Rect& plugin_rect) {
   const size_t stride =
-      skia::PlatformCanvas::StrideForWidth(plugin_rect.width());
+      skia::PlatformCanvasStrideForWidth(plugin_rect.width());
   return stride * plugin_rect.height();
 }
 
 #if !defined(OS_WIN)
 bool WebPluginDelegateProxy::CreateLocalBitmap(
     std::vector<uint8>* memory,
     scoped_ptr<skia::PlatformCanvas>* canvas) {
   const size_t size = BitmapSizeForPluginRect(plugin_rect_);
   memory->resize(size);
   if (memory->size() != size)
     return false;
-  canvas->reset(new skia::PlatformCanvas(
-      plugin_rect_.width(), plugin_rect_.height(), true, &((*memory)[0])));
+  canvas->reset(skia::CreatePlatformCanvas(
+      plugin_rect_.width(), plugin_rect_.height(), true, &((*memory)[0]),
+      skia::CRASH_ON_FAILURE));
   return true;
 }
 #endif
 
 bool WebPluginDelegateProxy::CreateSharedBitmap(
     scoped_ptr<TransportDIB>* memory,
     scoped_ptr<skia::PlatformCanvas>* canvas) {
   const size_t size = BitmapSizeForPluginRect(plugin_rect_);
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   memory->reset(TransportDIB::Create(size, 0));
@@ skipping 376 matching lines @@
     webkit::PaintSadPlugin(native_context, plugin_rect_, *sad_plugin_);
 }
 
 void WebPluginDelegateProxy::CopyFromBackBufferToFrontBuffer(
     const gfx::Rect& rect) {
 #if defined(OS_MACOSX)
   // Blitting the bits directly is much faster than going through CG, and since
   // the goal is just to move the raw pixels between two bitmaps with the same
   // pixel format (no compositing, color correction, etc.), it's safe.
   const size_t stride =
-      skia::PlatformCanvas::StrideForWidth(plugin_rect_.width());
+      skia::PlatformCanvasStrideForWidth(plugin_rect_.width());
   const size_t chunk_size = 4 * rect.width();
   DCHECK(back_buffer_dib() != NULL);
   uint8* source_data = static_cast<uint8*>(back_buffer_dib()->memory()) +
                        rect.y() * stride + 4 * rect.x();
   DCHECK(front_buffer_dib() != NULL);
   uint8* target_data = static_cast<uint8*>(front_buffer_dib()->memory()) +
                        rect.y() * stride + 4 * rect.x();
   for (int row = 0; row < rect.height(); ++row) {
     memcpy(target_data, source_data, chunk_size);
     source_data += stride;
@@ skipping 246 matching lines @@
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }
 
 }  // namespace content