diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
| commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
| tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/v8/src/json-parser.h | |
| parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
| download | qtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz | |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/v8/src/json-parser.h')
| -rw-r--r-- | chromium/v8/src/json-parser.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chromium/v8/src/json-parser.h b/chromium/v8/src/json-parser.h index cab094591fc..6566c92e404 100644 --- a/chromium/v8/src/json-parser.h +++ b/chromium/v8/src/json-parser.h @@ -135,7 +135,7 @@ class JsonParser BASE_EMBEDDED { } inline Isolate* isolate() { return isolate_; } - inline Factory* factory() { return factory_; } + inline Factory* factory() { return isolate_->factory(); } inline Handle<JSFunction> object_constructor() { return object_constructor_; } static const int kInitialSpecialStringLength = 32; @@ -145,7 +145,7 @@ class JsonParser BASE_EMBEDDED { Zone* zone() { return &zone_; } void CommitStateToJsonObject(Handle<JSObject> json_object, Handle<Map> map, - ZoneVector<Handle<Object>>* properties); + Vector<const Handle<Object>> properties); Handle<String> source_; int source_length_; @@ -153,11 +153,13 @@ class JsonParser BASE_EMBEDDED { PretenureFlag pretenure_; Isolate* isolate_; - Factory* factory_; Zone zone_; Handle<JSFunction> object_constructor_; uc32 c0_; int position_; + + // Property handles are stored here inside ParseJsonObject. + ZoneVector<Handle<Object>> properties_; }; } // namespace internal |