summaryrefslogtreecommitdiffstats
path: root/gfx
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 23:44:29 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-24 23:44:29 +0000
commit7ab63350c7555c55e174a267cea3c9b706c12583 (patch)
tree3b3d93c246f96e727639e534aa1821b3e3cf3edd /gfx
parent170ffd89b3dd5ee27727b1c6747098281ca06317 (diff)
downloadchromium_src-7ab63350c7555c55e174a267cea3c9b706c12583.zip
chromium_src-7ab63350c7555c55e174a267cea3c9b706c12583.tar.gz
chromium_src-7ab63350c7555c55e174a267cea3c9b706c12583.tar.bz2
fix linux bustage
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
-rw-r--r--gfx/canvas.h4
-rw-r--r--gfx/canvas_skia.h4
2 files changed, 5 insertions, 3 deletions
diff --git a/gfx/canvas.h b/gfx/canvas.h
index d66db03..6bcc959 100644
--- a/gfx/canvas.h
+++ b/gfx/canvas.h
@@ -169,6 +169,10 @@ class Canvas {
virtual void TileImageInt(const SkBitmap& bitmap, int src_x, int src_y,
int dest_x, int dest_y, int w, int h) = 0;
+ // Extracts a bitmap from the contents of this canvas.
+ // TODO(beng): remove
+ virtual SkBitmap ExtractBitmap() const = 0;
+
// TODO(beng): remove this once we don't need to use any skia-specific methods
// through this interface.
// A quick and dirty way to obtain the underlying SkCanvas.
diff --git a/gfx/canvas_skia.h b/gfx/canvas_skia.h
index cae4ac1..acdcd6e 100644
--- a/gfx/canvas_skia.h
+++ b/gfx/canvas_skia.h
@@ -76,9 +76,6 @@ class CanvasSkia : public skia::PlatformCanvas,
int x, int y, int w, int h, int flags);
#endif
- // Extracts a bitmap from the contents of this canvas.
- SkBitmap ExtractBitmap() const;
-
// Overridden from Canvas2:
virtual bool GetClipRect(gfx::Rect* clip_rect);
virtual bool ClipRectInt(int x, int y, int w, int h);
@@ -118,6 +115,7 @@ class CanvasSkia : public skia::PlatformCanvas,
virtual void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);
virtual void TileImageInt(const SkBitmap& bitmap, int src_x, int src_y,
int dest_x, int dest_y, int w, int h);
+ virtual SkBitmap ExtractBitmap() const;
virtual CanvasSkia* AsCanvasSkia();
virtual const CanvasSkia* AsCanvasSkia() const;