diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-06 21:36:31 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-07 10:36:05 +0000 |
| commit | 4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch) | |
| tree | ee905fa007e14522848f571215c1054734db9269 /WebCore/bindings/v8/custom | |
| parent | 21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff) | |
| download | external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2 | |
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebCore/bindings/v8/custom')
| -rw-r--r-- | WebCore/bindings/v8/custom/V8IDBKeyCustom.cpp | 2 | ||||
| -rw-r--r-- | WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/WebCore/bindings/v8/custom/V8IDBKeyCustom.cpp b/WebCore/bindings/v8/custom/V8IDBKeyCustom.cpp index 2afa55f..be05a80 100644 --- a/WebCore/bindings/v8/custom/V8IDBKeyCustom.cpp +++ b/WebCore/bindings/v8/custom/V8IDBKeyCustom.cpp @@ -45,7 +45,7 @@ v8::Handle<v8::Value> toV8(IDBKey* key) case IDBKey::NullType: return v8::Null(); case IDBKey::NumberType: - return v8::Integer::New(key->number()); + return v8::Number::New(key->number()); case IDBKey::StringType: return v8String(key->string()); // FIXME: Implement dates. diff --git a/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp b/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp index 5c56cfb..6a571ae 100644 --- a/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp +++ b/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp @@ -193,6 +193,13 @@ v8::Handle<v8::Value> V8XMLHttpRequest::sendCallback(const v8::Arguments& args) DOMFormData* domFormData = V8DOMFormData::toNative(object); ASSERT(domFormData); xmlHttpRequest->send(domFormData, ec); +#if ENABLE(3D_CANVAS) || ENABLE(BLOB) + } else if (V8ArrayBuffer::HasInstance(arg)) { + v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(arg); + ArrayBuffer* arrayBuffer = V8ArrayBuffer::toNative(object); + ASSERT(arrayBuffer); + xmlHttpRequest->send(arrayBuffer, ec); +#endif } else xmlHttpRequest->send(toWebCoreStringWithNullCheck(arg), ec); } |