Commit 827b6468 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Inline static Create() factory functions from renderer/modules/mediastream

This CL removes Create() factory functions in
//third_partyb/blink/renderer/modules/mediastream as much as possible,
and makes all callers use MakeGarbageCollected<Foo> instead.

This CL removes below factory functions,
  - MediaStreamEvent::Create
  - ApplyConstraintsRequest::Create
  - InputDeviceInfo::Create
  - MediaStreamTrackEvent::Create

Bug: 939691
Change-Id: If665d5a2d90cf01c209c9fbb97f69efc73421823
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1947617Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#721441}
parent 9c96951d
...@@ -7,16 +7,10 @@ ...@@ -7,16 +7,10 @@
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
#include "third_party/blink/renderer/core/dom/dom_exception.h" #include "third_party/blink/renderer/core/dom/dom_exception.h"
#include "third_party/blink/renderer/modules/mediastream/overconstrained_error.h" #include "third_party/blink/renderer/modules/mediastream/overconstrained_error.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
namespace blink { namespace blink {
ApplyConstraintsRequest* ApplyConstraintsRequest::CreateForTesting(
const WebMediaStreamTrack& track,
const WebMediaConstraints& constraints) {
return MakeGarbageCollected<ApplyConstraintsRequest>(track, constraints,
nullptr);
}
ApplyConstraintsRequest::ApplyConstraintsRequest( ApplyConstraintsRequest::ApplyConstraintsRequest(
const WebMediaStreamTrack& track, const WebMediaStreamTrack& track,
const WebMediaConstraints& constraints, const WebMediaConstraints& constraints,
...@@ -41,7 +35,8 @@ void ApplyConstraintsRequest::RequestSucceeded() { ...@@ -41,7 +35,8 @@ void ApplyConstraintsRequest::RequestSucceeded() {
void ApplyConstraintsRequest::RequestFailed(const String& constraint, void ApplyConstraintsRequest::RequestFailed(const String& constraint,
const String& message) { const String& message) {
if (resolver_) { if (resolver_) {
resolver_->Reject(OverconstrainedError::Create(constraint, message)); resolver_->Reject(
MakeGarbageCollected<OverconstrainedError>(constraint, message));
} }
track_.Reset(); track_.Reset();
} }
......
...@@ -18,9 +18,6 @@ class ScriptPromiseResolver; ...@@ -18,9 +18,6 @@ class ScriptPromiseResolver;
class MODULES_EXPORT ApplyConstraintsRequest final class MODULES_EXPORT ApplyConstraintsRequest final
: public GarbageCollected<ApplyConstraintsRequest> { : public GarbageCollected<ApplyConstraintsRequest> {
public: public:
static ApplyConstraintsRequest* CreateForTesting(const WebMediaStreamTrack&,
const WebMediaConstraints&);
ApplyConstraintsRequest(const WebMediaStreamTrack&, ApplyConstraintsRequest(const WebMediaStreamTrack&,
const WebMediaConstraints&, const WebMediaConstraints&,
ScriptPromiseResolver*); ScriptPromiseResolver*);
......
...@@ -42,14 +42,6 @@ WebMediaStreamTrack::FacingMode ToWebFacingMode(mojom::FacingMode facing_mode) { ...@@ -42,14 +42,6 @@ WebMediaStreamTrack::FacingMode ToWebFacingMode(mojom::FacingMode facing_mode) {
} // namespace } // namespace
InputDeviceInfo* InputDeviceInfo::Create(const String& device_id,
const String& label,
const String& group_id,
MediaDeviceType device_type) {
return MakeGarbageCollected<InputDeviceInfo>(device_id, label, group_id,
device_type);
}
InputDeviceInfo::InputDeviceInfo(const String& device_id, InputDeviceInfo::InputDeviceInfo(const String& device_id,
const String& label, const String& label,
const String& group_id, const String& group_id,
......
...@@ -16,11 +16,6 @@ class InputDeviceInfo final : public MediaDeviceInfo { ...@@ -16,11 +16,6 @@ class InputDeviceInfo final : public MediaDeviceInfo {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
static InputDeviceInfo* Create(const String& device_id,
const String& label,
const String& group_id,
MediaDeviceType);
InputDeviceInfo(const String& device_id, InputDeviceInfo(const String& device_id,
const String& label, const String& label,
const String& group_id, const String& group_id,
......
...@@ -304,7 +304,8 @@ void MediaDevices::DevicesEnumerated( ...@@ -304,7 +304,8 @@ void MediaDevices::DevicesEnumerated(
if (device_type == mojom::blink::MediaDeviceType::MEDIA_AUDIO_INPUT || if (device_type == mojom::blink::MediaDeviceType::MEDIA_AUDIO_INPUT ||
device_type == mojom::blink::MediaDeviceType::MEDIA_VIDEO_INPUT) { device_type == mojom::blink::MediaDeviceType::MEDIA_VIDEO_INPUT) {
InputDeviceInfo* input_device_info = InputDeviceInfo* input_device_info =
InputDeviceInfo::Create(device_info->device_id, device_info->label, MakeGarbageCollected<InputDeviceInfo>(
device_info->device_id, device_info->label,
device_info->group_id, device_type); device_info->group_id, device_type);
if (device_type == mojom::blink::MediaDeviceType::MEDIA_VIDEO_INPUT && if (device_type == mojom::blink::MediaDeviceType::MEDIA_VIDEO_INPUT &&
!video_input_capabilities.IsEmpty()) { !video_input_capabilities.IsEmpty()) {
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "third_party/blink/renderer/modules/mediastream/media_error_state.h" #include "third_party/blink/renderer/modules/mediastream/media_error_state.h"
#include "third_party/blink/renderer/modules/mediastream/overconstrained_error.h" #include "third_party/blink/renderer/modules/mediastream/overconstrained_error.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
namespace blink { namespace blink {
...@@ -118,7 +119,7 @@ String MediaErrorState::GetErrorMessage() { ...@@ -118,7 +119,7 @@ String MediaErrorState::GetErrorMessage() {
DOMExceptionOrOverconstrainedError MediaErrorState::CreateError() { DOMExceptionOrOverconstrainedError MediaErrorState::CreateError() {
DCHECK(error_type_ == kConstraintError); DCHECK(error_type_ == kConstraintError);
return DOMExceptionOrOverconstrainedError::FromOverconstrainedError( return DOMExceptionOrOverconstrainedError::FromOverconstrainedError(
OverconstrainedError::Create(constraint_, message_)); MakeGarbageCollected<OverconstrainedError>(constraint_, message_));
} }
} // namespace blink } // namespace blink
...@@ -438,8 +438,8 @@ void MediaStream::RemoveTrackByComponentAndFireEvents( ...@@ -438,8 +438,8 @@ void MediaStream::RemoveTrackByComponentAndFireEvents(
MediaStreamTrack* track = (*tracks)[index]; MediaStreamTrack* track = (*tracks)[index];
track->UnregisterMediaStream(this); track->UnregisterMediaStream(this);
tracks->EraseAt(index); tracks->EraseAt(index);
ScheduleDispatchEvent( ScheduleDispatchEvent(MakeGarbageCollected<MediaStreamTrackEvent>(
MediaStreamTrackEvent::Create(event_type_names::kRemovetrack, track)); event_type_names::kRemovetrack, track));
if (active() && EmptyOrOnlyEndedTracks()) { if (active() && EmptyOrOnlyEndedTracks()) {
descriptor_->SetActive(false); descriptor_->SetActive(false);
...@@ -460,8 +460,8 @@ void MediaStream::AddTrackAndFireEvents(MediaStreamTrack* track) { ...@@ -460,8 +460,8 @@ void MediaStream::AddTrackAndFireEvents(MediaStreamTrack* track) {
track->RegisterMediaStream(this); track->RegisterMediaStream(this);
descriptor_->AddComponent(track->Component()); descriptor_->AddComponent(track->Component());
ScheduleDispatchEvent( ScheduleDispatchEvent(MakeGarbageCollected<MediaStreamTrackEvent>(
MediaStreamTrackEvent::Create(event_type_names::kAddtrack, track)); event_type_names::kAddtrack, track));
if (!active() && !track->Ended()) { if (!active() && !track->Ended()) {
descriptor_->SetActive(true); descriptor_->SetActive(true);
......
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
namespace blink { namespace blink {
MediaStreamEvent* MediaStreamEvent::Create(const AtomicString& type,
MediaStream* stream) {
return MakeGarbageCollected<MediaStreamEvent>(type, stream);
}
MediaStreamEvent* MediaStreamEvent::Create( MediaStreamEvent* MediaStreamEvent::Create(
const AtomicString& type, const AtomicString& type,
const MediaStreamEventInit* initializer) { const MediaStreamEventInit* initializer) {
......
...@@ -40,7 +40,6 @@ class MediaStreamEvent final : public Event { ...@@ -40,7 +40,6 @@ class MediaStreamEvent final : public Event {
MediaStreamEvent(const AtomicString& type, const MediaStreamEventInit*); MediaStreamEvent(const AtomicString& type, const MediaStreamEventInit*);
~MediaStreamEvent() override; ~MediaStreamEvent() override;
static MediaStreamEvent* Create(const AtomicString& type, MediaStream*);
static MediaStreamEvent* Create(const AtomicString& type, static MediaStreamEvent* Create(const AtomicString& type,
const MediaStreamEventInit* initializer); const MediaStreamEventInit* initializer);
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
namespace blink { namespace blink {
MediaStreamTrackEvent* MediaStreamTrackEvent::Create(const AtomicString& type,
MediaStreamTrack* track) {
return MakeGarbageCollected<MediaStreamTrackEvent>(type, track);
}
MediaStreamTrackEvent::MediaStreamTrackEvent(const AtomicString& type, MediaStreamTrackEvent::MediaStreamTrackEvent(const AtomicString& type,
MediaStreamTrack* track) MediaStreamTrack* track)
: Event(type, Bubbles::kNo, Cancelable::kNo), track_(track) { : Event(type, Bubbles::kNo, Cancelable::kNo), track_(track) {
......
...@@ -39,8 +39,6 @@ class MediaStreamTrackEvent final : public Event { ...@@ -39,8 +39,6 @@ class MediaStreamTrackEvent final : public Event {
public: public:
~MediaStreamTrackEvent() override; ~MediaStreamTrackEvent() override;
static MediaStreamTrackEvent* Create(const AtomicString& type,
MediaStreamTrack*);
static MediaStreamTrackEvent* Create(const AtomicString& type, static MediaStreamTrackEvent* Create(const AtomicString& type,
const MediaStreamTrackEventInit*); const MediaStreamTrackEventInit*);
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "third_party/blink/renderer/modules/mediastream/mock_constraint_factory.h" #include "third_party/blink/renderer/modules/mediastream/mock_constraint_factory.h"
#include "third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.h" #include "third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.h"
#include "third_party/blink/renderer/modules/mediastream/mock_mojo_media_stream_dispatcher_host.h" #include "third_party/blink/renderer/modules/mediastream/mock_mojo_media_stream_dispatcher_host.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
#include "third_party/blink/renderer/platform/mediastream/media_stream_audio_processor_options.h" #include "third_party/blink/renderer/platform/mediastream/media_stream_audio_processor_options.h"
#include "third_party/blink/renderer/platform/mediastream/media_stream_audio_source.h" #include "third_party/blink/renderer/platform/mediastream/media_stream_audio_source.h"
#include "third_party/blink/renderer/platform/testing/io_task_runner_testing_platform_support.h" #include "third_party/blink/renderer/platform/testing/io_task_runner_testing_platform_support.h"
...@@ -627,8 +628,8 @@ class UserMediaClientTest : public ::testing::Test { ...@@ -627,8 +628,8 @@ class UserMediaClientTest : public ::testing::Test {
factory.basic().frame_rate.SetExact(*frame_rate); factory.basic().frame_rate.SetExact(*frame_rate);
auto* apply_constraints_request = auto* apply_constraints_request =
blink::ApplyConstraintsRequest::CreateForTesting( MakeGarbageCollected<blink::ApplyConstraintsRequest>(
web_track, factory.CreateWebMediaConstraints()); web_track, factory.CreateWebMediaConstraints(), nullptr);
user_media_client_impl_->ApplyConstraints(apply_constraints_request); user_media_client_impl_->ApplyConstraints(apply_constraints_request);
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
......
...@@ -2786,8 +2786,8 @@ void RTCPeerConnection::DidAddReceiverPlanB( ...@@ -2786,8 +2786,8 @@ void RTCPeerConnection::DidAddReceiverPlanB(
MediaStream::Create(GetExecutionContext(), descriptor, MediaStream::Create(GetExecutionContext(), descriptor,
std::move(audio_tracks), std::move(video_tracks)); std::move(audio_tracks), std::move(video_tracks));
// Schedule to fire "pc.onaddstream". // Schedule to fire "pc.onaddstream".
ScheduleDispatchEvent( ScheduleDispatchEvent(MakeGarbageCollected<MediaStreamEvent>(
MediaStreamEvent::Create(event_type_names::kAddstream, stream)); event_type_names::kAddstream, stream));
} else { } else {
// The stream already exists, add the track to it. // The stream already exists, add the track to it.
// This will cause to schedule to fire "stream.onaddtrack". // This will cause to schedule to fire "stream.onaddtrack".
...@@ -2829,8 +2829,8 @@ void RTCPeerConnection::DidRemoveReceiverPlanB( ...@@ -2829,8 +2829,8 @@ void RTCPeerConnection::DidRemoveReceiverPlanB(
// need for |StreamEnded|. // need for |StreamEnded|.
stream->StreamEnded(); stream->StreamEnded();
stream->UnregisterObserver(this); stream->UnregisterObserver(this);
ScheduleDispatchEvent( ScheduleDispatchEvent(MakeGarbageCollected<MediaStreamEvent>(
MediaStreamEvent::Create(event_type_names::kRemovestream, stream)); event_type_names::kRemovestream, stream));
} }
} }
...@@ -2954,13 +2954,13 @@ void RTCPeerConnection::DidModifyTransceivers( ...@@ -2954,13 +2954,13 @@ void RTCPeerConnection::DidModifyTransceivers(
// Legacy APIs: "pc.onaddstream" and "pc.onremovestream". // Legacy APIs: "pc.onaddstream" and "pc.onremovestream".
for (const auto& current_stream : current_streams) { for (const auto& current_stream : current_streams) {
if (!previous_streams.Contains(current_stream)) { if (!previous_streams.Contains(current_stream)) {
ScheduleDispatchEvent(MediaStreamEvent::Create( ScheduleDispatchEvent(MakeGarbageCollected<MediaStreamEvent>(
event_type_names::kAddstream, current_stream)); event_type_names::kAddstream, current_stream));
} }
} }
for (const auto& previous_stream : previous_streams) { for (const auto& previous_stream : previous_streams) {
if (!current_streams.Contains(previous_stream)) { if (!current_streams.Contains(previous_stream)) {
ScheduleDispatchEvent(MediaStreamEvent::Create( ScheduleDispatchEvent(MakeGarbageCollected<MediaStreamEvent>(
event_type_names::kRemovestream, previous_stream)); event_type_names::kRemovestream, previous_stream));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment