import changes from rmottola/Arctic-Fox:

- Bug 1188462 - Rename gfx/skia/trunk directory to gfx/skia/skia. (26e6a37fd)
- Bug 1188462 - Fix inclusion of skia headers to use correct directory prefixes. (cb8a82d14)
- Bug 1188462 - Add SKIA_INCLUDES list for adding Skia to header search path. (0f95f6f77)
- Bug 1157065 - GFX: 2D: Implement skia::Convolve in LS3 MMI. * skia::ConvolveVertically * skia:ConvolveHorizontally * skia:ConvolveHorizontally4 (445c1a64e)
This commit is contained in:
2019-02-17 13:38:45 +08:00
parent be72104a3f
commit aa57295df4
1555 changed files with 1588 additions and 956 deletions
+2 -2
View File
@@ -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