Remove last dependencies on ui/base from ui/gfx

ui/gfx/blit.h

Index: ui/gfx/blit.h
diff --git a/ui/gfx/blit.h b/ui/gfx/blit.h
index f0668172c052c753c15094fee8c242c8c00e0746..af56636bce7e2562cd8052cc7cc2a7ab8ca2c1ff 100644
--- a/ui/gfx/blit.h
+++ b/ui/gfx/blit.h
@@ -17,35 +17,35 @@ class Rect;
 class Vector2d;
 
 // Blits a rectangle from the source context into the destination context.
-UI_EXPORT void BlitContextToContext(NativeDrawingContext dst_context,
+GFX_EXPORT void BlitContextToContext(NativeDrawingContext dst_context,
+                                     const Rect& dst_rect,
+                                     NativeDrawingContext src_context,
+                                     const Point& src_origin);
+
+// Blits a rectangle from the source context into the destination canvas.
+GFX_EXPORT void BlitContextToCanvas(SkCanvas *dst_canvas,
                                     const Rect& dst_rect,
                                     NativeDrawingContext src_context,
                                     const Point& src_origin);
 
-// Blits a rectangle from the source context into the destination canvas.
-UI_EXPORT void BlitContextToCanvas(SkCanvas *dst_canvas,
-                                   const Rect& dst_rect,
-                                   NativeDrawingContext src_context,
-                                   const Point& src_origin);
-
 // Blits a rectangle from the source canvas into the destination context.
-UI_EXPORT void BlitCanvasToContext(NativeDrawingContext dst_context,
+GFX_EXPORT void BlitCanvasToContext(NativeDrawingContext dst_context,
+                                    const Rect& dst_rect,
+                                    SkCanvas *src_canvas,
+                                    const Point& src_origin);
+
+// Blits a rectangle from the source canvas into the destination canvas.
+GFX_EXPORT void BlitCanvasToCanvas(SkCanvas *dst_canvas,
                                    const Rect& dst_rect,
                                    SkCanvas *src_canvas,
                                    const Point& src_origin);
 
-// Blits a rectangle from the source canvas into the destination canvas.
-UI_EXPORT void BlitCanvasToCanvas(SkCanvas *dst_canvas,
-                                  const Rect& dst_rect,
-                                  SkCanvas *src_canvas,
-                                  const Point& src_origin);
-
 // Scrolls the given subset of the given canvas by the given offset.
 // The canvas should not have a clip or a transform applied, since platforms
 // may implement those operations differently.
-UI_EXPORT void ScrollCanvas(SkCanvas* canvas,
-                            const Rect& clip,
-                            const Vector2d& offset);
+GFX_EXPORT void ScrollCanvas(SkCanvas* canvas,
+                             const Rect& clip,
+                             const Vector2d& offset);
 
 }  // namespace gfx