Encoding API: Add TextDecodeOptions and TextDecoderOptions

Source/modules/encoding/TextDecoder.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 
 #include "modules/encoding/TextDecoder.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "wtf/StringExtras.h"
 #include "wtf/text/TextEncodingRegistry.h"
 
 namespace blink {
 
-TextDecoder* TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& exceptionState)
+TextDecoder* TextDecoder::create(const String& label, const TextDecoderOptions& options, ExceptionState& exceptionState)
 {
     WTF::TextEncoding encoding(label);
     // The replacement encoding is not valid, but the Encoding API also
     // rejects aliases of the replacement encoding.
     if (!encoding.isValid() || !strcasecmp(encoding.name(), "replacement")) {
         exceptionState.throwTypeError("The encoding label provided ('" + label + "') is invalid.");
         return 0;
     }
 
-    bool fatal = false;
-    DictionaryHelper::get(options, "fatal", fatal);
-
-    bool ignoreBOM = false;
-    DictionaryHelper::get(options, "ignoreBOM", ignoreBOM);
-
-    return new TextDecoder(encoding, fatal, ignoreBOM);
+    return new TextDecoder(encoding, options.fatal(), options.ignoreBOM());
 }
 
 
 TextDecoder::TextDecoder(const WTF::TextEncoding& encoding, bool fatal, bool ignoreBOM)
     : m_encoding(encoding)
     , m_codec(newTextCodec(encoding))
     , m_fatal(fatal)
     , m_ignoreBOM(ignoreBOM)
     , m_bomSeen(false)
 {
 }
 
 TextDecoder::~TextDecoder()
 {
 }
 
 String TextDecoder::encoding() const
 {
     String name = String(m_encoding.name()).lower();
     // Where possible, encoding aliases should be handled by changes to Chromium's ICU or Blink's WTF.
     // The same codec is used, but WTF maintains a different name/identity for these.
     if (name == "iso-8859-1" || name == "us-ascii")
         return "windows-1252";
     return name;
 }
 
-String TextDecoder::decode(ArrayBufferView* input, const Dictionary& options, ExceptionState& exceptionState)
+String TextDecoder::decode(ArrayBufferView* input, const TextDecodeOptions& options, ExceptionState& exceptionState)
 {
-    bool stream = false;
-    DictionaryHelper::get(options, "stream", stream);
-
     const char* start = input ? static_cast<const char*>(input->baseAddress()) : 0;
     size_t length = input ? input->byteLength() : 0;
 
-    WTF::FlushBehavior flush = stream ? WTF::DoNotFlush : WTF::DataEOF;
+    WTF::FlushBehavior flush = options.stream() ? WTF::DoNotFlush : WTF::DataEOF;
 
     bool sawError = false;
     String s = m_codec->decode(start, length, flush, m_fatal, sawError);
 
     if (m_fatal && sawError) {
         exceptionState.throwDOMException(EncodingError, "The encoded data was not valid.");
         return String();
     }
 
     if (!m_ignoreBOM && !m_bomSeen && !s.isEmpty()) {
         m_bomSeen = true;
         String name(m_encoding.name());
         if ((name == "UTF-8" || name == "UTF-16LE" || name == "UTF-16BE") && s[0] == 0xFEFF)
             s.remove(0);
     }
 
     if (flush)
         m_bomSeen = false;
 
     return s;
 }
 
+String TextDecoder::decode(ExceptionState& exceptionState)
+{
+    TextDecodeOptions* options = TextDecodeOptions::create();
+    return decode(0, *options, exceptionState);
+}
+
 } // namespace blink