Changes x11_util::GetRenderVisualFormat to determine the format id...

chrome/common/x11_util.cc

 // Copyright (c) 2009 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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "chrome/common/x11_util.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
+#include <list>
 #include <set>
 
 #include "base/logging.h"
 #include "base/gfx/size.h"
 #include "base/thread.h"
 #include "chrome/common/x11_util_internal.h"
 
 namespace x11_util {
 
+namespace {
+
+// Used to cache the XRenderPictFormat for a visual/display pair.
+struct CachedPictFormat {
+  bool equals(Display* display, Visual* visual) const {
+    return display == this->display && visual == this->visual;
+  }
+
+  Display* display;
+  Visual* visual;
+  XRenderPictFormat* format;
+};
+
+typedef std::list<CachedPictFormat> CachedPictFormats;
+
+// Returns the cache of pict formats.
+CachedPictFormats* get_cached_pict_formats() {

[evanm, 2010/11/09 19:30:17]

Why not GetCachedPictFormats?

+  static CachedPictFormats* formats = NULL;
+  if (!formats)
+    formats = new CachedPictFormats();
+  return formats;
+}
+
+// Maximum number of CachedPictFormats we keep around.
+const size_t kMaxCacheSize = 5;
+
+}  // namespace
+
 bool XDisplayExists() {
   return (gdk_display_get_default() != NULL);
 }
 
 Display* GetXDisplay() {
   static Display* display = NULL;
 
   if (!display)
     display = gdk_x11_get_default_xdisplay();
 
@@ skipping 286 matching lines @@
       windows->insert(windows->begin(), stack[i]);
   }
 
   if (data)
     XFree(data);
 
   return result;
 }
 
 XRenderPictFormat* GetRenderVisualFormat(Display* dpy, Visual* visual) {
-  static XRenderPictFormat* pictformat = NULL;
-  if (pictformat)
-    return pictformat;
-
   DCHECK(QueryRenderSupport(dpy));
 
-  pictformat = XRenderFindVisualFormat(dpy, visual);
+  CachedPictFormats* formats = get_cached_pict_formats();
+
+  for (CachedPictFormats::const_iterator i = formats->begin();
+       i != formats->end(); ++i) {
+    if (i->equals(dpy, visual))
+      return i->format;
+  }
+
+  // Not cached, look up the value.
+  XRenderPictFormat* pictformat = XRenderFindVisualFormat(dpy, visual);
   CHECK(pictformat) << "XRENDER does not support default visual";
 
+  // And store it in the cache.
+  CachedPictFormat cached_value;
+  cached_value.visual = visual;
+  cached_value.display = dpy;
+  cached_value.format = pictformat;
+  formats->push_front(cached_value);
+
+  if (formats->size() == kMaxCacheSize)
+    formats->pop_back();
+
   return pictformat;
 }
 
 XRenderPictFormat* GetRenderARGB32Format(Display* dpy) {
   static XRenderPictFormat* pictformat = NULL;
   if (pictformat)
     return pictformat;
 
   // First look for a 32-bit format which ignores the alpha value
   XRenderPictFormat templ;
@@ skipping 108 matching lines @@
     return false;
 
   if (children)
     XFree(children);
 
   *parent_is_root = root_window == *parent_window;
   return true;
 }
 
 }  // namespace x11_util