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 .

1 files changed, 20 insertions, 22 deletions

diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp
index 0d02503c96..a6bd5dca1f 100644
--- a/fpdfsdk/src/javascript/event.cpp
+++ b/fpdfsdk/src/javascript/event.cpp
@@ -52,7 +52,7 @@ event::event(CJS_Object* pJsObject) : CJS_EmbedObj(pJsObject) {}
 event::~event() {
 }
 
-FX_BOOL event::change(IFXJS_Context* cc,
+FX_BOOL event::change(IJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
@@ -70,7 +70,7 @@ FX_BOOL event::change(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::changeEx(IFXJS_Context* cc,
+FX_BOOL event::changeEx(IJS_Context* cc,
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -85,7 +85,7 @@ FX_BOOL event::changeEx(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::commitKey(IFXJS_Context* cc,
+FX_BOOL event::commitKey(IJS_Context* cc,
                          CJS_PropValue& vp,
                          CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -100,7 +100,7 @@ FX_BOOL event::commitKey(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::fieldFull(IFXJS_Context* cc,
+FX_BOOL event::fieldFull(IJS_Context* cc,
                          CJS_PropValue& vp,
                          CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
@@ -119,7 +119,7 @@ FX_BOOL event::fieldFull(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::keyDown(IFXJS_Context* cc,
+FX_BOOL event::keyDown(IJS_Context* cc,
                        CJS_PropValue& vp,
                        CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -137,7 +137,7 @@ FX_BOOL event::keyDown(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::modifier(IFXJS_Context* cc,
+FX_BOOL event::modifier(IJS_Context* cc,
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -155,7 +155,7 @@ FX_BOOL event::modifier(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::name(IFXJS_Context* cc,
+FX_BOOL event::name(IJS_Context* cc,
                     CJS_PropValue& vp,
                     CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -170,9 +170,7 @@ FX_BOOL event::name(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::rc(IFXJS_Context* cc,
-                  CJS_PropValue& vp,
-                  CFX_WideString& sError) {
+FX_BOOL event::rc(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
   ASSERT(pContext != NULL);
   CJS_EventHandler* pEvent = pContext->GetEventHandler();
@@ -187,7 +185,7 @@ FX_BOOL event::rc(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::richChange(IFXJS_Context* cc,
+FX_BOOL event::richChange(IJS_Context* cc,
                           CJS_PropValue& vp,
                           CFX_WideString& sError) {
   return TRUE;
@@ -198,7 +196,7 @@ FX_BOOL event::richChange(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::richChangeEx(IFXJS_Context* cc,
+FX_BOOL event::richChangeEx(IJS_Context* cc,
                             CJS_PropValue& vp,
                             CFX_WideString& sError) {
   return TRUE;
@@ -209,7 +207,7 @@ FX_BOOL event::richChangeEx(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::richValue(IFXJS_Context* cc,
+FX_BOOL event::richValue(IJS_Context* cc,
                          CJS_PropValue& vp,
                          CFX_WideString& sError) {
   return TRUE;
@@ -220,7 +218,7 @@ FX_BOOL event::richValue(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::selEnd(IFXJS_Context* cc,
+FX_BOOL event::selEnd(IJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
@@ -241,7 +239,7 @@ FX_BOOL event::selEnd(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::selStart(IFXJS_Context* cc,
+FX_BOOL event::selStart(IJS_Context* cc,
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
@@ -261,7 +259,7 @@ FX_BOOL event::selStart(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::shift(IFXJS_Context* cc,
+FX_BOOL event::shift(IJS_Context* cc,
                      CJS_PropValue& vp,
                      CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -279,7 +277,7 @@ FX_BOOL event::shift(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::source(IFXJS_Context* cc,
+FX_BOOL event::source(IJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -294,7 +292,7 @@ FX_BOOL event::source(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::target(IFXJS_Context* cc,
+FX_BOOL event::target(IJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -309,7 +307,7 @@ FX_BOOL event::target(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::targetName(IFXJS_Context* cc,
+FX_BOOL event::targetName(IJS_Context* cc,
                           CJS_PropValue& vp,
                           CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -324,7 +322,7 @@ FX_BOOL event::targetName(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::type(IFXJS_Context* cc,
+FX_BOOL event::type(IJS_Context* cc,
                     CJS_PropValue& vp,
                     CFX_WideString& sError) {
   if (!vp.IsGetting())
@@ -339,7 +337,7 @@ FX_BOOL event::type(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::value(IFXJS_Context* cc,
+FX_BOOL event::value(IJS_Context* cc,
                      CJS_PropValue& vp,
                      CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
@@ -360,7 +358,7 @@ FX_BOOL event::value(IFXJS_Context* cc,
   return TRUE;
 }
 
-FX_BOOL event::willCommit(IFXJS_Context* cc,
+FX_BOOL event::willCommit(IJS_Context* cc,
                           CJS_PropValue& vp,
                           CFX_WideString& sError) {
   if (!vp.IsGetting())