summaryrefslogtreecommitdiff
path: root/chromium/v8/src/json-parser.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:20:33 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:28:57 +0000
commitd17ea114e5ef69ad5d5d7413280a13e6428098aa (patch)
tree2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/v8/src/json-parser.cc
parent8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff)
downloadqtwebengine-chromium-d17ea114e5ef69ad5d5d7413280a13e6428098aa.tar.gz
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/v8/src/json-parser.cc')
-rw-r--r--chromium/v8/src/json-parser.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/v8/src/json-parser.cc b/chromium/v8/src/json-parser.cc
index 2d9593091d7..fa40731f45d 100644
--- a/chromium/v8/src/json-parser.cc
+++ b/chromium/v8/src/json-parser.cc
@@ -7,7 +7,6 @@
#include "src/char-predicates-inl.h"
#include "src/conversions.h"
#include "src/debug/debug.h"
-#include "src/factory.h"
#include "src/field-type.h"
#include "src/messages.h"
#include "src/objects-inl.h"
@@ -15,7 +14,6 @@
#include "src/string-hasher.h"
#include "src/transitions.h"
#include "src/unicode-cache.h"
-#include "src/zone/zone-containers.h"
namespace v8 {
namespace internal {
@@ -419,9 +417,10 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonObject() {
key = ParseJsonString();
if (key.is_null()) return ReportUnexpectedCharacter();
- target = TransitionsAccessor(map).FindTransitionToField(key);
// If a transition was found, follow it and continue.
- transitioning = !target.is_null();
+ transitioning =
+ TransitionsAccessor(map).FindTransitionToField(key).ToHandle(
+ &target);
}
if (c0_ != ':') return ReportUnexpectedCharacter();