| 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 #ifndef CHROME_COMMON_GFX_CHROME_CANVAS_H_ |    5 #ifndef CHROME_COMMON_GFX_CHROME_CANVAS_H_ | 
|    6 #define CHROME_COMMON_GFX_CHROME_CANVAS_H_ |    6 #define CHROME_COMMON_GFX_CHROME_CANVAS_H_ | 
|    7  |    7  | 
|    8 #if defined(OS_WIN) |    8 #if defined(OS_WIN) | 
|    9 #include <windows.h> |    9 #include <windows.h> | 
|   10 #endif |   10 #endif | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
|   28 // end with Int. If you need to use methods provided by the superclass |   28 // end with Int. If you need to use methods provided by the superclass | 
|   29 // you'll need to do a conversion. In particular you'll need to use |   29 // you'll need to do a conversion. In particular you'll need to use | 
|   30 // macro SkIntToScalar(xxx), or if converting from a scalar to an integer |   30 // macro SkIntToScalar(xxx), or if converting from a scalar to an integer | 
|   31 // SkScalarRound. |   31 // SkScalarRound. | 
|   32 // |   32 // | 
|   33 // A handful of methods in this class are overloaded providing an additional |   33 // A handful of methods in this class are overloaded providing an additional | 
|   34 // argument of type SkPorterDuff::Mode. SkPorterDuff::Mode specifies how the |   34 // argument of type SkPorterDuff::Mode. SkPorterDuff::Mode specifies how the | 
|   35 // source and destination colors are combined. Unless otherwise specified, |   35 // source and destination colors are combined. Unless otherwise specified, | 
|   36 // the variant that does not take a SkPorterDuff::Mode uses a transfer mode |   36 // the variant that does not take a SkPorterDuff::Mode uses a transfer mode | 
|   37 // of kSrcOver_Mode. |   37 // of kSrcOver_Mode. | 
|   38 class ChromeCanvas : public gfx::PlatformCanvas { |   38 class ChromeCanvas : public skia::PlatformCanvas { | 
|   39  public: |   39  public: | 
|   40   // Specifies the alignment for text rendered with the DrawStringInt method. |   40   // Specifies the alignment for text rendered with the DrawStringInt method. | 
|   41   enum { |   41   enum { | 
|   42     TEXT_ALIGN_LEFT = 1, |   42     TEXT_ALIGN_LEFT = 1, | 
|   43     TEXT_ALIGN_CENTER = 2, |   43     TEXT_ALIGN_CENTER = 2, | 
|   44     TEXT_ALIGN_RIGHT = 4, |   44     TEXT_ALIGN_RIGHT = 4, | 
|   45     TEXT_VALIGN_TOP = 8, |   45     TEXT_VALIGN_TOP = 8, | 
|   46     TEXT_VALIGN_MIDDLE = 16, |   46     TEXT_VALIGN_MIDDLE = 16, | 
|   47     TEXT_VALIGN_BOTTOM = 32, |   47     TEXT_VALIGN_BOTTOM = 32, | 
|   48  |   48  | 
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  175   // text is too big, it is truncated and '...' is added to the end. |  175   // text is too big, it is truncated and '...' is added to the end. | 
|  176   void DrawStringInt(const std::wstring& text, HFONT font, |  176   void DrawStringInt(const std::wstring& text, HFONT font, | 
|  177                      const SkColor& color, int x, int y, int w, int h, |  177                      const SkColor& color, int x, int y, int w, int h, | 
|  178                      int flags); |  178                      int flags); | 
|  179 #endif |  179 #endif | 
|  180  |  180  | 
|  181   DISALLOW_EVIL_CONSTRUCTORS(ChromeCanvas); |  181   DISALLOW_EVIL_CONSTRUCTORS(ChromeCanvas); | 
|  182 }; |  182 }; | 
|  183  |  183  | 
|  184 #if defined(OS_WIN) |  184 #if defined(OS_WIN) | 
|  185 typedef gfx::CanvasPaintT<ChromeCanvas> ChromeCanvasPaint; |  185 typedef skia::CanvasPaintT<ChromeCanvas> ChromeCanvasPaint; | 
|  186 #endif |  186 #endif | 
|  187  |  187  | 
|  188 #endif  // CHROME_COMMON_GFX_CHROME_CANVAS_H_ |  188 #endif  // CHROME_COMMON_GFX_CHROME_CANVAS_H_ | 
|  189  |  189  | 
| OLD | NEW |