diff options
| author | tsepez <tsepez@chromium.org> | 2016-05-26 17:35:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-26 17:35:54 -0700 |
| commit | 54ab2343c338f55735c37ed6751040791e1df1e2 (patch) | |
| tree | 59851961d740cb6c913dbdd42d54a8d64bfbf5de /xfa/fxfa/app/xfa_fftextedit.cpp | |
| parent | 3bd3841291b46bd7ae31cfb8dc8035e5b4ed4e40 (diff) | |
| download | pdfium-54ab2343c338f55735c37ed6751040791e1df1e2.tar.xz | |
Add opaque "layout item" to widgets for caller's use.
This avoids another use of CFX_PrivateData. Note that in the old
code, we'd be calling through a m_pImpl onto the same underlying
object as we passed as the "key" argument when setting the value,
which explains why the get calls, happening one object lower, pass
the same argument as which they are being inovked against.
Review-Url: https://codereview.chromium.org/2010923002
Diffstat (limited to 'xfa/fxfa/app/xfa_fftextedit.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_fftextedit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp index 89c9d356bd..ad1a508a16 100644 --- a/xfa/fxfa/app/xfa_fftextedit.cpp +++ b/xfa/fxfa/app/xfa_fftextedit.cpp @@ -38,8 +38,8 @@ FX_BOOL CXFA_FFTextEdit::LoadWidget() { CFWL_Edit* pFWLEdit = CFWL_Edit::Create(); pFWLEdit->Initialize(); m_pNormalWidget = pFWLEdit; + m_pNormalWidget->SetLayoutItem(this); IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); - m_pNormalWidget->SetPrivateData(pWidget, this, NULL); CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); @@ -450,7 +450,7 @@ FX_BOOL CXFA_FFNumericEdit::LoadWidget() { pWidget->Initialize(); m_pNormalWidget = (CFWL_Widget*)pWidget; IFWL_Widget* pIWidget = m_pNormalWidget->GetWidget(); - m_pNormalWidget->SetPrivateData(pIWidget, this, NULL); + m_pNormalWidget->SetLayoutItem(this); CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); @@ -523,8 +523,8 @@ FX_BOOL CXFA_FFPasswordEdit::LoadWidget() { CFWL_Edit* pWidget = CFWL_Edit::Create(); pWidget->Initialize(); m_pNormalWidget = (CFWL_Widget*)pWidget; + m_pNormalWidget->SetLayoutItem(this); IFWL_Widget* pIWidget = m_pNormalWidget->GetWidget(); - m_pNormalWidget->SetPrivateData(pIWidget, this, NULL); CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); @@ -589,8 +589,8 @@ FX_BOOL CXFA_FFDateTimeEdit::LoadWidget() { CFWL_DateTimePicker* pWidget = CFWL_DateTimePicker::Create(); pWidget->Initialize(); m_pNormalWidget = (CFWL_Widget*)pWidget; + m_pNormalWidget->SetLayoutItem(this); IFWL_Widget* pIWidget = m_pNormalWidget->GetWidget(); - m_pNormalWidget->SetPrivateData(pIWidget, this, NULL); CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); m_pOldDelegate = m_pNormalWidget->SetDelegate(this); |