diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 23:07:42 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 23:07:42 +0000 |
commit | 0d74f1e8fe44154ab7842812443b3138b2993c8c (patch) | |
tree | 11c2f071f68c19b3f25eed9150c1be11864eedc5 /skia/ext | |
parent | f799dd77cdfe8e5b29236547801f2e89ed0ed079 (diff) | |
download | chromium_src-0d74f1e8fe44154ab7842812443b3138b2993c8c.zip chromium_src-0d74f1e8fe44154ab7842812443b3138b2993c8c.tar.gz chromium_src-0d74f1e8fe44154ab7842812443b3138b2993c8c.tar.bz2 |
Move skia_utils into the skia namespace.
Review URL: http://codereview.chromium.org/14079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
-rw-r--r-- | skia/ext/platform_device_win.cc | 3 | ||||
-rw-r--r-- | skia/ext/skia_utils.cc | 4 | ||||
-rw-r--r-- | skia/ext/skia_utils.h | 4 | ||||
-rw-r--r-- | skia/ext/skia_utils_win.cc | 4 | ||||
-rw-r--r-- | skia/ext/skia_utils_win.h | 4 | ||||
-rw-r--r-- | skia/ext/vector_device.cc | 3 |
6 files changed, 14 insertions, 8 deletions
diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc index a712791..5a94efa 100644 --- a/skia/ext/platform_device_win.cc +++ b/skia/ext/platform_device_win.cc @@ -13,6 +13,9 @@ namespace gfx { +// TODO(brettw) remove this when this file is moved into the Skia namespace. +using namespace skia; + PlatformDeviceWin::PlatformDeviceWin(const SkBitmap& bitmap) : SkDevice(bitmap) { } diff --git a/skia/ext/skia_utils.cc b/skia/ext/skia_utils.cc index b2ea44f..80386e6 100644 --- a/skia/ext/skia_utils.cc +++ b/skia/ext/skia_utils.cc @@ -6,7 +6,7 @@ #include "SkGradientShader.h" -namespace gfx { +namespace skia { SkShader* CreateGradientShader(int start_point, int end_point, @@ -21,5 +21,5 @@ SkShader* CreateGradientShader(int start_point, grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode); } -} // namespace gfx +} // namespace skia diff --git a/skia/ext/skia_utils.h b/skia/ext/skia_utils.h index d2ed5db..86cb8f54 100644 --- a/skia/ext/skia_utils.h +++ b/skia/ext/skia_utils.h @@ -8,7 +8,7 @@ #include "SkColor.h" #include "SkShader.h" -namespace gfx { +namespace skia { // Creates a vertical gradient shader. The caller owns the shader. // Example usage to avoid leaks: @@ -21,7 +21,7 @@ SkShader* CreateGradientShader(int start_point, SkColor start_color, SkColor end_color); -} // namespace gfx +} // namespace skia #endif // SKIA_EXT_SKIA_UTILS_H_ diff --git a/skia/ext/skia_utils_win.cc b/skia/ext/skia_utils_win.cc index 05f0692..f6c8006 100644 --- a/skia/ext/skia_utils_win.cc +++ b/skia/ext/skia_utils_win.cc @@ -22,7 +22,7 @@ COMPILE_ASSERT(sizeof(RECT) == sizeof(SkIRect), o9); } // namespace -namespace gfx { +namespace skia { POINT SkPointToPOINT(const SkPoint& point) { POINT win_point = { SkScalarRound(point.fX), SkScalarRound(point.fY) }; @@ -57,5 +57,5 @@ COLORREF SkColorToCOLORREF(SkColor color) { #endif } -} // namespace gfx +} // namespace skia diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h index fa94507..677892e 100644 --- a/skia/ext/skia_utils_win.h +++ b/skia/ext/skia_utils_win.h @@ -15,7 +15,7 @@ typedef DWORD COLORREF; typedef struct tagPOINT POINT; typedef struct tagRECT RECT; -namespace gfx { +namespace skia { // Converts a Skia point to a Windows POINT. POINT SkPointToPOINT(const SkPoint& point); @@ -43,7 +43,7 @@ SkColor COLORREFToSkColor(COLORREF color); // Converts ARGB to COLORREFs (0BGR). COLORREF SkColorToCOLORREF(SkColor color); -} // namespace gfx +} // namespace skia #endif // SKIA_EXT_SKIA_UTILS_WIN_H_ diff --git a/skia/ext/vector_device.cc b/skia/ext/vector_device.cc index 32449ad..bf52462 100644 --- a/skia/ext/vector_device.cc +++ b/skia/ext/vector_device.cc @@ -13,6 +13,9 @@ namespace gfx { +// TODO(brettw) remove this when all the namespaces are moved to skia. +using namespace skia; + VectorDevice* VectorDevice::create(HDC dc, int width, int height) { InitializeDC(dc); |