| commit | 551a0fd73570a0292e7b017f764b70c4afde873a | [log] [tgz] |
|---|---|---|
| author | Tom Sepez <tsepez@chromium.org> | Tue Apr 28 14:31:15 2015 -0700 |
| committer | Tom Sepez <tsepez@chromium.org> | Tue Apr 28 14:31:15 2015 -0700 |
| tree | 2a3254f33780fab69a57dd5659e3643d1954753e | |
| parent | 596d3445356b3ed009d45cde8448c7fd2d9644fe [diff] |
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
diff --git a/DEPS b/DEPS index 88e3a3c..6f8417f 100644 --- a/DEPS +++ b/DEPS
@@ -12,7 +12,7 @@ "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 9bbfdf7..de7e054 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/src/value.cpp
@@ -506,7 +506,7 @@ } if(lpLocalArgs) { for (FX_UINT32 i = 0; i < nArgCount; i++) { - lpLocalArgs[i].~Handle(); + lpLocalArgs[i].~Local(); } FX_Free(lpLocalArgs); }