Skip to content

Commit 90ccf3c

Browse files
dtapuskaChromium LUCI CQ
authored andcommitted
Convert encryptedmedia code to use bindings enumerations
We had needless conversions from strings -> enums and back. Bug: 366411876, 370425456 Change-Id: I6e7b0dbb55e8432206cb442115d8793178e7c11a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5925119 Reviewed-by: Nate Chapin <[email protected]> Commit-Queue: Dave Tapuska <[email protected]> Cr-Commit-Position: refs/heads/main@{#1367811}
1 parent 7b1bd1c commit 90ccf3c

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

third_party/blink/renderer/modules/encryptedmedia/media_key_message_event.cc

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,12 @@
2929

3030
namespace blink {
3131

32-
MediaKeyMessageEvent::MediaKeyMessageEvent() = default;
33-
3432
MediaKeyMessageEvent::MediaKeyMessageEvent(
3533
const AtomicString& type,
3634
const MediaKeyMessageEventInit* initializer)
37-
: Event(type, initializer) {
38-
if (initializer->hasMessageType())
39-
message_type_ = String(initializer->messageType());
40-
if (initializer->hasMessage())
41-
message_ = initializer->message();
42-
}
35+
: Event(type, initializer),
36+
message_type_(initializer->messageType()),
37+
message_(initializer->message()) {}
4338

4439
MediaKeyMessageEvent::~MediaKeyMessageEvent() = default;
4540

third_party/blink/renderer/modules/encryptedmedia/media_key_message_event.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#define THIRD_PARTY_BLINK_RENDERER_MODULES_ENCRYPTEDMEDIA_MEDIA_KEY_MESSAGE_EVENT_H_
2929

3030
#include "third_party/blink/renderer/bindings/modules/v8/v8_media_key_message_event_init.h"
31+
#include "third_party/blink/renderer/bindings/modules/v8/v8_media_key_message_type.h"
3132
#include "third_party/blink/renderer/modules/event_modules.h"
3233

3334
namespace blink {
@@ -38,15 +39,10 @@ class MediaKeyMessageEvent final : public Event {
3839
DEFINE_WRAPPERTYPEINFO();
3940

4041
public:
41-
MediaKeyMessageEvent();
4242
MediaKeyMessageEvent(const AtomicString& type,
4343
const MediaKeyMessageEventInit* initializer);
4444
~MediaKeyMessageEvent() override;
4545

46-
static MediaKeyMessageEvent* Create() {
47-
return MakeGarbageCollected<MediaKeyMessageEvent>();
48-
}
49-
5046
static MediaKeyMessageEvent* Create(
5147
const AtomicString& type,
5248
const MediaKeyMessageEventInit* initializer) {
@@ -55,13 +51,13 @@ class MediaKeyMessageEvent final : public Event {
5551

5652
const AtomicString& InterfaceName() const override;
5753

58-
String messageType() const { return message_type_; }
54+
const V8MediaKeyMessageType& messageType() const { return message_type_; }
5955
DOMArrayBuffer* message() const { return message_.Get(); }
6056

6157
void Trace(Visitor*) const override;
6258

6359
private:
64-
String message_type_;
60+
const V8MediaKeyMessageType message_type_;
6561
Member<DOMArrayBuffer> message_;
6662
};
6763

0 commit comments

Comments
 (0)