diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:55:08 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 20:55:08 +0000 |
| commit | 57047da61489644b8b3604dffd915a1ebcf78f91 (patch) | |
| tree | e15a0fae2a4eee1fe1e96b4d9df6d623175cbeaf /ui/compositor | |
| parent | a2a5801c6c7eeb9b5d7a7068a6ff50a2dd51ebd8 (diff) | |
| download | chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.zip chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.tar.gz chromium_src-57047da61489644b8b3604dffd915a1ebcf78f91.tar.bz2 | |
Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed
Reverting because composite_unittests were failing on Linux (aura) and Linux ChromeOS Tests bots.
Bug=None
Test=Compiles on Mac and CrOS
R=oshima,sky
TBR=sadrul,sail
Review URL: https://chromiumcodereview.appspot.com/10701063
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10790128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor')
| -rw-r--r-- | ui/compositor/layer.cc | 14 | ||||
| -rw-r--r-- | ui/compositor/layer_unittest.cc | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index 6c30d52..a3ae747 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -488,19 +488,11 @@ void Layer::paintContents(WebKit::WebCanvas* web_canvas, WebKit::WebRect& opaque) { #endif TRACE_EVENT0("ui", "Layer::paintContents"); - scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling( - web_canvas, ui::GetScaleFactorFromScale(device_scale_factor_))); - - if (scale_content_) { - canvas->Save(); - canvas->sk_canvas()->scale(SkFloatToScalar(device_scale_factor_), - SkFloatToScalar(device_scale_factor_)); - } + gfx::Canvas canvas(web_canvas, + ui::GetScaleFactorFromScale(device_scale_factor_), scale_content_); if (delegate_) - delegate_->OnPaintLayer(canvas.get()); - if (scale_content_) - canvas->Restore(); + delegate_->OnPaintLayer(&canvas); } unsigned Layer::prepareTexture(WebKit::WebTextureUpdater& /* updater */) { diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index 6c76161..c72bdd4 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -238,8 +238,8 @@ class TestLayerDelegate : public LayerDelegate { // Overridden from LayerDelegate: virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE { - gfx::ImageSkiaRep contents = canvas->ExtractImageRep(); - paint_size_ = gfx::Size(contents.GetWidth(), contents.GetHeight()); + 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()); const SkMatrix& matrix = canvas->sk_canvas()->getTotalMatrix(); |