Move chrome/browser/gtk/ to chrome/browser/ui/gtk/...

chrome/browser/gtk/cairo_cached_surface.h

Index: chrome/browser/gtk/cairo_cached_surface.h
===================================================================
--- chrome/browser/gtk/cairo_cached_surface.h	(revision 71352)
+++ chrome/browser/gtk/cairo_cached_surface.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,55 +6,7 @@
 #define CHROME_BROWSER_GTK_CAIRO_CACHED_SURFACE_H_
 #pragma once
 
-typedef struct _GdkPixbuf GdkPixbuf;
-typedef struct _cairo cairo_t;
-typedef struct _cairo_surface cairo_surface_t;
+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
+// TODO(msw): remove this file once all includes have been updated.
 
-// A helper class that takes a GdkPixbuf* and renders it to the screen. Unlike
-// gdk_cairo_set_source_pixbuf(), CairoCachedSurface assumes that the pixbuf is
-// immutable after UsePixbuf() is called and can be sent to the X server
-// once. From then on, that cached version is used so we don't upload the same
-// image each and every time we expose.
-//
-// Most cached surfaces are owned by the GtkThemeProvider, which associates
-// them with a certain XDisplay. Some users of surfaces (CustomDrawButtonBase,
-// for example) own their surfaces instead since they interact with the
-// ResourceBundle instead of the GtkThemeProvider.
-class CairoCachedSurface {
- public:
-  CairoCachedSurface();
-  ~CairoCachedSurface();
-
-  // Whether this CairoCachedSurface owns a GdkPixbuf.
-  bool valid() const {
-    return pixbuf_;
-  }
-
-  // The dimensions of the underlying pixbuf/surface. (or -1 if invalid.)
-  int Width() const;
-  int Height() const;
-
-  // Sets the pixbuf that we pass to cairo. Calling UsePixbuf() only derefs the
-  // current pixbuf and surface (if they exist). Actually transfering data to
-  // the X server occurs at SetSource() time. Calling UsePixbuf() should only
-  // be done once as it clears cached data from the X server.
-  void UsePixbuf(GdkPixbuf* pixbuf);
-
-  // Sets our pixbuf as the active surface starting at (x, y), uploading it in
-  // case we don't have an X backed surface cached.
-  void SetSource(cairo_t* cr, int x, int y);
-
-  // Raw access to the pixbuf. May be NULL. Used for a few gdk operations
-  // regarding window shaping.
-  GdkPixbuf* pixbuf() { return pixbuf_; }
-
- private:
-  // The source pixbuf.
-  GdkPixbuf* pixbuf_;
-
-  // Our cached surface. This should be a xlib surface so the data lives on the
-  // server instead of on the client.
-  cairo_surface_t* surface_;
-};
-
 #endif  // CHROME_BROWSER_GTK_CAIRO_CACHED_SURFACE_H_