Reverting 20516.

webkit/glue/plugins/webplugin_delegate_impl_gtk.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 "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <string>
 #include <vector>
 
 #include <gtk/gtk.h>
@@ skipping 156 matching lines @@
 void WebPluginDelegateImpl::UpdateGeometry(
     const gfx::Rect& window_rect,
     const gfx::Rect& clip_rect) {
   if (windowless_) {
     WindowlessUpdateGeometry(window_rect, clip_rect);
   } else {
     WindowedUpdateGeometry(window_rect, clip_rect);
   }
 }
 
-void WebPluginDelegateImpl::Paint(cairo_surface_t* context,
+void WebPluginDelegateImpl::Paint(cairo_t* context,
                                   const gfx::Rect& rect) {
   if (windowless_)
     WindowlessPaint(context, rect);
 }
 
-void WebPluginDelegateImpl::Print(cairo_surface_t* context) {
+void WebPluginDelegateImpl::Print(cairo_t* context) {
   NOTIMPLEMENTED();
 }
 
 NPObject* WebPluginDelegateImpl::GetPluginScriptableObject() {
   return instance_->GetPluginScriptableObject();
 }
 
 void WebPluginDelegateImpl::DidFinishLoadWithReason(NPReason reason) {
   instance()->DidFinishLoadWithReason(reason);
 }
@@ skipping 198 matching lines @@
   cairo_set_source_rgba(cairo, r, g, b, 0.5);
   cairo_rectangle(cairo, rect.x(), rect.y(),
                   rect.width(), rect.height());
   cairo_stroke(cairo);
   cairo_destroy(cairo);
 }
 
 }  // namespace
 #endif
 
-void WebPluginDelegateImpl::WindowlessPaint(cairo_surface_t* context,
+void WebPluginDelegateImpl::WindowlessPaint(cairo_t* context,
                                             const gfx::Rect& damage_rect) {
   // Compare to:
   // http://mxr.mozilla.org/firefox/source/layout/generic/nsObjectFrame.cpp:
   // nsPluginInstanceOwner::Renderer::NativeDraw().
 
   DCHECK(context);
 
   // TODO(darin): we should avoid calling NPP_SetWindow here since it may
   // cause page layout to be invalidated.
 
@@ skipping 106 matching lines @@
 
   gfx::Rect pixmap_rect(0, 0,
                         draw_rect.x() + offset_x + draw_rect.width(),
                         draw_rect.y() + offset_y + draw_rect.height());
 
   EnsurePixmapAtLeastSize(pixmap_rect.width(), pixmap_rect.height());
 
   // Copy the current image into the pixmap, so the plugin can draw over
   // this background.
   cairo_t* cairo = gdk_cairo_create(pixmap_);
-  cairo_set_source_surface(cairo, context, offset_x, offset_y);
+  cairo_set_source_surface(cairo, cairo_get_target(context),
+                           offset_x, offset_y);
   cairo_rectangle(cairo, draw_rect.x() + offset_x, draw_rect.y() + offset_y,
                   draw_rect.width(), draw_rect.height());
   cairo_clip(cairo);
   cairo_paint(cairo);
   cairo_destroy(cairo);
 
   // Construct the paint message, targeting the pixmap.
   NPEvent np_event = {0};
   XGraphicsExposeEvent &event = np_event.xgraphicsexpose;
   event.type = GraphicsExpose;
   event.display = GDK_DISPLAY();
   event.drawable = GDK_PIXMAP_XID(pixmap_);
   event.x = draw_rect.x() + offset_x;
   event.y = draw_rect.y() + offset_y;
   event.width = draw_rect.width();
   event.height = draw_rect.height();
 
   // Tell the plugin to paint into the pixmap.
   static StatsRate plugin_paint("Plugin.Paint");
   StatsScope<StatsRate> scope(plugin_paint);
   NPError err = instance()->NPP_HandleEvent(&np_event);
   DCHECK_EQ(err, NPERR_NO_ERROR);
 
   // Now copy the rendered image pixmap back into the drawing buffer.
-  cairo = cairo_create(context);
-  gdk_cairo_set_source_pixmap(cairo, pixmap_, -offset_x, -offset_y);
-  cairo_rectangle(cairo, draw_rect.x(), draw_rect.y(),
+  gdk_cairo_set_source_pixmap(context, pixmap_, -offset_x, -offset_y);
+  cairo_rectangle(context, draw_rect.x(), draw_rect.y(),
                   draw_rect.width(), draw_rect.height());
-  cairo_clip(cairo);
-  cairo_paint(cairo);
-  cairo_destroy(cairo);
+  cairo_clip(context);
+  cairo_paint(context);
+  cairo_destroy(context);
 
 #ifdef DEBUG_RECTANGLES
   // Draw some debugging rectangles.
   // Pixmap rect = blue.
   DrawDebugRectangle(context, pixmap_rect, 0, 0, 1);
   // Drawing rect = red.
   DrawDebugRectangle(context, draw_rect, 1, 0, 0);
 #endif
 }
 
@@ skipping 274 matching lines @@
   return stream;
 }
 
 void WebPluginDelegateImpl::URLRequestRouted(const std::string&url,
                                              bool notify_needed,
                                              intptr_t notify_data) {
   if (notify_needed) {
     instance()->SetURLLoadData(GURL(url.c_str()), notify_data);
   }
 }