summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-12-08 14:06:10 -0800
committerCommit bot <commit-bot@chromium.org>2016-12-08 14:06:10 -0800
commit89ab499024b1f362b1d40dabd9fadded8b095203 (patch)
tree456a5edadee5b6e45ce11e552c110f84e5b765b9 /xfa
parent43ac44cbf52076fd2354d5276c95d5b4b4a06d64 (diff)
downloadpdfium-89ab499024b1f362b1d40dabd9fadded8b095203.tar.xz
Change layout item in CFWL_Widget type from void
Previously the LayoutItem was a void*. This Cl changes the LayoutItem to explicity be a CXFA_FFWidget. Review-Url: https://codereview.chromium.org/2559643004
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fwl/cfwl_edit.cpp6
-rw-r--r--xfa/fwl/cfwl_widget.h7
-rw-r--r--xfa/fxfa/app/xfa_fwladapter.cpp6
-rw-r--r--xfa/fxfa/app/xfa_fwltheme.cpp4
4 files changed, 9 insertions, 14 deletions
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 913f08d7b9..5cf3f2f006 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -1168,8 +1168,7 @@ void CFWL_Edit::ShowCaret(CFX_RectF* pRect) {
pRect->Offset(rtOuter.left, rtOuter.top);
}
- CXFA_FFWidget* pXFAWidget =
- static_cast<CXFA_FFWidget*>(pOuter->GetLayoutItem());
+ CXFA_FFWidget* pXFAWidget = pOuter->GetLayoutItem();
if (!pXFAWidget)
return;
@@ -1197,8 +1196,7 @@ void CFWL_Edit::HideCaret(CFX_RectF* pRect) {
while (pOuter->GetOuter())
pOuter = pOuter->GetOuter();
- CXFA_FFWidget* pXFAWidget =
- static_cast<CXFA_FFWidget*>(pOuter->GetLayoutItem());
+ CXFA_FFWidget* pXFAWidget = pOuter->GetLayoutItem();
if (!pXFAWidget)
return;
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index 64fc526ad6..5046aab888 100644
--- a/xfa/fwl/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -43,6 +43,7 @@ class CFWL_MessageKey;
class CFWL_Widget;
class CFWL_WidgetMgr;
class CFWL_WidgetProperties;
+class CXFA_FFWidget;
class IFWL_ThemeProvider;
class CFWL_Widget : public IFWL_WidgetDelegate {
@@ -105,8 +106,8 @@ class CFWL_Widget : public IFWL_WidgetDelegate {
uint32_t GetEventKey() const { return m_nEventKey; }
void SetEventKey(uint32_t key) { m_nEventKey = key; }
- void* GetLayoutItem() const { return m_pLayoutItem; }
- void SetLayoutItem(void* pItem) { m_pLayoutItem = pItem; }
+ CXFA_FFWidget* GetLayoutItem() const { return m_pLayoutItem; }
+ void SetLayoutItem(CXFA_FFWidget* pItem) { m_pLayoutItem = pItem; }
void SetFocus(bool bFocus);
void RepaintRect(const CFX_RectF& pRect);
@@ -189,7 +190,7 @@ class CFWL_Widget : public IFWL_WidgetDelegate {
void NotifyDriver();
bool IsParent(CFWL_Widget* pParent);
- void* m_pLayoutItem;
+ CXFA_FFWidget* m_pLayoutItem;
uint32_t m_nEventKey;
IFWL_WidgetDelegate* m_pDelegate; // Not owned.
};
diff --git a/xfa/fxfa/app/xfa_fwladapter.cpp b/xfa/fxfa/app/xfa_fwladapter.cpp
index 3f3dc160b9..3dfa679c4b 100644
--- a/xfa/fxfa/app/xfa_fwladapter.cpp
+++ b/xfa/fxfa/app/xfa_fwladapter.cpp
@@ -17,8 +17,7 @@ void CXFA_FWLAdapterWidgetMgr::RepaintWidget(CFWL_Widget* pWidget) {
if (!pWidget)
return;
- CXFA_FFWidget* pFFWidget =
- static_cast<CXFA_FFWidget*>(pWidget->GetLayoutItem());
+ CXFA_FFWidget* pFFWidget = pWidget->GetLayoutItem();
if (!pFFWidget)
return;
@@ -30,8 +29,7 @@ bool CXFA_FWLAdapterWidgetMgr::GetPopupPos(CFWL_Widget* pWidget,
FX_FLOAT fMaxHeight,
const CFX_RectF& rtAnchor,
CFX_RectF& rtPopup) {
- CXFA_FFWidget* pFFWidget =
- static_cast<CXFA_FFWidget*>(pWidget->GetLayoutItem());
+ CXFA_FFWidget* pFFWidget = pWidget->GetLayoutItem();
CFX_Matrix mt;
pFFWidget->GetRotateMatrix(mt);
CFX_RectF rtRotateAnchor(rtAnchor);
diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp
index 2ca6237109..5a494f1231 100644
--- a/xfa/fxfa/app/xfa_fwltheme.cpp
+++ b/xfa/fxfa/app/xfa_fwltheme.cpp
@@ -38,9 +38,7 @@ CXFA_FFWidget* XFA_ThemeGetOuterWidget(CFWL_Widget* pWidget) {
CFWL_Widget* pOuter = pWidget;
while (pOuter && pOuter->GetOuter())
pOuter = pOuter->GetOuter();
-
- return pOuter ? static_cast<CXFA_FFWidget*>(pOuter->GetLayoutItem())
- : nullptr;
+ return pOuter ? pOuter->GetLayoutItem() : nullptr;
}
CXFA_FWLTheme::CXFA_FWLTheme(CXFA_FFApp* pApp)