| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/native_theme/common_theme.h" | 5 #include "ui/native_theme/common_theme.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "third_party/skia/include/core/SkCanvas.h" | 8 #include "third_party/skia/include/core/SkCanvas.h" |
| 9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/gfx/canvas.h" | 10 #include "ui/gfx/canvas.h" |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 } | 200 } |
| 201 canvas->drawRect(gfx::RectToSkRect(rect), paint); | 201 canvas->drawRect(gfx::RectToSkRect(rect), paint); |
| 202 } | 202 } |
| 203 | 203 |
| 204 // static | 204 // static |
| 205 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) { | 205 scoped_ptr<gfx::Canvas> CommonThemeCreateCanvas(SkCanvas* sk_canvas) { |
| 206 // TODO(pkotwicz): Do something better and don't infer device | 206 // TODO(pkotwicz): Do something better and don't infer device |
| 207 // scale factor from canvas scale. | 207 // scale factor from canvas scale. |
| 208 SkMatrix m = sk_canvas->getTotalMatrix(); | 208 SkMatrix m = sk_canvas->getTotalMatrix(); |
| 209 float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX())); | 209 float device_scale = static_cast<float>(SkScalarAbs(m.getScaleX())); |
| 210 return scoped_ptr<gfx::Canvas>( | 210 return make_scoped_ptr( |
| 211 gfx::Canvas::CreateCanvasWithoutScaling(sk_canvas, device_scale)); | 211 gfx::Canvas::CreateCanvasWithoutScaling(sk_canvas, device_scale)); |
| 212 } | 212 } |
| 213 | 213 |
| 214 } // namespace ui | 214 } // namespace ui |
| OLD | NEW |