From b830fbc03a6d12d8b5be50e85499c281a4c5da7f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 8 Sep 2015 16:23:39 -0700 Subject: Beef up app_props.in and tidy app.cpp. Some of the values returned are dubious; capture the current state of affairs. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1317393003 . --- fpdfsdk/src/javascript/app.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp index e70bd47625..6db5d9a97f 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -19,16 +19,10 @@ 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() @@ -53,18 +47,13 @@ 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_NUM_VIEWERVERSION 8 #define JS_NUM_FORMSVERSION 7 -#define JS_FILEPATH_MAXLEN 2000 - -/* ---------------------------- app ---------------------------- */ - BEGIN_JS_STATIC_CONST(CJS_App) END_JS_STATIC_CONST() @@ -188,7 +177,7 @@ 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; } @@ -210,7 +199,7 @@ FX_BOOL app::viewerVersion(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError) { if (vp.IsGetting()) { - vp << JS_STR_VIEWERVERSION; + vp << JS_NUM_VIEWERVERSION; return TRUE; } -- cgit v1.2.3