Cleanup FWL default values part II.

xfa/fwl/core/cfwl_widgetmgr.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 
 #include <utility>
 
@@ skipping 86 matching lines @@
 CFWL_Widget* CFWL_WidgetMgr::GetSystemFormWidget(CFWL_Widget* pWidget) const {
   Item* pItem = GetWidgetMgrItem(pWidget);
   while (pItem) {
     if (IsAbleNative(pItem->pWidget))
       return pItem->pWidget;
     pItem = pItem->pParent;
   }
   return nullptr;
 }
 
-void CFWL_WidgetMgr::SetWidgetIndex(CFWL_Widget* pWidget, int32_t nIndex) {
+void CFWL_WidgetMgr::SetWidgetIndex(CFWL_Widget* pWidget) {
   Item* pItem = GetWidgetMgrItem(pWidget);
   if (!pItem)
     return;
   if (!pItem->pParent)
     return;
 
   Item* pChild = pItem->pParent->pChild;
   int32_t i = 0;
   while (pChild) {
     if (pChild == pItem) {
-      if (i == nIndex)
-        return;
       if (pChild->pPrevious)
         pChild->pPrevious->pNext = pChild->pNext;
       if (pChild->pNext)
         pChild->pNext->pPrevious = pChild->pPrevious;
       if (pItem->pParent->pChild == pItem)
         pItem->pParent->pChild = pItem->pNext;
 
       pItem->pNext = nullptr;
       pItem->pPrevious = nullptr;
       break;
     }
     if (!pChild->pNext)
       break;
 
     pChild = pChild->pNext;
     ++i;
   }
 
   pChild = pItem->pParent->pChild;
   if (pChild) {
-    if (nIndex < 0) {
-      while (pChild->pNext)
-        pChild = pChild->pNext;
+    while (pChild->pNext)
+      pChild = pChild->pNext;
 
-      pChild->pNext = pItem;
-      pItem->pPrevious = pChild;
-      pItem->pNext = nullptr;
-      return;
-    }
-
-    i = 0;
-    while (i < nIndex && pChild->pNext) {
-      pChild = pChild->pNext;
-      ++i;
-    }
-    if (!pChild->pNext) {
-      pChild->pNext = pItem;
-      pItem->pPrevious = pChild;
-      pItem->pNext = nullptr;
-      return;
-    }
-    if (pChild->pPrevious) {
-      pItem->pPrevious = pChild->pPrevious;
-      pChild->pPrevious->pNext = pItem;
-    }
-    pChild->pPrevious = pItem;
-    pItem->pNext = pChild;
-    if (pItem->pParent->pChild == pChild)
-      pItem->pParent->pChild = pItem;
+    pChild->pNext = pItem;
+    pItem->pPrevious = pChild;
   } else {
     pItem->pParent->pChild = pItem;
     pItem->pPrevious = nullptr;
-    pItem->pNext = nullptr;
   }
+  pItem->pNext = nullptr;
 }
 
 void CFWL_WidgetMgr::RepaintWidget(CFWL_Widget* pWidget,
                                    const CFX_RectF* pRect) {
   if (!m_pAdapter)
     return;
 
   CFWL_Widget* pNative = pWidget;
   CFX_RectF rect(*pRect);
   if (IsFormDisabled()) {
@@ skipping 10 matching lines @@
     pNative = GetSystemFormWidget(pWidget);
     if (!pNative)
       return;
 
     pWidget->TransformTo(pNative, rect.left, rect.top);
   }
   AddRedrawCounts(pNative);
   m_pAdapter->RepaintWidget(pNative, &rect);
 }
 
-void CFWL_WidgetMgr::InsertWidget(CFWL_Widget* pParent,
-                                  CFWL_Widget* pChild,
-                                  int32_t nIndex) {
+void CFWL_WidgetMgr::InsertWidget(CFWL_Widget* pParent, CFWL_Widget* pChild) {
   Item* pParentItem = GetWidgetMgrItem(pParent);
   if (!pParentItem) {
     auto item = pdfium::MakeUnique<Item>(pParent);
     pParentItem = item.get();
     m_mapWidgetItem[pParent] = std::move(item);
 
     pParentItem->pParent = GetWidgetMgrItem(nullptr);
-    SetWidgetIndex(pParent, -1);
+    SetWidgetIndex(pParent);
   }
 
   Item* pItem = GetWidgetMgrItem(pChild);
   if (!pItem) {
     auto item = pdfium::MakeUnique<Item>(pChild);
     pItem = item.get();
     m_mapWidgetItem[pChild] = std::move(item);
   }
   if (pItem->pParent && pItem->pParent != pParentItem) {
     if (pItem->pPrevious)
       pItem->pPrevious->pNext = pItem->pNext;
     if (pItem->pNext)
       pItem->pNext->pPrevious = pItem->pPrevious;
     if (pItem->pParent->pChild == pItem)
       pItem->pParent->pChild = pItem->pNext;
   }
   pItem->pParent = pParentItem;
-  SetWidgetIndex(pChild, nIndex);
+  SetWidgetIndex(pChild);
 }
 
 void CFWL_WidgetMgr::RemoveWidget(CFWL_Widget* pWidget) {
   Item* pItem = GetWidgetMgrItem(pWidget);
   if (!pItem)
     return;
   if (pItem->pPrevious)
     pItem->pPrevious->pNext = pItem->pNext;
   if (pItem->pNext)
     pItem->pNext->pPrevious = pItem->pPrevious;
@@ skipping 10 matching lines @@
 }
 
 void CFWL_WidgetMgr::SetOwner(CFWL_Widget* pOwner, CFWL_Widget* pOwned) {
   Item* pParentItem = GetWidgetMgrItem(pOwner);
   if (!pParentItem) {
     auto item = pdfium::MakeUnique<Item>(pOwner);
     pParentItem = item.get();
     m_mapWidgetItem[pOwner] = std::move(item);
 
     pParentItem->pParent = GetWidgetMgrItem(nullptr);
-    SetWidgetIndex(pOwner, -1);
+    SetWidgetIndex(pOwner);
   }
 
   Item* pItem = GetWidgetMgrItem(pOwned);
   if (!pItem) {
     auto item = pdfium::MakeUnique<Item>(pOwned);
     pItem = item.get();
     m_mapWidgetItem[pOwned] = std::move(item);
   }
   pItem->pOwner = pParentItem;
 }
 void CFWL_WidgetMgr::SetParent(CFWL_Widget* pParent, CFWL_Widget* pChild) {
   Item* pParentItem = GetWidgetMgrItem(pParent);
   Item* pItem = GetWidgetMgrItem(pChild);
   if (!pItem)
     return;
   if (pItem->pParent && pItem->pParent != pParentItem) {
     if (pItem->pPrevious)
       pItem->pPrevious->pNext = pItem->pNext;
     if (pItem->pNext)
       pItem->pNext->pPrevious = pItem->pPrevious;
     if (pItem->pParent->pChild == pItem)
       pItem->pParent->pChild = pItem->pNext;
 
     pItem->pNext = nullptr;
     pItem->pPrevious = nullptr;
   }
   pItem->pParent = pParentItem;
-  SetWidgetIndex(pChild, -1);
+  SetWidgetIndex(pChild);
 }
 
 void CFWL_WidgetMgr::SetWidgetRect_Native(CFWL_Widget* pWidget,
                                           const CFX_RectF& rect) {
   if (!FWL_UseOffscreen(pWidget))
     return;
 
   Item* pItem = GetWidgetMgrItem(pWidget);
   pItem->iRedrawCounter++;
   if (pItem->pOffscreen) {
@@ skipping 18 matching lines @@
     return nullptr;
 
   FX_FLOAT x1;
   FX_FLOAT y1;
   CFWL_Widget* child = GetLastChildWidget(parent);
   while (child) {
     if ((child->GetStates() & FWL_WGTSTATE_Invisible) == 0) {
       x1 = x;
       y1 = y;
       CFX_Matrix matrixOnParent;
-      child->GetMatrix(matrixOnParent);
+      child->GetMatrix(matrixOnParent, false);
       CFX_Matrix m;
       m.SetIdentity();
       m.SetReverse(matrixOnParent);
       m.TransformPoint(x1, y1);
       CFX_RectF bounds;
       child->GetWidgetRect(bounds, false);
       if (bounds.Contains(x1, y1)) {
         x1 -= bounds.left;
         y1 -= bounds.top;
         return GetWidgetAtPoint(child, x1, y1);
@@ skipping 418 matching lines @@
       pWidget(widget),
       iRedrawCounter(0)
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
       ,
       bOutsideChanged(false)
 #endif
 {
 }
 
 CFWL_WidgetMgr::Item::~Item() {}