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

Side by Side Diff: fpdfsdk/formfiller/cffl_formfiller.cpp

Issue 2266943002: Destroy window before cleaning up combobox (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Update textfield Created 4 years, 4 months 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 unified diff | Download patch
« no previous file with comments | « fpdfsdk/formfiller/cffl_formfiller.h ('k') | fpdfsdk/formfiller/cffl_textfield.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "fpdfsdk/formfiller/cffl_formfiller.h" 7 #include "fpdfsdk/formfiller/cffl_formfiller.h"
8 8
9 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h" 9 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
10 #include "core/fxge/include/cfx_renderdevice.h" 10 #include "core/fxge/include/cfx_renderdevice.h"
11 #include "fpdfsdk/include/cpdfsdk_widget.h" 11 #include "fpdfsdk/include/cpdfsdk_widget.h"
12 #include "fpdfsdk/formfiller/cba_fontmap.h" 12 #include "fpdfsdk/formfiller/cba_fontmap.h"
13 #include "fpdfsdk/include/fsdk_common.h" 13 #include "fpdfsdk/include/fsdk_common.h"
14 #include "fpdfsdk/include/fsdk_mgr.h" 14 #include "fpdfsdk/include/fsdk_mgr.h"
15 #include "fpdfsdk/pdfwindow/PWL_Utils.h" 15 #include "fpdfsdk/pdfwindow/PWL_Utils.h"
16 16
17 #define GetRed(rgb) ((uint8_t)(rgb)) 17 #define GetRed(rgb) ((uint8_t)(rgb))
18 #define GetGreen(rgb) ((uint8_t)(((uint16_t)(rgb)) >> 8)) 18 #define GetGreen(rgb) ((uint8_t)(((uint16_t)(rgb)) >> 8))
19 #define GetBlue(rgb) ((uint8_t)((rgb) >> 16)) 19 #define GetBlue(rgb) ((uint8_t)((rgb) >> 16))
20 20
21 #define FFL_HINT_ELAPSE 800 21 #define FFL_HINT_ELAPSE 800
22 22
23 CFFL_FormFiller::CFFL_FormFiller(CPDFDoc_Environment* pApp, 23 CFFL_FormFiller::CFFL_FormFiller(CPDFDoc_Environment* pApp,
24 CPDFSDK_Annot* pAnnot) 24 CPDFSDK_Annot* pAnnot)
25 : m_pApp(pApp), m_pAnnot(pAnnot), m_bValid(FALSE), m_ptOldPos(0, 0) { 25 : m_pApp(pApp), m_pAnnot(pAnnot), m_bValid(FALSE), m_ptOldPos(0, 0) {
26 m_pWidget = (CPDFSDK_Widget*)pAnnot; 26 m_pWidget = (CPDFSDK_Widget*)pAnnot;
27 } 27 }
28 28
29 CFFL_FormFiller::~CFFL_FormFiller() { 29 CFFL_FormFiller::~CFFL_FormFiller() {
30 DestroyWindows();
31 }
32
33 void CFFL_FormFiller::DestroyWindows() {
30 for (const auto& it : m_Maps) { 34 for (const auto& it : m_Maps) {
31 CPWL_Wnd* pWnd = it.second; 35 CPWL_Wnd* pWnd = it.second;
32 CFFL_PrivateData* pData = (CFFL_PrivateData*)pWnd->GetAttachedData(); 36 CFFL_PrivateData* pData = (CFFL_PrivateData*)pWnd->GetAttachedData();
33 pWnd->InvalidateProvider(this); 37 pWnd->InvalidateProvider(this);
34 pWnd->Destroy(); 38 pWnd->Destroy();
35 delete pWnd; 39 delete pWnd;
36 delete pData; 40 delete pData;
37 } 41 }
38 m_Maps.clear(); 42 m_Maps.clear();
39 } 43 }
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 } 719 }
716 } 720 }
717 721
718 void CFFL_Button::OnDrawDeactive(CPDFSDK_PageView* pPageView, 722 void CFFL_Button::OnDrawDeactive(CPDFSDK_PageView* pPageView,
719 CPDFSDK_Annot* pAnnot, 723 CPDFSDK_Annot* pAnnot,
720 CFX_RenderDevice* pDevice, 724 CFX_RenderDevice* pDevice,
721 CFX_Matrix* pUser2Device, 725 CFX_Matrix* pUser2Device,
722 uint32_t dwFlags) { 726 uint32_t dwFlags) {
723 OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags); 727 OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
724 } 728 }
OLDNEW
« no previous file with comments | « fpdfsdk/formfiller/cffl_formfiller.h ('k') | fpdfsdk/formfiller/cffl_textfield.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698