Remove last dependencies on ui/base from ui/gfx

ui/gfx/skia_util.h

Index: ui/gfx/skia_util.h
diff --git a/ui/gfx/skia_util.h b/ui/gfx/skia_util.h
index 592ff5f2f66017cecd3850ff2b8653b8ce317146..463c4e938595c68be9168a4487a6d9cdfc9cfa5d 100644
--- a/ui/gfx/skia_util.h
+++ b/ui/gfx/skia_util.h
@@ -26,13 +26,13 @@ class ShadowValue;
 class Transform;
 
 // Convert between Skia and gfx rect types.
-UI_EXPORT SkRect RectToSkRect(const Rect& rect);
-UI_EXPORT SkIRect RectToSkIRect(const Rect& rect);
-UI_EXPORT Rect SkIRectToRect(const SkIRect& rect);
-UI_EXPORT SkRect RectFToSkRect(const RectF& rect);
-UI_EXPORT RectF SkRectToRectF(const SkRect& rect);
+GFX_EXPORT SkRect RectToSkRect(const Rect& rect);
+GFX_EXPORT SkIRect RectToSkIRect(const Rect& rect);
+GFX_EXPORT Rect SkIRectToRect(const SkIRect& rect);
+GFX_EXPORT SkRect RectFToSkRect(const RectF& rect);
+GFX_EXPORT RectF SkRectToRectF(const SkRect& rect);
 
-UI_EXPORT void TransformToFlattenedSkMatrix(const gfx::Transform& transform,
+GFX_EXPORT void TransformToFlattenedSkMatrix(const gfx::Transform& transform,
                                             SkMatrix* flattened);

[sky, 2013/09/24 19:11:40]

nit: moar indenting

 
 // Creates a bitmap shader for the image rep with the image rep's scale factor.
@@ -42,14 +42,14 @@ UI_EXPORT void TransformToFlattenedSkMatrix(const gfx::Transform& transform,
 // TODO(pkotwicz): Allow shader's local matrix to be changed after the shader
 // is created.
 //
-UI_EXPORT skia::RefPtr<SkShader> CreateImageRepShader(
+GFX_EXPORT skia::RefPtr<SkShader> CreateImageRepShader(
     const gfx::ImageSkiaRep& image_rep,
     SkShader::TileMode tile_mode,
     const SkMatrix& local_matrix);
 
 // Creates a vertical gradient shader. The caller owns the shader.
 // Example usage to avoid leaks:
-UI_EXPORT skia::RefPtr<SkShader> CreateGradientShader(int start_point,
+GFX_EXPORT skia::RefPtr<SkShader> CreateGradientShader(int start_point,
                                                       int end_point,
                                                       SkColor start_color,
                                                       SkColor end_color);
@@ -57,15 +57,15 @@ UI_EXPORT skia::RefPtr<SkShader> CreateGradientShader(int start_point,
 // Creates a draw looper to generate |shadows|. The caller owns the draw looper.
 // NULL is returned if |shadows| is empty since no draw looper is needed in
 // this case.
-UI_EXPORT skia::RefPtr<SkDrawLooper> CreateShadowDrawLooper(
+GFX_EXPORT skia::RefPtr<SkDrawLooper> CreateShadowDrawLooper(
     const std::vector<ShadowValue>& shadows);
 
 // Returns true if the two bitmaps contain the same pixels.
-UI_EXPORT bool BitmapsAreEqual(const SkBitmap& bitmap1,
+GFX_EXPORT bool BitmapsAreEqual(const SkBitmap& bitmap1,
                                const SkBitmap& bitmap2);
 
 // Converts Skia ARGB format pixels in |skia| to RGBA.
-UI_EXPORT void ConvertSkiaToRGBA(const unsigned char* skia,
+GFX_EXPORT void ConvertSkiaToRGBA(const unsigned char* skia,
                                  int pixel_width,
                                  unsigned char* rgba);