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

Side by Side Diff: fpdfsdk/src/javascript/JS_Object.cpp

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: fix merge Created 5 years, 1 month 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/src/javascript/JS_Object.h ('k') | fpdfsdk/src/javascript/JS_Runtime.h » ('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 "JS_Object.h" 7 #include "JS_Object.h"
8 8
9 #include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment.
10 #include "../../include/javascript/IJavaScript.h"
11 #include "JS_Context.h" 9 #include "JS_Context.h"
12 #include "JS_Define.h" 10 #include "JS_Define.h"
11 #include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment.
12 #include "fpdfsdk/include/javascript/IJavaScript.h"
13 13
14 namespace { 14 namespace {
15 15
16 int FXJS_MsgBox(CPDFDoc_Environment* pApp, 16 int FXJS_MsgBox(CPDFDoc_Environment* pApp,
17 const FX_WCHAR* swMsg, 17 const FX_WCHAR* swMsg,
18 const FX_WCHAR* swTitle, 18 const FX_WCHAR* swTitle,
19 FX_UINT nType, 19 FX_UINT nType,
20 FX_UINT nIcon) { 20 FX_UINT nIcon) {
21 if (!pApp) 21 if (!pApp)
22 return 0; 22 return 0;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 // static 152 // static
153 CJS_Timer::TimerMap* CJS_Timer::GetGlobalTimerMap() { 153 CJS_Timer::TimerMap* CJS_Timer::GetGlobalTimerMap() {
154 // Leak the timer array at shutdown. 154 // Leak the timer array at shutdown.
155 static auto* s_TimerMap = new TimerMap; 155 static auto* s_TimerMap = new TimerMap;
156 return s_TimerMap; 156 return s_TimerMap;
157 } 157 }
158 158
159 void CJS_Timer::OnDestroyed() { 159 void CJS_Timer::OnDestroyed() {
160 m_bValid = false; 160 m_bValid = false;
161 } 161 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/javascript/JS_Object.h ('k') | fpdfsdk/src/javascript/JS_Runtime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698