Commit 167f7d6b authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Rename blink::AudioInputIPCFactory with a 'Web' prefix

This is a follow up of https://crrev.com/c/2388721, done separately
so that the rename itself was not noisy to reviewers.

BUG=787252
R=guidou@chromim.org, haraken@chromium.org

Change-Id: Ia64f7c4da453b8a2c313f79e13f811ccc41eba18
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2389018
Commit-Queue: Antonio Gomes (GMT-4) <tonikitoo@igalia.com>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804544}
parent 1fe913f5
......@@ -25,7 +25,7 @@
#include "media/base/audio_renderer_mixer_input.h"
#include "media/base/media_switches.h"
#include "third_party/blink/public/mojom/media/renderer_audio_input_stream_factory.mojom.h"
#include "third_party/blink/public/web/modules/media/audio/audio_input_ipc_factory.h"
#include "third_party/blink/public/web/modules/media/audio/web_audio_input_ipc_factory.h"
#include "third_party/blink/public/web/modules/media/audio/web_audio_output_ipc_factory.h"
namespace content {
......@@ -181,8 +181,8 @@ AudioDeviceFactory::NewAudioCapturerSource(
}
return base::MakeRefCounted<media::AudioInputDevice>(
blink::AudioInputIPCFactory::get()->CreateAudioInputIPC(frame_token,
params),
blink::WebAudioInputIPCFactory::get()->CreateAudioInputIPC(frame_token,
params),
media::AudioInputDevice::Purpose::kUserInput,
media::AudioInputDevice::DeadStreamDetection::kEnabled);
}
......
......@@ -20,7 +20,7 @@
#include "media/audio/audio_source_parameters.h"
#include "ppapi/shared_impl/ppb_audio_config_shared.h"
#include "third_party/blink/public/platform/task_type.h"
#include "third_party/blink/public/web/modules/media/audio/audio_input_ipc_factory.h"
#include "third_party/blink/public/web/modules/media/audio/web_audio_input_ipc_factory.h"
#include "third_party/blink/public/web/web_local_frame.h"
namespace content {
......@@ -173,7 +173,7 @@ void PepperPlatformAudioInput::InitializeOnIOThread(
DCHECK(io_task_runner_->BelongsToCurrentThread());
if (ipc_startup_state_ != kStopped)
ipc_ = blink::AudioInputIPCFactory::get()->CreateAudioInputIPC(
ipc_ = blink::WebAudioInputIPCFactory::get()->CreateAudioInputIPC(
render_frame_token_, media::AudioSourceParameters(session_id));
if (!ipc_)
return;
......
......@@ -61,7 +61,7 @@
#include "third_party/blink/public/platform/scheduler/web_rail_mode_observer.h"
#include "third_party/blink/public/platform/scheduler/web_thread_scheduler.h"
#include "third_party/blink/public/platform/web_connection_type.h"
#include "third_party/blink/public/web/modules/media/audio/audio_input_ipc_factory.h"
#include "third_party/blink/public/web/modules/media/audio/web_audio_input_ipc_factory.h"
#include "third_party/blink/public/web/modules/media/audio/web_audio_output_ipc_factory.h"
#include "third_party/blink/public/web/web_memory_statistics.h"
#include "ui/gfx/native_widget_types.h"
......@@ -533,7 +533,7 @@ class CONTENT_EXPORT RenderThreadImpl
// Provides AudioInputIPC objects for audio input devices. Initialized in
// Init.
base::Optional<blink::AudioInputIPCFactory> audio_input_ipc_factory_;
base::Optional<blink::WebAudioInputIPCFactory> audio_input_ipc_factory_;
// Provides AudioOutputIPC objects for audio output devices. Initialized in
// Init.
base::Optional<blink::WebAudioOutputIPCFactory> audio_output_ipc_factory_;
......
......@@ -278,7 +278,7 @@ source_set("blink_headers") {
"platform/websocket_handshake_throttle.h",
"web/blink.h",
"web/modules/autofill/web_form_element_observer.h",
"web/modules/media/audio/audio_input_ipc_factory.h",
"web/modules/media/audio/web_audio_input_ipc_factory.h",
"web/modules/media/audio/web_audio_output_ipc_factory.h",
"web/modules/media/webmediaplayer_util.h",
"web/modules/mediastream/encoded_video_frame.h",
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIA_AUDIO_AUDIO_INPUT_IPC_FACTORY_H_
#define THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIA_AUDIO_AUDIO_INPUT_IPC_FACTORY_H_
#ifndef THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIA_AUDIO_WEB_AUDIO_INPUT_IPC_FACTORY_H_
#define THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIA_AUDIO_WEB_AUDIO_INPUT_IPC_FACTORY_H_
#include <memory>
......@@ -24,15 +24,15 @@ struct AudioSourceParameters;
namespace blink {
// This is a thread-safe factory for AudioInputIPC objects.
class BLINK_MODULES_EXPORT AudioInputIPCFactory {
class BLINK_MODULES_EXPORT WebAudioInputIPCFactory {
public:
AudioInputIPCFactory(
WebAudioInputIPCFactory(
scoped_refptr<base::SequencedTaskRunner> main_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
~AudioInputIPCFactory();
~WebAudioInputIPCFactory();
static AudioInputIPCFactory* get() {
static WebAudioInputIPCFactory* get() {
DCHECK(instance_);
return instance_;
}
......@@ -51,11 +51,11 @@ class BLINK_MODULES_EXPORT AudioInputIPCFactory {
const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
// Global instance, set in constructor and unset in destructor.
static AudioInputIPCFactory* instance_;
static WebAudioInputIPCFactory* instance_;
DISALLOW_COPY_AND_ASSIGN(AudioInputIPCFactory);
DISALLOW_COPY_AND_ASSIGN(WebAudioInputIPCFactory);
};
} // namespace blink
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIA_AUDIO_AUDIO_INPUT_IPC_FACTORY_H_
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIA_AUDIO_WEB_AUDIO_INPUT_IPC_FACTORY_H_
......@@ -6,11 +6,11 @@ import("//third_party/blink/renderer/modules/modules.gni")
blink_modules_sources("media") {
sources = [
"audio/audio_input_ipc_factory.cc",
"audio/mojo_audio_input_ipc.cc",
"audio/mojo_audio_input_ipc.h",
"audio/mojo_audio_output_ipc.cc",
"audio/mojo_audio_output_ipc.h",
"audio/web_audio_input_ipc_factory.cc",
"audio/web_audio_output_ipc_factory.cc",
"webmediaplayer_util.cc",
]
......
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "third_party/blink/public/web/modules/media/audio/audio_input_ipc_factory.h"
#include "third_party/blink/public/web/modules/media/audio/web_audio_input_ipc_factory.h"
#include <string>
#include <utility>
......@@ -75,9 +75,9 @@ void AssociateInputAndOutputForAec(
}
} // namespace
AudioInputIPCFactory* AudioInputIPCFactory::instance_ = nullptr;
WebAudioInputIPCFactory* WebAudioInputIPCFactory::instance_ = nullptr;
AudioInputIPCFactory::AudioInputIPCFactory(
WebAudioInputIPCFactory::WebAudioInputIPCFactory(
scoped_refptr<base::SequencedTaskRunner> main_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
: main_task_runner_(std::move(main_task_runner)),
......@@ -86,12 +86,13 @@ AudioInputIPCFactory::AudioInputIPCFactory(
instance_ = this;
}
AudioInputIPCFactory::~AudioInputIPCFactory() {
WebAudioInputIPCFactory::~WebAudioInputIPCFactory() {
DCHECK_EQ(instance_, this);
instance_ = nullptr;
}
std::unique_ptr<media::AudioInputIPC> AudioInputIPCFactory::CreateAudioInputIPC(
std::unique_ptr<media::AudioInputIPC>
WebAudioInputIPCFactory::CreateAudioInputIPC(
const blink::LocalFrameToken& frame_token,
const media::AudioSourceParameters& source_params) const {
CHECK(!source_params.session_id.is_empty());
......
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