diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 23:45:48 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 23:45:48 +0000 |
| commit | 24fc19f3cff67e621cf9962eb135cfed4de7e65c (patch) | |
| tree | 5d46768f041d0662131f26e14b402ae607d07944 /gfx | |
| parent | 7ab63350c7555c55e174a267cea3c9b706c12583 (diff) | |
| download | chromium_src-24fc19f3cff67e621cf9962eb135cfed4de7e65c.zip chromium_src-24fc19f3cff67e621cf9962eb135cfed4de7e65c.tar.gz chromium_src-24fc19f3cff67e621cf9962eb135cfed4de7e65c.tar.bz2 | |
Revert 50788 - fix linux bustage
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/2860023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/canvas.h | 4 | ||||
| -rw-r--r-- | gfx/canvas_skia.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/gfx/canvas.h b/gfx/canvas.h index 6bcc959..d66db03 100644 --- a/gfx/canvas.h +++ b/gfx/canvas.h @@ -169,10 +169,6 @@ 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 acdcd6e..cae4ac1 100644 --- a/gfx/canvas_skia.h +++ b/gfx/canvas_skia.h @@ -76,6 +76,9 @@ 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); @@ -115,7 +118,6 @@ 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; |