Chromium Code Reviews| Index: fxjs/cfxjse_context.cpp |
| diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp |
| index 93efc4f12c00b576f98df60a656c5c70d4f2c927..c3a2335e47767ca50a7ee8c9583a1c7eeb2e42d2 100644 |
| --- a/fxjs/cfxjse_context.cpp |
| +++ b/fxjs/cfxjse_context.cpp |
| @@ -156,7 +156,7 @@ CFXJSE_Context* CFXJSE_Context::Create( |
| CFXJSE_Class* lpGlobalClassObj = nullptr; |
| v8::Local<v8::ObjectTemplate> hObjectTemplate; |
| if (lpGlobalClass) { |
| - lpGlobalClassObj = CFXJSE_Class::Create(pContext, lpGlobalClass, TRUE); |
| + lpGlobalClassObj = CFXJSE_Class::Create(pContext, lpGlobalClass, true); |
| ASSERT(lpGlobalClassObj); |
| v8::Local<v8::FunctionTemplate> hFunctionTemplate = |
| v8::Local<v8::FunctionTemplate>::New(pIsolate, |
| @@ -202,9 +202,9 @@ void CFXJSE_Context::EnableCompatibleMode() { |
| ExecuteScript(szCompatibleModeScript, nullptr, nullptr); |
| } |
| -FX_BOOL CFXJSE_Context::ExecuteScript(const FX_CHAR* szScript, |
| - CFXJSE_Value* lpRetValue, |
| - CFXJSE_Value* lpNewThisObject) { |
| +bool CFXJSE_Context::ExecuteScript(const FX_CHAR* szScript, |
| + CFXJSE_Value* lpRetValue, |
| + CFXJSE_Value* lpNewThisObject) { |
| CFXJSE_ScopeUtil_IsolateHandleContext scope(this); |
| v8::TryCatch trycatch(m_pIsolate); |
| v8::Local<v8::String> hScriptString = |
| @@ -217,14 +217,14 @@ FX_BOOL CFXJSE_Context::ExecuteScript(const FX_CHAR* szScript, |
| if (lpRetValue) { |
| lpRetValue->m_hValue.Reset(m_pIsolate, hValue); |
| } |
| - return TRUE; |
| + return true; |
| } |
| } |
| if (lpRetValue) { |
| lpRetValue->m_hValue.Reset(m_pIsolate, |
| FXJSE_CreateReturnValue(m_pIsolate, trycatch)); |
| } |
| - return FALSE; |
| + return false; |
| } else { |
|
Lei Zhang
2016/11/02 23:13:09
For later - else after return.
Tom Sepez
2016/11/02 23:17:50
Done.
|
| v8::Local<v8::Value> hNewThis = |
| v8::Local<v8::Value>::New(m_pIsolate, lpNewThisObject->m_hValue); |
| @@ -243,13 +243,13 @@ FX_BOOL CFXJSE_Context::ExecuteScript(const FX_CHAR* szScript, |
| if (lpRetValue) { |
| lpRetValue->m_hValue.Reset(m_pIsolate, hValue); |
| } |
| - return TRUE; |
| + return true; |
| } |
| } |
| if (lpRetValue) { |
| lpRetValue->m_hValue.Reset(m_pIsolate, |
| FXJSE_CreateReturnValue(m_pIsolate, trycatch)); |
| } |
| - return FALSE; |
| + return false; |
| } |
| } |