Skip to content

Commit 9401684

Browse files
kjyounckim1346
andauthored
starboard: Flatten starboard::shared::starboard namespace (#7140)
[go/cobalt-flatten-starboard-namespace](https://goto.google.com/cobalt-flatten-starboard-namespace) This PR is generated by steps below. - Run a script to replace `starboard::shared::starboard` with `starboard` - Fix the build error manually or by Gemini-CLI #vibe-coded Bug: 441955897 --------- Co-authored-by: Charley Kim <charleykim@google.com>
1 parent 8ec342e commit 9401684

62 files changed

Lines changed: 138 additions & 123 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

starboard/android/shared/accessibility_get_caption_settings.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <string>
1818

1919
#include "base/android/jni_android.h"
20+
#include "starboard/android/shared/accessibility_extension.h"
2021
#include "starboard/android/shared/jni_env_ext.h"
2122
#include "starboard/android/shared/jni_state.h"
2223
#include "starboard/android/shared/jni_utils.h"
@@ -25,14 +26,9 @@
2526
#include "starboard/configuration.h"
2627
#include "starboard/shared/starboard/accessibility_internal.h"
2728

28-
#include "starboard/android/shared/accessibility_extension.h"
29-
3029
namespace starboard::android::shared::accessibility {
3130

3231
using starboard::android::shared::ScopedLocalJavaRef;
33-
using starboard::shared::starboard::GetClosestCaptionColor;
34-
using starboard::shared::starboard::GetClosestFontSizePercentage;
35-
using starboard::shared::starboard::GetClosestOpacity;
3632

3733
namespace {
3834

starboard/android/shared/application_android.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ namespace starboard::android::shared {
2727

2828
using ::starboard::CommandLine;
2929

30-
class ApplicationAndroid
31-
: public ::starboard::shared::starboard::QueueApplication {
30+
class ApplicationAndroid : public QueueApplication {
3231
public:
3332
ApplicationAndroid(std::unique_ptr<CommandLine> command_line,
3433
base::android::ScopedJavaGlobalRef<jobject> asset_manager,
@@ -38,8 +37,7 @@ class ApplicationAndroid
3837
~ApplicationAndroid();
3938

4039
static ApplicationAndroid* Get() {
41-
return static_cast<ApplicationAndroid*>(
42-
::starboard::shared::starboard::Application::Get());
40+
return static_cast<ApplicationAndroid*>(Application::Get());
4341
}
4442

4543
int64_t app_start_with_android_fix() { return app_start_timestamp_; }

starboard/android/shared/audio_decoder_passthrough.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class AudioDecoderPassthrough
104104
}
105105

106106
private:
107-
::starboard::shared::starboard::ThreadChecker thread_checker_;
107+
ThreadChecker thread_checker_;
108108

109109
const int samples_per_second_;
110110
OutputCB output_cb_;

starboard/android/shared/audio_sink_min_required_frames_tester.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class MinRequiredFramesTester {
102102
const int required_frames_increment_;
103103
const int min_stable_played_frames_;
104104

105-
::starboard::shared::starboard::ThreadChecker thread_checker_;
105+
ThreadChecker thread_checker_;
106106

107107
std::vector<TestTask> test_tasks_;
108108
AudioTrackAudioSink* audio_sink_ = nullptr;

starboard/android/shared/input_events_generator.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
namespace starboard::android::shared {
2929

30-
using ::starboard::shared::starboard::Application;
3130
typedef ::starboard::android::shared::InputEventsGenerator::Event Event;
3231
typedef ::starboard::android::shared::InputEventsGenerator::Events Events;
3332

starboard/android/shared/input_events_generator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace starboard::android::shared {
2727

2828
class InputEventsGenerator {
2929
// public:
30-
// typedef ::starboard::shared::starboard::Application::Event Event;
30+
// typedef Application::Event Event;
3131
// typedef std::vector<std::unique_ptr<Event>> Events;
3232

3333
// explicit InputEventsGenerator(SbWindow window);

starboard/android/shared/log.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void SbLog(SbLogPriority priority, const char* message) {
5151
}
5252

5353
{
54-
std::lock_guard lock(*starboard::shared::starboard::GetLoggingMutex());
54+
std::lock_guard lock(*starboard::GetLoggingMutex());
5555
__android_log_write(android_priority, "starboard", message);
5656
}
5757

starboard/android/shared/media_decoder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class MediaDecoder final
182182
void OnMediaCodecFrameRendered(int64_t frame_timestamp) override;
183183
void OnMediaCodecFirstTunnelFrameReady() override;
184184

185-
::starboard::shared::starboard::ThreadChecker thread_checker_;
185+
ThreadChecker thread_checker_;
186186

187187
const SbMediaType media_type_;
188188
Host* const host_;

starboard/android/shared/system_request_freeze_no_freezedone_callback.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
void SbSystemRequestFreeze() {
2020
// There is no FreezeDone callback for stopping all thread execution
2121
// after fully transitioning into Frozen.
22-
starboard::shared::starboard::Application::Get()->Freeze(NULL, NULL);
22+
starboard::Application::Get()->Freeze(NULL, NULL);
2323
}

starboard/android/shared/video_frame_tracker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class VideoFrameTracker {
4141
private:
4242
void UpdateDroppedFrames();
4343

44-
::starboard::shared::starboard::ThreadChecker thread_checker_;
44+
ThreadChecker thread_checker_;
4545

4646
std::list<int64_t> frames_to_be_rendered_;
4747

0 commit comments

Comments
 (0)