Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-01 12:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 903772: Part 8 - Remove TextEncoderBase. r=emk

Browse Source
This commit is contained in:
Kyle Huey 2013-08-22 22:17:10 -07:00
parent 5973672ab9
commit 4c7a770de0
4 changed files with 63 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/encoding/TextEncoder.cpp
View File

@ -12,7 +12,7 @@ namespace mozilla {
namespace dom {
void
TextEncoderBase::Init(const nsAString& aEncoding, ErrorResult& aRv)
TextEncoder::Init(const nsAString& aEncoding, ErrorResult& aRv)
{
nsAutoString label(aEncoding);
EncodingUtils::TrimSpaceCharacters(label);
@ -48,11 +48,11 @@ TextEncoderBase::Init(const nsAString& aEncoding, ErrorResult& aRv)
}
JSObject*
TextEncoderBase::Encode(JSContext* aCx,
JS::Handle<JSObject*> aObj,
const nsAString& aString,
const bool aStream,
ErrorResult& aRv)
TextEncoder::Encode(JSContext* aCx,
JS::Handle<JSObject*> aObj,
const nsAString& aString,
const bool aStream,
ErrorResult& aRv)
{
// Run the steps of the encoding algorithm.
int32_t srcLen = aString.Length();
@ -102,7 +102,7 @@ TextEncoderBase::Encode(JSContext* aCx,
}
void
TextEncoderBase::GetEncoding(nsAString& aEncoding)
TextEncoder::GetEncoding(nsAString& aEncoding)
{
CopyASCIItoUTF16(mEncoding, aEncoding);
nsContentUtils::ASCIIToLower(aEncoding);

60
dom/encoding/TextEncoder.h
View File

@ -6,14 +6,16 @@
#define mozilla_dom_textencoder_h_
#include "mozilla/dom/NonRefcountedDOMObject.h"
#include "mozilla/dom/TextEncoderBase.h"
#include "mozilla/dom/TextEncoderBinding.h"
#include "mozilla/dom/TypedArray.h"
#include "nsIUnicodeEncoder.h"
namespace mozilla {
class ErrorResult;
namespace dom {
class TextEncoder MOZ_FINAL
: public NonRefcountedDOMObject, public TextEncoderBase
class TextEncoder MOZ_FINAL : public NonRefcountedDOMObject
{
public:
// The WebIDL constructor.
@ -56,10 +58,60 @@ public:
const nsAString& aString,
const TextEncodeOptions& aOptions,
ErrorResult& aRv) {
return TextEncoderBase::Encode(aCx, aObj, aString, aOptions.mStream, aRv);
return TextEncoder::Encode(aCx, aObj, aString, aOptions.mStream, aRv);
}
protected:
/**
* Validates provided encoding and throws an exception if invalid encoding.
* If no encoding is provided then mEncoding is default initialised to "utf-8".
*
* @param aEncoding Optional encoding (case insensitive) provided.
* (valid values are "utf-8", "utf-16", "utf-16be")
* Default value is "utf-8" if no encoding is provided.
* @return aRv EncodingError exception else null.
*/
void Init(const nsAString& aEncoding, ErrorResult& aRv);
public:
/**
* Return the encoding name.
*
* @param aEncoding, current encoding.
*/
void GetEncoding(nsAString& aEncoding);
/**
* Encodes incoming utf-16 code units/ DOM string to the requested encoding.
*
* @param aCx Javascript context.
* @param aObj the wrapper of the TextEncoder
* @param aString utf-16 code units to be encoded.
* @param aOptions Streaming option. Initialised by default to false.
* If the streaming option is false, then the encoding
* algorithm state will get reset. If set to true then
* the previous encoding is reused/continued.
* @return JSObject* The Uint8Array wrapped in a JS object.
*/
JSObject* Encode(JSContext* aCx,
JS::Handle<JSObject*> aObj,
const nsAString& aString,
const bool aStream,
ErrorResult& aRv);
protected:
JSObject*
CreateUint8Array(JSContext* aCx, JS::Handle<JSObject*> aObj,
char* aBuf, uint32_t aLen) const
{
return Uint8Array::Create(aCx, aObj, aLen,
reinterpret_cast<uint8_t*>(aBuf));
}
private:
nsCString mEncoding;
nsCOMPtr<nsIUnicodeEncoder> mEncoder;
};
} // dom

81
dom/encoding/TextEncoderBase.h
View File

@ -1,81 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef mozilla_dom_textencoderbase_h_
#define mozilla_dom_textencoderbase_h_
#include "mozilla/dom/BindingUtils.h"
#include "mozilla/dom/TypedArray.h"
#include "nsIUnicodeEncoder.h"
namespace mozilla {
class ErrorResult;
namespace dom {
class TextEncoderBase
{
protected:
TextEncoderBase()
{}
virtual
~TextEncoderBase()
{}
/**
* Validates provided encoding and throws an exception if invalid encoding.
* If no encoding is provided then mEncoding is default initialised to "utf-8".
*
* @param aEncoding Optional encoding (case insensitive) provided.
* (valid values are "utf-8", "utf-16", "utf-16be")
* Default value is "utf-8" if no encoding is provided.
* @return aRv EncodingError exception else null.
*/
void Init(const nsAString& aEncoding, ErrorResult& aRv);
public:
/**
* Return the encoding name.
*
* @param aEncoding, current encoding.
*/
void GetEncoding(nsAString& aEncoding);
/**
* Encodes incoming utf-16 code units/ DOM string to the requested encoding.
*
* @param aCx Javascript context.
* @param aObj the wrapper of the TextEncoder
* @param aString utf-16 code units to be encoded.
* @param aOptions Streaming option. Initialised by default to false.
* If the streaming option is false, then the encoding
* algorithm state will get reset. If set to true then
* the previous encoding is reused/continued.
* @return JSObject* The Uint8Array wrapped in a JS object.
*/
JSObject* Encode(JSContext* aCx,
JS::Handle<JSObject*> aObj,
const nsAString& aString,
const bool aStream,
ErrorResult& aRv);
protected:
JSObject*
CreateUint8Array(JSContext* aCx, JS::Handle<JSObject*> aObj,
char* aBuf, uint32_t aLen) const
{
return Uint8Array::Create(aCx, aObj, aLen,
reinterpret_cast<uint8_t*>(aBuf));
}
private:
nsCString mEncoding;
nsCOMPtr<nsIUnicodeEncoder> mEncoder;
};
} // dom
} // mozilla
#endif // mozilla_dom_textencoderbase_h_

1
dom/encoding/moz.build
View File

@ -12,7 +12,6 @@ EXPORTS.mozilla.dom += [
'EncodingUtils.h',
'TextDecoder.h',
'TextEncoder.h',
'TextEncoderBase.h',
]
CPP_SOURCES += [