@shopify/react-native-skia 0.1.122 → 0.1.123

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

@@ -18,10 +18,11 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
     @DoNotStrip
     private HybridData mHybridData;
 
-    private Surface mSurface;
+    @DoNotStrip
+    private boolean mViewRemoved;
 
     @DoNotStrip
-    private boolean mIsRemoved = false;
+    private Surface mSurface;
 
     public SkiaDrawView(Context ctx) {
         super(ctx);
@@ -36,26 +37,25 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
         // Texture view does not support setting the background color.
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        mHybridData.resetNative();
-        super.finalize();
+    public void releaseSurface() {
+        if(mSurface != null) {
+            mSurface.release();
+            mSurface = null;
+        }
+        // We can only reset the native side when the view was removed from screen.
+        // releasing the surface can also be done when the view is hidden and then
+        // we should only release the surface - and keep the native part around.
+        if(mViewRemoved) {
+            mHybridData.resetNative();
+        }
     }
 
-
-    public void onRemoved() {
-        // We'll mark the view removed since we reset the native part.
-        // This means that none of the native methods should be called after
-        // this point.
-        mIsRemoved = true;
-        mHybridData.resetNative();
+    void onViewRemoved() {
+        mViewRemoved = true;
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
-        if(mIsRemoved) {
-            return false;
-        }
         int action = ev.getAction();
         int count = ev.getPointerCount();
         MotionEvent.PointerCoords r = new MotionEvent.PointerCoords();
@@ -88,30 +88,23 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
 
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        if(mIsRemoved) {
-            return;
-        }
         mSurface = new Surface(surface);
         surfaceAvailable(mSurface, width, height);
     }
 
     @Override
     public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-        if(mIsRemoved) {
-            return;
-        }
         surfaceSizeChanged(width, height);
     }
 
     @Override
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        if(mIsRemoved) {
-            return true;
-        }
         surfaceDestroyed();
-        mSurface.release();
-        mSurface = null;
-        return true;
+        // https://developer.android.com/reference/android/view/TextureView.SurfaceTextureListener#onSurfaceTextureDestroyed(android.graphics.SurfaceTexture)
+        // Invoked when the specified SurfaceTexture is about to be destroyed. If returns true,
+        // no rendering should happen inside the surface texture after this method is invoked.
+        // If returns false, the client needs to call SurfaceTexture#release().
+        return false;
     }
 
     @Override

package/cpp/rnskia/RNSkDrawView.cpp

@@ -40,31 +40,13 @@ RNSkDrawView::RNSkDrawView(std::shared_ptr<RNSkPlatformContext> context)
       _platformContext(std::move(context)),
       _infoObject(std::make_shared<RNSkInfoObject>()),
       _jsDrawingLock(std::make_shared<std::timed_mutex>()),
-      _gpuDrawingLock(std::make_shared<std::timed_mutex>())
+      _gpuDrawingLock(std::make_shared<std::timed_mutex>()),
+      _jsTimingInfo("SKIA/JS"),
+      _gpuTimingInfo("SKIA/GPU")
       {}
 
 RNSkDrawView::~RNSkDrawView() {
-#if LOG_ALL_DRAWING
-  RNSkLogger::logToConsole("RNSkDrawView::~RNSkDrawView - %i", getNativeId());
-#endif
-  
-  _isInvalidated = true;
-  
   endDrawingLoop();
-  
-  // Wait for the drawing locks
-  if(!_jsDrawingLock->try_lock_for(1250ms)) {
-    RNSkLogger::logToConsole("Warning: JS drawing is still locked for native view with id %i", _nativeId);
-  }
-  
-  if(!_gpuDrawingLock->try_lock_for(1250ms)) {
-    RNSkLogger::logToConsole("Warning: SKIA drawing is still locked for native view with id %i", _nativeId);
-  }
-  
-  onInvalidated();
-
-  _jsDrawingLock = nullptr;
-  _gpuDrawingLock = nullptr;
 }
 
 void RNSkDrawView::setNativeId(size_t nativeId) {
@@ -84,7 +66,6 @@ void RNSkDrawView::setDrawCallback(std::shared_ptr<jsi::Function> callback) {
   // Reset timing info
   _jsTimingInfo.reset();
   _gpuTimingInfo.reset();
-  _vsyncTimingInfo.reset();
   
   // Set up debug font/paints
   auto font = SkFont();
@@ -94,53 +75,57 @@ void RNSkDrawView::setDrawCallback(std::shared_ptr<jsi::Function> callback) {
   
   // Create draw drawCallback wrapper
   _drawCallback = std::make_shared<RNSkDrawCallback>(
-      [this, paint = std::move(paint), font = std::move(font), callback = std::move(callback)](std::shared_ptr<JsiSkCanvas> canvas, int width,
-                                    int height, double timestamp,
-                                    std::shared_ptr<RNSkPlatformContext> context) {
-
-       auto runtime = context->getJsRuntime();
-                         
-       // Update info parameter
-       _infoObject->beginDrawOperation(width, height, timestamp);
-       
-       // Set up arguments array
-       std::vector<jsi::Value> args(2);
-       args[0] = jsi::Object::createFromHostObject(*runtime, canvas);
-       args[1] = jsi::Object::createFromHostObject(*runtime, _infoObject);
-
-       // To be able to call the drawing function we'll wrap it once again
-       callback->call(*runtime,
-                      static_cast<const jsi::Value *>(args.data()),
-                      (size_t)2);
-       
-       // Reset touches
-       _infoObject->endDrawOperation();
-                         
-      // Draw debug overlays
-      if (_showDebugOverlay) {
-
-        // Display average rendering timer
-        auto jsAvg = _jsTimingInfo.getAverage();
-        //auto jsFps = _jsTimingInfo.getFps();
-        
-        auto gpuAvg = _gpuTimingInfo.getAverage();
-        //auto gpuFps = _gpuTimingInfo.getFps();
-        
-        auto total = jsAvg + gpuAvg;
-        
-        //auto vsyncFps = _vsyncTimingInfo.getFps();
-                                                      
-        // Build string
-        std::ostringstream stream;
-        stream << "js: " << jsAvg << "ms gpu: " << gpuAvg << "ms " << " total: " << total << "ms";
-//        stream << "js:" << jsAvg << "ms/" << jsFps << "fps " << "gpu:" << gpuAvg << "ms/" <<
-//          gpuFps << "fps" << " total:" << total << "ms/" << vsyncFps << "fps";
-        
-        std::string debugString = stream.str();
-        
-        canvas->getCanvas()->drawSimpleText(
-         debugString.c_str(), debugString.size(), SkTextEncoding::kUTF8, 8,
-         18, font, paint);
+      [weakSelf = weak_from_this(),
+       paint = std::move(paint),
+       font = std::move(font),
+       callback = std::move(callback)](std::shared_ptr<JsiSkCanvas> canvas,
+                                       int width,
+                                       int height,
+                                       double timestamp,
+                                       std::shared_ptr<RNSkPlatformContext> context) {
+
+       auto self = weakSelf.lock();
+       if(self) {
+         auto runtime = context->getJsRuntime();
+                           
+         // Update info parameter
+         self->_infoObject->beginDrawOperation(width, height, timestamp);
+         
+         // Set up arguments array
+         std::vector<jsi::Value> args(2);
+         args[0] = jsi::Object::createFromHostObject(*runtime, canvas);
+         args[1] = jsi::Object::createFromHostObject(*runtime, self->_infoObject);
+
+         // To be able to call the drawing function we'll wrap it once again
+         callback->call(*runtime,
+                        static_cast<const jsi::Value *>(args.data()),
+                        (size_t)2);
+         
+         // Reset touches
+         self->_infoObject->endDrawOperation();
+                           
+        // Draw debug overlays
+        if (self->_showDebugOverlay) {
+
+          // Display average rendering timer
+          auto jsAvg = self->_jsTimingInfo.getAverage();
+          //auto jsFps = _jsTimingInfo.getFps();
+          
+          auto gpuAvg = self->_gpuTimingInfo.getAverage();
+          //auto gpuFps = _gpuTimingInfo.getFps();
+          
+          auto total = jsAvg + gpuAvg;
+          
+          // Build string
+          std::ostringstream stream;
+          stream << "js: " << jsAvg << "ms gpu: " << gpuAvg << "ms " << " total: " << total << "ms";
+          
+          std::string debugString = stream.str();
+          
+          canvas->getCanvas()->drawSimpleText(
+           debugString.c_str(), debugString.size(), SkTextEncoding::kUTF8, 8,
+           18, font, paint);
+        }
       }
     });
 
@@ -196,10 +181,6 @@ void RNSkDrawView::updateTouchState(std::vector<RNSkTouchPoint>&& points) {
 }
 
 void RNSkDrawView::performDraw() {
-#if LOG_ALL_DRAWING
-  RNSkLogger::logToConsole("RNSkDrawView::performDraw - %i", getNativeId());
-#endif
-  
   // Start timing
   _jsTimingInfo.beginTiming();
   
@@ -234,37 +215,22 @@ void RNSkDrawView::performDraw() {
     // Post drawing message to the render thread where the picture recorded
     // will be sent to the GPU/backend for rendering to screen.
     auto gpuLock = _gpuDrawingLock;
-    getPlatformContext()->runOnRenderThread([this, p = std::move(p), gpuLock]() {
-      
-      if(isInvalidated()) {
-        gpuLock->unlock();
-        return;
+    _platformContext->runOnRenderThread([weakSelf = weak_from_this(), p = std::move(p), gpuLock]() {
+      auto self = weakSelf.lock();
+      if (self) {
+        // Draw the picture recorded on the real GPU canvas
+        self->_gpuTimingInfo.beginTiming();
+        self->drawPicture(p);
+        self->_gpuTimingInfo.stopTiming();
       }
-      
-      _gpuTimingInfo.beginTiming();
-
-      // Draw the picture recorded on the real GPU canvas
-      if(_nativeDrawFunc != nullptr) {
-#if LOG_ALL_DRAWING
-          RNSkLogger::logToConsole("RNSkDrawView::drawFrame - %i", getNativeId());
-#endif
-        _nativeDrawFunc(p);
-      } else {
-#if LOG_ALL_DRAWING
-          RNSkLogger::logToConsole("RNSkDrawView::drawFrame - %i SKIPPING, draw func is null", getNativeId());
-#endif
-      }
-
-      _gpuTimingInfo.stopTiming();
-
       // Unlock GPU drawing
       gpuLock->unlock();
     });
   } else {
 #ifdef DEBUG
-    static size_t framesSkipped = 0;
-    printf("SKIA/GPU: Skipped frames: %lu\n", ++framesSkipped);
+    _gpuTimingInfo.markSkipped();
 #endif
+    // Request a new redraw since the last frame was skipped.
     requestRedraw();
   }
   
@@ -280,39 +246,34 @@ void RNSkDrawView::beginDrawingLoop() {
   if (_drawingLoopId != 0 || _nativeId == 0) {
     return;
   }
-  
   // Set to zero to avoid calling beginDrawLoop before we return
-  _drawingLoopId = _platformContext->beginDrawLoop(
-    _nativeId, std::bind(&RNSkDrawView::drawLoopCallback, this, std::placeholders::_1));
+  _drawingLoopId = _platformContext->beginDrawLoop(_nativeId,
+    [weakSelf = weak_from_this()](bool invalidated) {
+    auto self = weakSelf.lock();
+    if(self) {
+      self->drawLoopCallback(invalidated);
+    }
+  });
 }
 
 void RNSkDrawView::drawLoopCallback(bool invalidated) {
-  if(invalidated) {
-    _isInvalidated = true;
-    onInvalidated();
-#if LOG_ALL_DRAWING
-  RNSkLogger::logToConsole("RNSkDrawView::onInvalidated - %i", getNativeId());
-#endif
-    return;
-  }
-  
   if(_redrawRequestCounter > 0 || _drawingMode == RNSkDrawingMode::Continuous) {
       _redrawRequestCounter = 0;
       
-    _vsyncTimingInfo.beginTiming();
-    
     // We render on the javascript thread.
     if(_jsDrawingLock->try_lock()) {
-      _platformContext->runOnJavascriptThread(std::bind(&RNSkDrawView::performDraw, this));
+      _platformContext->runOnJavascriptThread([weakSelf = weak_from_this()](){
+        auto self = weakSelf.lock();
+        if(self) {
+          self->performDraw();
+        }
+      });
     } else {
 #ifdef DEBUG
-      static size_t framesSkipped = 0;
-      printf("SKIA/JS: Skipped frames: %lu\n", ++framesSkipped);
+      _jsTimingInfo.markSkipped();
 #endif
       requestRedraw();
     }
-    
-    _vsyncTimingInfo.stopTiming();
   }
 }
 

package/cpp/rnskia/RNSkDrawView.h

@@ -20,8 +20,6 @@
 
 #pragma clang diagnostic pop
 
-#define LOG_ALL_DRAWING 0
-
 class SkPicture;
 class SkRect;
 class SkImage;
@@ -35,7 +33,7 @@ using RNSkDrawCallback =
 
 enum RNSkDrawingMode { Default, Continuous };
 
-class RNSkDrawView {
+class RNSkDrawView: public std::enable_shared_from_this<RNSkDrawView> {
 public:
   /**
    * Constructor
@@ -45,7 +43,7 @@ public:
   /**
    Destructor
    */
-  ~RNSkDrawView();
+  virtual ~RNSkDrawView();
 
   /**
    * Repaints the Skia view using the underlying context and the drawcallback.
@@ -96,14 +94,6 @@ public:
   sk_sp<SkImage> makeImageSnapshot(std::shared_ptr<SkRect> bounds);
 
 protected:
-  void setNativeDrawFunc(std::function<void(const sk_sp<SkPicture>)> drawFunc) {
-    if(!_gpuDrawingLock->try_lock_for(250ms)) {
-      RNSkLogger::logToConsole("Could not lock drawing when clearing drawing function - %i", _nativeId);
-    }
-    _nativeDrawFunc = drawFunc;
-    _gpuDrawingLock->unlock();
-  }
-  
   /**
    Returns the scaled width of the view
    */
@@ -115,14 +105,9 @@ protected:
   virtual int getHeight() { return -1; };
   
   /**
-   Returns true if the view is invalidated
-   */
-  volatile bool isInvalidated() { return _isInvalidated; }
-  
-  /**
-   Override to be notified on invalidation
+   Override to render picture to GPU
    */
-  virtual void onInvalidated() {}
+  virtual void drawPicture(const sk_sp<SkPicture> picture) = 0;
   
   /**
    * @return The platformcontext
@@ -210,12 +195,7 @@ private:
   /**
    Timing information for GPU rendering
    */
-  RNSkTimingInfo _gpuTimingInfo;
-  
-  /**
-   Measures vsync framerate
-   */
-  RNSkTimingInfo _vsyncTimingInfo;
+  RNSkTimingInfo _gpuTimingInfo;  
   
   /**
    Redraw queue counter
@@ -227,16 +207,6 @@ private:
    */
   size_t _nativeId;
   
-  /**
-   Invalidation flag
-   */
-  std::atomic<bool> _isInvalidated = { false };
-  
-  /**
-   Native draw handler
-   */
-  std::function<void(const sk_sp<SkPicture>)> _nativeDrawFunc;  
-  
 };
 
 } // namespace RNSkia

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -20,7 +20,7 @@ using CallbackInfo = struct CallbackInfo {
     view = nullptr;
   }
   std::shared_ptr<jsi::Function> drawCallback;
-  RNSkDrawView *view;
+  std::shared_ptr<RNSkDrawView> view;
 };
 
 class RNSkJsiViewApi : public JsiHostObject {
@@ -105,7 +105,7 @@ public:
     sk_sp<SkImage> image;
     auto info = getEnsuredCallbackInfo(nativeId);
     if (info->view != nullptr) {
-      if(count > 1 && !arguments[1].isUndefined() && arguments[1].isNull()) {
+      if(count > 1 && !arguments[1].isUndefined() && !arguments[1].isNull()) {
         auto rect = JsiSkRect::fromValue(runtime, arguments[1]);
         image = info->view->makeImageSnapshot(rect);
       } else {
@@ -226,7 +226,7 @@ public:
    * @param nativeId Id of view to register
    * @param view View to register
    */
-  void registerSkiaDrawView(size_t nativeId, RNSkDrawView *view) {
+  void registerSkiaDrawView(size_t nativeId, std::shared_ptr<RNSkDrawView> view) {
     auto info = getEnsuredCallbackInfo(nativeId);
     info->view = view;
     if (info->drawCallback != nullptr) {
@@ -260,15 +260,18 @@ public:
    a valid view is set, the setDrawCallback method is called on the
    view (if a valid callback exists).
    */
-  void setSkiaDrawView(size_t nativeId, RNSkDrawView *view) {
+  void setSkiaDrawView(size_t nativeId, std::shared_ptr<RNSkDrawView> view) {
     if (_callbackInfos.find(nativeId) == _callbackInfos.end()) {
       return;
     }
     auto info = getEnsuredCallbackInfo(nativeId);
-    info->view = view;
     if (view != nullptr && info->drawCallback != nullptr) {
+      info->view = view;
       info->view->setNativeId(nativeId);
       info->view->setDrawCallback(info->drawCallback);
+    } else if(view == nullptr && info->drawCallback != nullptr) {
+      info->view->setDrawCallback(nullptr);
+      info->view = view;
     }
   }
 

package/cpp/rnskia/RNSkManager.cpp

@@ -45,7 +45,7 @@ void RNSkManager::invalidate() {
   _platformContext->invalidate();
 }
 
-void RNSkManager::registerSkiaDrawView(size_t nativeId, RNSkDrawView *view) {
+void RNSkManager::registerSkiaDrawView(size_t nativeId, std::shared_ptr<RNSkDrawView> view) {
   if (!_isInvalidated && _viewApi != nullptr)
     _viewApi->registerSkiaDrawView(nativeId, view);
 }
@@ -55,7 +55,7 @@ void RNSkManager::unregisterSkiaDrawView(size_t nativeId) {
     _viewApi->unregisterSkiaDrawView(nativeId);
 }
 
-void RNSkManager::setSkiaDrawView(size_t nativeId, RNSkDrawView *view) {
+void RNSkManager::setSkiaDrawView(size_t nativeId, std::shared_ptr<RNSkDrawView> view) {
   if (!_isInvalidated && _viewApi != nullptr)
     _viewApi->setSkiaDrawView(nativeId, view);
 }

package/cpp/rnskia/RNSkManager.h

@@ -41,7 +41,7 @@ public:
    * @param nativeId Native view id
    * @param view View to register
    */
-  void registerSkiaDrawView(size_t nativeId, RNSkDrawView *view);
+  void registerSkiaDrawView(size_t nativeId, std::shared_ptr<RNSkDrawView> view);
 
   /**
    * Unregisters the RNSkDrawView from the list of registered views
@@ -54,7 +54,7 @@ public:
    Used when we want to remove a view without unregistering it
    - this happens typically on iOS.
    */
-  void setSkiaDrawView(size_t nativeId, RNSkDrawView *view);
+  void setSkiaDrawView(size_t nativeId, std::shared_ptr<RNSkDrawView> view);
 
   /**
    * @return The platform context

package/cpp/rnskia/RNSkPlatformContext.h

@@ -43,7 +43,7 @@ public:
   /**
    * Destructor
    */
-  ~RNSkPlatformContext() {
+  virtual ~RNSkPlatformContext() {
     invalidate();
   }
   

package/cpp/rnskia/values/RNSkClockValue.h

@@ -72,8 +72,12 @@ public:
     _start += timeSinceStop;
     
     _state = RNSkClockState::Running;
-    auto dispatch = std::bind(&RNSkClockValue::notifyUpdate, this, std::placeholders::_1);
-    getContext()->beginDrawLoop(_identifier, dispatch);
+    getContext()->beginDrawLoop(_identifier, [weakSelf = weak_from_this()](bool invalidated){
+      auto self = weakSelf.lock();
+      if(self) {
+        std::dynamic_pointer_cast<RNSkClockValue>(self)->notifyUpdate(invalidated);
+      }
+    });
   }
   
   virtual void stopClock() {
@@ -103,12 +107,16 @@ protected:
     getContext()->runOnJavascriptThread(
       // To ensure that this shared_ptr instance is not deallocated before we are done
       // running the update lambda we pass a shared from this to the lambda scope.
-      [self = shared_from_this(), this]() {
-      if(_state == RNSkClockState::Running) {
-        auto now = std::chrono::high_resolution_clock::now();
-        auto deltaFromStart = std::chrono::duration_cast<std::chrono::milliseconds>(now - _start).count();
-        tick(_runtime, static_cast<double>(deltaFromStart));
-      }
+      [weakSelf = weak_from_this()]() {
+        auto self = weakSelf.lock();
+        if(self) {
+          auto selfClockValue = std::dynamic_pointer_cast<RNSkClockValue>(self);
+          if(selfClockValue->getState() == RNSkClockState::Running) {
+            auto now = std::chrono::high_resolution_clock::now();
+            auto deltaFromStart = std::chrono::duration_cast<std::chrono::milliseconds>(now - selfClockValue->_start).count();
+            selfClockValue->tick(selfClockValue->_runtime, static_cast<double>(deltaFromStart));
+          }
+        }
     });
   }
   

package/cpp/rnskia/values/RNSkReadonlyValue.h

@@ -48,10 +48,13 @@ public:
     }
     auto callback = std::make_shared<jsi::Function>(arguments[0].asObject(runtime).asFunction(runtime));
     
-    auto unsubscribe = addListener([self = shared_from_this(),
-                                    this,
+    auto unsubscribe = addListener([weakSelf = weak_from_this(),
                                     callback = std::move(callback)](jsi::Runtime& runtime){
-      callback->call(runtime, get_current(runtime));
+      auto self = weakSelf.lock();
+      if(self) {
+        auto selfReadonlyValue = std::dynamic_pointer_cast<RNSkReadonlyValue>(self);
+        callback->call(runtime, selfReadonlyValue->get_current(runtime));
+      }
     });
     
     return jsi::Function::createFromHostFunction(runtime,
@@ -74,8 +77,11 @@ public:
     std::lock_guard<std::mutex> lock(_mutex);
     auto listenerId = _listenerId++;
     _listeners.emplace(listenerId, cb);
-    return [self = shared_from_this(), this, listenerId]() {
-      removeListener(listenerId);
+    return [weakSelf = weak_from_this(), listenerId]() {
+      auto self = weakSelf.lock();
+      if(self) {
+        self->removeListener(listenerId);
+      }
     };
   }
   

package/cpp/utils/RNSkTimingInfo.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <RNSkLog.h>
 #include <chrono>
 
 #define NUMBER_OF_DURATION_SAMPLES 10
@@ -12,7 +13,7 @@ using ms = duration<float, std::milli>;
 
 class RNSkTimingInfo {
 public:
-  RNSkTimingInfo() {
+  RNSkTimingInfo(const std::string &name): _name(std::move(name)) {
     reset();
   }
 
@@ -25,6 +26,7 @@ public:
     _prevFpsTimer = -1;
     _frameCount = 0;
     _lastFrameCount = -1;
+    _didSkip = false;
   }
   
   void beginTiming() {
@@ -35,6 +37,14 @@ public:
     time_point<steady_clock> stop = high_resolution_clock::now();
     addLastDuration(duration_cast<milliseconds>(stop - _start).count());
     tick(stop);
+    if(_didSkip) {
+      _didSkip = false;
+      RNSkLogger::logToConsole("%s: Skipped frame. Previous frame time: %lldms", _name.c_str(), _lastDuration);
+    }
+  }
+
+  void markSkipped() {
+    _didSkip = true;
   }
 
   long getAverage() { return static_cast<long>(_average); }
@@ -86,6 +96,8 @@ private:
   long _prevFpsTimer;
   double _frameCount;
   double _lastFrameCount;
+  double _didSkip;
+  std::string _name;
 };
 
 } // namespace RNSkia

package/ios/RNSkia-iOS/RNSkDrawViewImpl.h

@@ -21,20 +21,18 @@
 class RNSkDrawViewImpl : public RNSkia::RNSkDrawView {
 public:
   RNSkDrawViewImpl(std::shared_ptr<RNSkia::RNSkPlatformContext> context);
+  ~RNSkDrawViewImpl();
   
-  void setSize(int width, int height);
+  CALayer* getLayer() { return _layer; }
   
-  CALayer* getLayer() { return _layer; };
+  void setSize(int width, int height);
 
 protected:
   int getWidth() override { return _width * _context->getPixelDensity(); };
-  int getHeight() override { return _height * _context->getPixelDensity(); };
-  void onInvalidated() override {
-    setNativeDrawFunc(nullptr);
-  };
+  int getHeight() override { return _height * _context->getPixelDensity(); };  
   
 private:
-  void drawFrame(const sk_sp<SkPicture> picture);
+  void drawPicture(const sk_sp<SkPicture> picture) override;
   bool createSkiaSurface();
 
   int _nativeId;