Reverting 20516.

chrome/renderer/webplugin_delegate_proxy.cc

 // Copyright (c) 2006-2008 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 "chrome/renderer/webplugin_delegate_proxy.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
@@ skipping 914 matching lines @@
   if (sad_plugin_) {
     canvas.DrawBitmapInt(*sad_plugin_,
                          std::max(0, (width - sad_plugin_->width())/2),
                          std::max(0, (height - sad_plugin_->height())/2));
   }
 
 #if defined(OS_WIN)
   skia::PlatformDevice& device = canvas.getTopPlatformDevice();
   device.drawToHDC(context, plugin_rect_.x(), plugin_rect_.y(), NULL);
 #elif defined(OS_LINUX)
-  // Though conceptually we've been handed a cairo_surface_t* and we
-  // could've just hooked up the canvas to draw directly onto it, our
-  // canvas implementation currently uses cairo as a dumb pixel buffer
-  // and would have done the following copy anyway.
-  // TODO(evanm): revisit when we have printing hooked up, as that might
-  // change our usage of cairo.
-  skia::PlatformDevice& device = canvas.getTopPlatformDevice();
-  cairo_t* cairo = cairo_create(context);
-  cairo_surface_t* source_surface = device.beginPlatformPaint();
-  cairo_set_source_surface(cairo, source_surface, plugin_rect_.x(), plugin_rect_.y());
+  cairo_t* cairo = canvas.getTopPlatformDevice().beginPlatformPaint();
+  cairo_set_source_surface(cairo, cairo_get_target(context),
+                           plugin_rect_.x(), plugin_rect_.y());
   cairo_paint(cairo);
   // We have no endPlatformPaint() on the Linux PlatformDevice.
   // The cairo_t* is owned by the device.
 #elif defined(OS_MACOSX)
   canvas.getTopPlatformDevice().DrawToContext(
       context, plugin_rect_.x(), plugin_rect_.y(), NULL);
 #else
   NOTIMPLEMENTED();
 #endif
 }
@@ skipping 63 matching lines @@
   plugin_->CancelDocumentLoad();
 }
 
 void WebPluginDelegateProxy::OnInitiateHTTPRangeRequest(
     const std::string& url, const std::string& range_info,
     intptr_t existing_stream, bool notify_needed, intptr_t notify_data) {
   plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(),
                                     existing_stream, notify_needed,
                                     notify_data);
 }