FX Bool considered harmful, part 3

fpdfsdk/src/javascript/JS_Runtime.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_EventHandler.h"
 #include "../../include/javascript/JS_Runtime.h"
@@ skipping 22 matching lines @@
 
 IFXJS_Runtime*                  CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environment* pApp)
 {
     if (!m_bInit)
     {
         unsigned int embedderDataSlot = 0;
         if (pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
             embedderDataSlot = pApp->GetFormFillInfo()->m_pJsPlatform->m_v8EmbedderSlot;
                 }
         JS_Initial(embedderDataSlot);
-        m_bInit = TRUE;
+        m_bInit = true;
     }
     return new CJS_Runtime(pApp);
 }
 void                            CJS_RuntimeFactory::AddRef()
 {
     //to do.Should be implemented as atom manipulation.
     m_nRef++;
 }
 void                            CJS_RuntimeFactory::Release()
 {
     if(m_bInit)
     {
         //to do.Should be implemented as atom manipulation.
         if (--m_nRef == 0)
         {
             JS_Release();
             ReleaseGlobalData();
-            m_bInit = FALSE;
+            m_bInit = false;
         }
     }
 }
 
 void                            CJS_RuntimeFactory::DeleteJSRuntime(IFXJS_Runtime* pRuntime)
 {
     delete (CJS_Runtime*)pRuntime;
 }
 
 CJS_GlobalData* CJS_RuntimeFactory::NewGlobalData(CPDFDoc_Environment* pApp)
@@ skipping 29 matching lines @@
 
 void CJS_ArrayBufferAllocator::Free(void* data, size_t length) {
     free(data);
 }
 
 /* ------------------------------ CJS_Runtime ------------------------------ */
 
 CJS_Runtime::CJS_Runtime(CPDFDoc_Environment * pApp) :
         m_pApp(pApp),
         m_pDocument(NULL),
-        m_bBlocking(FALSE),
+        m_bBlocking(false),
         m_pFieldEventPath(NULL),
     m_isolate(NULL)
 {
     if (m_pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
         m_isolate = reinterpret_cast<v8::Isolate*>(m_pApp->GetFormFillInfo()->m_pJsPlatform->m_isolate);
     }
     if (!m_isolate) {
         m_pArrayBufferAllocator.reset(new CJS_ArrayBufferAllocator());
 
         v8::Isolate::CreateParams params;
@@ skipping 21 matching lines @@
 
     m_pApp = NULL;
     m_pDocument = NULL;
     m_pFieldEventPath = NULL;
     m_context.Reset();
 
     //m_isolate->Exit();
     m_isolate->Dispose();
 }
 
-FX_BOOL CJS_Runtime::InitJSObjects()
+bool CJS_Runtime::InitJSObjects()
 {
     v8::Isolate::Scope isolate_scope(GetIsolate());
     v8::HandleScope handle_scope(GetIsolate());
     v8::Local<v8::Context> context = v8::Context::New(GetIsolate());
     v8::Context::Scope context_scope(context);
     //0 - 8
-    if (CJS_Border::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Display::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Font::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Highlight::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Position::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_ScaleHow::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_ScaleWhen::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Style::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Zoomtype::Init(*this, JS_STATIC) < 0) return FALSE;
+    if (CJS_Border::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Display::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Font::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Highlight::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Position::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_ScaleHow::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_ScaleWhen::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Style::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Zoomtype::Init(*this, JS_STATIC) < 0) return false;
 
     //9 - 11
-    if (CJS_App::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Color::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Console::Init(*this, JS_STATIC) < 0) return FALSE;
+    if (CJS_App::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Color::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Console::Init(*this, JS_STATIC) < 0) return false;
 
     //12 - 14
-    if (CJS_Document::Init(*this, JS_DYNAMIC) < 0) return FALSE;
-    if (CJS_Event::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Field::Init(*this, JS_DYNAMIC) < 0) return FALSE;
+    if (CJS_Document::Init(*this, JS_DYNAMIC) < 0) return false;
+    if (CJS_Event::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Field::Init(*this, JS_DYNAMIC) < 0) return false;
 
     //15 - 17
-    if (CJS_Global::Init(*this, JS_STATIC) < 0) return FALSE;
-    if (CJS_Icon::Init(*this, JS_DYNAMIC) < 0) return FALSE;
-    if (CJS_Util::Init(*this, JS_STATIC) < 0) return FALSE;
+    if (CJS_Global::Init(*this, JS_STATIC) < 0) return false;
+    if (CJS_Icon::Init(*this, JS_DYNAMIC) < 0) return false;
+    if (CJS_Util::Init(*this, JS_STATIC) < 0) return false;
 
-    if (CJS_PublicMethods::Init(*this) < 0) return FALSE;
-    if (CJS_GlobalConsts::Init(*this) < 0) return FALSE;
-    if (CJS_GlobalArrays::Init(*this) < 0) return FALSE;
+    if (CJS_PublicMethods::Init(*this) < 0) return false;
+    if (CJS_GlobalConsts::Init(*this) < 0) return false;
+    if (CJS_GlobalArrays::Init(*this) < 0) return false;
 
-    if (CJS_TimerObj::Init(*this, JS_DYNAMIC) < 0) return FALSE;
-    if (CJS_PrintParamsObj::Init(*this, JS_DYNAMIC) <0) return FALSE;
+    if (CJS_TimerObj::Init(*this, JS_DYNAMIC) < 0) return false;
+    if (CJS_PrintParamsObj::Init(*this, JS_DYNAMIC) <0) return false;
 
-    return TRUE;
+    return true;
 }
 
 IFXJS_Context* CJS_Runtime::NewContext()
 {
     CJS_Context * p = new CJS_Context(this);
     m_ContextArray.Add(p);
     return p;
 }
 
 void CJS_Runtime::ReleaseContext(IFXJS_Context * pContext)
@@ skipping 45 matching lines @@
             }
             JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"Document"));
         }
         else
         {
             JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"app"));
         }
     }
 }
 
-FX_BOOL CJS_Runtime::AddEventToLoop(const CFX_WideString& sTargetName, JS_EVENT_T eEventType)
+bool CJS_Runtime::AddEventToLoop(const CFX_WideString& sTargetName, JS_EVENT_T eEventType)
 {
     if (m_pFieldEventPath == NULL)
     {
         m_pFieldEventPath = new CJS_FieldEvent;
         m_pFieldEventPath->sTargetName = sTargetName;
         m_pFieldEventPath->eEventType = eEventType;
         m_pFieldEventPath->pNext = NULL;
 
-        return TRUE;
+        return true;
     }
 
     //to search
     CJS_FieldEvent* p = m_pFieldEventPath;
     CJS_FieldEvent* pLast = m_pFieldEventPath;
     while (p)
     {
         if (p->eEventType == eEventType && p->sTargetName == sTargetName)
-            return FALSE;
+            return false;
 
         pLast = p;
         p = p->pNext;
     }
 
     //to add
     CJS_FieldEvent* pNew = new CJS_FieldEvent;
     pNew->sTargetName = sTargetName;
     pNew->eEventType = eEventType;
     pNew->pNext = NULL;
 
     pLast->pNext = pNew;
 
-    return TRUE;
+    return true;
 }
 
 void CJS_Runtime::RemoveEventInLoop(const CFX_WideString& sTargetName, JS_EVENT_T eEventType)
 {
-    FX_BOOL bFind = FALSE;
+    bool bFind = false;
 
     CJS_FieldEvent* p = m_pFieldEventPath;
     CJS_FieldEvent* pLast = NULL;
     while (p)
     {
         if (p->eEventType == eEventType && p->sTargetName == sTargetName)
         {
-            bFind = TRUE;
+            bFind = true;
             break;
         }
 
         pLast = p;
         p = p->pNext;
     }
 
     if (bFind)
     {
         RemoveEventsInLoop(p);
@@ skipping 23 matching lines @@
 {
     return v8::Local<v8::Context>::New(m_isolate, m_context);
 }
 
 CFX_WideString ChangeObjName(const CFX_WideString& str)
 {
     CFX_WideString sRet = str;
     sRet.Replace(L"_", L".");
     return sRet;
 }