Changeset 85953 in webkit

Timestamp:

May 6, 2011 9:55:47 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-05-06 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Implement NetscapePlugin::platformPaint for GTK platform
​https://bugs.webkit.org/show_bug.cgi?id=60368

• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: (WebKit::NetscapePlugin::platformPaint):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-06  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Implement NetscapePlugin::platformPaint for GTK platform
+        https://bugs.webkit.org/show_bug.cgi?id=60368
+
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        (WebKit::NetscapePlugin::platformPaint):
+
 2011-05-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

@@ -40 +40 @@
 #include <QX11Info>
 #elif PLATFORM(GTK)
+#include "PlatformContextCairo.h"
+#include "RefPtrCairo.h"
+#include <cairo/cairo-xlib.h>
 #include <gdk/gdkx.h>
 #include <WebCore/GtkVersioning.h>
@@ -214 +217 @@
     QPainter* painter = context->platformContext();
     painter->translate(m_frameRect.x(), m_frameRect.y());
-#else
+#elif !PLATFORM(GTK)
     notImplemented();
     return;
@@ -248 +251 @@
 
     painter->translate(-m_frameRect.x(), -m_frameRect.y());
+#elif PLATFORM(GTK)
+    RefPtr<cairo_surface_t> drawableSurface = adoptRef(cairo_xlib_surface_create(m_pluginDisplay,
+                                                                                 m_drawable,
+                                                                                 static_cast<NPSetWindowCallbackStruct*>(m_npWindow.ws_info)->visual,
+                                                                                 m_frameRect.width(),
+                                                                                 m_frameRect.height()));
+    cairo_t* cr = context->platformContext()->cr();
+    cairo_save(cr);
+
+    cairo_set_source_surface(cr, drawableSurface.get(), m_frameRect.x(), m_frameRect.y());
+
+    cairo_rectangle(cr, m_frameRect.x() + exposedRect.x(), m_frameRect.y() + exposedRect.y(), exposedRect.width(), exposedRect.height());
+    cairo_clip(cr);
+    cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+    cairo_paint(cr);
+
+    cairo_restore(cr);
 #endif
 }