| Index: Source/core/html/canvas/DataView.h
|
| diff --git a/Source/core/html/canvas/DataView.h b/Source/core/html/canvas/DataView.h
|
| index c0f48960f3307f77ba251db12e16bdf2758db2c3..a0dbd5c87df34dc23a8d0bdda37f4bd689294a33 100644
|
| --- a/Source/core/html/canvas/DataView.h
|
| +++ b/Source/core/html/canvas/DataView.h
|
| @@ -26,21 +26,19 @@
|
| #ifndef DataView_h
|
| #define DataView_h
|
|
|
| -#include "bindings/core/v8/ScriptWrappable.h"
|
| #include "wtf/ArrayBufferView.h"
|
| -#include "wtf/PassRefPtr.h"
|
|
|
| namespace blink {
|
|
|
| class ExceptionState;
|
|
|
| -class DataView final : public ArrayBufferView, public ScriptWrappable {
|
| - DEFINE_WRAPPERTYPEINFO();
|
| +class DataView final : public ArrayBufferView {
|
| public:
|
| static PassRefPtr<DataView> create(unsigned length);
|
| static PassRefPtr<DataView> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned byteLength);
|
|
|
| virtual unsigned byteLength() const override { return m_byteLength; }
|
| + virtual ViewType type() const override { return TypeDataView; }
|
|
|
| int8_t getInt8(unsigned byteOffset, ExceptionState&);
|
| uint8_t getUint8(unsigned byteOffset, ExceptionState&);
|
| @@ -72,13 +70,6 @@ public:
|
| void setFloat64(unsigned byteOffset, double value, ExceptionState& ec) { setFloat64(byteOffset, value, false, ec); }
|
| void setFloat64(unsigned byteOffset, double value, bool littleEndian, ExceptionState&);
|
|
|
| - virtual ViewType type() const override
|
| - {
|
| - return TypeDataView;
|
| - }
|
| -
|
| - virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override;
|
| -
|
| protected:
|
| virtual void neuter() override;
|
|
|
| @@ -86,7 +77,7 @@ private:
|
| DataView(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned byteLength);
|
|
|
| template<typename T>
|
| - inline bool beyondRange(unsigned byteOffset) const { return byteOffset >= m_byteLength || byteOffset + sizeof(T) > m_byteLength; }
|
| + bool beyondRange(unsigned byteOffset) const { return byteOffset >= m_byteLength || byteOffset + sizeof(T) > m_byteLength; }
|
|
|
| template<typename T>
|
| T getData(unsigned byteOffset, bool littleEndian, ExceptionState&) const;
|
|
|