summaryrefslogtreecommitdiffstats
path: root/base/gfx
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-17 20:39:38 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-17 20:39:38 +0000
commit777f996eab1610f9676ee62ee478cc97687c56cd (patch)
tree0b5df00b507bf0d0de8ba292541d7b0987f7f3ab /base/gfx
parent6e9f27f9b6839b7a07e44a6299bfa48579fe5ba2 (diff)
downloadchromium_src-777f996eab1610f9676ee62ee478cc97687c56cd.zip
chromium_src-777f996eab1610f9676ee62ee478cc97687c56cd.tar.gz
chromium_src-777f996eab1610f9676ee62ee478cc97687c56cd.tar.bz2
Reverting 20516 by re-landing this previous patch.
Keep the cairo clipping region in sync with the Skia one. The PlatformCanvas now tracks this, so we don't need to have the similar code in gfx::Canvas. I moved most references of cairo_surface_t to cairo_t since the cairo_t has a transform and clip but the surface does not. Review URL: http://codereview.chromium.org/149409 Review URL: http://codereview.chromium.org/155700 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx')
-rw-r--r--base/gfx/native_widget_types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/gfx/native_widget_types.h b/base/gfx/native_widget_types.h
index d165cd4a..08bf76f 100644
--- a/base/gfx/native_widget_types.h
+++ b/base/gfx/native_widget_types.h
@@ -50,7 +50,7 @@ class NSTextField;
typedef struct _GdkCursor GdkCursor;
typedef struct _GtkWidget GtkWidget;
typedef struct _GtkWindow GtkWindow;
-typedef struct _cairo_surface cairo_surface_t;
+typedef struct _cairo cairo_t;
#endif
namespace gfx {
@@ -73,7 +73,7 @@ typedef void* NativeMenu;
typedef GtkWidget* NativeView;
typedef GtkWindow* NativeWindow;
typedef GtkWidget* NativeEditView;
-typedef cairo_surface_t* NativeDrawingContext;
+typedef cairo_t* NativeDrawingContext;
typedef GdkCursor* NativeCursor;
typedef GtkWidget* NativeMenu;
#endif