diff options
author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
---|---|---|
committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/bindings/js/JSUint8ArrayCustom.cpp | |
parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/bindings/js/JSUint8ArrayCustom.cpp')
-rw-r--r-- | WebCore/bindings/js/JSUint8ArrayCustom.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/bindings/js/JSUint8ArrayCustom.cpp b/WebCore/bindings/js/JSUint8ArrayCustom.cpp index adf60a9..a9ed73f 100644 --- a/WebCore/bindings/js/JSUint8ArrayCustom.cpp +++ b/WebCore/bindings/js/JSUint8ArrayCustom.cpp @@ -27,9 +27,9 @@ #if ENABLE(3D_CANVAS) || ENABLE(BLOB) -#include "JSArrayBufferViewHelper.h" #include "JSUint8Array.h" +#include "JSArrayBufferViewHelper.h" #include "Uint8Array.h" using namespace JSC; @@ -54,7 +54,7 @@ JSC::JSValue JSUint8Array::set(JSC::ExecState* exec) EncodedJSValue JSC_HOST_CALL JSUint8ArrayConstructor::constructJSUint8Array(ExecState* exec) { JSUint8ArrayConstructor* jsConstructor = static_cast<JSUint8ArrayConstructor*>(exec->callee()); - RefPtr<Uint8Array> array = static_cast<Uint8Array*>(constructArrayBufferView<Uint8Array, unsigned char>(exec).get()); + RefPtr<Uint8Array> array = constructArrayBufferView<Uint8Array, unsigned char>(exec); if (!array.get()) // Exception has already been thrown. return JSValue::encode(JSValue()); |