RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:47:34 +00:00
Code Issues Activity Actions

LibWeb: Port TextDecoder interface from DeprecatedString to String

Browse source
This commit is contained in:
Shannon Booth 2023-09-06 16:06:53 +12:00 • committed by Tim Flynn
parent 41928c2902
commit 278061e8b9
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibWeb/Encoding/TextDecoder.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/DeprecatedFlyString.h> #include <AK/FlyString.h>
#include <LibJS/Runtime/TypedArray.h> #include <LibJS/Runtime/TypedArray.h>
#include <LibWeb/Bindings/Intrinsics.h> #include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/Encoding/TextDecoder.h> #include <LibWeb/Encoding/TextDecoder.h>
@ -12,7 +12,7 @@
namespace Web::Encoding { namespace Web::Encoding {
WebIDL::ExceptionOr<JS::NonnullGCPtr<TextDecoder>> TextDecoder::construct_impl(JS::Realm& realm, DeprecatedFlyString encoding) WebIDL::ExceptionOr<JS::NonnullGCPtr<TextDecoder>> TextDecoder::construct_impl(JS::Realm& realm, FlyString encoding)
{ {
auto& vm = realm.vm(); auto& vm = realm.vm();
@ -24,7 +24,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<TextDecoder>> TextDecoder::construct_impl(J
} }
// https://encoding.spec.whatwg.org/#dom-textdecoder // https://encoding.spec.whatwg.org/#dom-textdecoder
TextDecoder::TextDecoder(JS::Realm& realm, TextCodec::Decoder& decoder, DeprecatedFlyString encoding, bool fatal, bool ignore_bom) TextDecoder::TextDecoder(JS::Realm& realm, TextCodec::Decoder& decoder, FlyString encoding, bool fatal, bool ignore_bom)
: PlatformObject(realm) : PlatformObject(realm)
, m_decoder(decoder) , m_decoder(decoder)
, m_encoding(move(encoding)) , m_encoding(move(encoding))
@ -42,7 +42,7 @@ void TextDecoder::initialize(JS::Realm& realm)
} }
// https://encoding.spec.whatwg.org/#dom-textdecoder-decode // https://encoding.spec.whatwg.org/#dom-textdecoder-decode
WebIDL::ExceptionOr<DeprecatedString> TextDecoder::decode(Optional<JS::Handle<JS::Object>> const& input) const WebIDL::ExceptionOr<String> TextDecoder::decode(Optional<JS::Handle<JS::Object>> const& input) const
{ {
if (!input.has_value()) if (!input.has_value())
return TRY_OR_THROW_OOM(vm(), m_decoder.to_utf8({})); return TRY_OR_THROW_OOM(vm(), m_decoder.to_utf8({}));

10
Userland/Libraries/LibWeb/Encoding/TextDecoder.h
View file

@ -21,24 +21,24 @@ class TextDecoder : public Bindings::PlatformObject {
WEB_PLATFORM_OBJECT(TextDecoder, Bindings::PlatformObject); WEB_PLATFORM_OBJECT(TextDecoder, Bindings::PlatformObject);
public: public:
static WebIDL::ExceptionOr<JS::NonnullGCPtr<TextDecoder>> construct_impl(JS::Realm&, DeprecatedFlyString encoding); static WebIDL::ExceptionOr<JS::NonnullGCPtr<TextDecoder>> construct_impl(JS::Realm&, FlyString encoding);
virtual ~TextDecoder() override; virtual ~TextDecoder() override;
WebIDL::ExceptionOr<DeprecatedString> decode(Optional<JS::Handle<JS::Object>> const&) const; WebIDL::ExceptionOr<String> decode(Optional<JS::Handle<JS::Object>> const&) const;
DeprecatedFlyString const& encoding() const { return m_encoding; } FlyString const& encoding() const { return m_encoding; }
bool fatal() const { return m_fatal; } bool fatal() const { return m_fatal; }
bool ignore_bom() const { return m_ignore_bom; } bool ignore_bom() const { return m_ignore_bom; }
private: private:
// https://encoding.spec.whatwg.org/#dom-textdecoder // https://encoding.spec.whatwg.org/#dom-textdecoder
TextDecoder(JS::Realm&, TextCodec::Decoder&, DeprecatedFlyString encoding, bool fatal, bool ignore_bom); TextDecoder(JS::Realm&, TextCodec::Decoder&, FlyString encoding, bool fatal, bool ignore_bom);
virtual void initialize(JS::Realm&) override; virtual void initialize(JS::Realm&) override;
TextCodec::Decoder& m_decoder; TextCodec::Decoder& m_decoder;
DeprecatedFlyString m_encoding; FlyString m_encoding;
bool m_fatal { false }; bool m_fatal { false };
bool m_ignore_bom { false }; bool m_ignore_bom { false };
}; };

2
Userland/Libraries/LibWeb/Encoding/TextDecoder.idl
View file

@ -1,4 +1,4 @@
[Exposed=(Window,Worker), UseDeprecatedAKString] [Exposed=(Window,Worker)]
interface TextDecoder { interface TextDecoder {
// FIXME: 'optional TextDecoderOptions options = {}' // FIXME: 'optional TextDecoderOptions options = {}'
constructor(optional DOMString label = "utf-8"); constructor(optional DOMString label = "utf-8");