Add back-pointer to "Associated widget" to CFWL_WidgetImp.

xfa/fwl/core/fwl_widgetimp.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/fwl_widgetimp.h"
 
 #include <algorithm>
 
@@ skipping 93 matching lines @@
 }
 
 void* IFWL_Widget::GetLayoutItem() const {
   return GetImpl()->GetLayoutItem();
 }
 
 void IFWL_Widget::SetLayoutItem(void* pItem) {
   GetImpl()->SetLayoutItem(pItem);
 }
 
-FWL_Error IFWL_Widget::SetPrivateData(void* module_id,
-                                      void* pData,
-                                      PD_CALLBACK_FREEDATA callback) {
-  return GetImpl()->SetPrivateData(module_id, pData, callback);
+void* IFWL_Widget::GetAssociateWidget() const {
+  return GetImpl()->GetAssociateWidget();
 }
-void* IFWL_Widget::GetPrivateData(void* module_id) {
-  return GetImpl()->GetPrivateData(module_id);
+
+void IFWL_Widget::SetAssociateWidget(void* pAssociate) {
+  GetImpl()->SetAssociateWidget(pAssociate);
 }
+
 FWL_Error IFWL_Widget::Update() {
   return GetImpl()->Update();
 }
 FWL_Error IFWL_Widget::LockUpdate() {
   return GetImpl()->LockUpdate();
 }
 FWL_Error IFWL_Widget::UnlockUpdate() {
   return GetImpl()->UnlockUpdate();
 }
 FWL_WidgetHit IFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
@@ skipping 191 matching lines @@
   CFWL_WidgetMgr* widgetMgr = CFWL_WidgetMgr::GetInstance();
   noteDriver->NotifyTargetHide(m_pInterface);
   IFWL_Widget* child = widgetMgr->GetFirstChildWidget(m_pInterface);
   while (child) {
     noteDriver->NotifyTargetHide(child);
     NotifyHideChildWidget(widgetMgr, child, noteDriver);
     child = widgetMgr->GetNextSiblingWidget(child);
   }
   return;
 }
-FWL_Error CFWL_WidgetImp::SetPrivateData(void* module_id,
-                                         void* pData,
-                                         PD_CALLBACK_FREEDATA callback) {
-  if (!m_pPrivateData) {
-    m_pPrivateData = new CFX_PrivateData;
-  }
-  m_pPrivateData->SetPrivateData(module_id, pData, callback);
-  return FWL_Error::Succeeded;
-}
-void* CFWL_WidgetImp::GetPrivateData(void* module_id) {
-  if (!m_pPrivateData)
-    return NULL;
-  return m_pPrivateData->GetPrivateData(module_id);
-}
 FWL_Error CFWL_WidgetImp::Update() {
   return FWL_Error::Succeeded;
 }
 FWL_Error CFWL_WidgetImp::LockUpdate() {
   m_iLock++;
   return FWL_Error::Succeeded;
 }
 FWL_Error CFWL_WidgetImp::UnlockUpdate() {
   if (IsLocked()) {
     m_iLock--;
@@ skipping 169 matching lines @@
 }
 
 void* CFWL_WidgetImp::GetLayoutItem() const {
   return m_pLayoutItem;
 }
 
 void CFWL_WidgetImp::SetLayoutItem(void* pItem) {
   m_pLayoutItem = pItem;
 }
 
+void* CFWL_WidgetImp::GetAssociateWidget() const {
+  return m_pAssociate;
+}
+
+void CFWL_WidgetImp::SetAssociateWidget(void* pAssociate) {
+  m_pAssociate = pAssociate;
+}
+
 CFWL_WidgetImp::CFWL_WidgetImp(const CFWL_WidgetImpProperties& properties,
                                IFWL_Widget* pOuter)
     : m_pProperties(new CFWL_WidgetImpProperties),
-      m_pPrivateData(nullptr),
       m_pDelegate(nullptr),
       m_pCurDelegate(nullptr),
       m_pOuter(pOuter),
       m_pInterface(nullptr),
       m_pLayoutItem(nullptr),

[Lei Zhang, 2016/05/26 23:06:07]

Initialize |m_pAssociate| ?

[Tom Sepez, 2016/05/27 17:15:40]

Done.

       m_iLock(0),
       m_nEventKey(0) {
   *m_pProperties = properties;
   m_pWidgetMgr = CFWL_WidgetMgr::GetInstance();
   ASSERT(m_pWidgetMgr);
 }
 
 CFWL_WidgetImp::~CFWL_WidgetImp() {
-  delete m_pPrivateData;
   delete m_pProperties;
 }
 
 FX_BOOL CFWL_WidgetImp::IsEnabled() const {
   return (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) == 0;
 }
 FX_BOOL CFWL_WidgetImp::IsVisible() const {
   return (m_pProperties->m_dwStates & FWL_WGTSTATE_Invisible) == 0;
 }
 FX_BOOL CFWL_WidgetImp::IsActive() const {
@@ skipping 484 matching lines @@
   }
 }
 
 void CFWL_WidgetImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {}
 
 void CFWL_WidgetImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
                                           const CFX_Matrix* pMatrix) {
   CFWL_EvtDraw evt;
   evt.m_pGraphics = pGraphics;
 }