linux: fix some plugin colormap leaks

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 62 matching lines @@
 
   if (!windowless_)
     WindowedDestroyWindow();
 
   if (window_.ws_info) {
     // We only ever use ws_info as an NPSetWindowCallbackStruct.
     delete static_cast<NPSetWindowCallbackStruct*>(window_.ws_info);
   }
 
   if (pixmap_) {
-    g_object_unref(gdk_drawable_get_colormap(pixmap_));
     g_object_unref(pixmap_);
     pixmap_ = NULL;
   }
 }
 
 void WebPluginDelegateImpl::PlatformInitialize(WebPlugin* plugin) {
   gfx::PluginWindowHandle handle =
       windowless_ ? 0 : gtk_plug_get_id(GTK_PLUG(plug_));
   plugin->SetWindow(handle);
 }
@@ skipping 149 matching lines @@
 }
 
 void WebPluginDelegateImpl::EnsurePixmapAtLeastSize(int width, int height) {
   if (pixmap_) {
     gint cur_width, cur_height;
     gdk_drawable_get_size(pixmap_, &cur_width, &cur_height);
     if (cur_width >= width && cur_height >= height)
       return;  // We are already the appropriate size.
 
     // Otherwise, we need to recreate ourselves.
-    g_object_unref(gdk_drawable_get_colormap(pixmap_));
     g_object_unref(pixmap_);
     pixmap_ = NULL;
   }
 
   // |sys_visual| is owned by gdk; we shouldn't free it.
   GdkVisual* sys_visual = gdk_visual_get_system();
   pixmap_ = gdk_pixmap_new(NULL,  // use width/height/depth params
                            std::max(1, width), std::max(1, height),
                            sys_visual->depth);
   GdkColormap* colormap = gdk_colormap_new(gdk_visual_get_system(),
                                            FALSE);
   gdk_drawable_set_colormap(GDK_DRAWABLE(pixmap_), colormap);
+  // The GdkDrawable now owns the GdkColormap.
+  g_object_unref(colormap);
 }
 
 #ifdef DEBUG_RECTANGLES
 namespace {
 
 // Draw a rectangle on a Cairo context.
 // Useful for debugging various rectangles involved in drawing plugins.
 void DrawDebugRectangle(cairo_t* cairo,
                         const gfx::Rect& rect,
                         float r, float g, float b) {
@@ skipping 196 matching lines @@
   window_.width = window_rect_.width();
   window_.x = window_rect_.x();
   window_.y = window_rect_.y();
   window_.type = NPWindowTypeDrawable;
 
   if (!window_.ws_info)
     window_.ws_info = new NPSetWindowCallbackStruct;
   NPSetWindowCallbackStruct* extra =
       static_cast<NPSetWindowCallbackStruct*>(window_.ws_info);
   extra->display = GDK_DISPLAY();
-  GdkVisual* visual = gdk_visual_get_system();
-  extra->visual = GDK_VISUAL_XVISUAL(visual);
-  extra->depth = visual->depth;
-  GdkColormap* colormap = gdk_colormap_new(gdk_visual_get_system(), FALSE);
-  extra->colormap = GDK_COLORMAP_XCOLORMAP(colormap);
+  extra->visual = DefaultVisual(GDK_DISPLAY(), 0);
+  extra->depth = DefaultDepth(GDK_DISPLAY(), 0);
+  extra->colormap = DefaultColormap(GDK_DISPLAY(), 0);
 
   if (!force_set_window)
     windowless_needs_set_window_ = false;
 
   NPError err = instance()->NPP_SetWindow(&window_);
   DCHECK(err == NPERR_NO_ERROR);
   if (quirks_ & PLUGIN_QUIRK_WINDOWLESS_INVALIDATE_AFTER_SET_WINDOW) {
     // After a NPP_SetWindow, Flash cancels its timer that generates the
     // invalidates until it gets a paint event, but doesn't explicitly call
     // NPP_InvalidateRect.
@@ skipping 204 matching lines @@
   if (event->event == WM_MOUSEMOVE) {
     // Snag a reference to the current cursor ASAP in case the plugin modified
     // it. There is a nasty race condition here with the multiprocess browser
     // as someone might be setting the cursor in the main process as well.
     *cursor = current_windowless_cursor_;
   }
 #endif
 
   return ret;
 }