Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / encoding / TextDecoder.h

diff --git a/src/third_party/WebKit/Source/modules/encoding/TextDecoder.h b/src/third_party/WebKit/Source/modules/encoding/TextDecoder.h
index 67991ae..acc940f 100644 (file)
--- a/src/third_party/WebKit/Source/modules/encoding/TextDecoder.h
+++ b/src/third_party/WebKit/Source/modules/encoding/TextDecoder.h
@@ -31,8 +31,9 @@
 #ifndef TextDecoder_h
 #define TextDecoder_h
 
-#include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "modules/encoding/TextDecodeOptions.h"
+#include "modules/encoding/TextDecoderOptions.h"
 #include "platform/heap/Handle.h"
 #include "wtf/ArrayBufferView.h"
 #include "wtf/text/TextCodec.h"
@@ -44,16 +45,17 @@ namespace blink {
 class ExceptionState;
 
 class TextDecoder FINAL : public GarbageCollectedFinalized<TextDecoder>, public ScriptWrappable {
+    DEFINE_WRAPPERTYPEINFO();
 public:
-    static TextDecoder* create(const String& label, const Dictionary&, ExceptionState&);
+    static TextDecoder* create(const String& label, const TextDecoderOptions&, ExceptionState&);
     ~TextDecoder();
 
     // Implement the IDL
     String encoding() const;
     bool fatal() const { return m_fatal; }
     bool ignoreBOM() const { return m_ignoreBOM; }
-    String decode(ArrayBufferView*, const Dictionary&, ExceptionState&);
-    String decode(ExceptionState& exceptionState) { return decode(0, Dictionary(), exceptionState); }
+    String decode(ArrayBufferView*, const TextDecodeOptions&, ExceptionState&);
+    String decode(ExceptionState&);
 
     void trace(Visitor*) { }