summaryrefslogtreecommitdiffstats
path: root/ui/gfx/compositor
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-11 15:06:32 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-11 15:06:32 +0000
commit3e97b6fa38039487f98d84deb8e63e21617a975d (patch)
tree384a6b9b3723aa6d7b735bd2e4971ca9411135b2 /ui/gfx/compositor
parentb7a2c78f2f398d676cab96035c836c9af723d1dd (diff)
downloadchromium_src-3e97b6fa38039487f98d84deb8e63e21617a975d.zip
chromium_src-3e97b6fa38039487f98d84deb8e63e21617a975d.tar.gz
chromium_src-3e97b6fa38039487f98d84deb8e63e21617a975d.tar.bz2
ui/gfx: Get rid of CanvasSkia::AsCanvasSkia() function.
BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9662034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/compositor')
-rw-r--r--ui/gfx/compositor/layer_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc
index f7de8b7..3e9783e 100644
--- a/ui/gfx/compositor/layer_unittest.cc
+++ b/ui/gfx/compositor/layer_unittest.cc
@@ -217,12 +217,12 @@ class TestLayerDelegate : public LayerDelegate {
colors_.push_back(color);
}
- gfx::Size paint_size() const { return paint_size_; }
+ const gfx::Size& paint_size() const { return paint_size_; }
int color_index() const { return color_index_; }
// Overridden from LayerDelegate:
virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
- SkBitmap contents = canvas->AsCanvasSkia()->ExtractBitmap();
+ SkBitmap contents = canvas->ExtractBitmap();
paint_size_ = gfx::Size(contents.width(), contents.height());
canvas->FillRect(gfx::Rect(paint_size_), colors_[color_index_]);
color_index_ = (color_index_ + 1) % static_cast<int>(colors_.size());