1 files changed, 129 insertions, 103 deletions

diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/src/value.cpp
index 5aca40368f..aa0f7cfc86 100644
--- a/xfa/src/fxjse/src/value.cpp
+++ b/xfa/src/fxjse/src/value.cpp
@@ -8,7 +8,6 @@
 
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxjse/src/class.h"
-#include "xfa/src/fxjse/src/fxv8.h"
 #include "xfa/src/fxjse/src/util_inline.h"
 #include "xfa/src/fxjse/src/value.h"
 
@@ -16,140 +15,139 @@ FX_BOOL FXJSE_Value_IsUndefined(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsUndefined();
 }
+
 FX_BOOL FXJSE_Value_IsNull(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsNull();
 }
+
 FX_BOOL FXJSE_Value_IsBoolean(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsBoolean();
 }
+
 FX_BOOL FXJSE_Value_IsUTF8String(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsString();
 }
+
 FX_BOOL FXJSE_Value_IsNumber(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsNumber();
 }
+
 FX_BOOL FXJSE_Value_IsInteger(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsInteger();
 }
+
 FX_BOOL FXJSE_Value_IsObject(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsObject();
 }
+
 FX_BOOL FXJSE_Value_IsArray(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsArray();
 }
+
 FX_BOOL FXJSE_Value_IsFunction(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsFunction();
 }
+
 FX_BOOL FXJSE_Value_IsDate(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   return lpValue && lpValue->IsDate();
 }
+
 FX_BOOL FXJSE_Value_ToBoolean(FXJSE_HVALUE hValue) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->ToBoolean();
+  return reinterpret_cast<CFXJSE_Value*>(hValue)->ToBoolean();
 }
+
 FX_FLOAT FXJSE_Value_ToFloat(FXJSE_HVALUE hValue) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->ToFloat();
+  return reinterpret_cast<CFXJSE_Value*>(hValue)->ToFloat();
 }
+
 FXJSE_DOUBLE FXJSE_Value_ToDouble(FXJSE_HVALUE hValue) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->ToDouble();
+  return reinterpret_cast<CFXJSE_Value*>(hValue)->ToDouble();
 }
+
 void FXJSE_Value_ToUTF8String(FXJSE_HVALUE hValue,
                               CFX_ByteString& szStrOutput) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->ToString(szStrOutput);
+  return reinterpret_cast<CFXJSE_Value*>(hValue)->ToString(szStrOutput);
 }
+
 int32_t FXJSE_Value_ToInteger(FXJSE_HVALUE hValue) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->ToInteger();
+  return reinterpret_cast<CFXJSE_Value*>(hValue)->ToInteger();
 }
+
 void* FXJSE_Value_ToObject(FXJSE_HVALUE hValue, FXJSE_HCLASS hClass) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   CFXJSE_Class* lpClass = reinterpret_cast<CFXJSE_Class*>(hClass);
-  ASSERT(lpValue);
-  return lpValue->ToObject(lpClass);
+  return reinterpret_cast<CFXJSE_Value*>(hValue)->ToObject(lpClass);
 }
+
 void FXJSE_Value_SetUndefined(FXJSE_HVALUE hValue) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->SetUndefined();
+  reinterpret_cast<CFXJSE_Value*>(hValue)->SetUndefined();
 }
+
 void FXJSE_Value_SetNull(FXJSE_HVALUE hValue) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->SetNull();
+  reinterpret_cast<CFXJSE_Value*>(hValue)->SetNull();
 }
+
 void FXJSE_Value_SetBoolean(FXJSE_HVALUE hValue, FX_BOOL bBoolean) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->SetBoolean(bBoolean);
+  reinterpret_cast<CFXJSE_Value*>(hValue)->SetBoolean(bBoolean);
 }
+
 void FXJSE_Value_SetUTF8String(FXJSE_HVALUE hValue,
                                const CFX_ByteStringC& szString) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->SetString(szString);
+  reinterpret_cast<CFXJSE_Value*>(hValue)->SetString(szString);
 }
+
 void FXJSE_Value_SetInteger(FXJSE_HVALUE hValue, int32_t nInteger) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->SetInteger(nInteger);
+  reinterpret_cast<CFXJSE_Value*>(hValue)->SetInteger(nInteger);
 }
+
 void FXJSE_Value_SetFloat(FXJSE_HVALUE hValue, FX_FLOAT fFloat) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->SetFloat(fFloat);
+  reinterpret_cast<CFXJSE_Value*>(hValue)->SetFloat(fFloat);
 }
+
 void FXJSE_Value_SetDouble(FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->SetDouble(dDouble);
+  reinterpret_cast<CFXJSE_Value*>(hValue)->SetDouble(dDouble);
 }
+
 void FXJSE_Value_SetObject(FXJSE_HVALUE hValue,
                            void* lpObject,
                            FXJSE_HCLASS hClass) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   CFXJSE_Class* lpClass = reinterpret_cast<CFXJSE_Class*>(hClass);
-  if (lpClass == NULL) {
-    ASSERT(lpObject == NULL);
+  if (!lpClass) {
+    ASSERT(!lpObject);
     lpValue->SetJSObject();
-  } else if (lpClass != NULL) {
+  } else {
     lpValue->SetHostObject(lpObject, lpClass);
   }
 }
+
 void FXJSE_Value_SetArray(FXJSE_HVALUE hValue,
                           uint32_t uValueCount,
                           FXJSE_HVALUE* rgValues) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  return lpValue->SetArray(uValueCount,
-                           reinterpret_cast<CFXJSE_Value**>(rgValues));
+  reinterpret_cast<CFXJSE_Value*>(hValue)
+      ->SetArray(uValueCount, reinterpret_cast<CFXJSE_Value**>(rgValues));
 }
+
 void FXJSE_Value_SetDate(FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  return lpValue->SetDate(dDouble);
+  reinterpret_cast<CFXJSE_Value*>(hValue)->SetDate(dDouble);
 }
+
 void FXJSE_Value_Set(FXJSE_HVALUE hValue, FXJSE_HVALUE hOriginalValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
   CFXJSE_Value* lpOriginalValue =
       reinterpret_cast<CFXJSE_Value*>(hOriginalValue);
   ASSERT(lpValue && lpOriginalValue);
-  return lpValue->Assign(lpOriginalValue);
+  lpValue->Assign(lpOriginalValue);
 }
+
 FX_BOOL FXJSE_Value_GetObjectProp(FXJSE_HVALUE hValue,
                                   const CFX_ByteStringC& szPropName,
                                   FXJSE_HVALUE hPropValue) {
@@ -158,6 +156,7 @@ FX_BOOL FXJSE_Value_GetObjectProp(FXJSE_HVALUE hValue,
   ASSERT(lpValue && lpPropValue);
   return lpValue->GetObjectProperty(szPropName, lpPropValue);
 }
+
 FX_BOOL FXJSE_Value_SetObjectProp(FXJSE_HVALUE hValue,
                                   const CFX_ByteStringC& szPropName,
                                   FXJSE_HVALUE hPropValue) {
@@ -166,6 +165,7 @@ FX_BOOL FXJSE_Value_SetObjectProp(FXJSE_HVALUE hValue,
   ASSERT(lpValue && lpPropValue);
   return lpValue->SetObjectProperty(szPropName, lpPropValue);
 }
+
 FX_BOOL FXJSE_Value_GetObjectPropByIdx(FXJSE_HVALUE hValue,
                                        uint32_t uPropIdx,
                                        FXJSE_HVALUE hPropValue) {
@@ -174,6 +174,7 @@ FX_BOOL FXJSE_Value_GetObjectPropByIdx(FXJSE_HVALUE hValue,
   ASSERT(lpValue && lpPropValue);
   return lpValue->GetObjectProperty(uPropIdx, lpPropValue);
 }
+
 FX_BOOL FXJSE_Value_SetObjectPropByIdx(FXJSE_HVALUE hValue,
                                        uint32_t uPropIdx,
                                        FXJSE_HVALUE hPropValue) {
@@ -182,19 +183,20 @@ FX_BOOL FXJSE_Value_SetObjectPropByIdx(FXJSE_HVALUE hValue,
   ASSERT(lpValue && lpPropValue);
   return lpValue->SetObjectProperty(uPropIdx, lpPropValue);
 }
+
 FX_BOOL FXJSE_Value_DeleteObjectProp(FXJSE_HVALUE hValue,
                                      const CFX_ByteStringC& szPropName) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->DeleteObjectProperty(szPropName);
+  return reinterpret_cast<CFXJSE_Value*>(hValue)
+      ->DeleteObjectProperty(szPropName);
 }
+
 FX_BOOL FXJSE_Value_ObjectHasOwnProp(FXJSE_HVALUE hValue,
                                      const CFX_ByteStringC& szPropName,
                                      FX_BOOL bUseTypeGetter) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return lpValue->HasObjectOwnProperty(szPropName, bUseTypeGetter);
+  return reinterpret_cast<CFXJSE_Value*>(hValue)
+      ->HasObjectOwnProperty(szPropName, bUseTypeGetter);
 }
+
 FX_BOOL FXJSE_Value_SetObjectOwnProp(FXJSE_HVALUE hValue,
                                      const CFX_ByteStringC& szPropName,
                                      FXJSE_HVALUE hPropValue) {
@@ -203,6 +205,7 @@ FX_BOOL FXJSE_Value_SetObjectOwnProp(FXJSE_HVALUE hValue,
   ASSERT(lpValue && lpPropValue);
   return lpValue->SetObjectOwnProperty(szPropName, lpPropValue);
 }
+
 FX_BOOL FXJSE_Value_SetFunctionBind(FXJSE_HVALUE hValue,
                                     FXJSE_HVALUE hOldFunction,
                                     FXJSE_HVALUE hNewThis) {
@@ -212,43 +215,44 @@ FX_BOOL FXJSE_Value_SetFunctionBind(FXJSE_HVALUE hValue,
   ASSERT(lpValue && lpOldFunction && lpNewThis);
   return lpValue->SetFunctionBind(lpOldFunction, lpNewThis);
 }
+
 FX_BOOL FXJSE_Value_CallFunction(FXJSE_HVALUE hFunction,
                                  FXJSE_HVALUE hThis,
                                  FXJSE_HVALUE hRetValue,
                                  uint32_t nArgCount,
                                  FXJSE_HVALUE* lpArgs) {
-  CFXJSE_Value* lpFunction = reinterpret_cast<CFXJSE_Value*>(hFunction);
   CFXJSE_Value* lpThis = reinterpret_cast<CFXJSE_Value*>(hThis);
   CFXJSE_Value* lpRetValue = reinterpret_cast<CFXJSE_Value*>(hRetValue);
-  ASSERT(lpFunction);
-  return lpFunction->Call(lpThis, lpRetValue, nArgCount, lpArgs);
+  return reinterpret_cast<CFXJSE_Value*>(hFunction)
+      ->Call(lpThis, lpRetValue, nArgCount, lpArgs);
 }
+
 FXJSE_HVALUE FXJSE_Value_Create(FXJSE_HRUNTIME hRuntime) {
-  CFXJSE_Value* lpValue =
-      CFXJSE_Value::Create(reinterpret_cast<v8::Isolate*>(hRuntime));
-  ASSERT(lpValue);
-  return reinterpret_cast<FXJSE_HVALUE>(lpValue);
+  return reinterpret_cast<FXJSE_HVALUE>(
+      CFXJSE_Value::Create(reinterpret_cast<v8::Isolate*>(hRuntime)));
 }
+
 void FXJSE_Value_Release(FXJSE_HVALUE hValue) {
   CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  if (lpValue) {
-    delete lpValue;
-  }
+  delete lpValue;
 }
+
 FXJSE_HRUNTIME FXJSE_Value_GetRuntime(FXJSE_HVALUE hValue) {
-  CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue);
-  ASSERT(lpValue);
-  return reinterpret_cast<FXJSE_HRUNTIME>(lpValue->GetIsolate());
+  return reinterpret_cast<FXJSE_HRUNTIME>(
+      reinterpret_cast<CFXJSE_Value*>(hValue)->GetIsolate());
 }
+
 void FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Name,
                         const CFX_ByteStringC& utf8Message) {
   v8::Isolate* pIsolate = v8::Isolate::GetCurrent();
   ASSERT(pIsolate);
+
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(pIsolate);
   v8::Local<v8::String> hMessage = v8::String::NewFromUtf8(
       pIsolate, utf8Message.GetCStr(), v8::String::kNormalString,
       utf8Message.GetLength());
   v8::Local<v8::Value> hError;
+
   if (utf8Name == "RangeError") {
     hError = v8::Exception::RangeError(hMessage);
   } else if (utf8Name == "ReferenceError") {
@@ -269,33 +273,39 @@ void FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Name,
   }
   pIsolate->ThrowException(hError);
 }
+
 CFXJSE_Value* CFXJSE_Value::Create(v8::Isolate* pIsolate) {
   return new CFXJSE_Value(pIsolate);
 }
+
 void* CFXJSE_Value::ToObject(CFXJSE_Class* lpClass) const {
   ASSERT(!m_hValue.IsEmpty());
+
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hValue = v8::Local<v8::Value>::New(m_pIsolate, m_hValue);
   ASSERT(!hValue.IsEmpty());
-  if (!hValue->IsObject()) {
-    return NULL;
-  }
+
+  if (!hValue->IsObject())
+    return nullptr;
+
   return FXJSE_RetrieveObjectBinding(hValue.As<v8::Object>(), lpClass);
 }
+
 V8_INLINE static double FXJSE_ftod(FX_FLOAT fNumber) {
   if (sizeof(FX_FLOAT) != 4) {
     ASSERT(FALSE);
     return fNumber;
   }
+
   uint32_t nFloatBits = (uint32_t&)fNumber;
   uint8_t nExponent = (uint8_t)(nFloatBits >> 16 >> 7);
-  if (nExponent == 0 || nExponent == 255) {
+  if (nExponent == 0 || nExponent == 255)
     return fNumber;
-  }
+
   int8_t nErrExp = nExponent - 127 - 23;
-  if (nErrExp >= 0) {
+  if (nErrExp >= 0)
     return fNumber;
-  }
+
   double dwError = pow(2.0, nErrExp), dwErrorHalf = dwError / 2;
   double dNumber = fNumber, dNumberAbs = fabs(fNumber);
   double dNumberAbsMin = dNumberAbs - dwErrorHalf,
@@ -320,11 +330,13 @@ V8_INLINE static double FXJSE_ftod(FX_FLOAT fNumber) {
   return fNumber < 0 ? ceil(dNumber * dPow - 0.5) / dPow
                      : floor(dNumber * dPow + 0.5) / dPow;
 }
+
 void CFXJSE_Value::SetFloat(FX_FLOAT fFloat) {
   CFXJSE_ScopeUtil_IsolateHandle scope(m_pIsolate);
   v8::Local<v8::Value> hValue = v8::Number::New(m_pIsolate, FXJSE_ftod(fFloat));
   m_hValue.Reset(m_pIsolate, hValue);
 }
+
 void CFXJSE_Value::SetHostObject(void* lpObject, CFXJSE_Class* lpClass) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   ASSERT(lpClass);
@@ -334,6 +346,7 @@ void CFXJSE_Value::SetHostObject(void* lpObject, CFXJSE_Class* lpClass) {
   FXJSE_UpdateObjectBinding(hObject, lpObject);
   m_hValue.Reset(m_pIsolate, hObject);
 }
+
 void CFXJSE_Value::SetArray(uint32_t uValueCount, CFXJSE_Value** rgValues) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Array> hArrayObject = v8::Array::New(m_pIsolate, uValueCount);
@@ -347,19 +360,21 @@ void CFXJSE_Value::SetArray(uint32_t uValueCount, CFXJSE_Value** rgValues) {
   }
   m_hValue.Reset(m_pIsolate, hArrayObject);
 }
+
 void CFXJSE_Value::SetDate(FXJSE_DOUBLE dDouble) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hDate = v8::Date::New(m_pIsolate, dDouble);
   m_hValue.Reset(m_pIsolate, hDate);
 }
+
 FX_BOOL CFXJSE_Value::SetObjectProperty(const CFX_ByteStringC& szPropName,
                                         CFXJSE_Value* lpPropValue) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hObject =
       v8::Local<v8::Value>::New(m_pIsolate, m_hValue);
-  if (!hObject->IsObject()) {
+  if (!hObject->IsObject())
     return FALSE;
-  }
+
   v8::Local<v8::Value> hPropValue =
       v8::Local<v8::Value>::New(m_pIsolate, lpPropValue->DirectGetValue());
   return (FX_BOOL)hObject.As<v8::Object>()->Set(
@@ -368,14 +383,15 @@ FX_BOOL CFXJSE_Value::SetObjectProperty(const CFX_ByteStringC& szPropName,
                               szPropName.GetLength()),
       hPropValue);
 }
+
 FX_BOOL CFXJSE_Value::GetObjectProperty(const CFX_ByteStringC& szPropName,
                                         CFXJSE_Value* lpPropValue) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hObject =
       v8::Local<v8::Value>::New(m_pIsolate, m_hValue);
-  if (!hObject->IsObject()) {
+  if (!hObject->IsObject())
     return FALSE;
-  }
+
   v8::Local<v8::Value> hPropValue =
       hObject.As<v8::Object>()->Get(v8::String::NewFromUtf8(
           m_pIsolate, szPropName.GetCStr(), v8::String::kNormalString,
@@ -383,64 +399,69 @@ FX_BOOL CFXJSE_Value::GetObjectProperty(const CFX_ByteStringC& szPropName,
   lpPropValue->ForceSetValue(hPropValue);
   return TRUE;
 }
+
 FX_BOOL CFXJSE_Value::SetObjectProperty(uint32_t uPropIdx,
                                         CFXJSE_Value* lpPropValue) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hObject =
       v8::Local<v8::Value>::New(m_pIsolate, m_hValue);
-  if (!hObject->IsObject()) {
+  if (!hObject->IsObject())
     return FALSE;
-  }
+
   v8::Local<v8::Value> hPropValue =
       v8::Local<v8::Value>::New(m_pIsolate, lpPropValue->DirectGetValue());
   return (FX_BOOL)hObject.As<v8::Object>()->Set(uPropIdx, hPropValue);
 }
+
 FX_BOOL CFXJSE_Value::GetObjectProperty(uint32_t uPropIdx,
                                         CFXJSE_Value* lpPropValue) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hObject =
       v8::Local<v8::Value>::New(m_pIsolate, m_hValue);
-  if (!hObject->IsObject()) {
+  if (!hObject->IsObject())
     return FALSE;
-  }
+
   v8::Local<v8::Value> hPropValue = hObject.As<v8::Object>()->Get(uPropIdx);
   lpPropValue->ForceSetValue(hPropValue);
   return TRUE;
 }
+
 FX_BOOL CFXJSE_Value::DeleteObjectProperty(const CFX_ByteStringC& szPropName) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hObject =
       v8::Local<v8::Value>::New(m_pIsolate, m_hValue);
-  if (!hObject->IsObject()) {
+  if (!hObject->IsObject())
     return FALSE;
-  }
+
   hObject.As<v8::Object>()->Delete(v8::String::NewFromUtf8(
       m_pIsolate, szPropName.GetCStr(), v8::String::kNormalString,
       szPropName.GetLength()));
   return TRUE;
 }
+
 FX_BOOL CFXJSE_Value::HasObjectOwnProperty(const CFX_ByteStringC& szPropName,
                                            FX_BOOL bUseTypeGetter) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hObject =
       v8::Local<v8::Value>::New(m_pIsolate, m_hValue);
-  if (!hObject->IsObject()) {
+  if (!hObject->IsObject())
     return FALSE;
-  }
+
   v8::Local<v8::String> hKey = v8::String::NewFromUtf8(
       m_pIsolate, szPropName.GetCStr(), v8::String::kNormalString,
       szPropName.GetLength());
   return hObject.As<v8::Object>()->HasRealNamedProperty(hKey) ||
          (bUseTypeGetter && hObject.As<v8::Object>()->HasOwnProperty(hKey));
 }
+
 FX_BOOL CFXJSE_Value::SetObjectOwnProperty(const CFX_ByteStringC& szPropName,
                                            CFXJSE_Value* lpPropValue) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> hObject =
       v8::Local<v8::Value>::New(m_pIsolate, m_hValue);
-  if (!hObject->IsObject()) {
+  if (!hObject->IsObject())
     return FALSE;
-  }
+
   v8::Local<v8::Value> hValue =
       v8::Local<v8::Value>::New(m_pIsolate, lpPropValue->m_hValue);
   return hObject.As<v8::Object>()->ForceSet(
@@ -449,21 +470,22 @@ FX_BOOL CFXJSE_Value::SetObjectOwnProperty(const CFX_ByteStringC& szPropName,
                               szPropName.GetLength()),
       hValue);
 }
+
 FX_BOOL CFXJSE_Value::SetFunctionBind(CFXJSE_Value* lpOldFunction,
                                       CFXJSE_Value* lpNewThis) {
   CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate);
   v8::Local<v8::Value> rgArgs[2];
   v8::Local<v8::Value> hOldFunction =
       v8::Local<v8::Value>::New(m_pIsolate, lpOldFunction->DirectGetValue());
-  if (hOldFunction.IsEmpty() || !hOldFunction->IsFunction()) {
+  if (hOldFunction.IsEmpty() || !hOldFunction->IsFunction())
     return FALSE;
-  }
+
   rgArgs[0] = hOldFunction;
   v8::Local<v8::Value> hNewThis =
       v8::Local<v8::Value>::New(m_pIsolate, lpNewThis->DirectGetValue());
-  if (hNewThis.IsEmpty()) {
+  if (hNewThis.IsEmpty())
     return FALSE;
-  }
+
   rgArgs[1] = hNewThis;
   v8::Local<v8::String> hBinderFuncSource =
       v8::String::NewFromUtf8(m_pIsolate,
@@ -473,12 +495,13 @@ FX_BOOL CFXJSE_Value::SetFunctionBind(CFXJSE_Value* lpOldFunction,
       v8::Script::Compile(hBinderFuncSource)->Run().As<v8::Function>();
   v8::Local<v8::Value> hBoundFunction =
       hBinderFunc->Call(m_pIsolate->GetCurrentContext()->Global(), 2, rgArgs);
-  if (hBoundFunction.IsEmpty() || !hBoundFunction->IsFunction()) {
+  if (hBoundFunction.IsEmpty() || !hBoundFunction->IsFunction())
     return FALSE;
-  }
+
   m_hValue.Reset(m_pIsolate, hBoundFunction);
   return TRUE;
 }
+
 #define FXJSE_INVALID_PTR ((void*)(intptr_t)-1)
 FX_BOOL CFXJSE_Value::Call(CFXJSE_Value* lpReceiver,
                            CFXJSE_Value* lpRetValue,
@@ -491,13 +514,14 @@ FX_BOOL CFXJSE_Value::Call(CFXJSE_Value* lpReceiver,
       !hFunctionValue.IsEmpty() && hFunctionValue->IsObject()
           ? hFunctionValue.As<v8::Object>()
           : v8::Local<v8::Object>();
+
   v8::TryCatch trycatch;
   if (hFunctionObject.IsEmpty() || !hFunctionObject->IsCallable()) {
-    if (lpRetValue) {
+    if (lpRetValue)
       lpRetValue->ForceSetValue(FXJSE_CreateReturnValue(m_pIsolate, trycatch));
-    }
     return FALSE;
   }
+
   v8::Local<v8::Value> hReturnValue;
   v8::Local<v8::Value>* lpLocalArgs = NULL;
   if (nArgCount) {
@@ -514,6 +538,7 @@ FX_BOOL CFXJSE_Value::Call(CFXJSE_Value* lpReceiver,
       }
     }
   }
+
   FX_BOOL bRetValue = TRUE;
   if (lpReceiver == FXJSE_INVALID_PTR) {
     hReturnValue = hFunctionObject->CallAsConstructor(nArgCount, lpLocalArgs);
@@ -523,23 +548,24 @@ FX_BOOL CFXJSE_Value::Call(CFXJSE_Value* lpReceiver,
       hReceiver =
           v8::Local<v8::Value>::New(m_pIsolate, lpReceiver->DirectGetValue());
     }
-    if (hReceiver.IsEmpty() || !hReceiver->IsObject()) {
+    if (hReceiver.IsEmpty() || !hReceiver->IsObject())
       hReceiver = v8::Object::New(m_pIsolate);
-    }
+
     hReturnValue =
         hFunctionObject->CallAsFunction(hReceiver, nArgCount, lpLocalArgs);
   }
+
   if (trycatch.HasCaught()) {
     hReturnValue = FXJSE_CreateReturnValue(m_pIsolate, trycatch);
     bRetValue = FALSE;
   }
-  if (lpRetValue) {
+
+  if (lpRetValue)
     lpRetValue->ForceSetValue(hReturnValue);
-  }
+
   if (lpLocalArgs) {
-    for (uint32_t i = 0; i < nArgCount; i++) {
+    for (uint32_t i = 0; i < nArgCount; i++)
       lpLocalArgs[i].~Local();
-    }
     FX_Free(lpLocalArgs);
   }
   return bRetValue;