Merge to XFA: Beef up app_props.in and tidy app.cpp.

fpdfsdk/src/javascript/app.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 "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
 #include "../../include/javascript/JS_Value.h"
 #include "../../include/javascript/app.h"
 #include "../../include/javascript/JS_EventHandler.h"
 #include "../../include/javascript/resource.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Runtime.h"
 #include "../../include/javascript/Document.h"
 
 static v8::Isolate* GetIsolate(IFXJS_Context* cc) {
   CJS_Context* pContext = (CJS_Context*)cc;
-  ASSERT(pContext != NULL);
-
   CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-  ASSERT(pRuntime != NULL);
-
   return pRuntime->GetIsolate();
 }
 
-/* ---------------------------- TimerObj ---------------------------- */
-
 BEGIN_JS_STATIC_CONST(CJS_TimerObj)
 END_JS_STATIC_CONST()
 
 BEGIN_JS_STATIC_PROP(CJS_TimerObj)
 END_JS_STATIC_PROP()
 
 BEGIN_JS_STATIC_METHOD(CJS_TimerObj)
 END_JS_STATIC_METHOD()
 
 IMPLEMENT_JS_CLASS(CJS_TimerObj, TimerObj)
 
 TimerObj::TimerObj(CJS_Object* pJSObject)
     : CJS_EmbedObj(pJSObject), m_pTimer(NULL) {}
 
 TimerObj::~TimerObj() {}
 
 void TimerObj::SetTimer(CJS_Timer* pTimer) {
   m_pTimer = pTimer;
 }
 
 CJS_Timer* TimerObj::GetTimer() const {
   return m_pTimer;
 }
 
-#define JS_STR_VIEWERTYPE_READER L"Reader"
-#define JS_STR_VIEWERTYPE_STANDARD L"Exchange"
+#define JS_STR_VIEWERTYPE L"pdfium"
 #define JS_STR_VIEWERVARIATION L"Full"
 #define JS_STR_PLATFORM L"WIN"
 #define JS_STR_LANGUANGE L"ENU"
-#define JS_STR_VIEWERVERSION 8
-#define JS_STR_VIEWERVERSION_XFA 11
+#define JS_NUM_VIEWERVERSION 8
+#define JS_NUM_VIEWERVERSION_XFA 11
 #define JS_NUM_FORMSVERSION 7
 
-#define JS_FILEPATH_MAXLEN 2000
-
-/* ---------------------------- app ---------------------------- */
-
 BEGIN_JS_STATIC_CONST(CJS_App)
 END_JS_STATIC_CONST()
 
 BEGIN_JS_STATIC_PROP(CJS_App)
 JS_STATIC_PROP_ENTRY(activeDocs)
 JS_STATIC_PROP_ENTRY(calculate)
 JS_STATIC_PROP_ENTRY(formsVersion)
 JS_STATIC_PROP_ENTRY(fs)
 JS_STATIC_PROP_ENTRY(fullscreen)
 JS_STATIC_PROP_ENTRY(language)
@@ skipping 103 matching lines @@
     return TRUE;
   }
 
   return FALSE;
 }
 
 FX_BOOL app::viewerType(IFXJS_Context* cc,
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
   if (vp.IsGetting()) {
-    vp << L"pdfium";
+    vp << JS_STR_VIEWERTYPE;
     return TRUE;
   }
 
   return FALSE;
 }
 
 FX_BOOL app::viewerVariation(IFXJS_Context* cc,
                              CJS_PropValue& vp,
                              CFX_WideString& sError) {
   if (vp.IsGetting()) {
     vp << JS_STR_VIEWERVARIATION;
     return TRUE;
   }
 
   return FALSE;
 }
 
 FX_BOOL app::viewerVersion(IFXJS_Context* cc,
                            CJS_PropValue& vp,
                            CFX_WideString& sError) {
   if (!vp.IsGetting())
     return FALSE;
 
   CJS_Context* pContext = (CJS_Context*)cc;
   CPDFSDK_Document* pCurDoc = pContext->GetReaderDocument();
   CPDFXFA_Document* pDoc = pCurDoc->GetDocument();
   if (pDoc->GetDocType() == 1 || pDoc->GetDocType() == 2)
-    vp << JS_STR_VIEWERVERSION_XFA;
+    vp << JS_NUM_VIEWERVERSION_XFA;
   else
-    vp << JS_STR_VIEWERVERSION;
+    vp << JS_NUM_VIEWERVERSION;
 
   return TRUE;
 }
 
 FX_BOOL app::platform(IFXJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError) {
   if (vp.IsGetting()) {
     vp << JS_STR_PLATFORM;
     return TRUE;
@@ skipping 636 matching lines @@
                    CFX_WideString& sError) {
   return FALSE;
 }
 
 FX_BOOL app::execDialog(IFXJS_Context* cc,
                         const CJS_Parameters& params,
                         CJS_Value& vRet,
                         CFX_WideString& sError) {
   return TRUE;
 }