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

Side by Side Diff: fpdfsdk/pdfwindow/PWL_Wnd.cpp

Issue 2386273004: Add ptr_util.h from base until std::make_unique<> available (Closed)
Patch Set: 2016 Created 4 years, 2 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/pdfwindow/PWL_ListBox.cpp ('k') | testing/js_embedder_test.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 <map> 7 #include <map>
8 8
9 #include "fpdfsdk/pdfwindow/PWL_ScrollBar.h" 9 #include "fpdfsdk/pdfwindow/PWL_ScrollBar.h"
10 #include "fpdfsdk/pdfwindow/PWL_Utils.h" 10 #include "fpdfsdk/pdfwindow/PWL_Utils.h"
11 #include "fpdfsdk/pdfwindow/PWL_Wnd.h" 11 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
12 #include "third_party/base/ptr_util.h"
12 13
13 static std::map<int32_t, CPWL_Timer*>& GetPWLTimeMap() { 14 static std::map<int32_t, CPWL_Timer*>& GetPWLTimeMap() {
14 // Leak the object at shutdown. 15 // Leak the object at shutdown.
15 static auto timeMap = new std::map<int32_t, CPWL_Timer*>; 16 static auto timeMap = new std::map<int32_t, CPWL_Timer*>;
16 return *timeMap; 17 return *timeMap;
17 } 18 }
18 19
19 PWL_CREATEPARAM::PWL_CREATEPARAM() 20 PWL_CREATEPARAM::PWL_CREATEPARAM()
20 : rcRectWnd(0, 0, 0, 0), 21 : rcRectWnd(0, 0, 0, 0),
21 pSystemHandler(nullptr), 22 pSystemHandler(nullptr),
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 if (pTimer->m_pAttached) 80 if (pTimer->m_pAttached)
80 pTimer->m_pAttached->TimerProc(); 81 pTimer->m_pAttached->TimerProc();
81 } 82 }
82 83
83 CPWL_TimerHandler::CPWL_TimerHandler() {} 84 CPWL_TimerHandler::CPWL_TimerHandler() {}
84 85
85 CPWL_TimerHandler::~CPWL_TimerHandler() {} 86 CPWL_TimerHandler::~CPWL_TimerHandler() {}
86 87
87 void CPWL_TimerHandler::BeginTimer(int32_t nElapse) { 88 void CPWL_TimerHandler::BeginTimer(int32_t nElapse) {
88 if (!m_pTimer) 89 if (!m_pTimer)
89 m_pTimer = WrapUnique(new CPWL_Timer(this, GetSystemHandler())); 90 m_pTimer = pdfium::MakeUnique<CPWL_Timer>(this, GetSystemHandler());
90 91
91 if (m_pTimer) 92 m_pTimer->SetPWLTimer(nElapse);
92 m_pTimer->SetPWLTimer(nElapse);
93 } 93 }
94 94
95 void CPWL_TimerHandler::EndTimer() { 95 void CPWL_TimerHandler::EndTimer() {
96 if (m_pTimer) 96 if (m_pTimer)
97 m_pTimer->KillPWLTimer(); 97 m_pTimer->KillPWLTimer();
98 } 98 }
99 99
100 void CPWL_TimerHandler::TimerProc() {} 100 void CPWL_TimerHandler::TimerProc() {}
101 101
102 class CPWL_MsgControl { 102 class CPWL_MsgControl {
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 return FALSE; 1032 return FALSE;
1033 } 1033 }
1034 1034
1035 FX_BOOL CPWL_Wnd::IsALTpressed(uint32_t nFlag) const { 1035 FX_BOOL CPWL_Wnd::IsALTpressed(uint32_t nFlag) const {
1036 if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) { 1036 if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
1037 return pSystemHandler->IsALTKeyDown(nFlag); 1037 return pSystemHandler->IsALTKeyDown(nFlag);
1038 } 1038 }
1039 1039
1040 return FALSE; 1040 return FALSE;
1041 } 1041 }
OLDNEW
« no previous file with comments | « fpdfsdk/pdfwindow/PWL_ListBox.cpp ('k') | testing/js_embedder_test.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698