Remove base versions of the graphics headers, which previously just forwarded...

webkit/port/platform/graphics/FontWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #include "config.h"
 #include <windows.h>
 
 #include "ChromiumBridge.h"
 #include "Font.h"
 #include "FontFallbackList.h"
 #include "GlyphBuffer.h"
 #include "PlatformContextSkia.h"
 #include "SimpleFontData.h"
+#include "SkiaUtils.h"
 #include "UniscribeHelperTextRun.h"
 
-#include "base/gfx/platform_canvas_win.h"
-#include "base/gfx/skia_utils.h"
-#include "graphics/SkiaUtils.h"
-
+#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this dependency.
+#include "skia/ext/platform_canvas_win.h"
 
 namespace WebCore {
 
 void Font::drawGlyphs(GraphicsContext* graphicsContext,
                       const SimpleFontData* font,
                       const GlyphBuffer& glyphBuffer,
                       int from,
                       int numGlyphs,
                       const FloatPoint& point) const
 {
@@ skipping 146 matching lines @@
     int char_index = state.XToCharacter(x);
 
     // XToCharacter will return -1 if the position is before the first
     // character (we get called like this sometimes).
     if (char_index < 0)
       char_index = 0;
     return char_index;
 }
 
 } // namespace WebCore