| Index: Source/modules/encoding/TextDecoder.cpp
|
| diff --git a/Source/modules/encoding/TextDecoder.cpp b/Source/modules/encoding/TextDecoder.cpp
|
| index b90a8a4c41b5c598cb60f419935a0ba2f8c72c7d..e463c08f725499571fea8f9e70d3d0fb5051781c 100644
|
| --- a/Source/modules/encoding/TextDecoder.cpp
|
| +++ b/Source/modules/encoding/TextDecoder.cpp
|
| @@ -38,13 +38,13 @@
|
|
|
| namespace WebCore {
|
|
|
| -PassRefPtr<TextDecoder> TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& es)
|
| +PassRefPtr<TextDecoder> TextDecoder::create(const String& label, const Dictionary& options, ExceptionState& exceptionState)
|
| {
|
| const String& encodingLabel = label.isNull() ? String("utf-8") : label;
|
|
|
| WTF::TextEncoding encoding(encodingLabel);
|
| if (!encoding.isValid()) {
|
| - es.throwUninformativeAndGenericTypeError();
|
| + exceptionState.throwUninformativeAndGenericTypeError();
|
| return 0;
|
| }
|
|
|
| @@ -77,7 +77,7 @@ String TextDecoder::encoding() const
|
| return name;
|
| }
|
|
|
| -String TextDecoder::decode(ArrayBufferView* input, const Dictionary& options, ExceptionState& es)
|
| +String TextDecoder::decode(ArrayBufferView* input, const Dictionary& options, ExceptionState& exceptionState)
|
| {
|
| bool stream = false;
|
| options.get("stream", stream);
|
| @@ -94,7 +94,7 @@ String TextDecoder::decode(ArrayBufferView* input, const Dictionary& options, Ex
|
| String s = m_codec->decode(start, length, flush, m_fatal, sawError);
|
|
|
| if (m_fatal && sawError) {
|
| - es.throwDOMException(EncodingError, "The encoded data was not valid.");
|
| + exceptionState.throwDOMException(EncodingError, "The encoded data was not valid.");
|
| return String();
|
| }
|
|
|
|
|