diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | build_gyp/standalone.gypi | 1 | ||||
| -rw-r--r-- | xfa/fxjse/dynprop.cpp | 8 |
3 files changed, 8 insertions, 5 deletions
@@ -14,8 +14,8 @@ vars = { 'icu_revision': 'c291cde264469b20ca969ce8832088acb21e0c48', 'pdfium_tests_revision': '6c769320872e6ca82da4adaec1a497237f71b543', 'skia_revision': '6f47dbaff54a7705ef3e98f1f65c765e56fd9bd0', - 'trace_event_revision': 'd83d44b13d07c2fd0a40101a7deef9b93b841732', - 'v8_revision': '5cd0d8f27e3f740179a8a3de7b9d2c0cfae7afb9', + 'trace_event_revision': '54b8455be9505c2cb0cf5c26bb86739c236471aa', + 'v8_revision': '453b746d88e3d047d3f6c4363f0fe42b6bd13638', } deps = { diff --git a/build_gyp/standalone.gypi b/build_gyp/standalone.gypi index f191c28e42..2b6ff6a83a 100644 --- a/build_gyp/standalone.gypi +++ b/build_gyp/standalone.gypi @@ -50,6 +50,7 @@ 'werror%': '-Werror', 'v8_optimized_debug%': 0, 'v8_use_external_startup_data%': 0, + 'icu_use_data_file_flag%': 1, 'icu_gyp_path': '../third_party/icu/icu.gyp', 'libjpeg_gyp_path': '../third_party/third_party.gyp', 'conditions': [ diff --git a/xfa/fxjse/dynprop.cpp b/xfa/fxjse/dynprop.cpp index 498c6608cf..2fa7a8df10 100644 --- a/xfa/fxjse/dynprop.cpp +++ b/xfa/fxjse/dynprop.cpp @@ -63,9 +63,11 @@ static void FXJSE_DynPropGetterAdapter(const FXJSE_CLASS* lpClass, 1, v8::String::NewFromUtf8( pIsolate, reinterpret_cast<const char*>(szPropName.raw_str()), v8::String::kNormalString, szPropName.GetLength())); - lpValue->ForceSetValue(v8::Function::New( - lpValue->GetIsolate(), FXJSE_DynPropGetterAdapter_MethodCallback, - hCallBackInfo)); + lpValue->ForceSetValue( + v8::Function::New(lpValue->GetIsolate()->GetCurrentContext(), + FXJSE_DynPropGetterAdapter_MethodCallback, + hCallBackInfo, 0, v8::ConstructorBehavior::kThrow) + .ToLocalChecked()); } } } |