XFA: merge patch from issue 801913002 and 804463003

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"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
 #include "../../include/javascript/JS_Value.h"
 #include "../../include/javascript/Document.h"
 #include "../../include/javascript/app.h"
 #include "../../include/javascript/color.h"
 #include "../../include/javascript/Consts.h"
 #include "../../include/javascript/Document.h"
 #include "../../include/javascript/event.h"
 #include "../../include/javascript/Field.h"
 #include "../../include/javascript/Icon.h"
 #include "../../include/javascript/PublicMethods.h"
 #include "../../include/javascript/report.h"
 #include "../../include/javascript/util.h"
 #include "../../include/javascript/JS_GlobalData.h"
 #include "../../include/javascript/global.h"
 #include "../../include/javascript/console.h"
 #include "../../include/fpdfxfa/fpdfxfa_app.h"
-#ifndef FOXIT_CHROME_BUILD
-#include "../../../fxjse/value.h"
-#else
 #include "../../../xfa/src/fxjse/src/value.h"
-#endif
 
 #include <libplatform/libplatform.h>
 
 CJS_RuntimeFactory::~CJS_RuntimeFactory()
 {
 }
 
 IFXJS_Runtime*                                  CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environment* pApp)
 {
         if (!m_bInit)
@@ skipping 487 matching lines @@
     v8::Local<v8::Context> context =
         v8::Local<v8::Context>::New(pIsolate, m_context);
     v8::Context::Scope context_scope(context);
 
         //v8::Local<v8::Context> tmpCotext = v8::Local<v8::Context>::New(GetIsolate(), m_context);
         v8::Local<v8::Value> propvalue = v8::Local<v8::Value>::New(GetIsolate(),((CFXJSE_Value*)hValue)->DirectGetValue());
         context->Global()->Set(v8::String::NewFromUtf8(pIsolate, name, v8::String::kNormalString, utf8Name.GetLength()), propvalue);
          
         return TRUE;
 }