Bug 1188462 - Fix inclusion of skia headers to use correct directory prefixes. r=jrmuizel

gfx/2d/DrawTargetSkia.cpp

@@ -8,24 +8,23 @@
 #include "SourceSurfaceSkia.h"
 #include "ScaledFontBase.h"
 #include "ScaledFontCairo.h"
-#include "skia/SkGpuDevice.h"
-#include "skia/SkBitmapDevice.h"
+#include "skia/include/core/SkBitmapDevice.h"
 #include "FilterNodeSoftware.h"
 
 #ifdef USE_SKIA_GPU
-#include "skia/SkGpuDevice.h"
-#include "skia/GrGLInterface.h"
+#include "skia/include/gpu/SkGpuDevice.h"
+#include "skia/include/gpu/gl/GrGLInterface.h"
 #endif
 
-#include "skia/SkTypeface.h"
-#include "skia/SkGradientShader.h"
-#include "skia/SkBlurDrawLooper.h"
-#include "skia/SkBlurMaskFilter.h"
-#include "skia/SkColorFilter.h"
-#include "skia/SkDropShadowImageFilter.h"
-#include "skia/SkLayerRasterizer.h"
-#include "skia/SkLayerDrawLooper.h"
-#include "skia/SkDashPathEffect.h"
+#include "skia/include/core/SkTypeface.h"
+#include "skia/include/effects/SkGradientShader.h"
+#include "skia/include/effects/SkBlurDrawLooper.h"
+#include "skia/include/effects/SkBlurMaskFilter.h"
+#include "skia/include/core/SkColorFilter.h"
+#include "skia/include/effects/SkDropShadowImageFilter.h"
+#include "skia/include/effects/SkLayerRasterizer.h"
+#include "skia/include/effects/SkLayerDrawLooper.h"
+#include "skia/include/effects/SkDashPathEffect.h"
 #include "Logging.h"
 #include "Tools.h"
 #include "DataSurfaceHelpers.h"

gfx/2d/DrawTargetSkia.h

@@ -7,11 +7,11 @@
 #define _MOZILLA_GFX_SOURCESURFACESKIA_H
 
 #ifdef USE_SKIA_GPU
-#include "skia/GrContext.h"
-#include "skia/GrGLInterface.h"
+#include "skia/include/gpu/GrContext.h"
+#include "skia/include/gpu/gl/GrGLInterface.h"
 #endif
 
-#include "skia/SkCanvas.h"
+#include "skia/include/core/SkCanvas.h"
 
 #include "2D.h"
 #include "HelpersSkia.h"

gfx/2d/HelpersSkia.h

@@ -7,11 +7,11 @@
 #define MOZILLA_GFX_HELPERSSKIA_H_
 
 #include "2D.h"
-#include "skia/SkCanvas.h"
-#include "skia/SkDashPathEffect.h"
-#include "skia/SkShader.h"
+#include "skia/include/core/SkCanvas.h"
+#include "skia/include/effects/SkDashPathEffect.h"
+#include "skia/include/core/SkShader.h"
 #ifdef USE_SKIA_GPU
-#include "skia/GrTypes.h"
+#include "skia/include/gpu/GrTypes.h"
 #endif
 #include "mozilla/Assertions.h"
 #include <vector>

gfx/2d/PathSkia.h

@@ -7,7 +7,7 @@
 #define MOZILLA_GFX_PATH_SKIA_H_
 
 #include "2D.h"
-#include "skia/SkPath.h"
+#include "skia/include/core/SkPath.h"
 
 namespace mozilla {
 namespace gfx {

gfx/2d/Scale.cpp

@@ -6,7 +6,7 @@
 
 #ifdef USE_SKIA
 #include "HelpersSkia.h"
-#include "skia/SkBitmap.h"
+#include "skia/include/core/SkBitmap.h"
 #include "image_operations.h"
 #endif
 

gfx/2d/ScaledFontBase.cpp

@@ -7,7 +7,7 @@
 
 #ifdef USE_SKIA
 #include "PathSkia.h"
-#include "skia/SkPaint.h"
+#include "skia/include/core/SkPaint.h"
 #endif
 
 #ifdef USE_CAIRO

gfx/2d/ScaledFontBase.h

@@ -14,8 +14,8 @@
 #endif
 
 #ifdef USE_SKIA
-#include "skia/SkPath.h"
-#include "skia/SkTypeface.h"
+#include "skia/include/core/SkPath.h"
+#include "skia/include/core/SkTypeface.h"
 #endif
 #ifdef USE_CAIRO_SCALED_FONT
 #include "cairo.h"

gfx/2d/ScaledFontCairo.cpp

@@ -13,8 +13,8 @@
 #endif
 
 #if defined(USE_SKIA) && defined(MOZ_ENABLE_FREETYPE)
-#include "skia/SkTypeface.h"
-#include "skia/SkTypeface_cairo.h"
+#include "skia/include/core/SkTypeface.h"
+#include "skia/include/ports/SkTypeface_cairo.h"
 #endif
 
 #include <string>

gfx/2d/ScaledFontMac.cpp

@@ -6,9 +6,9 @@
 #include "ScaledFontMac.h"
 #ifdef USE_SKIA
 #include "PathSkia.h"
-#include "skia/SkPaint.h"
-#include "skia/SkPath.h"
-#include "skia/SkTypeface_mac.h"
+#include "skia/include/core/SkPaint.h"
+#include "skia/include/core/SkPath.h"
+#include "skia/include/ports/SkTypeface_mac.h"
 #endif
 #include "DrawTargetCG.h"
 #include <vector>

gfx/2d/ScaledFontWin.cpp

@@ -7,7 +7,7 @@
 #include "ScaledFontBase.h"
 
 #ifdef USE_SKIA
-#include "skia/SkTypeface_win.h"
+#include "skia/include/ports/SkTypeface_win.h"
 #endif
 
 namespace mozilla {

gfx/2d/SourceSurfaceSkia.cpp

@@ -6,12 +6,15 @@
 
 #include "Logging.h"
 #include "SourceSurfaceSkia.h"
-#include "skia/SkBitmap.h"
-#include "skia/SkDevice.h"
+#include "skia/include/core/SkBitmap.h"
+#include "skia/include/core/SkDevice.h"
 #include "HelpersSkia.h"
 #include "DrawTargetSkia.h"
 #include "DataSurfaceHelpers.h"
-#include "skia/SkGrPixelRef.h"
+
+#ifdef USE_SKIA_GPU
+#include "skia/include/gpu/SkGrPixelRef.h"
+#endif
 
 namespace mozilla {
 namespace gfx {

gfx/2d/SourceSurfaceSkia.h

@@ -8,8 +8,8 @@
 
 #include "2D.h"
 #include <vector>
-#include "skia/SkCanvas.h"
-#include "skia/SkBitmap.h"
+#include "skia/include/core/SkCanvas.h"
+#include "skia/include/core/SkBitmap.h"
 
 namespace mozilla {
 

gfx/2d/convolver.cpp

@@ -31,7 +31,7 @@
 
 #include <algorithm>
 
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 
 #if defined(USE_SSE2)

gfx/2d/convolver.h

@@ -35,7 +35,7 @@
 #include "base/basictypes.h"
 #include "base/cpu.h"
 #include "mozilla/Assertions.h"
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 // avoid confusion with Mac OS X's math library (Carbon)
 #if defined(__APPLE__)

gfx/2d/convolverLS3.cpp

@@ -28,7 +28,7 @@
 
 #include "convolver.h"
 #include <algorithm>
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 #if defined(_MIPS_ARCH_LOONGSON3A)
 

gfx/2d/convolverLS3.h

@@ -33,7 +33,7 @@
 
 #include <algorithm>
 
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 namespace skia {
 

gfx/2d/convolverSSE2.cpp

@@ -28,7 +28,7 @@
 
 #include "convolver.h"
 #include <algorithm>
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 #include <emmintrin.h>  // ARCH_CPU_X86_FAMILY was defined in build/config.h
 

gfx/2d/convolverSSE2.h

@@ -33,7 +33,7 @@
 
 #include <algorithm>
 
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 namespace skia {
 

gfx/2d/image_operations.cpp

@@ -37,10 +37,10 @@
 
 #include "base/stack_container.h"
 #include "convolver.h"
-#include "skia/SkColorPriv.h"
-#include "skia/SkBitmap.h"
-#include "skia/SkRect.h"
-#include "skia/SkFontHost.h"
+#include "skia/include/core/SkColorPriv.h"
+#include "skia/include/core/SkBitmap.h"
+#include "skia/include/core/SkRect.h"
+#include "skia/include/core/SkFontHost.h"
 
 namespace skia {
 

gfx/2d/image_operations.h

@@ -29,10 +29,10 @@
 #ifndef SKIA_EXT_IMAGE_OPERATIONS_H_
 #define SKIA_EXT_IMAGE_OPERATIONS_H_
 
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 #include "Types.h"
 #include "convolver.h"
-#include "skia/SkRect.h"
+#include "skia/include/core/SkRect.h"
 
 class SkBitmap;
 struct SkIRect;

gfx/gl/SkiaGLGlue.cpp

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "skia/GrContext.h"
-#include "skia/GrGLInterface.h"
+#include "skia/include/gpu/GrContext.h"
+#include "skia/include/gpu/gl/GrGLInterface.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/ThreadLocal.h"
 #include "mozilla/DebugOnly.h"

gfx/gl/SkiaGLGlue.h

@@ -8,8 +8,8 @@
 #ifdef USE_SKIA_GPU
 
 #include "GLContext.h"
-#include "skia/GrGLInterface.h"
-#include "skia/GrContext.h"
+#include "skia/include/gpu/gl/GrGLInterface.h"
+#include "skia/include/gpu/GrContext.h"
 #include "mozilla/gfx/HelpersSkia.h"
 
 namespace mozilla {

gfx/layers/basic/BasicCompositor.cpp

@@ -18,8 +18,8 @@
 #include "ImageContainer.h"
 #include "gfxPrefs.h"
 #ifdef MOZ_ENABLE_SKIA
-#include "skia/SkCanvas.h"              // for SkCanvas
-#include "skia/SkBitmapDevice.h"        // for SkBitmapDevice
+#include "skia/include/core/SkCanvas.h"              // for SkCanvas
+#include "skia/include/core/SkBitmapDevice.h"        // for SkBitmapDevice
 #else
 #define PIXMAN_DONT_DEFINE_STDINT
 #include "pixman.h"                     // for pixman_f_transform, etc

gfx/layers/basic/BasicLayerManager.cpp

@@ -46,8 +46,8 @@
 #include "nsRegion.h"                   // for nsIntRegion, etc
 #include "nsTArray.h"                   // for nsAutoTArray
 #ifdef MOZ_ENABLE_SKIA
-#include "skia/SkCanvas.h"              // for SkCanvas
-#include "skia/SkBitmapDevice.h"        // for SkBitmapDevice
+#include "skia/include/core/SkCanvas.h"         // for SkCanvas
+#include "skia/include/core/SkBitmapDevice.h"   // for SkBitmapDevice
 #else
 #define PIXMAN_DONT_DEFINE_STDINT
 #include "pixman.h"                     // for pixman_f_transform, etc

gfx/skia/skia/include/config/SkUserConfig.h

@@ -179,21 +179,21 @@
 //#define SK_ATOMICS_PLATFORM_H "SkAtomics_xxx.h"
 //#define SK_MUTEX_PLATFORM_H "SkMutex_xxx.h"
 #if defined(_MSC_VER)
-#  define SK_ATOMICS_PLATFORM_H "skia/SkAtomics_win.h"
+#  define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_win.h"
 #else
-#  define SK_ATOMICS_PLATFORM_H "skia/SkAtomics_sync.h"
+#  define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"
 #endif
 
 #if defined(_WIN32)
-#  define SK_MUTEX_PLATFORM_H   "skia/SkMutex_win.h"
+#  define SK_MUTEX_PLATFORM_H   "../../src/ports/SkMutex_win.h"
 #else
-#  define SK_MUTEX_PLATFORM_H   "skia/SkMutex_pthread.h"
+#  define SK_MUTEX_PLATFORM_H   "../../src/ports/SkMutex_pthread.h"
 #endif
 
 #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64)
-#  define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h"
+#  define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_arm.h"
 #else
-#  define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h"
+#  define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_x86.h"
 #endif
 
 // On all platforms we have this byte order

gfx/skia/skia/include/core/SkShader.h

@@ -14,7 +14,7 @@
 #include "SkMask.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
-#include "GrColor.h"
+#include "../gpu/GrColor.h"
 
 class SkPath;
 class SkPicture;

gfx/thebes/gfxPlatform.cpp

@@ -91,7 +91,7 @@
 
 #include "mozilla/Hal.h"
 #ifdef USE_SKIA
-#include "skia/SkGraphics.h"
+#include "skia/include/core/SkGraphics.h"
 # ifdef USE_SKIA_GPU
 #  include "SkiaGLGlue.h"
 # endif

image/Downscaler.cpp

@@ -11,7 +11,7 @@
 #include "gfxPrefs.h"
 #include "image_operations.h"
 #include "convolver.h"
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 using std::max;
 using std::swap;