From 777f996eab1610f9676ee62ee478cc97687c56cd Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 17 Jul 2009 20:39:38 +0000 Subject: 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 --- skia/ext/platform_device_linux.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'skia/ext/platform_device_linux.h') diff --git a/skia/ext/platform_device_linux.h b/skia/ext/platform_device_linux.h index c23a4d8..2a08cc8 100644 --- a/skia/ext/platform_device_linux.h +++ b/skia/ext/platform_device_linux.h @@ -7,19 +7,19 @@ #include "third_party/skia/include/core/SkDevice.h" -typedef struct _cairo_surface cairo_surface_t; +typedef struct _cairo cairo_t; namespace skia { // Blindly copying the mac hierarchy. class PlatformDevice : public SkDevice { public: - typedef cairo_surface_t* PlatformSurface; + typedef cairo_t* PlatformSurface; // Returns if the preferred rendering engine is vectorial or bitmap based. virtual bool IsVectorial() = 0; - virtual cairo_surface_t* beginPlatformPaint() = 0; + virtual PlatformSurface beginPlatformPaint() = 0; protected: // Forwards |bitmap| to SkDevice's constructor. -- cgit v1.1