| OLD | NEW |
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "app/gfx/canvas.h" | 5 #include "gfx/canvas.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "app/gfx/font.h" | |
| 10 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 11 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "gfx/font.h" |
| 12 #include "gfx/rect.h" | 12 #include "gfx/rect.h" |
| 13 #include "third_party/skia/include/core/SkShader.h" | 13 #include "third_party/skia/include/core/SkShader.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 | 16 |
| 17 bool Canvas::GetClipRect(gfx::Rect* r) { | 17 bool Canvas::GetClipRect(gfx::Rect* r) { |
| 18 SkRect clip; | 18 SkRect clip; |
| 19 if (!getClipBounds(&clip)) { | 19 if (!getClipBounds(&clip)) { |
| 20 if (r) | 20 if (r) |
| 21 r->SetRect(0, 0, 0, 0); | 21 r->SetRect(0, 0, 0, 0); |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 } | 268 } |
| 269 | 269 |
| 270 // static | 270 // static |
| 271 int Canvas::DefaultCanvasTextAlignment() { | 271 int Canvas::DefaultCanvasTextAlignment() { |
| 272 if (!base::i18n::IsRTL()) | 272 if (!base::i18n::IsRTL()) |
| 273 return gfx::Canvas::TEXT_ALIGN_LEFT; | 273 return gfx::Canvas::TEXT_ALIGN_LEFT; |
| 274 return gfx::Canvas::TEXT_ALIGN_RIGHT; | 274 return gfx::Canvas::TEXT_ALIGN_RIGHT; |
| 275 } | 275 } |
| 276 | 276 |
| 277 } // namespace gfx | 277 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1132006:
Move app/gfx/canvas and app/gfx/font to gfx/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/