commit ba038bc14bfeb4d011d57f388871f7f14c4c3c22
author Tom Sepez <tsepez@chromium.org> Thu Oct 08 12:03:00 2015 -0700
committer Tom Sepez <tsepez@chromium.org> Thu Oct 08 12:03:00 2015 -0700
tree 2786d0c3d7c56492c09f9c01e4eae090023c4040
parent 4d4a442aa413cdf5e114c4e432ae930bc9d9e0f1

Merge to XFA: Rename IFXJS_Runtime and IFXJS_Context to IJS_.

Merge conflicts in:
  fpdfsdk/src/javascript/Document.cpp
  fpdfsdk/src/javascript/JS_Define.h

New code in:
 fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
 fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp

(cherry picked from commit 213a172779fddbd7e588ee2e2b3906ccc47d6896)
Original Review URL: https://codereview.chromium.org/1386173002 .

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1395713002 .

fpdfsdk/src/javascript/util.cpp

diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp
index c83aa6f..6a48c09 100644
--- a/fpdfsdk/src/javascript/util.cpp
+++ b/fpdfsdk/src/javascript/util.cpp
@@ -20,7 +20,7 @@
 #include <ctype.h>
 #endif
 
-static v8::Isolate* GetIsolate(IFXJS_Context* cc) {
+static v8::Isolate* GetIsolate(IJS_Context* cc) {
   CJS_Context* pContext = (CJS_Context*)cc;
   ASSERT(pContext != NULL);
 
@@ -124,7 +124,7 @@
   return -1;
 }
 
-FX_BOOL util::printf(IFXJS_Context* cc,
+FX_BOOL util::printf(IJS_Context* cc,
                      const CJS_Parameters& params,
                      CJS_Value& vRet,
                      CFX_WideString& sError) {
@@ -187,7 +187,7 @@
   return TRUE;
 }
 
-FX_BOOL util::printd(IFXJS_Context* cc,
+FX_BOOL util::printd(IJS_Context* cc,
                      const CJS_Parameters& params,
                      CJS_Value& vRet,
                      CFX_WideString& sError) {
@@ -400,7 +400,7 @@
   cPurpose = cFormat;
 }
 
-FX_BOOL util::printx(IFXJS_Context* cc,
+FX_BOOL util::printx(IJS_Context* cc,
                      const CJS_Parameters& params,
                      CJS_Value& vRet,
                      CFX_WideString& sError) {
@@ -500,7 +500,7 @@
   }
 }
 
-FX_BOOL util::scand(IFXJS_Context* cc,
+FX_BOOL util::scand(IJS_Context* cc,
                     const CJS_Parameters& params,
                     CJS_Value& vRet,
                     CFX_WideString& sError) {
@@ -551,7 +551,7 @@
   return sign == '-' ? -total : total;
 }
 
-FX_BOOL util::byteToChar(IFXJS_Context* cc,
+FX_BOOL util::byteToChar(IJS_Context* cc,
                          const CJS_Parameters& params,
                          CJS_Value& vRet,
                          CFX_WideString& sError) {