third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h - Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.h

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reverting some behavior changes Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« third_party/WebKit/LayoutTests/crypto/subtle/digest-arraybuffer-oom.html ('K') | « third_party/WebKit/LayoutTests/fast/canvas/imageData-oom-expected.txt ('k') | third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp » ('j') | third_party/WebKit/Source/bindings/core/v8/ScriptValueSerializer.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef ScriptValueSerializer_h	5 #ifndef ScriptValueSerializer_h

6 #define ScriptValueSerializer_h	6 #define ScriptValueSerializer_h

7	7

8 #include "bindings/core/v8/SerializationTag.h"	8 #include "bindings/core/v8/SerializationTag.h"

9 #include "bindings/core/v8/SerializedScriptValue.h"	9 #include "bindings/core/v8/SerializedScriptValue.h"

10 #include "bindings/core/v8/V8Binding.h"	10 #include "bindings/core/v8/V8Binding.h"

(...skipping 515 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
526 bool readArrayBufferViewSubTag(ArrayBufferViewSubTag*);	526 bool readArrayBufferViewSubTag(ArrayBufferViewSubTag*);

527 bool readString(v8::Local<v8::Value>*);	527 bool readString(v8::Local<v8::Value>*);

528 bool readUCharString(v8::Local<v8::Value>*);	528 bool readUCharString(v8::Local<v8::Value>*);

529 bool readStringObject(v8::Local<v8::Value>*);	529 bool readStringObject(v8::Local<v8::Value>*);

530 bool readInt32(v8::Local<v8::Value>*);	530 bool readInt32(v8::Local<v8::Value>*);

531 bool readDate(v8::Local<v8::Value>*);	531 bool readDate(v8::Local<v8::Value>*);

532 bool readNumber(v8::Local<v8::Value>*);	532 bool readNumber(v8::Local<v8::Value>*);

533 bool readNumberObject(v8::Local<v8::Value>*);	533 bool readNumberObject(v8::Local<v8::Value>*);

534 bool readImageData(v8::Local<v8::Value>*);	534 bool readImageData(v8::Local<v8::Value>*);

535 bool readCompositorProxy(v8::Local<v8::Value>*);	535 bool readCompositorProxy(v8::Local<v8::Value>*);

536 PassRefPtr<DOMArrayBuffer> doReadArrayBuffer();	536 PassRefPtr<DOMArrayBuffer> doReadArrayBufferOrNull();

537 bool readArrayBuffer(v8::Local<v8::Value>*);	537 bool readArrayBuffer(v8::Local<v8::Value>*);

538 bool readArrayBufferView(v8::Local<v8::Value>*, ScriptValueCompositeCreator& );	538 bool readArrayBufferView(v8::Local<v8::Value>*, ScriptValueCompositeCreator& );

539 bool readRegExp(v8::Local<v8::Value>*);	539 bool readRegExp(v8::Local<v8::Value>*);

540 bool readBlob(v8::Local<v8::Value>*, bool isIndexed);	540 bool readBlob(v8::Local<v8::Value>*, bool isIndexed);

541 bool readFile(v8::Local<v8::Value>*, bool isIndexed);	541 bool readFile(v8::Local<v8::Value>*, bool isIndexed);

542 bool readFileList(v8::Local<v8::Value>*, bool isIndexed);	542 bool readFileList(v8::Local<v8::Value>*, bool isIndexed);

543 File* readFileHelper();	543 File* readFileHelper();

544 File* readFileIndexHelper();	544 File* readFileIndexHelper();

545	545

546 template<class T>	546 template<class T>

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
634 MessagePortArray* m_transferredMessagePorts;	634 MessagePortArray* m_transferredMessagePorts;

635 ArrayBufferContentsArray* m_arrayBufferContents;	635 ArrayBufferContentsArray* m_arrayBufferContents;

636 ImageBitmapArray* m_imageBitmaps;	636 ImageBitmapArray* m_imageBitmaps;

637 Vector<v8::Local<v8::Value>> m_arrayBuffers;	637 Vector<v8::Local<v8::Value>> m_arrayBuffers;

638 uint32_t m_version;	638 uint32_t m_version;

639 };	639 };

640	640

641 } // namespace blink	641 } // namespace blink

642	642

643 #endif // ScriptValueSerializer_h	643 #endif // ScriptValueSerializer_h

OLD	NEW