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/field-index-inl.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/field-index-inl.h')
| -rw-r--r-- | chromium/v8/src/field-index-inl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/v8/src/field-index-inl.h b/chromium/v8/src/field-index-inl.h index c151ab10724..042e4fbdd23 100644 --- a/chromium/v8/src/field-index-inl.h +++ b/chromium/v8/src/field-index-inl.h @@ -16,7 +16,7 @@ inline FieldIndex FieldIndex::ForInObjectOffset(int offset, Map* map) { int index = offset / kPointerSize; DCHECK(map == NULL || index < (map->GetInObjectPropertyOffset(0) / kPointerSize + - map->inobject_properties())); + map->GetInObjectProperties())); return FieldIndex(true, index, false, 0, 0, true); } @@ -25,7 +25,7 @@ inline FieldIndex FieldIndex::ForPropertyIndex(Map* map, int property_index, bool is_double) { DCHECK(map->instance_type() >= FIRST_NONSTRING_TYPE); - int inobject_properties = map->inobject_properties(); + int inobject_properties = map->GetInObjectProperties(); bool is_inobject = property_index < inobject_properties; int first_inobject_offset; if (is_inobject) { @@ -58,7 +58,7 @@ inline FieldIndex FieldIndex::ForLoadByFieldIndex(Map* map, int orig_index) { field_index += JSObject::kHeaderSize / kPointerSize; } FieldIndex result(is_inobject, field_index, is_double, - map->inobject_properties(), first_inobject_offset); + map->GetInObjectProperties(), first_inobject_offset); DCHECK(result.GetLoadByFieldIndex() == orig_index); return result; } |