From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/plugins/gtk/PluginViewGtk.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/plugins/gtk/PluginViewGtk.cpp') diff --git a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp index 75a51c5..58a4f2c 100644 --- a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp +++ b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp @@ -48,6 +48,7 @@ #include "KeyboardEvent.h" #include "MouseEvent.h" #include "Page.h" +#include "PlatformContextCairo.h" #include "PlatformKeyboardEvent.h" #include "PlatformMouseEvent.h" #include "PluginDebug.h" @@ -217,7 +218,7 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect) // avoid drawing artifacts. // This Would not work without double buffering, but we always use it. - cairo_set_source_surface(cr.get(), cairo_get_group_target(context->platformContext()), + cairo_set_source_surface(cr.get(), cairo_get_group_target(context->platformContext()->cr()), -m_windowRect.x(), -m_windowRect.y()); cairo_set_operator(cr.get(), CAIRO_OPERATOR_SOURCE); } else @@ -244,7 +245,7 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect) if (syncX) XSync(m_pluginDisplay, false); // sync changes by plugin - cairo_t* cr = context->platformContext(); + cairo_t* cr = context->platformContext()->cr(); cairo_save(cr); cairo_set_source_surface(cr, drawableSurface.get(), frameRect().x(), frameRect().y()); -- cgit v1.1