Fix Skia includes to use the whole path name.

Review URL: http://codereview.chromium.org/115412

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16374 0039d316-1c4b-4281-b951-d872f2087c98

app/gfx/path.h

@@ -13,7 +13,7 @@
 typedef struct _GdkRegion GdkRegion;
 #endif
 
-#include "SkPath.h"
+#include "third_party/skia/include/core/SkPath.h"
 
 namespace gfx {
 

app/resource_bundle.cc

@@ -10,7 +10,7 @@
 #include "base/string_piece.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 

chrome/browser/extensions/extension.h

@@ -18,7 +18,7 @@
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/page_action.h"
 #include "googleurl/src/gurl.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 // Represents a Chromium extension.
 class Extension {

chrome/browser/history/expire_history_backend_unittest.cc

@@ -19,7 +19,7 @@
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;
 using base::TimeDelta;

chrome/browser/history/thumbnail_database_unittest.cc

@@ -13,7 +13,7 @@
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;
 using base::TimeDelta;

chrome/browser/icon_manager.cc

@@ -7,8 +7,8 @@
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 
 IconManager::IconManager() {
 }

chrome/browser/views/theme_helpers.cc

@@ -11,7 +11,7 @@
 #include "app/gfx/canvas.h"
 #include "base/logging.h"
 #include "skia/ext/bitmap_platform_device_win.h"
-#include "SkGradientShader.h"
+#include "third_party/skia/include/effects/SkGradientShader.h"
 
 void GetRebarGradientColors(int width, int x1, int x2,
                             SkColor* c1, SkColor* c2) {

chrome/browser/views/theme_helpers.h

@@ -7,7 +7,7 @@
 
 #include <windows.h>
 
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 // Get the colors at two points on a Rebar background gradient. This is for
 // drawing Rebar like backgrounds in Views. The reason not to just use

chrome/common/ipc_message_unittest.cc

@@ -9,8 +9,7 @@
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
-
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 // Tests that serialize/deserialize correctly understand each other
 TEST(IPCMessageTest, Serialize) {

chrome/common/ipc_message_utils.cc

@@ -7,7 +7,7 @@
 #include "base/gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #ifndef EXCLUDE_SKIA_DEPENDENCIES
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #endif
 #include "webkit/glue/dom_operations.h"
 

chrome/common/security_filter_peer.cc

@@ -13,11 +13,10 @@
 #include "grit/renderer_resources.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkDevice.h"
 #include "webkit/glue/webkit_glue.h"
-#include "SkDevice.h"
-
 
 SecurityFilterPeer::SecurityFilterPeer(
     webkit_glue::ResourceLoaderBridge* resource_loader_bridge,

chrome/renderer/renderer_glue.cc

@@ -25,6 +25,7 @@
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "googleurl/src/url_util.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebKitClient.h"
 #include "webkit/api/public/WebString.h"
@@ -32,7 +33,6 @@
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 
-#include "SkBitmap.h"
 
 #if defined(OS_WIN)
 #include <strsafe.h>  // note: per msdn docs, this must *follow* other includes

chrome/tools/profiles/generate_profile.cc

@@ -18,7 +18,7 @@
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/common/thumbnail_score.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;
 

skia/ext/SkMemory_new_handler.cpp

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "SkTypes.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <new>
 
+#include "third_party/skia/include/core/SkTypes.h"
+
 // This implementation of sk_malloc_flags() and friends is identical
 // to SkMemory_malloc.c, except that it disables the CRT's new_handler
 // during malloc(), when SK_MALLOC_THROW is not set (ie., when

skia/ext/bitmap_platform_device_mac.cc

@@ -6,13 +6,12 @@
 
 #include <time.h>
 
-#include "SkMatrix.h"
-#include "SkRegion.h"
-#include "SkTypes.h"
-#include "SkUtils.h"
-
 #include "base/ref_counted.h"
 #include "skia/ext/skia_utils_mac.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "third_party/skia/include/core/SkTypes.h"
+#include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 

skia/ext/bitmap_platform_device_win.cc

@@ -4,10 +4,10 @@
 
 #include "skia/ext/bitmap_platform_device_win.h"
 
-#include "SkMatrix.h"
-#include "SkRefCnt.h"
-#include "SkRegion.h"
-#include "SkUtils.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 

skia/ext/convolver.cc

@@ -5,7 +5,7 @@
 #include <algorithm>
 
 #include "skia/ext/convolver.h"
-#include "SkTypes.h"
+#include "third_party/skia/include/core/SkTypes.h"
 
 namespace skia {
 

skia/ext/image_operations.cc

@@ -13,8 +13,8 @@
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/stack_container.h"
-#include "SkBitmap.h"
-#include "SkColorPriv.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColorPriv.h"
 #include "skia/ext/convolver.h"
 
 namespace skia {

skia/ext/image_operations.h

@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "skia/ext/skia_utils.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 class SkBitmap;
 

skia/ext/image_operations_unittest.cc

@@ -6,8 +6,8 @@
 
 #include "skia/ext/image_operations.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "SkColorPriv.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkColorPriv.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 

skia/ext/platform_canvas_linux.cc

@@ -4,11 +4,11 @@
 
 #include "skia/ext/platform_canvas_linux.h"
 
+#include <cairo/cairo.h>
+
 #include "skia/ext/platform_device_linux.h"
 #include "skia/ext/bitmap_platform_device_linux.h"
-#include "SkTypes.h"
-
-#include <cairo/cairo.h>
+#include "third_party/skia/include/core/SkTypes.h"
 
 namespace skia {
 

skia/ext/platform_canvas_mac.cc

@@ -5,7 +5,7 @@
 #include "skia/ext/platform_canvas_mac.h"
 
 #include "skia/ext/bitmap_platform_device_mac.h"
-#include "SkTypes.h"
+#include "third_party/skia/include/core/SkTypes.h"
 
 namespace skia {
 

skia/ext/platform_canvas_mac.h

@@ -7,7 +7,7 @@
 
 #include "skia/ext/platform_device_mac.h"
 
-#include "SkCanvas.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace skia {
 

skia/ext/platform_canvas_win.h

@@ -9,7 +9,7 @@
 
 #include "skia/ext/platform_device_win.h"
 
-#include "SkCanvas.h"
+#include "third_party/skia/include/core/SkCanvas.h"
 
 namespace skia {
 

skia/ext/platform_device_linux.h

@@ -5,7 +5,7 @@
 #ifndef SKIA_EXT_PLATFORM_DEVICE_LINUX_H_
 #define SKIA_EXT_PLATFORM_DEVICE_LINUX_H_
 
-#include "SkDevice.h"
+#include "third_party/skia/include/core/SkDevice.h"
 
 typedef struct _cairo_surface cairo_surface_t;
 

skia/ext/platform_device_mac.cc

@@ -5,10 +5,10 @@
 #include "skia/ext/bitmap_platform_device_mac.h"
 
 #include "skia/ext/skia_utils_mac.h"
-#include "SkMatrix.h"
-#include "SkPath.h"
-#include "SkTypes.h"
-#include "SkUtils.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/core/SkTypes.h"
+#include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 

skia/ext/platform_device_mac.h

@@ -6,7 +6,7 @@
 #define SKIA_EXT_PLATFORM_DEVICE_MAC_H_
 
 #import <ApplicationServices/ApplicationServices.h>
-#include "SkDevice.h"
+#include "third_party/skia/include/core/SkDevice.h"
 
 class SkMatrix;
 class SkPath;

skia/ext/platform_device_win.cc

@@ -5,10 +5,10 @@
 #include "skia/ext/platform_device_win.h"
 
 #include "skia/ext/skia_utils_win.h"
-#include "SkMatrix.h"
-#include "SkPath.h"
-#include "SkRegion.h"
-#include "SkUtils.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkPath.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 

skia/ext/skia_utils.cc

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "skia/ext/skia_utils.h"
-#include "SkColorPriv.h"
-#include "SkGradientShader.h"
+#include "third_party/skia/include/core/SkColorPriv.h"
+#include "third_party/skia/include/effects/SkGradientShader.h"
 
 namespace skia {
 

skia/ext/skia_utils.h

@@ -5,8 +5,8 @@
 #ifndef SKIA_EXT_SKIA_UTILS_H_
 #define SKIA_EXT_SKIA_UTILS_H_
 
-#include "SkColor.h"
-#include "SkShader.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkShader.h"
 
 namespace skia {
 

skia/ext/skia_utils_mac.cc

@@ -5,8 +5,8 @@
 #include "skia/ext/skia_utils_mac.h"
 
 #include "base/logging.h"
-#include "SkMatrix.h"
-#include "SkRect.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkRect.h"
 
 namespace gfx {
 

skia/ext/skia_utils_mac.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef SKIA_EXT_SKIA_UTILS_MAC_H_
 #define SKIA_EXT_SKIA_UTILS_MAC_H_
 
-#include "SkColor.h"
 #include <CoreGraphics/CGColor.h>
 
+#include "third_party/skia/include/core/SkColor.h"
+
 struct SkMatrix;
 struct SkIRect;
 struct SkPoint;

skia/ext/skia_utils_unittest.cc

@@ -6,8 +6,8 @@
 
 #include "skia/ext/skia_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "SkColorPriv.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColorPriv.h"
 
 TEST(SkiaUtils, SkColorToHSLRed) {
   SkColor red = SkColorSetARGB(255, 255, 0, 0);

skia/ext/skia_utils_win.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <windows.h>
-
 #include "skia/ext/skia_utils_win.h"
 
-#include "SkRect.h"
-#include "SkGradientShader.h"
+#include <windows.h>
+
+#include "third_party/skia/include/core/SkRect.h"
+#include "third_party/skia/include/effects/SkGradientShader.h"
 
 namespace {
 

skia/ext/skia_utils_win.h

@@ -5,7 +5,7 @@
 #ifndef SKIA_EXT_SKIA_UTILS_WIN_H_
 #define SKIA_EXT_SKIA_UTILS_WIN_H_
 
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 struct SkIRect;
 struct SkPoint;

skia/ext/vector_canvas_unittest.cc

@@ -10,8 +10,6 @@
 #include <unistd.h>
 #endif
 
-#include "skia/ext/vector_canvas.h"
-
 #include "PNGImageDecoder.h"
 
 #include "base/command_line.h"
@@ -20,10 +18,9 @@
 #include "base/gfx/png_encoder.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
-
+#include "skia/ext/vector_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
-
-#include "SkDashPathEffect.h"
+#include "third_party/skia/include/effects/SkDashPathEffect.h"
 
 namespace skia {
 

skia/ext/vector_device.cc

@@ -6,8 +6,7 @@
 
 #include "base/gfx/gdi_util.h"
 #include "skia/ext/skia_utils_win.h"
-
-#include "SkUtils.h"
+#include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 

skia/ext/vector_device.h

@@ -6,8 +6,8 @@
 #define SKIA_EXT_VECTOR_DEVICE_H_
 
 #include "skia/ext/platform_device_win.h"
-#include "SkMatrix.h"
-#include "SkRegion.h"
+#include "third_party/skia/include/core/SkMatrix.h"
+#include "third_party/skia/include/core/SkRegion.h"
 
 namespace skia {
 

skia/precompiled.cc

@@ -3,5 +3,5 @@
 // found in the LICENSE file.
 
 // Used to generate the precompiled header.
-#include "SkTypes.h"
+#include "third_party/skia/include/core/SkTypes.h"
 

webkit/glue/image_decoder.cc

@@ -6,6 +6,7 @@
 #include "webkit/glue/image_decoder.h"
 
 #include "base/compiler_specific.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #if defined(OS_WIN) || defined(OS_LINUX)
@@ -19,8 +20,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "SharedBuffer.h"
 MSVC_POP_WARNING();
 
-#include "SkBitmap.h"
-
 namespace webkit_glue {
 
 ImageDecoder::ImageDecoder() : desired_icon_size_(0, 0) {

webkit/tools/test_shell/simple_clipboard_impl.cc

@@ -10,9 +10,8 @@
 #include "base/lazy_instance.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/glue/scoped_clipboard_writer_glue.h"
-
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "webkit/glue/scoped_clipboard_writer_glue.h"
 
 // Clipboard glue
 

webkit/tools/test_shell/test_shell.cc

@@ -31,6 +31,7 @@
 #include "net/url_request/url_request_filter.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
@@ -43,8 +44,6 @@
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
-#include "third_party/skia/include/core/SkBitmap.h"
-
 namespace {
 
 // Default timeout in ms for file page loads when in layout test mode.