diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/plugins/gtk/PluginViewGtk.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/plugins/gtk/PluginViewGtk.cpp')
| -rw-r--r-- | Source/WebCore/plugins/gtk/PluginViewGtk.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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()); |