Split fwl/core class pt 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>
 
-#include "xfa/fwl/core/fwl_noteimp.h"
+#include "xfa/fwl/core/cfwl_notedriver.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_form.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 
 namespace {
 
 const int kNeedRepaintHitPoints = 12;
 const int kNeedRepaintHitPiece = 3;
 
 struct FWL_NEEDREPAINTHITDATA {
   CFX_PointF hitPoint;
   bool bNotNeedRepaint;
   bool bNotContainByDirty;
 };
 
 }  // namespace
 
 bool FWL_UseOffscreen(IFWL_Widget* pWidget) {
 #if (_FX_OS_ == _FX_MACOSX_)
   return false;
 #else
   return !!(pWidget->GetStyles() & FWL_WGTSTYLE_Offscreen);
 #endif
 }
 
 CFWL_WidgetMgr::CFWL_WidgetMgr(CXFA_FFApp* pAdapterNative)
     : m_dwCapability(0), m_pAdapter(pAdapterNative->GetWidgetMgr(this)) {
   ASSERT(m_pAdapter);
-  m_mapWidgetItem[nullptr].reset(new CFWL_WidgetMgrItem);
+  m_mapWidgetItem[nullptr].reset(new Item);

[npm, 2016/11/21 21:21:46]

MakeUnique?

[dsinclair, 2016/11/21 21:57:07]

Done.

 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
   m_rtScreen.Reset();
 #endif
 }
 
 CFWL_WidgetMgr::~CFWL_WidgetMgr() {}
 
 IFWL_Widget* CFWL_WidgetMgr::GetParentWidget(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   return pItem && pItem->pParent ? pItem->pParent->pWidget : nullptr;
 }
 
 IFWL_Widget* CFWL_WidgetMgr::GetOwnerWidget(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   return pItem && pItem->pOwner ? pItem->pOwner->pWidget : nullptr;
 }
 
 IFWL_Widget* CFWL_WidgetMgr::GetFirstSiblingWidget(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   if (!pItem)
     return nullptr;
 
   pItem = pItem->pPrevious;
   while (pItem && pItem->pPrevious)
     pItem = pItem->pPrevious;
   return pItem ? pItem->pWidget : nullptr;
 }
 
 IFWL_Widget* CFWL_WidgetMgr::GetPriorSiblingWidget(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   return pItem && pItem->pPrevious ? pItem->pPrevious->pWidget : nullptr;
 }
 
 IFWL_Widget* CFWL_WidgetMgr::GetNextSiblingWidget(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   return pItem && pItem->pNext ? pItem->pNext->pWidget : nullptr;
 }
 
 IFWL_Widget* CFWL_WidgetMgr::GetFirstChildWidget(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   return pItem && pItem->pChild ? pItem->pChild->pWidget : nullptr;
 }
 
 IFWL_Widget* CFWL_WidgetMgr::GetLastChildWidget(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   if (!pItem)
     return nullptr;
 
   pItem = pItem->pChild;
   while (pItem && pItem->pNext)
     pItem = pItem->pNext;
   return pItem ? pItem->pWidget : nullptr;
 }
 
 IFWL_Widget* CFWL_WidgetMgr::GetSystemFormWidget(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   while (pItem) {
     if (IsAbleNative(pItem->pWidget))
       return pItem->pWidget;
     pItem = pItem->pParent;
   }
   return nullptr;
 }
 
 void CFWL_WidgetMgr::SetWidgetIndex(IFWL_Widget* pWidget, int32_t nIndex) {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   if (!pItem)
     return;
   if (!pItem->pParent)
     return;
 
-  CFWL_WidgetMgrItem* pChild = pItem->pParent->pChild;
+  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)
@@ skipping 72 matching lines @@
 
     pWidget->TransformTo(pNative, rect.left, rect.top);
   }
   AddRedrawCounts(pNative);
   m_pAdapter->RepaintWidget(pNative, &rect);
 }
 
 void CFWL_WidgetMgr::InsertWidget(IFWL_Widget* pParent,
                                   IFWL_Widget* pChild,
                                   int32_t nIndex) {
-  CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(pParent);
+  Item* pParentItem = GetWidgetMgrItem(pParent);
   if (!pParentItem) {
-    pParentItem = new CFWL_WidgetMgrItem(pParent);
+    pParentItem = new Item(pParent);
     m_mapWidgetItem[pParent].reset(pParentItem);
     pParentItem->pParent = GetWidgetMgrItem(nullptr);
     SetWidgetIndex(pParent, -1);
   }
 
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pChild);
+  Item* pItem = GetWidgetMgrItem(pChild);
   if (!pItem) {
-    pItem = new CFWL_WidgetMgrItem(pChild);
+    pItem = new Item(pChild);
     m_mapWidgetItem[pChild].reset(pItem);
   }
   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);
 }
 
 void CFWL_WidgetMgr::RemoveWidget(IFWL_Widget* pWidget) {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   if (!pItem)
     return;
   if (pItem->pPrevious)
     pItem->pPrevious->pNext = pItem->pNext;
   if (pItem->pNext)
     pItem->pNext->pPrevious = pItem->pPrevious;
   if (pItem->pParent && pItem->pParent->pChild == pItem)
     pItem->pParent->pChild = pItem->pNext;
 
-  CFWL_WidgetMgrItem* pChild = pItem->pChild;
+  Item* pChild = pItem->pChild;
   while (pChild) {
-    CFWL_WidgetMgrItem* pNext = pChild->pNext;
+    Item* pNext = pChild->pNext;
     RemoveWidget(pChild->pWidget);
     pChild = pNext;
   }
   m_mapWidgetItem.erase(pWidget);
 }
 
 void CFWL_WidgetMgr::SetOwner(IFWL_Widget* pOwner, IFWL_Widget* pOwned) {
-  CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(pOwner);
+  Item* pParentItem = GetWidgetMgrItem(pOwner);
   if (!pParentItem) {
-    pParentItem = new CFWL_WidgetMgrItem(pOwner);
+    pParentItem = new Item(pOwner);
     m_mapWidgetItem[pOwner].reset(pParentItem);
     pParentItem->pParent = GetWidgetMgrItem(nullptr);
     SetWidgetIndex(pOwner, -1);
   }
 
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pOwned);
+  Item* pItem = GetWidgetMgrItem(pOwned);
   if (!pItem) {
-    pItem = new CFWL_WidgetMgrItem(pOwned);
+    pItem = new Item(pOwned);
     m_mapWidgetItem[pOwned].reset(pItem);
   }
   pItem->pOwner = pParentItem;
 }
 void CFWL_WidgetMgr::SetParent(IFWL_Widget* pParent, IFWL_Widget* pChild) {
-  CFWL_WidgetMgrItem* pParentItem = GetWidgetMgrItem(pParent);
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(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);
 }
 
 void CFWL_WidgetMgr::SetWidgetRect_Native(IFWL_Widget* pWidget,
                                           const CFX_RectF& rect) {
   if (!FWL_UseOffscreen(pWidget))
     return;
 
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   pItem->iRedrawCounter++;
   if (pItem->pOffscreen) {
     CFX_RenderDevice* pDevice = pItem->pOffscreen->GetRenderDevice();
     if (pDevice && pDevice->GetBitmap()) {
       CFX_DIBitmap* pBitmap = pDevice->GetBitmap();
       if (pBitmap->GetWidth() - rect.width > 1 ||
           pBitmap->GetHeight() - rect.height > 1) {
         pItem->pOffscreen.reset();
       }
     }
@@ skipping 117 matching lines @@
 }
 
 void CFWL_WidgetMgr::AddRedrawCounts(IFWL_Widget* pWidget) {
   GetWidgetMgrItem(pWidget)->iRedrawCounter++;
 }
 
 void CFWL_WidgetMgr::ResetRedrawCounts(IFWL_Widget* pWidget) {
   GetWidgetMgrItem(pWidget)->iRedrawCounter = 0;
 }
 
-CFWL_WidgetMgrItem* CFWL_WidgetMgr::GetWidgetMgrItem(
+CFWL_WidgetMgr::Item* CFWL_WidgetMgr::GetWidgetMgrItem(
     IFWL_Widget* pWidget) const {
   auto it = m_mapWidgetItem.find(pWidget);
-  return it != m_mapWidgetItem.end()
-             ? static_cast<CFWL_WidgetMgrItem*>(it->second.get())
-             : nullptr;
+  return it != m_mapWidgetItem.end() ? static_cast<Item*>(it->second.get())
+                                     : nullptr;
 }
 
 bool CFWL_WidgetMgr::IsAbleNative(IFWL_Widget* pWidget) const {
   if (!pWidget)
     return false;
   if (!pWidget->IsInstance(FX_WSTRC(FWL_CLASS_Form)))
     return false;
 
   uint32_t dwStyles = pWidget->GetStyles();
   return ((dwStyles & FWL_WGTSTYLE_WindowTypeMask) ==
@@ skipping 138 matching lines @@
     child = GetNextSiblingWidget(child);
   }
 }
 
 CFX_Graphics* CFWL_WidgetMgr::DrawWidgetBefore(IFWL_Widget* pWidget,
                                                CFX_Graphics* pGraphics,
                                                const CFX_Matrix* pMatrix) {
   if (!FWL_UseOffscreen(pWidget))
     return pGraphics;
 
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   if (!pItem->pOffscreen) {
     pItem->pOffscreen.reset(new CFX_Graphics);
     CFX_RectF rect;
     pWidget->GetWidgetRect(rect);
     pItem->pOffscreen->Create((int32_t)rect.width, (int32_t)rect.height,
                               FXDIB_Argb);
   }
   CFX_RectF rect;
   pGraphics->GetClipRect(rect);
   pItem->pOffscreen->SetClipRect(rect);
   return pItem->pOffscreen.get();
 }
 
 void CFWL_WidgetMgr::DrawWidgetAfter(IFWL_Widget* pWidget,
                                      CFX_Graphics* pGraphics,
                                      CFX_RectF& rtClip,
                                      const CFX_Matrix* pMatrix) {
   if (FWL_UseOffscreen(pWidget)) {
-    CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+    Item* pItem = GetWidgetMgrItem(pWidget);
     pGraphics->Transfer(pItem->pOffscreen.get(), rtClip.left, rtClip.top,
                         rtClip, pMatrix);
 #ifdef _WIN32
     pItem->pOffscreen->ClearClip();
 #endif
   }
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   pItem->iRedrawCounter = 0;
 }
 
 bool CFWL_WidgetMgr::IsNeedRepaint(IFWL_Widget* pWidget,
                                    CFX_Matrix* pMatrix,
                                    const CFX_RectF& rtDirty) {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   if (pItem && pItem->iRedrawCounter > 0) {
     pItem->iRedrawCounter = 0;
     return true;
   }
 
   CFX_RectF rtWidget;
   pWidget->GetWidgetRect(rtWidget);
   rtWidget.left = rtWidget.top = 0;
   pMatrix->TransformRect(rtWidget);
   if (!rtWidget.IntersectWith(rtDirty))
@@ skipping 77 matching lines @@
   if (repaintPoint > 0)
     return true;
 
   pMatrix->TransformRect(rtChilds);
   if (rtChilds.Contains(rtDirty) || rtChilds.Contains(rtWidget))
     return false;
   return true;
 }
 
 bool CFWL_WidgetMgr::UseOffscreenDirect(IFWL_Widget* pWidget) const {
-  CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+  Item* pItem = GetWidgetMgrItem(pWidget);
   if (!FWL_UseOffscreen(pWidget) || !(pItem->pOffscreen))
     return false;
 
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
   if (pItem->bOutsideChanged) {
     CFX_RectF r;
     pWidget->GetWidgetRect(r);
     CFX_RectF temp(m_rtScreen);
     temp.Deflate(50, 50);
     if (!temp.Contains(r))
       return false;
 
     pItem->bOutsideChanged = false;
   }
 #endif
 
   return pItem->iRedrawCounter == 0;
 }
 
-CFWL_WidgetMgrItem::CFWL_WidgetMgrItem() : CFWL_WidgetMgrItem(nullptr) {}
+CFWL_WidgetMgr::Item::Item() : CFWL_WidgetMgr::Item(nullptr) {}
 
-CFWL_WidgetMgrItem::CFWL_WidgetMgrItem(IFWL_Widget* widget)
+CFWL_WidgetMgr::Item::Item(IFWL_Widget* widget)
     : pParent(nullptr),
       pOwner(nullptr),
       pChild(nullptr),
       pPrevious(nullptr),
       pNext(nullptr),
       pWidget(widget),
       iRedrawCounter(0)
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
       ,
       bOutsideChanged(false)
 #endif
 {
 }
 
-CFWL_WidgetMgrItem::~CFWL_WidgetMgrItem() {}
+CFWL_WidgetMgr::Item::~Item() {}