diff options
Diffstat (limited to 'skia/ext')
25 files changed, 52 insertions, 56 deletions
diff --git a/skia/ext/SkMemory_new_handler.cpp b/skia/ext/SkMemory_new_handler.cpp index 0ccc1e0..e64de61 100644 --- a/skia/ext/SkMemory_new_handler.cpp +++ b/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 diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc index f752d3d..668f4f0 100644 --- a/skia/ext/bitmap_platform_device_mac.cc +++ b/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 { diff --git a/skia/ext/bitmap_platform_device_win.cc b/skia/ext/bitmap_platform_device_win.cc index 72eff55..fb39148 100644 --- a/skia/ext/bitmap_platform_device_win.cc +++ b/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 { diff --git a/skia/ext/convolver.cc b/skia/ext/convolver.cc index f826b53..9fe9d3c 100644 --- a/skia/ext/convolver.cc +++ b/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 { diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc index b6be37f..fa5194b 100644 --- a/skia/ext/image_operations.cc +++ b/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 { diff --git a/skia/ext/image_operations.h b/skia/ext/image_operations.h index b5e049d..3086fab 100644 --- a/skia/ext/image_operations.h +++ b/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; diff --git a/skia/ext/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc index 4011c0e..06bd4fc 100644 --- a/skia/ext/image_operations_unittest.cc +++ b/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 { diff --git a/skia/ext/platform_canvas_linux.cc b/skia/ext/platform_canvas_linux.cc index a4e080f..6ea8581 100644 --- a/skia/ext/platform_canvas_linux.cc +++ b/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 { diff --git a/skia/ext/platform_canvas_mac.cc b/skia/ext/platform_canvas_mac.cc index 9ada02d..ba1549d 100644 --- a/skia/ext/platform_canvas_mac.cc +++ b/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 { diff --git a/skia/ext/platform_canvas_mac.h b/skia/ext/platform_canvas_mac.h index 935bdc6..d969246 100644 --- a/skia/ext/platform_canvas_mac.h +++ b/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 { diff --git a/skia/ext/platform_canvas_win.h b/skia/ext/platform_canvas_win.h index 7a8c31e..d031ebf 100644 --- a/skia/ext/platform_canvas_win.h +++ b/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 { diff --git a/skia/ext/platform_device_linux.h b/skia/ext/platform_device_linux.h index eae8965..e438d85a 100644 --- a/skia/ext/platform_device_linux.h +++ b/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; diff --git a/skia/ext/platform_device_mac.cc b/skia/ext/platform_device_mac.cc index 0b09b9e..b935b25 100644 --- a/skia/ext/platform_device_mac.cc +++ b/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 { diff --git a/skia/ext/platform_device_mac.h b/skia/ext/platform_device_mac.h index b2136af..2005e89 100644 --- a/skia/ext/platform_device_mac.h +++ b/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; diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc index 34f9c3d..d58b14a 100644 --- a/skia/ext/platform_device_win.cc +++ b/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 { diff --git a/skia/ext/skia_utils.cc b/skia/ext/skia_utils.cc index c665c58b..5a1226e 100644 --- a/skia/ext/skia_utils.cc +++ b/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 { diff --git a/skia/ext/skia_utils.h b/skia/ext/skia_utils.h index 0f61b18..f9707ab 100644 --- a/skia/ext/skia_utils.h +++ b/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 { diff --git a/skia/ext/skia_utils_mac.cc b/skia/ext/skia_utils_mac.cc index a7610aa..fbad62d 100644 --- a/skia/ext/skia_utils_mac.cc +++ b/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 { diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index c43f6eb..b678abb 100644 --- a/skia/ext/skia_utils_mac.h +++ b/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; diff --git a/skia/ext/skia_utils_unittest.cc b/skia/ext/skia_utils_unittest.cc index 37815e5..21a6c8d 100644 --- a/skia/ext/skia_utils_unittest.cc +++ b/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); diff --git a/skia/ext/skia_utils_win.cc b/skia/ext/skia_utils_win.cc index 59bef6d..4988a3a 100644 --- a/skia/ext/skia_utils_win.cc +++ b/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 { diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h index bf58fba..c799e02 100644 --- a/skia/ext/skia_utils_win.h +++ b/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; diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc index 710d356..0d63b00 100644 --- a/skia/ext/vector_canvas_unittest.cc +++ b/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 { diff --git a/skia/ext/vector_device.cc b/skia/ext/vector_device.cc index 295101f..94da9b0 100644 --- a/skia/ext/vector_device.cc +++ b/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 { diff --git a/skia/ext/vector_device.h b/skia/ext/vector_device.h index ccd4333..cc534f7 100644 --- a/skia/ext/vector_device.h +++ b/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 { |