Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / canvas / DataView.h

diff --git a/src/third_party/WebKit/Source/core/html/canvas/DataView.h b/src/third_party/WebKit/Source/core/html/canvas/DataView.h
index b2482c2..a0dbd5c 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/canvas/DataView.h
+++ b/src/third_party/WebKit/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 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,21 +70,14 @@ 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;
+    virtual void neuter() override;
 
 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;