[BugFix] Preserve platform renderer child order

- Pass the insertion index through platform renderer AddChild so rebuilt sublayers can insert before existing children.

- Measure renderer-backed AndroidView hosts in onMeasure and avoid triggering UIHost measure from onLayout.

- Keep the source branch free of temporary diagnostic logging changes.

TEST: Android noasan debug example build succeeded.

AutoLand: release/3.8, release/3.9, release/4.0, develop

Author: linxs0211

core/renderer/dom/fragment/fragment_unittest.cc

@@ -97,7 +97,7 @@ class TestPlatformRenderer : public PlatformRendererImpl {
     }
   }
   void OnUpdateAttributes(const fml::RefPtr<PropBundle>&, bool) override {}
-  void OnAddChild(PlatformRenderer*) override {}
+  void OnAddChild(PlatformRenderer*, int) override {}
   void OnRemoveFromParent() override {}
   void OnUpdateSubtreeProperties(const DisplayList&) override {}
 };

core/renderer/ui_wrapper/painting/android/platform_renderer_android.cc

@@ -70,10 +70,10 @@ void PlatformRendererAndroid::OnUpdateDisplayList(DisplayList display_list) {
   }
 }
 
-void PlatformRendererAndroid::OnAddChild(PlatformRenderer* child) {
+void PlatformRendererAndroid::OnAddChild(PlatformRenderer* child, int index) {
   if (context_ && child) {
     context_->InsertPlatformRenderer(PlatformRendererImpl::GetId(),
-                                     child->GetId(), -1);
+                                     child->GetId(), index);
   }
 }
 

core/renderer/ui_wrapper/painting/android/platform_renderer_android.h

@@ -31,7 +31,7 @@ class PlatformRendererAndroid : public PlatformRendererImpl {
   void OnUpdateDisplayList(DisplayList display_list) override;
   void OnUpdateAttributes(const fml::RefPtr<PropBundle>& attributes,
                           bool tends_to_flatten) override;
-  void OnAddChild(PlatformRenderer* child) override;
+  void OnAddChild(PlatformRenderer* child, int index) override;
   void OnRemoveFromParent() override;
   void OnUpdateSubtreeProperties(
       const DisplayList& subtree_properties) override;

core/renderer/ui_wrapper/painting/ios/platform_renderer_darwin.h

@@ -44,7 +44,7 @@ class PlatformRendererDarwin : public PlatformRendererImpl {
   void OnUpdateDisplayList(DisplayList display_list) override;
   void OnUpdateAttributes(const fml::RefPtr<PropBundle>& attributes,
                           bool tends_to_flatten) override;
-  void OnAddChild(PlatformRenderer* child) override;
+  void OnAddChild(PlatformRenderer* child, int index) override;
   void OnRemoveFromParent() override;
   void OnUpdateSubtreeProperties(const DisplayList& subtree_properties) override;
   void UpdatePlatformExtraBundle(id platform_extra_bundle);

core/renderer/ui_wrapper/painting/ios/platform_renderer_darwin.mm

@@ -147,7 +147,9 @@ bool ShouldDetachThroughUIOwner(LynxUIOwner* owner, int sign) {
   }
 }
 
-void PlatformRendererDarwin::OnAddChild(PlatformRenderer* child) {
+void PlatformRendererDarwin::OnAddChild(PlatformRenderer* child, int /* index */) {
+  // TODO(linxs): Support indexed insertion on iOS after mapping the
+  // platform renderer child index to the corresponding UIOwner/UIView child index.
   if (child == nullptr) {
     return;
   }

core/renderer/ui_wrapper/painting/native_painting_context_platform_ref.cc

@@ -135,7 +135,7 @@ void NativePaintingCtxPlatformRef::RebuildSubLayers(
     int child_id = new_children[insert_pos];
     auto child_it = renderers_.find(child_id);
     if (child_it != renderers_.end()) {
-      renderer->AddChild(child_it->second);
+      renderer->AddChild(child_it->second, insert_pos);
     }
   }
 }

core/renderer/ui_wrapper/painting/platform_renderer.h

@@ -31,7 +31,8 @@ class PlatformRenderer : public fml::RefCountedThreadSafeStorage {
   virtual void UpdateAttributes(const fml::RefPtr<PropBundle>& attributes,
                                 bool tends_to_flatten) = 0;
   // Add a child renderer
-  virtual void AddChild(fml::RefPtr<PlatformRenderer> child) = 0;
+  virtual void AddChild(fml::RefPtr<PlatformRenderer> child,
+                        int index = -1) = 0;
 
   // Remove this renderer from its parent
   virtual void RemoveFromParent() = 0;

core/renderer/ui_wrapper/painting/platform_renderer_impl.cc

@@ -53,7 +53,8 @@ void PlatformRendererImpl::UpdateAttributes(
   OnUpdateAttributes(attributes, tends_to_flatten);
 }
 
-void PlatformRendererImpl::AddChild(fml::RefPtr<PlatformRenderer> child) {
+void PlatformRendererImpl::AddChild(fml::RefPtr<PlatformRenderer> child,
+                                    int index) {
   if (!child) {
     return;
   }
@@ -64,14 +65,22 @@ void PlatformRendererImpl::AddChild(fml::RefPtr<PlatformRenderer> child) {
     child_impl->RemoveFromParent();
   }
 
+  const bool should_append =
+      index < 0 || static_cast<size_t>(index) >= children_.size();
+  const int insert_index = should_append ? -1 : index;
+
   // Set parent relationship
   child_impl->parent_ = this;
 
   // Call platform-specific implementation
-  OnAddChild(child.get());
+  OnAddChild(child.get(), insert_index);
 
   // Add to children list
-  children_.push_back(std::move(child));
+  if (should_append) {
+    children_.push_back(std::move(child));
+  } else {
+    children_.insert(children_.begin() + index, std::move(child));
+  }
 }
 
 void PlatformRendererImpl::RemoveFromParent() {

core/renderer/ui_wrapper/painting/platform_renderer_impl.h

@@ -43,7 +43,7 @@ class PlatformRendererImpl : public PlatformRenderer {
   const DisplayList& GetDisplayList() const { return display_list_; }
 
   void RemoveFromParent() override;
-  void AddChild(fml::RefPtr<PlatformRenderer> child) override;
+  void AddChild(fml::RefPtr<PlatformRenderer> child, int index = -1) override;
 
   const ChildVecT& Children() const override { return children_; }
 
@@ -68,7 +68,7 @@ class PlatformRendererImpl : public PlatformRenderer {
   virtual void OnUpdateDisplayList(DisplayList display_list) = 0;
   virtual void OnUpdateAttributes(const fml::RefPtr<PropBundle>& attributes,
                                   bool tends_to_flatten) = 0;
-  virtual void OnAddChild(PlatformRenderer* child) = 0;
+  virtual void OnAddChild(PlatformRenderer* child, int index) = 0;
   virtual void OnRemoveFromParent() = 0;
   virtual void OnUpdateSubtreeProperties(
       const DisplayList& subtree_properties) = 0;

platform/android/lynx_android/src/main/java/com/lynx/tasm/behavior/render/Renderer.java

@@ -97,6 +97,8 @@ public void setUIHost(LynxBaseUI uiHost) {
   }
 
   public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    // TODO(linxs): Rename this to performMeasureChildren and remove the unused measure
+    // spec parameters, since this method only measures renderer host children.
     if (mRenderHost == null) {
       return;
     }
@@ -120,6 +122,8 @@ public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
   }
 
   public void onLayout(boolean changed, int l, int t, int r, int b) {
+    // TODO(linxs): Rename this to performLayoutChildren, since this method only lays out
+    // renderer host children.
     if (mRenderHost == null) {
       return;
     }