Bring back necessary c25 base changes #4752
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
y4vor
approved these changes
Jan 25, 2025
| @@ -6,15 +6,50 @@ | |||
| #include "base/compiler_specific.h" | |||
| #include "third_party/abseil-cpp/absl/base/attributes.h" | |||
|
|
|||
| #if defined(STARBOARD) | |||
There was a problem hiding this comment.
We would have to change this to BUILDFLAG(IS_STARBOARD)
| @@ -502,9 +585,17 @@ class TraceLog::ThreadLocalEventBuffer | |||
| int generation_; | |||
| }; | |||
|
|
|||
| void ThreadLocalEventBufferDestructor(void* buffer) { | |||
| @@ -458,6 +534,14 @@ inline FuchsiaLogSeverity LogSeverityToFuchsiaLogSeverity( | |||
| #endif // BUILDFLAG(IS_FUCHSIA) | |||
|
|
|||
| void WriteToFd(int fd, const char* data, size_t length) { | |||
| #if defined(STARBOARD) | |||
| if (length > 0) { | |||
| SbLogRaw(data); | |||
There was a problem hiding this comment.
We need to keep SbLog APIs and keep a custom base/logging.cc.
| return base::TestSuite(argc, argv).Run(); | ||
| } | ||
|
|
||
| STARBOARD_WRAP_SIMPLE_MAIN(TestSuiteRun); |
There was a problem hiding this comment.
We would need the wrapper for 3P.
| @@ -288,7 +288,38 @@ | |||
| X(TRACE_DISABLED_BY_DEFAULT("webgpu")) \ | |||
| X(TRACE_DISABLED_BY_DEFAULT("webrtc")) \ | |||
| X(TRACE_DISABLED_BY_DEFAULT("worker.scheduler")) \ | |||
| X(TRACE_DISABLED_BY_DEFAULT("xr.debug")) | |||
| X(TRACE_DISABLED_BY_DEFAULT("xr.debug")) \ | |||
| X("cobalt::cssom") \ | |||
There was a problem hiding this comment.
Those seem custom events from Cobalt. Probably most would not be needed. There could be something about media to keep around.
| @@ -14,6 +14,7 @@ | |||
| #include <type_traits> | |||
| #include <unordered_map> | |||
| #include <utility> | |||
| #include <limits> | |||
There was a problem hiding this comment.
maybe not needed
Also there is not #ifdef guard.
| @@ -6,6 +6,7 @@ | |||
|
|
|||
| #if defined(ADDRESS_SANITIZER) | |||
| #include <sanitizer/asan_interface.h> | |||
| #include <string.h> | |||
| @@ -38,6 +38,7 @@ | |||
| #include "base/time/time_override.h" | |||
| #include "build/build_config.h" | |||
| #include "third_party/abseil-cpp/absl/types/optional.h" | |||
| #include "starboard/configuration_constants.h" | |||
andrewsavage1
commented
Jan 27, 2025
| @@ -687,6 +687,11 @@ TEST(JSONReaderTest, LiteralRoots) { | |||
| TEST(JSONReaderTest, ReadFromFile) { | |||
| FilePath path; | |||
| ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &path)); | |||
| #if defined(STARBOARD) | |||
There was a problem hiding this comment.
Leave out for now
|
I need to bring in base/message_loop/message_pump_io_starboard.cc and base/message_loop/message_pump_ui_starboard.cc |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.