@shopify/react-native-skia 0.1.197 → 0.1.199

package/cpp/skia/include/core/SkShader.h

@@ -8,23 +8,19 @@
 #ifndef SkShader_DEFINED
 #define SkShader_DEFINED
 
-#include "include/core/SkBlendMode.h"
 #include "include/core/SkColor.h"
 #include "include/core/SkFlattenable.h"
-#include "include/core/SkImageInfo.h"
-#include "include/core/SkMatrix.h"
-#include "include/core/SkTileMode.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
-class SkArenaAlloc;
-class SkBitmap;
 class SkBlender;
 class SkColorFilter;
 class SkColorSpace;
 class SkImage;
-class SkPath;
-class SkPicture;
-class SkRasterPipeline;
-class GrFragmentProcessor;
+class SkMatrix;
+enum class SkBlendMode;
+enum class SkTileMode;
+struct SkRect;
 
 /** \class SkShader
  *
@@ -78,16 +74,13 @@ private:
     using INHERITED = SkFlattenable;
 };
 
-class SK_API SkShaders {
-public:
-    static sk_sp<SkShader> Empty();
-    static sk_sp<SkShader> Color(SkColor);
-    static sk_sp<SkShader> Color(const SkColor4f&, sk_sp<SkColorSpace>);
-    static sk_sp<SkShader> Blend(SkBlendMode mode, sk_sp<SkShader> dst, sk_sp<SkShader> src);
-    static sk_sp<SkShader> Blend(sk_sp<SkBlender>, sk_sp<SkShader> dst, sk_sp<SkShader> src);
-    static sk_sp<SkShader> CoordClamp(sk_sp<SkShader>, const SkRect& subset);
-private:
-    SkShaders() = delete;
-};
+namespace SkShaders {
+SK_API sk_sp<SkShader> Empty();
+SK_API sk_sp<SkShader> Color(SkColor);
+SK_API sk_sp<SkShader> Color(const SkColor4f&, sk_sp<SkColorSpace>);
+SK_API sk_sp<SkShader> Blend(SkBlendMode mode, sk_sp<SkShader> dst, sk_sp<SkShader> src);
+SK_API sk_sp<SkShader> Blend(sk_sp<SkBlender>, sk_sp<SkShader> dst, sk_sp<SkShader> src);
+SK_API sk_sp<SkShader> CoordClamp(sk_sp<SkShader>, const SkRect& subset);
+}
 
 #endif

package/cpp/skia/include/core/SkString.h

@@ -270,8 +270,10 @@ private:
     static_assert(::sk_is_trivially_relocatable<decltype(fRec)>::value);
 
 #ifdef SK_DEBUG
+          SkString& validate();
     const SkString& validate() const;
 #else
+          SkString& validate()       { return *this; }
     const SkString& validate() const { return *this; }
 #endif