Changeset 69793 in webkit

Timestamp:

Oct 14, 2010 12:29:25 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-14 Xan Lopez <​xlopez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Small cleanup in PluginViewGtk
​https://bugs.webkit.org/show_bug.cgi?id=47588

Remove some dead code and use PlatformRefPtr for cairo surfaces.

No new tests, only refactoring.

• plugins/gtk/PluginViewGtk.cpp: (WebCore::PluginView::paint):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/gtk/PluginViewGtk.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-14  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Small cleanup in PluginViewGtk
+        https://bugs.webkit.org/show_bug.cgi?id=47588
+
+        Remove some dead code and use PlatformRefPtr for cairo surfaces.
+
+        No new tests, only refactoring.
+
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::paint):
+
 2010-10-14  Dawit Alemayehu  <adawit@kde.org>
 

trunk/WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -194 +194 @@
     exposedRect.move(-frameRect().x(), -frameRect().y());
 
-    Window dummyW;
-    int dummyI;
-    unsigned int dummyUI, actualDepth = 0;
-    XGetGeometry(GDK_DISPLAY(), m_drawable, &dummyW, &dummyI, &dummyI,
-                 &dummyUI, &dummyUI, &dummyUI, &actualDepth);
-
-    const unsigned int drawableDepth = ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth;
-    ASSERT(drawableDepth == actualDepth);
-
-    cairo_surface_t* drawableSurface = cairo_xlib_surface_create(GDK_DISPLAY(),
-                                                                 m_drawable,
-                                                                 m_visual,
-                                                                 m_windowRect.width(),
-                                                                 m_windowRect.height());
+    PlatformRefPtr<cairo_surface_t> drawableSurface = adoptPlatformRef(cairo_xlib_surface_create(GDK_DISPLAY(),
+                                                                                                 m_drawable,
+                                                                                                 m_visual,
+                                                                                                 m_windowRect.width(),
+                                                                                                 m_windowRect.height()));
 
     if (m_isTransparent) {
@@ -214 +205 @@
         // we'd end up with junk in there from the last paint, or, worse,
         // uninitialized data.
-        PlatformRefPtr<cairo_t> cr = adoptPlatformRef(cairo_create(drawableSurface));
-
-        if (!(cairo_surface_get_content(drawableSurface) & CAIRO_CONTENT_ALPHA)) {
+        PlatformRefPtr<cairo_t> cr = adoptPlatformRef(cairo_create(drawableSurface.get()));
+
+        if (!(cairo_surface_get_content(drawableSurface.get()) & CAIRO_CONTENT_ALPHA)) {
             // Attempt to fake it when we don't have an alpha channel on our
             // pixmap.  If that's not possible, at least clear the window to
@@ -252 +243 @@
     cairo_save(cr);
 
-    cairo_set_source_surface(cr, drawableSurface, frameRect().x(), frameRect().y());
+    cairo_set_source_surface(cr, drawableSurface.get(), frameRect().x(), frameRect().y());
 
     cairo_rectangle(cr,
@@ -266 +257 @@
 
     cairo_restore(cr);
-    cairo_surface_destroy(drawableSurface);
 #endif // defined(XP_UNIX)
 }