Move convolver, image_operations, and skia_utils from base/gfx to skia/ext....

skia/ext/skia_utils.h

Index: skia/ext/skia_utils.h
===================================================================
--- skia/ext/skia_utils.h	(revision 6142)
+++ skia/ext/skia_utils.h	(working copy)
@@ -2,55 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_SKIA_UTILS_H__
-#define BASE_GFX_SKIA_UTILS_H__
+// This file contains cross-platform Skia helper routines.
 
-#include "SkColor.h"
+#ifndef SKIA_EXT_SKIA_UTILS_H_
+#define SKIA_EXT_SKIA_UTILS_H_
+
 #include "SkShader.h"
 
-struct SkIRect;
-struct SkPoint;
-struct SkRect;
-typedef unsigned long DWORD;
-typedef DWORD COLORREF;
-typedef struct tagPOINT POINT;
-typedef struct tagRECT RECT;
+namespace skia {
 
-namespace gfx {
-
-// Converts a Skia point to a Windows POINT.
-POINT SkPointToPOINT(const SkPoint& point);
-
-// Converts a Windows RECT to a Skia rect.
-SkRect RECTToSkRect(const RECT& rect);
-
-// Converts a Windows RECT to a Skia rect.
-// Both use same in-memory format. Verified by COMPILE_ASSERT() in
-// skia_utils.cc.
-inline const SkIRect& RECTToSkIRect(const RECT& rect) {
-  return reinterpret_cast<const SkIRect&>(rect);
-}
-
-// Converts a Skia rect to a Windows RECT.
-// Both use same in-memory format. Verified by COMPILE_ASSERT() in
-// skia_utils.cc.
-inline const RECT& SkIRectToRECT(const SkIRect& rect) {
-  return reinterpret_cast<const RECT&>(rect);
-}
-
 // Creates a vertical gradient shader. The caller owns the shader.
 SkShader* CreateGradientShader(int start_point,
                                int end_point,
                                SkColor start_color,
                                SkColor end_color);
 
-// Converts COLORREFs (0BGR) to the ARGB layout Skia expects.
-SkColor COLORREFToSkColor(COLORREF color);
+}  // namespace skia
 
-// Converts ARGB to COLORREFs (0BGR).
-COLORREF SkColorToCOLORREF(SkColor color);
+#endif  // SKIA_EXT_SKIA_UTILS_H_
 
-}  // namespace gfx
-
-#endif
-
Property changes on: skia\ext\skia_utils.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/skia_utils.h:r69-2775