[sksg] Refactor inval registration

... to avoid having too many Node friends.

TBR=
Change-Id: I8f8ff570d94ea48017935066a3d51cd8265ec120
Reviewed-on: https://skia-review.googlesource.com/97980
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

2 files changed, 6 insertions, 6 deletions

diff --git a/experimental/sksg/effects/SkSGMaskEffect.cpp b/experimental/sksg/effects/SkSGMaskEffect.cpp
index d4ce6df4db..17b4da7037 100644
--- a/experimental/sksg/effects/SkSGMaskEffect.cpp
+++ b/experimental/sksg/effects/SkSGMaskEffect.cpp
@@ -14,11 +14,11 @@ namespace sksg {
 MaskEffect::MaskEffect(sk_sp<RenderNode> child, sk_sp<RenderNode> mask)
     : INHERITED(std::move(child))
     , fMaskNode(std::move(mask)) {
-    fMaskNode->addInvalReceiver(this);
+    this->observeInval(fMaskNode);
 }
 
 MaskEffect::~MaskEffect() {
-    fMaskNode->removeInvalReceiver(this);
+    this->unobserveInval(fMaskNode);
 }
 
 void MaskEffect::onRender(SkCanvas* canvas) const {
diff --git a/experimental/sksg/effects/SkSGTransform.cpp b/experimental/sksg/effects/SkSGTransform.cpp
index a5731b1a3f..6a985a971e 100644
--- a/experimental/sksg/effects/SkSGTransform.cpp
+++ b/experimental/sksg/effects/SkSGTransform.cpp
@@ -16,13 +16,13 @@ Matrix::Matrix(const SkMatrix& m, sk_sp<Matrix> parent)
     , fParent(std::move(parent))
     , fLocalMatrix(m) {
     if (fParent) {
-        fParent->addInvalReceiver(this);
+        this->observeInval(fParent);
     }
 }
 
 Matrix::~Matrix() {
     if (fParent) {
-        fParent->removeInvalReceiver(this);
+        this->unobserveInval(fParent);
     }
 }
 
@@ -40,11 +40,11 @@ SkRect Matrix::onRevalidate(InvalidationController* ic, const SkMatrix& ctm) {
 Transform::Transform(sk_sp<RenderNode> child, sk_sp<Matrix> matrix)
     : INHERITED(std::move(child))
     , fMatrix(std::move(matrix)) {
-    fMatrix->addInvalReceiver(this);
+    this->observeInval(fMatrix);
 }
 
 Transform::~Transform() {
-    fMatrix->removeInvalReceiver(this);
+    this->unobserveInval(fMatrix);
 }
 
 void Transform::onRender(SkCanvas* canvas) const {