From 41f0590a9d7d627783a1b11c86808959928fc1a6 Mon Sep 17 00:00:00 2001 From: John Abd-El-Malek Date: Tue, 20 May 2014 09:52:29 -0700 Subject: Remove "using namespace v8" in header. This allows us to turn all warnings into errors. It also makes it clearer to find usage of v8 in the library. --- fpdfsdk/include/javascript/JS_Define.h | 22 +++++++++++----------- fpdfsdk/include/jsapi/fxjs_v8.h | 9 ++++----- 2 files changed, 15 insertions(+), 16 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index c86289e640..81d44550c4 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -23,14 +23,14 @@ struct JSConstSpec struct JSPropertySpec { const wchar_t* pName; - AccessorGetterCallback pPropGet; - AccessorSetterCallback pPropPut; + v8::AccessorGetterCallback pPropGet; + v8::AccessorSetterCallback pPropPut; }; struct JSMethodSpec { const wchar_t* pName; - FunctionCallback pMethodCall; + v8::FunctionCallback pMethodCall; unsigned nParamNum; }; @@ -100,7 +100,7 @@ typedef CFX_WideString JS_ErrorString; v8::Local v = context->GetEmbedderData(1);\ ASSERT(!v.IsEmpty());\ if(v.IsEmpty()) return;\ - v8::Handle field = v8::Handle::Cast(v);\ + v8::Handle field = v8::Handle::Cast(v);\ IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\ IFXJS_Context* cc = pRuntime->GetCurrentContext();\ CJS_PropValue value(isolate);\ @@ -146,7 +146,7 @@ typedef CFX_WideString JS_ErrorString; v8::Local v = context->GetEmbedderData(1);\ ASSERT(!v.IsEmpty());\ if(v.IsEmpty()) return;\ - v8::Handle field = v8::Handle::Cast(v);\ + v8::Handle field = v8::Handle::Cast(v);\ IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\ IFXJS_Context* cc = pRuntime->GetCurrentContext();\ CJS_PropValue propValue(CJS_Value(isolate,value,VT_unknown));\ @@ -197,7 +197,7 @@ JS_STATIC_PROP_SET(prop_name, class_name) v8::Local v = context->GetEmbedderData(1);\ ASSERT(!v.IsEmpty());\ if(v.IsEmpty()) return;\ - v8::Handle field = v8::Handle::Cast(v);\ + v8::Handle field = v8::Handle::Cast(v);\ IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\ IFXJS_Context* cc = pRuntime->GetCurrentContext();\ CJS_Parameters parameters;\ @@ -403,7 +403,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\ v8::Local v = context->GetEmbedderData(1);\ ASSERT(!v.IsEmpty());\ if(v.IsEmpty()) return;\ - v8::Handle field = v8::Handle::Cast(v);\ + v8::Handle field = v8::Handle::Cast(v);\ IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\ IFXJS_Context* cc = pRuntime->GetCurrentContext();\ v8::String::Utf8Value utf8_value(property);\ @@ -451,7 +451,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\ v8::Local v = context->GetEmbedderData(1);\ ASSERT(!v.IsEmpty());\ if(v.IsEmpty()) return;\ - v8::Handle field = v8::Handle::Cast(v);\ + v8::Handle field = v8::Handle::Cast(v);\ IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\ IFXJS_Context* cc = pRuntime->GetCurrentContext();\ v8::String::Utf8Value utf8_value(property);\ @@ -498,7 +498,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\ v8::Local v = context->GetEmbedderData(1);\ ASSERT(!v.IsEmpty());\ if(v.IsEmpty()) return;\ - v8::Handle field = v8::Handle::Cast(v);\ + v8::Handle field = v8::Handle::Cast(v);\ IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\ IFXJS_Context* cc = pRuntime->GetCurrentContext();\ v8::String::Utf8Value utf8_value(property);\ @@ -598,7 +598,7 @@ void js_class_name::GetMethods(JSMethodSpec*& pMethods, int& nSize)\ v8::Local v = context->GetEmbedderData(1);\ ASSERT(!v.IsEmpty());\ if(v.IsEmpty()) return;\ - v8::Handle field = v8::Handle::Cast(v);\ + v8::Handle field = v8::Handle::Cast(v);\ IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\ IFXJS_Context* cc = pRuntime->GetCurrentContext();\ CJS_Parameters parameters;\ @@ -651,7 +651,7 @@ static void fun_name##_static(JS_METHOD_ARGS)\ v8::Local v = context->GetEmbedderData(1);\ ASSERT(!v.IsEmpty());\ if(v.IsEmpty()) return;\ - v8::Handle field = v8::Handle::Cast(v);\ + v8::Handle field = v8::Handle::Cast(v);\ IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();\ IFXJS_Context* cc = pRuntime->GetCurrentContext();\ CJS_Parameters parameters;\ diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index 7e8e655a6e..3ea5054e17 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -8,7 +8,6 @@ #define FXJSAPI_H #include -using namespace v8; enum FXJSOBJTYPE { @@ -63,11 +62,11 @@ typedef unsigned (*LP_DESTRUCTOR)(JS_DESTRUCTOR_ARGS); #endif int JS_DefineObj(IJS_Runtime* pJSRuntime, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew); -int JS_DefineObjMethod(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sMethodName, FunctionCallback pMethodCall, unsigned nParamNum); -int JS_DefineObjProperty(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sPropName, AccessorGetterCallback pPropGet, AccessorSetterCallback pPropPut); -int JS_DefineObjAllProperties(IJS_Runtime* pJSRuntime, int nObjDefnID, NamedPropertyQueryCallback pPropQurey, NamedPropertyGetterCallback pPropGet, NamedPropertySetterCallback pPropPut, NamedPropertyDeleterCallback pPropDel); +int JS_DefineObjMethod(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sMethodName, v8::FunctionCallback pMethodCall, unsigned nParamNum); +int JS_DefineObjProperty(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sPropName, v8::AccessorGetterCallback pPropGet, v8::AccessorSetterCallback pPropPut); +int JS_DefineObjAllProperties(IJS_Runtime* pJSRuntime, int nObjDefnID, v8::NamedPropertyQueryCallback pPropQurey, v8::NamedPropertyGetterCallback pPropGet, v8::NamedPropertySetterCallback pPropPut, v8::NamedPropertyDeleterCallback pPropDel); int JS_DefineObjConst(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sConstName, v8::Handle pDefault); -int JS_DefineGlobalMethod(IJS_Runtime* pJSRuntime, const wchar_t* sMethodName, FunctionCallback pMethodCall, unsigned nParamNum); +int JS_DefineGlobalMethod(IJS_Runtime* pJSRuntime, const wchar_t* sMethodName, v8::FunctionCallback pMethodCall, unsigned nParamNum); int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8::Handle pDefault); void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_Context* context, v8::Persistent& v8PersistentContext); -- cgit v1.2.3