commit bee88d433d002d56d0455b26e4f70c7155c4cdf4
author Florin Malita <fmalita@chromium.org> Tue Oct 02 13:05:39 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 02 17:27:34 2018 +0000
tree 4ee0a26e508b8074c3e38d66d40abcfb54063d69
parent cb969c76e7331bf99ef4e5c6f3b064b503eeadb9

[sksg] Fix inval tracking in Group::removeChild()

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

modules/sksg/src/SkSGGroup.cpp

diff --git a/modules/sksg/src/SkSGGroup.cpp b/modules/sksg/src/SkSGGroup.cpp
index 4841714..df696c4 100644
--- a/modules/sksg/src/SkSGGroup.cpp
+++ b/modules/sksg/src/SkSGGroup.cpp
@@ -43,6 +43,7 @@
     fChildren.erase(std::remove(fChildren.begin(), fChildren.end(), node), fChildren.end());
     SkASSERT(fChildren.size() == origSize - 1);
 
+    this->unobserveInval(node);
     this->invalidate();
 }
 

modules/sksg/tests/SGTest.cpp

diff --git a/modules/sksg/tests/SGTest.cpp b/modules/sksg/tests/SGTest.cpp
index e098171..1b6e4f9 100644
--- a/modules/sksg/tests/SGTest.cpp
+++ b/modules/sksg/tests/SGTest.cpp
@@ -191,9 +191,21 @@
     }
 }
 
+static void inval_group_remove(skiatest::Reporter* reporter) {
+    auto draw = sksg::Draw::Make(sksg::Rect::Make(SkRect::MakeWH(100, 100)),
+                                 sksg::Color::Make(SK_ColorBLACK));
+    auto grp = sksg::Group::Make();
+
+    // Readding the child should not trigger asserts.
+    grp->addChild(draw);
+    grp->removeChild(draw);
+    grp->addChild(draw);
+}
+
 DEF_TEST(SGInvalidation, reporter) {
     inval_test1(reporter);
     inval_test2(reporter);
+    inval_group_remove(reporter);
 }
 
 #endif // !defined(SK_BUILD_FOR_GOOGLE3)