diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/v8/src/json.js | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/v8/src/json.js')
-rw-r--r-- | chromium/v8/src/json.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/v8/src/json.js b/chromium/v8/src/json.js index b0e14e1965d..c21e6351d45 100644 --- a/chromium/v8/src/json.js +++ b/chromium/v8/src/json.js @@ -181,7 +181,7 @@ function JSONSerialize(key, holder, replacer, stack, indent, gap) { } } // Undefined or a callable object. - return void 0; + return UNDEFINED; } @@ -236,5 +236,5 @@ function JSONSerializeAdapter(key, object) { var holder = {}; holder[key] = object; // No need to pass the actual holder since there is no replacer function. - return JSONSerialize(key, holder, void 0, new InternalArray(), "", ""); + return JSONSerialize(key, holder, UNDEFINED, new InternalArray(), "", ""); } |