Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / encoding / TextEncoder.cpp

diff --git a/src/third_party/WebKit/Source/modules/encoding/TextEncoder.cpp b/src/third_party/WebKit/Source/modules/encoding/TextEncoder.cpp
index 255ede3..ec5e50c 100644 (file)
--- a/src/third_party/WebKit/Source/modules/encoding/TextEncoder.cpp
+++ b/src/third_party/WebKit/Source/modules/encoding/TextEncoder.cpp
@@ -32,38 +32,34 @@
 
 #include "modules/encoding/TextEncoder.h"
 
-#include "bindings/v8/Dictionary.h"
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/TextEncodingRegistry.h"
 
-namespace WebCore {
+namespace blink {
 
-DEFINE_GC_INFO(TextEncoder);
-
-PassRefPtrWillBeRawPtr<TextEncoder> TextEncoder::create(const String& utfLabel, ExceptionState& exceptionState)
+TextEncoder* TextEncoder::create(const String& utfLabel, ExceptionState& exceptionState)
 {
-    const String& encodingLabel = utfLabel.isNull() ? String("utf-8") : utfLabel;
-
-    WTF::TextEncoding encoding(encodingLabel);
+    WTF::TextEncoding encoding(utfLabel);
     if (!encoding.isValid()) {
-        exceptionState.throwTypeError("The encoding label provided ('" + encodingLabel + "') is invalid.");
+        exceptionState.throwTypeError("The encoding label provided ('" + utfLabel + "') is invalid.");
         return 0;
     }
 
     String name(encoding.name());
     if (name != "UTF-8" && name != "UTF-16LE" && name != "UTF-16BE") {
-        exceptionState.throwTypeError("The encoding provided ('" + encodingLabel + "') is not one of 'utf-8', 'utf-16', or 'utf-16be'.");
+        exceptionState.throwTypeError("The encoding provided ('" + utfLabel + "') is not one of 'utf-8', 'utf-16', or 'utf-16be'.");
         return 0;
     }
 
-    return adoptRefWillBeNoop(new TextEncoder(encoding.name()));
+    return new TextEncoder(encoding);
 }
 
-TextEncoder::TextEncoder(const String& encoding)
+TextEncoder::TextEncoder(const WTF::TextEncoding& encoding)
     : m_encoding(encoding)
-    , m_codec(newTextCodec(m_encoding))
+    , m_codec(newTextCodec(encoding))
 {
+    ScriptWrappable::init(this);
 }
 
 TextEncoder::~TextEncoder()
@@ -77,14 +73,8 @@ String TextEncoder::encoding() const
     return name;
 }
 
-PassRefPtr<Uint8Array> TextEncoder::encode(const String& input, const Dictionary& options)
+PassRefPtr<Uint8Array> TextEncoder::encode(const String& input)
 {
-    bool stream = false;
-    options.get("stream", stream);
-
-    // FIXME: Not flushing is not supported by TextCodec for encode; add it or
-    // handle split surrogates here.
-
     CString result;
     if (input.is8Bit())
         result = m_codec->encode(input.characters8(), input.length(), WTF::QuestionMarksForUnencodables);
@@ -97,4 +87,4 @@ PassRefPtr<Uint8Array> TextEncoder::encode(const String& input, const Dictionary
     return Uint8Array::create(unsignedBuffer, result.length());
 }
 
-} // namespace WebCore
+} // namespace blink