Chromium Code Reviews| 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 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/dom/DOMDataView.h" | 6 #include "core/dom/DOMDataView.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/DOMDataStore.h" | 8 #include "bindings/core/v8/DOMDataStore.h" |
| 9 #include "bindings/core/v8/V8ArrayBuffer.h" | 9 #include "bindings/core/v8/V8ArrayBuffer.h" |
| 10 #include "bindings/core/v8/V8DOMWrapper.h" | 10 #include "bindings/core/v8/V8DOMWrapper.h" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 { | 22 { |
| 23 // It's possible that no one except for the new wrapper owns this object at | 23 // It's possible that no one except for the new wrapper owns this object at |
| 24 // this moment, so we have to prevent GC to collect this object until the | 24 // this moment, so we have to prevent GC to collect this object until the |
| 25 // object gets associated with the wrapper. | 25 // object gets associated with the wrapper. |
| 26 RefPtr<DOMDataView> protect(this); | 26 RefPtr<DOMDataView> protect(this); |
| 27 | 27 |
| 28 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); | 28 ASSERT(!DOMDataStore::containsWrapper(this, isolate)); |
| 29 | 29 |
| 30 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); | 30 const WrapperTypeInfo* wrapperTypeInfo = this->wrapperTypeInfo(); |
| 31 v8::Local<v8::Value> v8Buffer = toV8(buffer(), creationContext, isolate); | 31 v8::Local<v8::Value> v8Buffer = toV8(buffer(), creationContext, isolate); |
| 32 if (v8Buffer.IsEmpty()) | |
| 33 return v8::Handle<v8::Object>(); | |
|
haraken
2015/04/28 04:24:59
Remove.
Yuki
2015/04/28 04:47:57
I think it's good to check that v8Buffer is not v8
| |
| 32 ASSERT(v8Buffer->IsArrayBuffer()); | 34 ASSERT(v8Buffer->IsArrayBuffer()); |
| 33 | 35 |
| 34 v8::Handle<v8::Object> wrapper = v8::DataView::New(v8Buffer.As<v8::ArrayBuff er>(), byteOffset(), byteLength()); | 36 v8::Handle<v8::Object> wrapper = v8::DataView::New(v8Buffer.As<v8::ArrayBuff er>(), byteOffset(), byteLength()); |
| 35 | 37 |
| 36 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); | 38 return associateWithWrapper(isolate, wrapperTypeInfo, wrapper); |
| 37 } | 39 } |
| 38 | 40 |
| 39 v8::Handle<v8::Object> DOMDataView::associateWithWrapper(v8::Isolate* isolate, c onst WrapperTypeInfo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper) | 41 v8::Handle<v8::Object> DOMDataView::associateWithWrapper(v8::Isolate* isolate, c onst WrapperTypeInfo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper) |
| 40 { | 42 { |
| 41 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); | 43 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperTypeIn fo, wrapper); |
| 42 } | 44 } |
| 43 | 45 |
| 44 } // namespace blink | 46 } // namespace blink |
| OLD | NEW |