fix: fix ui command swap.

Author: andycall

bridge/foundation/shared_ui_command.cc

@@ -73,11 +73,11 @@ void SharedUICommand::SyncToReserve() {
   size_t waiting_size = waiting_buffer_->size();
   size_t origin_reserve_size = reserve_buffer_->size();
 
-//  if (reserve_buffer_->empty()) {
-//    swap(reserve_buffer_, waiting_buffer_);
-//  } else {
+  if (reserve_buffer_->empty()) {
+    swap(reserve_buffer_, waiting_buffer_);
+  } else {
     appendCommand(reserve_buffer_, waiting_buffer_);
-//  }
+  }
 
   assert(waiting_buffer_->empty());
   assert(reserve_buffer_->size() == waiting_size + origin_reserve_size);
@@ -100,11 +100,7 @@ void SharedUICommand::SyncToActive() {
 
   size_t reserve_size = reserve_buffer_->size();
   size_t origin_active_size = active_buffer->size();
-//  if (active_buffer->empty()) {
-//    swap(active_buffer, reserve_buffer_);
-//  } else {
-    appendCommand(active_buffer, reserve_buffer_);
-//  }
+  appendCommand(active_buffer, reserve_buffer_);
   assert(reserve_buffer_->empty());
   assert(active_buffer->size() == reserve_size + origin_active_size);
 }
@@ -120,9 +116,7 @@ void SharedUICommand::appendCommand(std::unique_ptr<UICommandBuffer>& target,
   is_blocking_writing_.store(true, std::memory_order::memory_order_release);
 
   UICommandItem* command_item = original->data();
-  for (int i = 0; i < original->size(); i++) {
-    target->addCommand(command_item[i]);
-  }
+  target->addCommands(command_item, original->size());
 
   original->clear();
 

bridge/foundation/ui_command_buffer.cc

@@ -86,6 +86,28 @@ void UICommandBuffer::addCommand(const UICommandItem& item, bool request_ui_upda
   size_++;
 }
 
+void UICommandBuffer::addCommands(const webf::UICommandItem* items, int64_t item_size, bool request_ui_update) {
+  if (UNLIKELY(!context_->dartIsolateContext()->valid())) {
+    return;
+  }
+
+  int64_t target_size = size_ + item_size;
+  if (target_size > max_size_) {
+    buffer_ = (UICommandItem*)realloc(buffer_, sizeof(UICommandItem) * target_size * 2);
+    max_size_ = target_size * 2;
+  }
+
+#if FLUTTER_BACKEND
+  if (UNLIKELY(request_ui_update && !update_batched_ && context_->IsContextValid())) {
+    context_->dartMethodPtr()->requestBatchUpdate(context_->isDedicated(), context_->contextId());
+    update_batched_ = true;
+  }
+#endif
+
+  std::memcpy(buffer_ + size_, items, sizeof(UICommandItem) * item_size);
+  size_ = target_size;
+}
+
 UICommandItem* UICommandBuffer::data() {
   return buffer_;
 }

bridge/foundation/ui_command_buffer.h

@@ -83,6 +83,7 @@ class UICommandBuffer {
 
  private:
   void addCommand(const UICommandItem& item, bool request_ui_update = true);
+  void addCommands(const UICommandItem* items, int64_t item_size, bool request_ui_update = true);
   void updateFlags(UICommand command);
 
   ExecutingContext* context_{nullptr};

webf/lib/src/launcher/controller.dart

@@ -496,6 +496,9 @@ class WebFViewController implements WidgetsBindingObserver {
   }
 
   void cloneNode(Pointer<NativeBindingObject> selfPtr, Pointer<NativeBindingObject> newPtr) {
+    assert(hasBindingObject(selfPtr));
+    assert(hasBindingObject(newPtr));
+
     EventTarget? originalTarget = getBindingObject<EventTarget>(selfPtr);
     EventTarget? newTarget = getBindingObject<EventTarget>(newPtr);