@shopify/react-native-skia 1.0.1 → 1.0.3

package/android/CMakeLists.txt

@@ -73,6 +73,8 @@ target_include_directories(
         "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
         "${NODE_MODULES_DIR}/react-native/ReactCommon"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/react/nativemodule/core"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/runtimeexecutor"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni"
         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
 
         cpp/jni/include
@@ -178,6 +180,34 @@ else()
 endif()
 message("-- FBJNI   : " ${FBJNI_LIBRARY})
 
+unset(REACTNATIVEJNI_LIB CACHE)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+    # RN 0.71 distributes prebuilt binaries.
+    set (REACTNATIVEJNI_LIB "ReactAndroid::reactnativejni")
+else()
+    find_library(
+            REACTNATIVEJNI_LIB
+            reactnativejni
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
+message("-- REACTNATIVEJNI   : " ${REACTNATIVEJNI_LIB})
+
+unset(RUNTIMEEXECUTOR_LIB CACHE)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+    # RN 0.71 distributes prebuilt binaries.
+    set (RUNTIMEEXECUTOR_LIB "ReactAndroid::runtimeexecutor")
+else()
+    find_library(
+            RUNTIMEEXECUTOR_LIB
+            runtimeexecutor
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
+message("-- RUNTIMEEXECUTOR   : " ${RUNTIMEEXECUTOR_LIB})
+
 unset(TURBOMODULES_LIB CACHE)
 if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
     # RN 0.71 distributes prebuilt binaries.
@@ -199,6 +229,8 @@ target_link_libraries(
         ${FBJNI_LIBRARY}
         ${REACT_LIB}
         ${JSI_LIB}
+        ${REACTNATIVEJNI_LIB}
+        ${RUNTIMEEXECUTOR_LIB}
         ${TURBOMODULES_LIB}
         ${SKIA_SVG_LIB}
         ${SKIA_SKSHAPER_LIB}

package/android/build.gradle

@@ -167,6 +167,16 @@ android {
                     "src/paper/java",
                 ]
             }
+
+            if (REACT_NATIVE_VERSION >= 74) {
+                srcDirs += [
+                    "src/reactnative74/java"
+                ]
+            } else {
+                srcDirs += [
+                    "src/reactnative69/java"
+                ]
+            }
         }
     }
 
@@ -182,6 +192,8 @@ android {
              "**/libfbjni.so",
              "**/libjsi.so",
              "**/libreact_nativemodule_core.so",
+             "**/libreactnativejni.so",
+             "**/libruntimeexecutor.so",
              "**/libturbomodulejsijni.so",
              "META-INF/**"
         ]

package/android/cpp/jni/JniSkiaManager.cpp

@@ -7,6 +7,36 @@
 
 #include <RNSkManager.h>
 
+namespace {
+
+// For bridgeless mode, currently we don't have a way to get the JSCallInvoker
+// from Java. Workaround to use RuntimeExecutor to simulate the behavior of
+// JSCallInvoker. In the future when bridgeless mode is a standard and no more
+// backward compatible to be considered, we could just use RuntimeExecutor to
+// run task on JS thread.
+class BridgelessJSCallInvoker : public facebook::react::CallInvoker {
+public:
+  explicit BridgelessJSCallInvoker(
+      facebook::react::RuntimeExecutor runtimeExecutor)
+      : runtimeExecutor_(std::move(runtimeExecutor)) {}
+
+  void invokeAsync(std::function<void()> &&func) noexcept override {
+    runtimeExecutor_(
+        [func = std::move(func)](facebook::jsi::Runtime &runtime) { func(); });
+  }
+
+  void invokeSync(std::function<void()> &&func) override {
+    throw std::runtime_error(
+        "Synchronous native -> JS calls are currently not supported.");
+  }
+
+private:
+  facebook::react::RuntimeExecutor runtimeExecutor_;
+
+}; // class BridgelessJSCallInvoker
+
+} // namespace
+
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
@@ -22,14 +52,17 @@ void JniSkiaManager::registerNatives() {
 
 // JNI init
 jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata>
-JniSkiaManager::initHybrid(jni::alias_ref<jhybridobject> jThis, jlong jsContext,
-                           JSCallInvokerHolder jsCallInvokerHolder,
-                           JavaPlatformContext skiaContext) {
+JniSkiaManager::initHybrid(
+    jni::alias_ref<jhybridobject> jThis, jlong jsContext,
+    jni::alias_ref<facebook::react::JRuntimeExecutor::javaobject>
+        jRuntimeExecutor,
+    JavaPlatformContext skiaContext) {
 
+  auto jsCallInvoker = std::make_shared<BridgelessJSCallInvoker>(
+      jRuntimeExecutor->cthis()->get());
   // cast from JNI hybrid objects to C++ instances
   return makeCxxInstance(jThis, reinterpret_cast<jsi::Runtime *>(jsContext),
-                         jsCallInvokerHolder->cthis()->getCallInvoker(),
-                         skiaContext->cthis());
+                         jsCallInvoker, skiaContext->cthis());
 }
 
 void JniSkiaManager::initializeRuntime() {

package/android/cpp/jni/include/JniPlatformContext.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <ReactCommon/CallInvokerHolder.h>
 #include <fbjni/fbjni.h>
 
 #include <exception>
@@ -18,9 +17,6 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 namespace jni = facebook::jni;
 
-using JSCallInvokerHolder =
-    jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>;
-
 class JniPlatformContext : public jni::HybridClass<JniPlatformContext> {
 public:
   static auto constexpr kJavaDescriptor =

package/android/cpp/jni/include/JniSkiaManager.h

@@ -5,6 +5,7 @@
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
 #include <memory>
+#include <react/jni/JRuntimeExecutor.h>
 
 #include <JniPlatformContext.h>
 #include <RNSkAndroidPlatformContext.h>
@@ -17,9 +18,6 @@ class RNSkManager;
 
 namespace jsi = facebook::jsi;
 
-using JSCallInvokerHolder =
-    jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>;
-
 using JavaPlatformContext = jni::alias_ref<JniPlatformContext::javaobject>;
 
 class JniSkiaManager : public jni::HybridClass<JniSkiaManager> {
@@ -30,7 +28,8 @@ public:
 
   static jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata>
   initHybrid(jni::alias_ref<jhybridobject> jThis, jlong jsContext,
-             JSCallInvokerHolder jsCallInvokerHolder,
+             jni::alias_ref<facebook::react::JRuntimeExecutor::javaobject>
+                 jRuntimeExecutor,
              JavaPlatformContext platformContext);
 
   static void registerNatives();

package/android/src/main/java/com/shopify/reactnative/skia/SkiaDomView.java

@@ -5,14 +5,15 @@ import android.content.Context;
 import com.facebook.jni.HybridData;
 import com.facebook.jni.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.ThemedReactContext;
 
 public class SkiaDomView extends SkiaBaseView {
     @DoNotStrip
     private HybridData mHybridData;
 
-    public SkiaDomView(Context context) {
+    public SkiaDomView(ThemedReactContext context) {
         super(context);
-        RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
+        RNSkiaModule skiaModule = context.getReactApplicationContext().getNativeModule(RNSkiaModule.class);
         mHybridData = initHybrid(skiaModule.getSkiaManager());
     }
 

package/android/src/main/java/com/shopify/reactnative/skia/SkiaManager.java

@@ -3,7 +3,7 @@ package com.shopify.reactnative.skia;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
+import com.facebook.react.bridge.RuntimeExecutor;
 
 @DoNotStrip
 public class SkiaManager {
@@ -22,11 +22,11 @@ public class SkiaManager {
         super();
         mContext = context;
 
-        CallInvokerHolderImpl holder = (CallInvokerHolderImpl) context.getCatalystInstance().getJSCallInvokerHolder();
+        RuntimeExecutor runtimeExecutor = ReactNativeCompatible.getRuntimeExecutor(context);
 
         mPlatformContext = new PlatformContext(context);
 
-        mHybridData = initHybrid(context.getJavaScriptContextHolder().get(), holder, mPlatformContext);
+        mHybridData = initHybrid(context.getJavaScriptContextHolder().get(), runtimeExecutor, mPlatformContext);
 
         initializeRuntime();
     }
@@ -48,7 +48,7 @@ public class SkiaManager {
     public void onHostPause() {  mPlatformContext.onPause(); }
 
     // private C++ functions
-    private native HybridData initHybrid(long jsContext, CallInvokerHolderImpl jsCallInvokerHolder,
+    private native HybridData initHybrid(long jsContext, RuntimeExecutor runtimeExecutor,
             PlatformContext platformContext);
 
     private native void initializeRuntime();

package/android/src/reactnative69/java/com/shopify/reactnative/skia/ReactNativeCompatible.java

@@ -0,0 +1,11 @@
+package com.shopify.reactnative.skia;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.RuntimeExecutor;
+
+/* package */ final class ReactNativeCompatible {
+    public static RuntimeExecutor getRuntimeExecutor(ReactContext context) {
+        return context.getCatalystInstance().getRuntimeExecutor();
+    }
+}
+

package/android/src/reactnative74/java/com/shopify/reactnative/skia/ReactNativeCompatible.java

@@ -0,0 +1,14 @@
+package com.shopify.reactnative.skia;
+
+import androidx.annotation.OptIn;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.RuntimeExecutor;
+import com.facebook.react.common.annotations.FrameworkAPI;
+
+/* package */ final class ReactNativeCompatible {
+    @OptIn(markerClass = FrameworkAPI.class)
+    public static RuntimeExecutor getRuntimeExecutor(ReactContext context) {
+        return context.getRuntimeExecutor();
+    }
+}

package/cpp/skia/include/codec/SkCodec.h

@@ -136,6 +136,8 @@ public:
         /**
          *  If the container format contains both still images and image sequences,
          *  SkCodec should choose one of the still images. This is the default.
+         *  Note that kPreferStillImage may prevent use of the animation features
+         *  if the input is not rewindable.
          */
         kPreferStillImage,
         /**
@@ -409,7 +411,8 @@ public:
     }
 
     /**
-     *  Return an image containing the pixels.
+     *  Return an image containing the pixels. If the codec's origin is not "upper left",
+     *  This will rotate the output image accordingly.
      */
     std::tuple<sk_sp<SkImage>, SkCodec::Result> getImage(const SkImageInfo& info,
                                                          const Options* opts = nullptr);

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

@@ -62,7 +62,7 @@ namespace SkSL { struct Program; }
  * assumed to be shared between stages. It is an error to specify uniforms in the vertex and
  * fragment program with the same name but different types, dimensionality, or layouts.
  */
-class SkMeshSpecification : public SkNVRefCnt<SkMeshSpecification> {
+class SK_API SkMeshSpecification : public SkNVRefCnt<SkMeshSpecification> {
 public:
     /** These values are enforced when creating a specification. */
     static constexpr size_t kMaxStride       = 1024;
@@ -260,7 +260,7 @@ private:
  * SkMeshSpecification::uniformSize() and SkMeshSpecification::uniforms() for sizing and packing
  * uniforms into the SkData.
  */
-class SkMesh {
+class SK_API SkMesh {
 public:
     class IndexBuffer : public SkRefCnt {
     public:

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

@@ -5,5 +5,5 @@
  * found in the LICENSE file.
  */
 #ifndef SK_MILESTONE
-#define SK_MILESTONE 122
+#define SK_MILESTONE 123
 #endif

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

@@ -9,13 +9,20 @@
 #define SkPathEffect_DEFINED
 
 #include "include/core/SkFlattenable.h"
+#include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
-// not needed, but some of our clients need it (they don't IWYU)
-#include "include/core/SkPath.h"
+#include "include/private/base/SkAPI.h"
 
-class SkPath;
-struct SkRect;
+// TODO(kjlubick) update clients and remove this unnecessary #include
+#include "include/core/SkPath.h"  // IWYU pragma: keep
+
+#include <cstddef>
+#include <cstdint>
+
+class SkMatrix;
 class SkStrokeRec;
+struct SkDeserialProcs;
+struct SkRect;
 
 /** \class SkPathEffect
 

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

@@ -9,8 +9,13 @@
 #define SkPathMeasure_DEFINED
 
 #include "include/core/SkContourMeasure.h"
-#include "include/core/SkPath.h"
-#include "include/private/base/SkTDArray.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
+
+class SkMatrix;
+class SkPath;
 
 class SK_API SkPathMeasure {
 public:

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

@@ -8,8 +8,9 @@
 #ifndef SkPoint3_DEFINED
 #define SkPoint3_DEFINED
 
-#include "include/core/SkPoint.h"
 #include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
+#include "include/private/base/SkAssert.h"
 
 struct SK_API SkPoint3 {
     SkScalar fX, fY, fZ;

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

@@ -9,7 +9,9 @@
 #define SkRSXform_DEFINED
 
 #include "include/core/SkPoint.h"
+#include "include/core/SkScalar.h"
 #include "include/core/SkSize.h"
+#include "include/private/base/SkAPI.h"
 
 /**
  *  A compressed form of a rotation+scale matrix.

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

@@ -82,14 +82,14 @@ static inline bool SkStrContains(const char string[], const char subchar) {
  */
 
 static constexpr int kSkStrAppendU32_MaxSize = 10;
-char*   SkStrAppendU32(char buffer[], uint32_t);
+char* SkStrAppendU32(char buffer[], uint32_t);
 static constexpr int kSkStrAppendU64_MaxSize = 20;
-char*   SkStrAppendU64(char buffer[], uint64_t, int minDigits);
+char* SkStrAppendU64(char buffer[], uint64_t, int minDigits);
 
 static constexpr int kSkStrAppendS32_MaxSize = kSkStrAppendU32_MaxSize + 1;
-char*   SkStrAppendS32(char buffer[], int32_t);
+char* SkStrAppendS32(char buffer[], int32_t);
 static constexpr int kSkStrAppendS64_MaxSize = kSkStrAppendU64_MaxSize + 1;
-char*   SkStrAppendS64(char buffer[], int64_t, int minDigits);
+char* SkStrAppendS64(char buffer[], int64_t, int minDigits);
 
 /**
  *  Floats have at most 8 significant digits, so we limit our %g to that.
@@ -281,7 +281,7 @@ private:
 };
 
 /// Creates a new string and writes into it using a printf()-style format.
-SkString SkStringPrintf(const char* format, ...) SK_PRINTF_LIKE(1, 2);
+SK_API SkString SkStringPrintf(const char* format, ...) SK_PRINTF_LIKE(1, 2);
 /// This makes it easier to write a caller as a VAR_ARGS function where the format string is
 /// optional.
 static inline SkString SkStringPrintf() { return SkString(); }

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

@@ -8,6 +8,7 @@
 #ifndef SkSurfaceProps_DEFINED
 #define SkSurfaceProps_DEFINED
 
+#include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 #include "include/private/base/SkTo.h"
 
@@ -52,27 +53,33 @@ static inline bool SkPixelGeometryIsV(SkPixelGeometry geo) {
 class SK_API SkSurfaceProps {
 public:
     enum Flags {
+        kDefault_Flag = 0,
         kUseDeviceIndependentFonts_Flag = 1 << 0,
         // Use internal MSAA to render to non-MSAA GPU surfaces.
-        kDynamicMSAA_Flag               = 1 << 1,
+        kDynamicMSAA_Flag = 1 << 1,
         // If set, all rendering will have dithering enabled
         // Currently this only impacts GPU backends
-        kAlwaysDither_Flag              = 1 << 2,
+        kAlwaysDither_Flag = 1 << 2,
     };
 
-    /** No flags, unknown pixel geometry. */
+    /** No flags, unknown pixel geometry, platform-default contrast/gamma. */
     SkSurfaceProps();
+    /** TODO(kschmi): Remove this constructor and replace with the one below. **/
     SkSurfaceProps(uint32_t flags, SkPixelGeometry);
+    /** Specified pixel geometry, text contrast, and gamma **/
+    SkSurfaceProps(uint32_t flags, SkPixelGeometry, SkScalar textContrast, SkScalar textGamma);
 
     SkSurfaceProps(const SkSurfaceProps&) = default;
     SkSurfaceProps& operator=(const SkSurfaceProps&) = default;
 
     SkSurfaceProps cloneWithPixelGeometry(SkPixelGeometry newPixelGeometry) const {
-        return SkSurfaceProps(fFlags, newPixelGeometry);
+        return SkSurfaceProps(fFlags, newPixelGeometry, fTextContrast, fTextGamma);
     }
 
     uint32_t flags() const { return fFlags; }
     SkPixelGeometry pixelGeometry() const { return fPixelGeometry; }
+    SkScalar textContrast() const { return fTextContrast; }
+    SkScalar textGamma() const { return fTextGamma; }
 
     bool isUseDeviceIndependentFonts() const {
         return SkToBool(fFlags & kUseDeviceIndependentFonts_Flag);
@@ -83,7 +90,8 @@ public:
     }
 
     bool operator==(const SkSurfaceProps& that) const {
-        return fFlags == that.fFlags && fPixelGeometry == that.fPixelGeometry;
+        return fFlags == that.fFlags && fPixelGeometry == that.fPixelGeometry &&
+        fTextContrast == that.fTextContrast && fTextGamma == that.fTextGamma;
     }
 
     bool operator!=(const SkSurfaceProps& that) const {
@@ -93,6 +101,11 @@ public:
 private:
     uint32_t        fFlags;
     SkPixelGeometry fPixelGeometry;
+
+    // This gamma value is specifically about blending of mask coverage.
+    // The surface also has a color space, but that applies to the colors.
+    SkScalar fTextContrast;
+    SkScalar fTextGamma;
 };
 
 #endif

package/cpp/skia/include/gpu/GrBackendDrawableInfo.h

@@ -5,40 +5,5 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrBackendDrawableInfo_DEFINED
-#define GrBackendDrawableInfo_DEFINED
-
-#include "include/gpu/GrTypes.h"
-
-#include "include/gpu/vk/GrVkTypes.h"
-
-class SK_API GrBackendDrawableInfo {
-public:
-    // Creates an invalid backend drawable info.
-    GrBackendDrawableInfo() : fIsValid(false) {}
-
-    GrBackendDrawableInfo(const GrVkDrawableInfo& info)
-            : fIsValid(true)
-            , fBackend(GrBackendApi::kVulkan)
-            , fVkInfo(info) {}
-
-    // Returns true if the backend texture has been initialized.
-    bool isValid() const { return fIsValid; }
-
-    GrBackendApi backend() const { return fBackend; }
-
-    bool getVkDrawableInfo(GrVkDrawableInfo* outInfo) const {
-        if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
-            *outInfo = fVkInfo;
-            return true;
-        }
-        return false;
-    }
-
-private:
-    bool             fIsValid;
-    GrBackendApi     fBackend;
-    GrVkDrawableInfo fVkInfo;
-};
-
-#endif
+// TODO(kjlubick) delete after Chrome (and Android?) are migrated.
+#include "include/gpu/ganesh/vk/GrBackendDrawableInfo.h"

package/cpp/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h

@@ -5,6 +5,7 @@
 // This file is auto-generated from build_workaround_header.py
 // DO NOT EDIT!
 
+#ifndef GPU_DRIVER_BUG_WORKAROUNDS
 #define GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)              \
   GPU_OP(ADD_AND_TRUE_TO_LOOP_CONDITION,                \
          add_and_true_to_loop_condition)                \
@@ -40,4 +41,5 @@
          unbind_attachments_on_bound_render_fbo_delete) \
   GPU_OP(UNFOLD_SHORT_CIRCUIT_AS_TERNARY_OPERATION,     \
          unfold_short_circuit_as_ternary_operation)     \
-// The End
+
+#endif  // GPU_DRIVER_BUG_WORKAROUNDS

package/cpp/skia/include/gpu/MutableTextureState.h

@@ -12,12 +12,6 @@
 #include "include/core/SkTypes.h"
 #include "include/private/base/SkAnySubclass.h"
 
-#if defined(SK_VULKAN) && !defined(SK_DISABLE_LEGACY_VULKAN_MUTABLE_TEXTURE_STATE)
-#include "include/private/gpu/vk/SkiaVulkan.h"
-
-#include <cstdint>
-#endif
-
 #include <cstddef>
 
 namespace skgpu {
@@ -49,13 +43,6 @@ public:
     // Returns true if the backend mutable state has been initialized.
     bool isValid() const { return fIsValid; }
 
-#if defined(SK_VULKAN) && !defined(SK_DISABLE_LEGACY_VULKAN_MUTABLE_TEXTURE_STATE)
-    MutableTextureState(VkImageLayout layout, uint32_t queueFamilyIndex);
-
-    VkImageLayout getVkImageLayout() const;
-    uint32_t getQueueFamilyIndex() const;
-#endif
-
 private:
     friend class MutableTextureStateData;
     friend class MutableTextureStatePriv;

package/cpp/skia/include/gpu/ganesh/vk/GrBackendDrawableInfo.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBackendDrawableInfo_DEFINED
+#define GrBackendDrawableInfo_DEFINED
+
+#include "include/gpu/GrTypes.h"
+
+#include "include/gpu/vk/GrVkTypes.h"
+
+// If necessary, this could be pulled into a generic interface, but at this point, we only expect
+// it to be used by the Ganesh Vulkan backend.
+class SK_API GrBackendDrawableInfo {
+public:
+    // Creates an invalid backend drawable info.
+    GrBackendDrawableInfo() : fIsValid(false) {}
+
+    GrBackendDrawableInfo(const GrVkDrawableInfo& info)
+            : fIsValid(true)
+            , fBackend(GrBackendApi::kVulkan)
+            , fVkInfo(info) {}
+
+    // Returns true if the backend texture has been initialized.
+    bool isValid() const { return fIsValid; }
+
+    GrBackendApi backend() const { return fBackend; }
+
+    bool getVkDrawableInfo(GrVkDrawableInfo* outInfo) const {
+        if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
+            *outInfo = fVkInfo;
+            return true;
+        }
+        return false;
+    }
+
+private:
+    bool             fIsValid;
+    GrBackendApi     fBackend;
+    GrVkDrawableInfo fVkInfo;
+};
+
+#endif

package/cpp/skia/include/gpu/gl/GrGLAssembleHelpers.h

@@ -4,8 +4,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#ifndef GrGLAssembleHelpers_DEFINED
+#define GrGLAssembleHelpers_DEFINED
 
 #include "include/gpu/gl/GrGLAssembleInterface.h"
 
 void GrGetEGLQueryAndDisplay(GrEGLQueryStringFn** queryString, GrEGLDisplay* display,
                              void* ctx, GrGLGetProc get);
+
+#endif  // GrGLAssembleHelpers_DEFINED

package/cpp/skia/include/gpu/gl/GrGLAssembleInterface.h

@@ -4,8 +4,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#ifndef GrGLAssembleInterface_DEFINED
+#define GrGLAssembleInterface_DEFINED
 
 #include "include/gpu/gl/GrGLInterface.h"
+#include "include/private/base/SkAPI.h"
 
 typedef GrGLFuncPtr (*GrGLGetProc)(void* ctx, const char name[]);
 
@@ -37,3 +40,5 @@ SK_API sk_sp<const GrGLInterface> GrGLMakeAssembledWebGLInterface(void *ctx, GrG
 
 /** Deprecated version of GrGLMakeAssembledInterface() that returns a bare pointer. */
 SK_API const GrGLInterface* GrGLAssembleInterface(void *ctx, GrGLGetProc get);
+
+#endif  // GrGLAssembleInterface_DEFINED

package/cpp/skia/include/gpu/gl/GrGLInterface.h

@@ -78,11 +78,7 @@ public:
 #endif
 
     // Indicates the type of GL implementation
-    union {
-        GrGLStandard fStandard;
-        GrGLStandard fBindingsExported; // Legacy name, will be remove when Chromium is updated.
-    };
-
+    GrGLStandard fStandard;
     GrGLExtensions fExtensions;
 
     bool hasExtension(const char ext[]) const { return fExtensions.has(ext); }