From 551a0fd73570a0292e7b017f764b70c4afde873a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 28 Apr 2015 14:31:15 -0700 Subject: Merge to XFA: Pin V8 version until initialization issue in b584bab resolved. Also make a Handle => Local change for XFA required at https://chromium.googlesource.com/v8/v8.git/+/202a97c88eb6807915135a1e6be9aa921cd8efac to fix compile. Original Review URL https://codereview.chromium.org/1108913004/ TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1108973005 --- DEPS | 2 +- xfa/src/fxjse/src/value.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 88e3a3c2e0..6f8417f5a0 100644 --- a/DEPS +++ b/DEPS @@ -12,7 +12,7 @@ deps = { "https://chromium.googlesource.com/external/googletest.git@8245545b6dc9c4703e6496d1efd19e975ad2b038", "v8": - "https://chromium.googlesource.com/v8/v8.git", + "https://chromium.googlesource.com/v8/v8.git@6988aec61f071a1caec96abae1cf39353a234455", "v8/third_party/icu": "https://chromium.googlesource.com/chromium/deps/icu46", diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/src/value.cpp index 9bbfdf7c61..de7e05455b 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/src/value.cpp @@ -506,7 +506,7 @@ FX_BOOL CFXJSE_Value::Call(CFXJSE_Value* lpReceiver, CFXJSE_Value* lpRetValue, F } if(lpLocalArgs) { for (FX_UINT32 i = 0; i < nArgCount; i++) { - lpLocalArgs[i].~Handle(); + lpLocalArgs[i].~Local(); } FX_Free(lpLocalArgs); } -- cgit v1.2.3