Encoding API: Use 'windows-1252' as name for 'us-ascii' 'iso-8859-1'

Source/modules/encoding/TextEncoder.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 25 matching lines @@
 #include "bindings/v8/ExceptionState.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/TextEncodingRegistry.h"
 
 namespace WebCore {
 
 PassRefPtr<TextEncoder> TextEncoder::create(const String& utfLabel, ExceptionState& es)
 {
     const String& encodingLabel = utfLabel.isNull() ? String("utf-8") : utfLabel;
 
-    // FIXME: Types don't match Encoding spec, e.g. "ascii" => "US-ASCII" not "UTF-8".
-
     WTF::TextEncoding encoding(encodingLabel);
     if (!encoding.isValid()) {
         es.throwTypeError();
         return 0;
     }
 
     String name(encoding.name());
     if (name != "UTF-8" && name != "UTF-16LE" && name != "UTF-16BE") {
         es.throwTypeError();
         return 0;
     }
 
     return adoptRef(new TextEncoder(encoding.name()));
 }
 
 TextEncoder::TextEncoder(const String& encoding)
     : m_encoding(encoding)
     , m_codec(newTextCodec(m_encoding))
 {
 }
 
 TextEncoder::~TextEncoder()
 {
 }
 
 String TextEncoder::encoding() const
 {
-    return String(m_encoding.name()).lower();
+    String name = String(m_encoding.name()).lower();
+    ASSERT(name == "utf-8" || name == "utf-16le" || name == "utf-16be");
+    return name;
 }
 
 PassRefPtr<Uint8Array> TextEncoder::encode(const String& input, const Dictionary& options)
 {
     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);
     else
         result = m_codec->encode(input.characters16(), input.length(), WTF::QuestionMarksForUnencodables);
 
     const char* buffer = result.data();
     const unsigned char* unsignedBuffer = reinterpret_cast<const unsigned char*>(buffer);
 
     return Uint8Array::create(unsignedBuffer, result.length());
 }
 
 } // namespace WebCore