Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1860)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: xfa/fwl/core/cfwl_widgetmgr.cpp

Issue 2520063002: Split fwl/core class pt II. (Closed)
Patch Set: sort header Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« xfa/fwl/core/cfwl_eventtarget.h ('K') | « xfa/fwl/core/cfwl_widgetmgr.h ('k') | xfa/fwl/core/cfwl_widgetproperties.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/cfwl_widgetmgr.cpp
diff --git a/xfa/fwl/core/cfwl_widgetmgr.cpp b/xfa/fwl/core/cfwl_widgetmgr.cpp
index 6623e8f9fb524e9821a1313862da90ec1340e80d..0fc2425d100b96e19007f1f98f9ceb54abbbc0c7 100644
--- a/xfa/fwl/core/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/core/cfwl_widgetmgr.cpp
@@ -8,7 +8,7 @@
#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"
@@ -38,7 +38,7 @@ bool FWL_UseOffscreen(IFWL_Widget* pWidget) {
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
@@ -47,17 +47,17 @@ CFWL_WidgetMgr::CFWL_WidgetMgr(CXFA_FFApp* pAdapterNative)
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;
@@ -68,22 +68,22 @@ IFWL_Widget* CFWL_WidgetMgr::GetFirstSiblingWidget(IFWL_Widget* pWidget) const {
}
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;
@@ -94,7 +94,7 @@ IFWL_Widget* CFWL_WidgetMgr::GetLastChildWidget(IFWL_Widget* pWidget) const {
}
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;
@@ -104,13 +104,13 @@ IFWL_Widget* CFWL_WidgetMgr::GetSystemFormWidget(IFWL_Widget* pWidget) const {
}
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) {
@@ -203,17 +203,17 @@ void CFWL_WidgetMgr::RepaintWidget(IFWL_Widget* pWidget,
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) {
@@ -229,7 +229,7 @@ void CFWL_WidgetMgr::InsertWidget(IFWL_Widget* pParent,
}
void CFWL_WidgetMgr::RemoveWidget(IFWL_Widget* pWidget) {
- CFWL_WidgetMgrItem* pItem = GetWidgetMgrItem(pWidget);
+ Item* pItem = GetWidgetMgrItem(pWidget);
if (!pItem)
return;
if (pItem->pPrevious)
@@ -239,9 +239,9 @@ void CFWL_WidgetMgr::RemoveWidget(IFWL_Widget* pWidget) {
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;
}
@@ -249,24 +249,24 @@ void CFWL_WidgetMgr::RemoveWidget(IFWL_Widget* 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) {
@@ -289,7 +289,7 @@ void CFWL_WidgetMgr::SetWidgetRect_Native(IFWL_Widget* pWidget,
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();
@@ -427,12 +427,11 @@ 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 {
@@ -591,7 +590,7 @@ CFX_Graphics* CFWL_WidgetMgr::DrawWidgetBefore(IFWL_Widget* pWidget,
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;
@@ -610,21 +609,21 @@ void CFWL_WidgetMgr::DrawWidgetAfter(IFWL_Widget* pWidget,
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;
@@ -722,7 +721,7 @@ bool CFWL_WidgetMgr::IsNeedRepaint(IFWL_Widget* pWidget,
}
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;
@@ -742,9 +741,9 @@ bool CFWL_WidgetMgr::UseOffscreenDirect(IFWL_Widget* pWidget) const {
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),
@@ -759,4 +758,4 @@ CFWL_WidgetMgrItem::CFWL_WidgetMgrItem(IFWL_Widget* widget)
{
}
-CFWL_WidgetMgrItem::~CFWL_WidgetMgrItem() {}
+CFWL_WidgetMgr::Item::~Item() {}
« xfa/fwl/core/cfwl_eventtarget.h ('K') | « xfa/fwl/core/cfwl_widgetmgr.h ('k') | xfa/fwl/core/cfwl_widgetproperties.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698