Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / pdfium / fpdfsdk / include / javascript / JS_Define.h

diff --git a/src/third_party/pdfium/fpdfsdk/include/javascript/JS_Define.h b/src/third_party/pdfium/fpdfsdk/include/javascript/JS_Define.h
index cc20333..108c1e2 100644 (file)
--- a/src/third_party/pdfium/fpdfsdk/include/javascript/JS_Define.h
+++ b/src/third_party/pdfium/fpdfsdk/include/javascript/JS_Define.h
@@ -44,11 +44,7 @@ typedef CFX_WideString       JS_ErrorString;
 #define CJS_IntArray           CFX_ArrayTemplate<int>
 
 /* ====================================== PUBLIC DEFINE SPEC ============================================== */
-#ifndef __GNUC__
-#define JS_WIDESTRING(widestring) L#widestring
-#else
-#define JS_WIDESTRING(widestring) L""#widestring
-#endif
+#define JS_WIDESTRING(widestring) L###widestring
 
 #define OBJ_PROP_PARAMS                        IFXJS_Context* cc, CJS_PropValue& vp, JS_ErrorString& sError
 #define OBJ_METHOD_PARAMS              IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError
@@ -111,19 +107,9 @@ typedef CFX_WideString     JS_ErrorString;
        ASSERT(pObj != NULL);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
-       try\
-       {\
-               MEMLEAKCHECK_1();\
-               bRet = pObj->prop_name(cc, value, sError);\
-               MEMLEAKCHECK_2(class_name, prop_name);\
-       }\
-       catch (...)\
-       {\
-               CFX_ByteString cbName;\
-               cbName.Format("%s.%s", #class_name, #prop_name);\
-               JS_Error(NULL,CFX_WideString::FromLocal(cbName), L"Unknown error is catched!");\
-               return ;\
-       }\
+       MEMLEAKCHECK_1();\
+       bRet = pObj->prop_name(cc, value, sError);\
+       MEMLEAKCHECK_2(class_name, prop_name);\
        if (bRet)\
        {\
                info.GetReturnValue().Set((v8::Handle<v8::Value>)value);\
@@ -157,19 +143,9 @@ typedef CFX_WideString     JS_ErrorString;
        ASSERT(pObj != NULL);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
-       try\
-       {\
-               MEMLEAKCHECK_1();\
-               bRet = pObj->prop_name(cc, propValue, sError);\
-               MEMLEAKCHECK_2(class_name, prop_name);\
-       }\
-       catch (...)\
-       {\
-               CFX_ByteString cbName;\
-               cbName.Format("%s.%s", #class_name, #prop_name);\
-               JS_Error(NULL,CFX_WideString::FromLocal(cbName), L"Unknown error is catched!");\
-               return ;\
-       }\
+       MEMLEAKCHECK_1();\
+       bRet = pObj->prop_name(cc, propValue, sError);\
+       MEMLEAKCHECK_2(class_name, prop_name);\
        if (bRet)\
        {\
                return ;\
@@ -212,19 +188,9 @@ JS_STATIC_PROP_SET(prop_name, class_name)
        ASSERT(pObj != NULL);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
-       try\
-       {\
-               MEMLEAKCHECK_1();\
-               bRet = pObj->method_name(cc, parameters, valueRes, sError);\
-               MEMLEAKCHECK_2(class_name, method_name);\
-       }\
-       catch (...)\
-       {\
-               CFX_ByteString cbName;\
-               cbName.Format("%s.%s", #class_name, #method_name);\
-               JS_Error(NULL, CFX_WideString::FromLocal(cbName), L"Unknown error is catched!");\
-               return ;\
-       }\
+       MEMLEAKCHECK_1();\
+       bRet = pObj->method_name(cc, parameters, valueRes, sError);\
+       MEMLEAKCHECK_2(class_name, method_name);\
        if (bRet)\
        {\
                info.GetReturnValue().Set(valueRes.ToJSValue());\
@@ -374,16 +340,9 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
        class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
        ASSERT(pObj != NULL);\
        FX_BOOL bRet = FALSE;\
-       try\
-       {\
-               MEMLEAKCHECK_1();\
-               bRet = pObj->QueryProperty((FX_LPCWSTR)propname);\
-               MEMLEAKCHECK_2(class_name, (FX_LPCWSTR)prop_name);\
-       }\
-       catch (...)\
-       {\
-               return ;\
-       }\
+       MEMLEAKCHECK_1();\
+       bRet = pObj->QueryProperty((FX_LPCWSTR)propname);\
+       MEMLEAKCHECK_2(class_name, (FX_LPCWSTR)prop_name);\
        if (bRet)\
        {\
                info.GetReturnValue().Set(0x004);\
@@ -416,19 +375,9 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
        ASSERT(pObj != NULL);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
-       try\
-       {\
-               MEMLEAKCHECK_1();\
-               bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, value, sError);\
-               MEMLEAKCHECK_2(class_name, L"GetProperty");\
-       }\
-       catch (...)\
-       {\
-               CFX_ByteString cbName;\
-               cbName.Format("%s.%s", #class_name, L"GetProperty");\
-               JS_Error(NULL,CFX_WideString::FromLocal(cbName), L"Unknown error is catched!");\
-               return ;\
-       }\
+       MEMLEAKCHECK_1();\
+       bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, value, sError);\
+       MEMLEAKCHECK_2(class_name, L"GetProperty");\
        if (bRet)\
        {\
                info.GetReturnValue().Set((v8::Handle<v8::Value>)value);\
@@ -464,19 +413,9 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
        ASSERT(pObj != NULL);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
-       try\
-       {\
-               MEMLEAKCHECK_1();\
-               bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, PropValue, sError);\
-               MEMLEAKCHECK_2(class_name,L"PutProperty");\
-       }\
-       catch (...)\
-       {\
-               CFX_ByteString cbName;\
-               cbName.Format("%s.%s", #class_name, "PutProperty");\
-               JS_Error(NULL,CFX_WideString::FromLocal(cbName), L"Unknown error is catched!");\
-               return ;\
-       }\
+       MEMLEAKCHECK_1();\
+       bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, PropValue, sError);\
+       MEMLEAKCHECK_2(class_name,L"PutProperty");\
        if (bRet)\
        {\
                return ;\
@@ -509,18 +448,9 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
        ASSERT(pObj != NULL);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
-       try\
-       {\
-               MEMLEAKCHECK_1();\
-               bRet = pObj->DelProperty(cc, (FX_LPCWSTR)propname, sError);\
-               MEMLEAKCHECK_2(class_name,L"DelProperty");\
-       }\
-       catch (...)\
-       {\
-               CFX_ByteString cbName;\
-               cbName.Format("%s.%s", #class_name, "DelProperty");\
-               return ;\
-       }\
+       MEMLEAKCHECK_1();\
+       bRet = pObj->DelProperty(cc, (FX_LPCWSTR)propname, sError);\
+       MEMLEAKCHECK_2(class_name,L"DelProperty");\
        if (bRet)\
        {\
                return ;\
@@ -613,19 +543,9 @@ void js_class_name::GetMethods(JSMethodSpec*& pMethods, int& nSize)\
        ASSERT(pObj != NULL);\
        JS_ErrorString sError;\
        FX_BOOL bRet = FALSE;\
-       try\
-       {\
-               MEMLEAKCHECK_1();\
-               bRet = pObj->method_name(cc, parameters, valueRes, sError);\
-               MEMLEAKCHECK_2(class_name, method_name);\
-       }\
-       catch (...)\
-       {\
-               CFX_ByteString cbName;\
-               cbName.Format("%s.%s", #class_name, #method_name);\
-               JS_Error(NULL, CFX_WideString::FromLocal(cbName), L"Unknown error is catched!");\
-               return ;\
-       }\
+       MEMLEAKCHECK_1();\
+       bRet = pObj->method_name(cc, parameters, valueRes, sError);\
+       MEMLEAKCHECK_2(class_name, method_name);\
        if (bRet)\
        {\
                info.GetReturnValue().Set(valueRes.ToJSValue());\