Fix restore

Author: bdero

impeller/aiks/canvas.cc

@@ -209,17 +209,16 @@ bool Canvas::Restore() {
   if (transform_stack_.size() == 1) {
     return false;
   }
+  size_t num_clips = transform_stack_.back().num_clips;
   if (transform_stack_.back().rendering_mode ==
       Entity::RenderingMode::kSubpass) {
+    current_pass_->PopClips(num_clips, current_depth_);
     current_pass_ = GetCurrentPass().GetSuperpass();
     FML_DCHECK(current_pass_);
   }
 
-  size_t num_clips = transform_stack_.back().num_clips;
   transform_stack_.pop_back();
-
   if (num_clips > 0) {
-    GetCurrentPass().PopClips(num_clips, current_depth_);
     RestoreClip();
   }
 
@@ -561,7 +560,7 @@ void Canvas::ClipGeometry(const std::shared_ptr<Geometry>& geometry,
   GetCurrentPass().PushClip(std::move(entity));
 
   ++transform_stack_.back().clip_depth;
-  transform_stack_.back().num_clips++;
+  ++transform_stack_.back().num_clips;
 }
 
 void Canvas::IntersectCulling(Rect clip_rect) {

impeller/aiks/canvas.h

@@ -33,8 +33,9 @@ struct CanvasStackEntry {
   // |cull_rect| is conservative screen-space bounds of the clipped output area
   std::optional<Rect> cull_rect;
   size_t clip_depth = 0u;
+  // The number of clips tracked for this canvas stack entry.
+  size_t num_clips = 0u;
   Entity::RenderingMode rendering_mode = Entity::RenderingMode::kDirect;
-  size_t num_clips = false;
 };
 
 enum class PointStyle {

impeller/entity/entity_pass.cc

@@ -86,7 +86,10 @@ void EntityPass::PushClip(Entity entity) {
 
 void EntityPass::PopClips(size_t num_clips, uint64_t depth) {
   if (num_clips > active_clips_.size()) {
-    VALIDATION_LOG << "Attempted to pop more clips than are currently active.";
+    VALIDATION_LOG
+        << "Attempted to pop more clips than are currently active. Active: "
+        << active_clips_.size() << ", Popped: " << num_clips
+        << ", Depth: " << depth;
   }
   for (size_t i = 0; i < std::min(num_clips, active_clips_.size()); i++) {
     FML_DCHECK(active_clips_.back() < elements_.size());