Bug 1188462 - Fix inclusion of skia headers to use correct directory prefixes. r=jrmuizel
authorLee Salzman <lsalzman@mozilla.com>
Wed, 29 Jul 2015 16:31:40 -0400
changeset 255526 370dc3fc7cc3a87bc2ae99849fbdce63030e864d
parent 255525 2d74c410fed85337d21a000d3887b3b85c223b57
child 255527 436b509ee2bc60b1bae87386b8464e9a1043e59e
push id63059
push userryanvm@gmail.com
push dateThu, 30 Jul 2015 20:31:32 +0000
treeherdermozilla-inbound@370dc3fc7cc3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1188462
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1188462 - Fix inclusion of skia headers to use correct directory prefixes. r=jrmuizel
gfx/2d/DrawTargetSkia.cpp
gfx/2d/DrawTargetSkia.h
gfx/2d/HelpersSkia.h
gfx/2d/PathSkia.h
gfx/2d/Scale.cpp
gfx/2d/ScaledFontBase.cpp
gfx/2d/ScaledFontBase.h
gfx/2d/ScaledFontCairo.cpp
gfx/2d/ScaledFontMac.cpp
gfx/2d/ScaledFontWin.cpp
gfx/2d/SourceSurfaceSkia.cpp
gfx/2d/SourceSurfaceSkia.h
gfx/2d/convolver.cpp
gfx/2d/convolver.h
gfx/2d/convolverLS3.cpp
gfx/2d/convolverLS3.h
gfx/2d/convolverSSE2.cpp
gfx/2d/convolverSSE2.h
gfx/2d/image_operations.cpp
gfx/2d/image_operations.h
gfx/gl/SkiaGLGlue.cpp
gfx/gl/SkiaGLGlue.h
gfx/layers/basic/BasicCompositor.cpp
gfx/layers/basic/BasicLayerManager.cpp
gfx/skia/skia/include/config/SkUserConfig.h
gfx/skia/skia/include/core/SkShader.h
gfx/thebes/gfxPlatform.cpp
image/Downscaler.cpp
--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
@@ -3,34 +3,33 @@
  * 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 "DrawTargetSkia.h"
 #include "SourceSurfaceCairo.h"
 #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"
 #include <algorithm>
 
 namespace mozilla {
 namespace gfx {
 
--- a/gfx/2d/DrawTargetSkia.h
+++ b/gfx/2d/DrawTargetSkia.h
@@ -2,21 +2,21 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #ifndef _MOZILLA_GFX_SOURCESURFACESKIA_H
 #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"
 #include "Rect.h"
 #include "PathSkia.h"
 #include <sstream>
 #include <vector>
 
--- a/gfx/2d/HelpersSkia.h
+++ b/gfx/2d/HelpersSkia.h
@@ -2,21 +2,21 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #ifndef MOZILLA_GFX_HELPERSSKIA_H_
 #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>
 
 namespace mozilla {
 namespace gfx {
 
 static inline SkColorType
--- a/gfx/2d/PathSkia.h
+++ b/gfx/2d/PathSkia.h
@@ -2,17 +2,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 #ifndef MOZILLA_GFX_PATH_SKIA_H_
 #define MOZILLA_GFX_PATH_SKIA_H_
 
 #include "2D.h"
-#include "skia/SkPath.h"
+#include "skia/include/core/SkPath.h"
 
 namespace mozilla {
 namespace gfx {
 
 class PathSkia;
 
 class PathBuilderSkia : public PathBuilder
 {
--- a/gfx/2d/Scale.cpp
+++ b/gfx/2d/Scale.cpp
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "Scale.h"
 
 #ifdef USE_SKIA
 #include "HelpersSkia.h"
-#include "skia/SkBitmap.h"
+#include "skia/include/core/SkBitmap.h"
 #include "image_operations.h"
 #endif
 
 namespace mozilla {
 namespace gfx {
 
 bool Scale(uint8_t* srcData, int32_t srcWidth, int32_t srcHeight, int32_t srcStride,
            uint8_t* dstData, int32_t dstWidth, int32_t dstHeight, int32_t dstStride,
--- a/gfx/2d/ScaledFontBase.cpp
+++ b/gfx/2d/ScaledFontBase.cpp
@@ -2,17 +2,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "ScaledFontBase.h"
 
 #ifdef USE_SKIA
 #include "PathSkia.h"
-#include "skia/SkPaint.h"
+#include "skia/include/core/SkPaint.h"
 #endif
 
 #ifdef USE_CAIRO
 #include "PathCairo.h"
 #include "DrawTargetCairo.h"
 #include "HelpersCairo.h"
 #endif
 
--- a/gfx/2d/ScaledFontBase.h
+++ b/gfx/2d/ScaledFontBase.h
@@ -9,18 +9,18 @@
 #include "2D.h"
 
 // Skia uses cairo_scaled_font_t as the internal font type in ScaledFont
 #if defined(USE_SKIA) || defined(USE_CAIRO)
 #define USE_CAIRO_SCALED_FONT
 #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"
 #endif
 
 namespace mozilla {
 namespace gfx {
 
--- a/gfx/2d/ScaledFontCairo.cpp
+++ b/gfx/2d/ScaledFontCairo.cpp
@@ -8,18 +8,18 @@
 
 #ifdef MOZ_ENABLE_FREETYPE
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include "cairo-ft.h"
 #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>
 
 typedef struct FT_FaceRec_* FT_Face;
 
 using namespace std;
 
--- a/gfx/2d/ScaledFontMac.cpp
+++ b/gfx/2d/ScaledFontMac.cpp
@@ -1,19 +1,19 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "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>
 #include <dlfcn.h>
 
 // prototype for private API
 extern "C" {
 CGPathRef CGFontGetGlyphPath(CGFontRef fontRef, CGAffineTransform *textTransform, int unknown, CGGlyph glyph);
--- a/gfx/2d/ScaledFontWin.cpp
+++ b/gfx/2d/ScaledFontWin.cpp
@@ -2,17 +2,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "ScaledFontWin.h"
 #include "ScaledFontBase.h"
 
 #ifdef USE_SKIA
-#include "skia/SkTypeface_win.h"
+#include "skia/include/ports/SkTypeface_win.h"
 #endif
 
 namespace mozilla {
 namespace gfx {
 
 ScaledFontWin::ScaledFontWin(LOGFONT* aFont, Float aSize)
   : ScaledFontBase(aSize)
   , mLogFont(*aFont)
--- a/gfx/2d/SourceSurfaceSkia.cpp
+++ b/gfx/2d/SourceSurfaceSkia.cpp
@@ -1,22 +1,25 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "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 {
 
 SourceSurfaceSkia::SourceSurfaceSkia()
   : mDrawTarget(nullptr), mLocked(false)
 {
 }
--- a/gfx/2d/SourceSurfaceSkia.h
+++ b/gfx/2d/SourceSurfaceSkia.h
@@ -3,18 +3,18 @@
  * 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/. */
 
 #ifndef MOZILLA_GFX_SOURCESURFACESKIA_H_
 #define MOZILLA_GFX_SOURCESURFACESKIA_H_
 
 #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 {
 
 namespace gfx {
 
 class DrawTargetSkia;
 
 class SourceSurfaceSkia : public DataSourceSurface
--- a/gfx/2d/convolver.cpp
+++ b/gfx/2d/convolver.cpp
@@ -26,17 +26,17 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 // SUCH DAMAGE.
 
 #include "2D.h"
 #include "convolver.h"
 
 #include <algorithm>
 
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 
 #if defined(USE_SSE2)
 #include "convolverSSE2.h"
 #endif
 
 #if defined(_MIPS_ARCH_LOONGSON3A)
 #include "convolverLS3.h"
--- a/gfx/2d/convolver.h
+++ b/gfx/2d/convolver.h
@@ -30,17 +30,17 @@
 #define SKIA_EXT_CONVOLVER_H_
 
 #include <cmath>
 #include <vector>
 
 #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__)
 #undef FloatToFixed
 #undef FixedToFloat
 #endif
 
 namespace skia {
--- a/gfx/2d/convolverLS3.cpp
+++ b/gfx/2d/convolverLS3.cpp
@@ -23,17 +23,17 @@
 // OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
 // AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 // SUCH DAMAGE.
 
 #include "convolver.h"
 #include <algorithm>
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 #if defined(_MIPS_ARCH_LOONGSON3A)
 
 #include "MMIHelpers.h"
 
 namespace skia {
 
 // Convolves horizontally along a single row. The row data is given in
--- a/gfx/2d/convolverLS3.h
+++ b/gfx/2d/convolverLS3.h
@@ -28,17 +28,17 @@
 
 #ifndef SKIA_EXT_CONVOLVER_LS3_H_
 #define SKIA_EXT_CONVOLVER_LS3_H_
 
 #include "convolver.h"
 
 #include <algorithm>
 
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 namespace skia {
 
 // Convolves horizontally along a single row. The row data is given in
 // |src_data| and continues for the [begin, end) of the filter.
 void ConvolveHorizontally_LS3(const unsigned char* src_data,
                                int begin, int end,
                                const ConvolutionFilter1D& filter,
--- a/gfx/2d/convolverSSE2.cpp
+++ b/gfx/2d/convolverSSE2.cpp
@@ -23,17 +23,17 @@
 // OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
 // AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 // SUCH DAMAGE.
 
 #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
 
 namespace skia {
 
 // Convolves horizontally along a single row. The row data is given in
 // |src_data| and continues for the [begin, end) of the filter.
 void ConvolveHorizontally_SSE2(const unsigned char* src_data,
--- a/gfx/2d/convolverSSE2.h
+++ b/gfx/2d/convolverSSE2.h
@@ -28,17 +28,17 @@
 
 #ifndef SKIA_EXT_CONVOLVER_SSE_H_
 #define SKIA_EXT_CONVOLVER_SSE_H_
 
 #include "convolver.h"
 
 #include <algorithm>
 
-#include "skia/SkTypes.h"
+#include "skia/include/core/SkTypes.h"
 
 namespace skia {
 
 // Convolves horizontally along a single row. The row data is given in
 // |src_data| and continues for the [begin, end) of the filter.
 void ConvolveHorizontally_SSE2(const unsigned char* src_data,
                                int begin, int end,
                                const ConvolutionFilter1D& filter,
--- a/gfx/2d/image_operations.cpp
+++ b/gfx/2d/image_operations.cpp
@@ -32,20 +32,20 @@
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
 #include "image_operations.h"
 
 #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 {
 
 namespace resize {
 
 // TODO(egouriou): Take advantage of periods in the convolution.
 // Practical resizing filters are periodic outside of the border area.
 // For Lanczos, a scaling by a (reduced) factor of p/q (q pixels in the
--- a/gfx/2d/image_operations.h
+++ b/gfx/2d/image_operations.h
@@ -24,20 +24,20 @@
 // AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 // SUCH DAMAGE.
 
 #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;
 
 namespace skia {
 
 class ImageOperations {
  public:
--- a/gfx/gl/SkiaGLGlue.cpp
+++ b/gfx/gl/SkiaGLGlue.cpp
@@ -1,15 +1,15 @@
 /* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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"
 
 /* SkPostConfig.h includes windows.h, which includes windef.h
  * which redefines min/max. We don't want that. */
 #ifdef _WIN32
 #undef min
--- a/gfx/gl/SkiaGLGlue.h
+++ b/gfx/gl/SkiaGLGlue.h
@@ -3,18 +3,18 @@
 * 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 "mozilla/RefPtr.h"
 
 #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 {
 namespace gl {
 
 class SkiaGLGlue : public GenericAtomicRefCounted
 {
 public:
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -13,18 +13,18 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Helpers.h"
 #include "gfxUtils.h"
 #include "YCbCrUtils.h"
 #include <algorithm>
 #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
 #endif
 
 namespace mozilla {
 using namespace mozilla::gfx;
 
--- a/gfx/layers/basic/BasicLayerManager.cpp
+++ b/gfx/layers/basic/BasicLayerManager.cpp
@@ -41,18 +41,18 @@
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsDebug.h"                    // for NS_ASSERTION, etc
 #include "nsISupportsImpl.h"            // for gfxContext::Release, etc
 #include "nsPoint.h"                    // for nsIntPoint
 #include "nsRect.h"                     // for mozilla::gfx::IntRect
 #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
 #endif
 class nsIWidget;
 
 namespace mozilla {
 namespace layers {
--- a/gfx/skia/skia/include/config/SkUserConfig.h
+++ b/gfx/skia/skia/include/config/SkUserConfig.h
@@ -174,31 +174,31 @@
  * The header files pointed to by these defines provide declarations and
  * possibly inline implementations of threading primitives.
  *
  * See SkThread.h for documentation on what these includes must contain.
  */
 //#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
 #define SK_A32_SHIFT 24
 #define SK_R32_SHIFT 16
 #define SK_G32_SHIFT 8
 #define SK_B32_SHIFT 0
 
--- a/gfx/skia/skia/include/core/SkShader.h
+++ b/gfx/skia/skia/include/core/SkShader.h
@@ -9,17 +9,17 @@
 #ifndef SkShader_DEFINED
 #define SkShader_DEFINED
 
 #include "SkBitmap.h"
 #include "SkFlattenable.h"
 #include "SkMask.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
-#include "GrColor.h"
+#include "../gpu/GrColor.h"
 
 class SkPath;
 class SkPicture;
 class SkXfermode;
 class GrContext;
 class GrEffect;
 
 /** \class SkShader
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -86,17 +86,17 @@
 #endif
 
 #ifdef MOZ_WIDGET_GONK
 #include "mozilla/layers/GrallocTextureHost.h"
 #endif
 
 #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
 #endif
 
 #if !defined(USE_SKIA) || !defined(USE_SKIA_GPU)
 class mozilla::gl::SkiaGLGlue : public GenericAtomicRefCounted {
 };
--- a/image/Downscaler.cpp
+++ b/image/Downscaler.cpp
@@ -6,17 +6,17 @@
 
 #include "Downscaler.h"
 
 #include <algorithm>
 #include <ctime>
 #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;
 
 namespace mozilla {
 namespace image {
 
 Downscaler::Downscaler(const nsIntSize& aTargetSize)