diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/v8/src/json-parser.h | |
parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/v8/src/json-parser.h')
-rw-r--r-- | chromium/v8/src/json-parser.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/chromium/v8/src/json-parser.h b/chromium/v8/src/json-parser.h index f1fa5647f84..cac49798598 100644 --- a/chromium/v8/src/json-parser.h +++ b/chromium/v8/src/json-parser.h @@ -5,13 +5,15 @@ #ifndef V8_JSON_PARSER_H_ #define V8_JSON_PARSER_H_ -#include "src/v8.h" - -#include "src/char-predicates-inl.h" +#include "src/char-predicates.h" #include "src/conversions.h" -#include "src/heap/spaces-inl.h" +#include "src/debug/debug.h" +#include "src/factory.h" #include "src/messages.h" +#include "src/scanner.h" #include "src/token.h" +#include "src/transitions.h" +#include "src/types.h" namespace v8 { namespace internal { @@ -243,9 +245,11 @@ MaybeHandle<Object> JsonParser<seq_one_byte>::ParseJson() { break; } - MessageLocation location(factory->NewScript(source_), - position_, - position_ + 1); + Handle<Script> script(factory->NewScript(source_)); + // We should sent compile error event because we compile JSON object in + // separated source file. + isolate()->debug()->OnCompileError(script); + MessageLocation location(script, position_, position_ + 1); Handle<Object> error = factory->NewSyntaxError(message, argument); return isolate()->template Throw<Object>(error, &location); } @@ -262,10 +266,10 @@ Handle<Object> JsonParser<seq_one_byte>::ParseJsonValue() { return Handle<Object>::null(); } - if (isolate_->stack_guard()->InterruptRequested()) { + if (stack_check.InterruptRequested()) { ExecutionAccess access(isolate_); // Avoid blocking GC in long running parser (v8:3974). - isolate_->stack_guard()->CheckAndHandleGCInterrupt(); + isolate_->stack_guard()->HandleGCInterrupt(); } if (c0_ == '"') return ParseJsonString(); |