Skip to content

Commit

Permalink
Bug 1591996 - update Skia to m79. r=jrmuizel
Browse files Browse the repository at this point in the history 
Differential Revision: https://phabricator.services.mozilla.com/D50860

--HG--
rename : gfx/skia/skia/include/private/SkArenaAlloc.h => gfx/skia/skia/src/core/SkArenaAlloc.h
rename : gfx/skia/skia/include/private/SkLeanWindows.h => gfx/skia/skia/src/core/SkLeanWindows.h
rename : gfx/skia/skia/include/core/SkTLazy.h => gfx/skia/skia/src/core/SkTLazy.h
rename : gfx/skia/skia/include/private/SkTSearch.h => gfx/skia/skia/src/core/SkTSearch.h
rename : gfx/skia/skia/include/gpu/GrBlend.h => gfx/skia/skia/src/gpu/GrBlend.h
rename : gfx/skia/skia/include/private/GrColor.h => gfx/skia/skia/src/gpu/GrColor.h
rename : gfx/skia/skia/include/private/GrSkSLFPFactoryCache.h => gfx/skia/skia/src/gpu/GrSkSLFPFactoryCache.h
rename : gfx/skia/skia/src/gpu/GrPathUtils.cpp => gfx/skia/skia/src/gpu/geometry/GrPathUtils.cpp
rename : gfx/skia/skia/src/gpu/GrPathUtils.h => gfx/skia/skia/src/gpu/geometry/GrPathUtils.h
rename : gfx/skia/skia/src/gpu/GrShape.cpp => gfx/skia/skia/src/gpu/geometry/GrShape.cpp
rename : gfx/skia/skia/src/gpu/GrShape.h => gfx/skia/skia/src/gpu/geometry/GrShape.h
extra : moz-landing-system : lando
  • Loading branch information
@lsalzman
lsalzman committed Oct 28, 2019
1 parent de81af2 commit 655f204
Show file tree
Hide file tree
Showing 2,111 changed files with 93,576 additions and 71,146 deletions.
13 changes: 11 additions & 2 deletions gfx/skia/skia/include/android/SkAndroidFrameworkUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#ifndef SkAndroidFrameworkUtils_DEFINED
#define SkAndroidFrameworkUtils_DEFINED

#include "SkTypes.h"
#include "SkRefCnt.h"
#include "include/core/SkRefCnt.h"
#include "include/core/SkTypes.h"

#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK

Expand Down Expand Up @@ -40,6 +40,15 @@ class SkAndroidFrameworkUtils {
static sk_sp<SkSurface> getSurfaceFromCanvas(SkCanvas* canvas);

static int SaveBehind(SkCanvas* canvas, const SkRect* subset);

/**
* Unrolls a chain of nested SkPaintFilterCanvas to return the base wrapped canvas.
*
* @param canvas A SkPaintFilterCanvas or any other SkCanvas subclass.
*
* @return SkCanvas that was found in the innermost SkPaintFilterCanvas.
*/
static SkCanvas* getBaseWrappedCanvas(SkCanvas* canvas);
};

#endif // SK_BUILD_FOR_ANDROID_ANDROID
Expand Down
10 changes: 5 additions & 5 deletions gfx/skia/skia/include/android/SkAnimatedImage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
#ifndef SkAnimatedImage_DEFINED
#define SkAnimatedImage_DEFINED

#include "SkBitmap.h"
#include "SkCodecAnimation.h"
#include "SkDrawable.h"
#include "SkMatrix.h"
#include "SkRect.h"
#include "include/codec/SkCodecAnimation.h"
#include "include/core/SkBitmap.h"
#include "include/core/SkDrawable.h"
#include "include/core/SkMatrix.h"
#include "include/core/SkRect.h"

class SkAndroidCodec;
class SkPicture;
Expand Down
4 changes: 2 additions & 2 deletions gfx/skia/skia/include/android/SkBRDAllocator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#ifndef SkBRDAllocator_DEFINED
#define SkBRDAllocator_DEFINED

#include "SkBitmap.h"
#include "SkCodec.h"
#include "include/codec/SkCodec.h"
#include "include/core/SkBitmap.h"

/**
* Abstract subclass of SkBitmap's allocator.
Expand Down
8 changes: 4 additions & 4 deletions gfx/skia/skia/include/android/SkBitmapRegionDecoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#ifndef SkBitmapRegionDecoder_DEFINED
#define SkBitmapRegionDecoder_DEFINED

#include "SkBitmap.h"
#include "SkBRDAllocator.h"
#include "SkEncodedImageFormat.h"
#include "SkStream.h"
#include "include/android/SkBRDAllocator.h"
#include "include/core/SkBitmap.h"
#include "include/core/SkEncodedImageFormat.h"
#include "include/core/SkStream.h"

/*
* This class aims to provide an interface to test multiple implementations of
Expand Down
2 changes: 1 addition & 1 deletion gfx/skia/skia/include/atlastext/SkAtlasTextContext.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef SkAtlasTextContext_DEFINED
#define SkAtlasTextContext_DEFINED

#include "SkRefCnt.h"
#include "include/core/SkRefCnt.h"

class SkAtlasTextRenderer;
class SkInternalAtlasTextContext;
Expand Down
6 changes: 3 additions & 3 deletions gfx/skia/skia/include/atlastext/SkAtlasTextFont.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#ifndef SkAtlasTextFont_DEFINED
#define SkAtlasTextFont_DEFINED

#include "SkFont.h"
#include "SkRefCnt.h"
#include "SkTypeface.h"
#include "include/core/SkFont.h"
#include "include/core/SkRefCnt.h"
#include "include/core/SkTypeface.h"

/** Represents a font at a size. TODO: What else do we need here (skewX, scaleX, vertical, ...)? */
class SK_API SkAtlasTextFont : public SkRefCnt {
Expand Down
4 changes: 2 additions & 2 deletions gfx/skia/skia/include/atlastext/SkAtlasTextRenderer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* found in the LICENSE file.
*/

#include "SkPoint3.h"
#include "SkRefCnt.h"
#include "include/core/SkPoint3.h"
#include "include/core/SkRefCnt.h"

#ifndef SkAtlasTextRenderer_DEFINED
#define SkAtlasTextRenderer_DEFINED
Expand Down
6 changes: 3 additions & 3 deletions gfx/skia/skia/include/atlastext/SkAtlasTextTarget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#ifndef SkAtlasTextTarget_DEFINED
#define SkAtlasTextTarget_DEFINED

#include "SkDeque.h"
#include "SkRefCnt.h"
#include "SkScalar.h"
#include "include/core/SkDeque.h"
#include "include/core/SkRefCnt.h"
#include "include/core/SkScalar.h"

#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion gfx/skia/skia/include/c/sk_canvas.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef sk_canvas_DEFINED
#define sk_canvas_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

Expand Down
12 changes: 6 additions & 6 deletions gfx/skia/skia/include/c/sk_colorspace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
// DO NOT USE -- FOR INTERNAL TESTING ONLY

#ifndef sk_imageinfo_DEFINED
#define sk_imageinfo_DEFINED
#ifndef sk_colorspace_DEFINED
#define sk_colorspace_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

sk_colorspace_t* sk_colorspace_new_srgb();
SK_API sk_colorspace_t* sk_colorspace_new_srgb();

void sk_colorspace_ref(sk_colorspace_t*);
void sk_colorspace_unref(sk_colorspace_t*);
SK_API void sk_colorspace_ref(sk_colorspace_t*);
SK_API void sk_colorspace_unref(sk_colorspace_t*);

SK_C_PLUS_PLUS_END_GUARD

Expand Down
2 changes: 1 addition & 1 deletion gfx/skia/skia/include/c/sk_data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef sk_data_DEFINED
#define sk_data_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

Expand Down
2 changes: 1 addition & 1 deletion gfx/skia/skia/include/c/sk_image.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef sk_image_DEFINED
#define sk_image_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

Expand Down
16 changes: 8 additions & 8 deletions gfx/skia/skia/include/c/sk_imageinfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef sk_imageinfo_DEFINED
#define sk_imageinfo_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

Expand All @@ -35,27 +35,27 @@ typedef enum {
* Allocate a new imageinfo object. If colorspace is not null, it's owner-count will be
* incremented automatically.
*/
sk_imageinfo_t* sk_imageinfo_new(int width, int height, sk_colortype_t ct, sk_alphatype_t at,
SK_API sk_imageinfo_t* sk_imageinfo_new(int width, int height, sk_colortype_t ct, sk_alphatype_t at,
sk_colorspace_t* cs);

/**
* Free the imageinfo object. If it contains a reference to a colorspace, its owner-count will
* be decremented automatically.
*/
void sk_imageinfo_delete(sk_imageinfo_t*);
SK_API void sk_imageinfo_delete(sk_imageinfo_t*);

int32_t sk_imageinfo_get_width(sk_imageinfo_t*);
int32_t sk_imageinfo_get_height(sk_imageinfo_t*);
sk_colortype_t sk_imageinfo_get_colortype(sk_imageinfo_t*);
sk_alphatype_t sk_imageinfo_get_alphatype(sk_imageinfo_t*);
SK_API int32_t sk_imageinfo_get_width(const sk_imageinfo_t*);
SK_API int32_t sk_imageinfo_get_height(const sk_imageinfo_t*);
SK_API sk_colortype_t sk_imageinfo_get_colortype(const sk_imageinfo_t*);
SK_API sk_alphatype_t sk_imageinfo_get_alphatype(const sk_imageinfo_t*);

/**
* Return the colorspace object reference contained in the imageinfo, or null if there is none.
* Note: this does not modify the owner-count on the colorspace object. If the caller needs to
* use the colorspace beyond the lifetime of the imageinfo, it should manually call
* sk_colorspace_ref() (and then call unref() when it is done).
*/
sk_colorspace_t* sk_imageinfo_get_colorspace(sk_imageinfo_t*);
SK_API sk_colorspace_t* sk_imageinfo_get_colorspace(const sk_imageinfo_t*);

SK_C_PLUS_PLUS_END_GUARD

Expand Down
8 changes: 4 additions & 4 deletions gfx/skia/skia/include/c/sk_maskfilter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef sk_maskfilter_DEFINED
#define sk_maskfilter_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

typedef enum {
NORMAL_SK_BLUR_STYLE, //!< fuzzy inside and outside
Expand All @@ -26,21 +26,21 @@ SK_C_PLUS_PLUS_BEGIN_GUARD
Increment the reference count on the given sk_maskfilter_t. Must be
balanced by a call to sk_maskfilter_unref().
*/
void sk_maskfilter_ref(sk_maskfilter_t*);
SK_API void sk_maskfilter_ref(sk_maskfilter_t*);
/**
Decrement the reference count. If the reference count is 1 before
the decrement, then release both the memory holding the
sk_maskfilter_t and any other associated resources. New
sk_maskfilter_t are created with a reference count of 1.
*/
void sk_maskfilter_unref(sk_maskfilter_t*);
SK_API void sk_maskfilter_unref(sk_maskfilter_t*);

/**
Create a blur maskfilter.
@param sk_blurstyle_t The SkBlurStyle to use
@param sigma Standard deviation of the Gaussian blur to apply. Must be > 0.
*/
sk_maskfilter_t* sk_maskfilter_new_blur(sk_blurstyle_t, float sigma);
SK_API sk_maskfilter_t* sk_maskfilter_new_blur(sk_blurstyle_t, float sigma);

SK_C_PLUS_PLUS_END_GUARD

Expand Down
2 changes: 1 addition & 1 deletion gfx/skia/skia/include/c/sk_matrix.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef sk_matrix_DEFINED
#define sk_matrix_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

Expand Down
2 changes: 1 addition & 1 deletion gfx/skia/skia/include/c/sk_paint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef sk_paint_DEFINED
#define sk_paint_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

Expand Down
2 changes: 1 addition & 1 deletion gfx/skia/skia/include/c/sk_path.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef sk_path_DEFINED
#define sk_path_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

Expand Down
18 changes: 9 additions & 9 deletions gfx/skia/skia/include/c/sk_picture.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
#ifndef sk_picture_DEFINED
#define sk_picture_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

/**
Create a new sk_picture_recorder_t. Its resources should be
released with a call to sk_picture_recorder_delete().
*/
sk_picture_recorder_t* sk_picture_recorder_new(void);
SK_API sk_picture_recorder_t* sk_picture_recorder_new(void);
/**
Release the memory and other resources used by this
sk_picture_recorder_t.
*/
void sk_picture_recorder_delete(sk_picture_recorder_t*);
SK_API void sk_picture_recorder_delete(sk_picture_recorder_t*);

/**
Returns the canvas that records the drawing commands
Expand All @@ -33,37 +33,37 @@ void sk_picture_recorder_delete(sk_picture_recorder_t*);
picture. Any drawing the falls outside of this
rect is undefined, and may be drawn or it may not.
*/
sk_canvas_t* sk_picture_recorder_begin_recording(sk_picture_recorder_t*, const sk_rect_t*);
SK_API sk_canvas_t* sk_picture_recorder_begin_recording(sk_picture_recorder_t*, const sk_rect_t*);
/**
Signal that the caller is done recording. This invalidates the
canvas returned by begin_recording. Ownership of the sk_picture_t
is passed to the caller, who must call sk_picture_unref() when
they are done using it. The returned picture is immutable.
*/
sk_picture_t* sk_picture_recorder_end_recording(sk_picture_recorder_t*);
SK_API sk_picture_t* sk_picture_recorder_end_recording(sk_picture_recorder_t*);

/**
Increment the reference count on the given sk_picture_t. Must be
balanced by a call to sk_picture_unref().
*/
void sk_picture_ref(sk_picture_t*);
SK_API void sk_picture_ref(sk_picture_t*);
/**
Decrement the reference count. If the reference count is 1 before
the decrement, then release both the memory holding the
sk_picture_t and any resouces it may be managing. New
sk_picture_t are created with a reference count of 1.
*/
void sk_picture_unref(sk_picture_t*);
SK_API void sk_picture_unref(sk_picture_t*);

/**
Returns a non-zero value unique among all pictures.
*/
uint32_t sk_picture_get_unique_id(sk_picture_t*);
SK_API uint32_t sk_picture_get_unique_id(sk_picture_t*);

/**
Return the cull rect specified when this picture was recorded.
*/
sk_rect_t sk_picture_get_bounds(sk_picture_t*);
SK_API sk_rect_t sk_picture_get_bounds(sk_picture_t*);

SK_C_PLUS_PLUS_END_GUARD

Expand Down
14 changes: 7 additions & 7 deletions gfx/skia/skia/include/c/sk_shader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#ifndef sk_shader_DEFINED
#define sk_shader_DEFINED

#include "sk_types.h"
#include "include/c/sk_types.h"

SK_C_PLUS_PLUS_BEGIN_GUARD

void sk_shader_ref(sk_shader_t*);
void sk_shader_unref(sk_shader_t*);
SK_API void sk_shader_ref(sk_shader_t*);
SK_API void sk_shader_unref(sk_shader_t*);

typedef enum {
CLAMP_SK_SHADER_TILEMODE,
Expand All @@ -42,7 +42,7 @@ typedef enum {
NULL) entries.
@param mode The tiling mode
*/
sk_shader_t* sk_shader_new_linear_gradient(const sk_point_t points[2],
SK_API sk_shader_t* sk_shader_new_linear_gradient(const sk_point_t points[2],
const sk_color_t colors[],
const float colorPos[],
int colorCount,
Expand Down Expand Up @@ -71,7 +71,7 @@ sk_shader_t* sk_shader_new_linear_gradient(const sk_point_t points[2],
@param tileMode The tiling mode
@param localMatrix May be NULL
*/
sk_shader_t* sk_shader_new_radial_gradient(const sk_point_t* center,
SK_API sk_shader_t* sk_shader_new_radial_gradient(const sk_point_t* center,
float radius,
const sk_color_t colors[],
const float colorPos[],
Expand All @@ -96,7 +96,7 @@ sk_shader_t* sk_shader_new_radial_gradient(const sk_point_t* center,
not NULL) entries
@param localMatrix May be NULL
*/
sk_shader_t* sk_shader_new_sweep_gradient(const sk_point_t* center,
SK_API sk_shader_t* sk_shader_new_sweep_gradient(const sk_point_t* center,
const sk_color_t colors[],
const float colorPos[],
int colorCount,
Expand Down Expand Up @@ -127,7 +127,7 @@ sk_shader_t* sk_shader_new_sweep_gradient(const sk_point_t* center,
@param localMatrix May be NULL
*/
sk_shader_t* sk_shader_new_two_point_conical_gradient(
SK_API sk_shader_t* sk_shader_new_two_point_conical_gradient(
const sk_point_t* start,
float startRadius,
const sk_point_t* end,
Expand Down
Loading

0 comments on commit 655f204

Please sign in to comment.