Remove starboard/memory.h

b/366056170 Change-Id: Id8183f08f0df2ee58b027db2f13724e13b3d3132
youtube · Sep 18, 2024 · 872ba26 · 872ba26
1 parent 948d0bf
commit 872ba26
Show file tree

Hide file tree

Showing 159 changed files with 37 additions and 393 deletions.
diff --git a/base/files/file_enumerator_starboard.cc b/base/files/file_enumerator_starboard.cc
@@ -22,7 +22,6 @@
 #include "starboard/common/log.h"
 #include "starboard/common/string.h"
 #include "starboard/configuration_constants.h"
-#include "starboard/memory.h"
 
 namespace base {
 

diff --git a/base/files/memory_mapped_file_starboard.cc b/base/files/memory_mapped_file_starboard.cc
@@ -17,6 +17,7 @@
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -27,7 +28,6 @@
 #include "base/threading/scoped_blocking_call.h"
 #include "build/build_config.h"
 #include "starboard/extension/memory_mapped_file.h"
-#include "starboard/memory.h"
 
 namespace base {
 

diff --git a/base/metrics/persistent_memory_allocator.cc b/base/metrics/persistent_memory_allocator.cc
@@ -35,9 +35,6 @@
 #include <sys/prctl.h>
 #endif
 #endif
-#if defined(STARBOARD)
-#include "starboard/memory.h"
-#endif
 
 namespace {
 

diff --git a/base/process/memory_starboard.cc b/base/process/memory_starboard.cc
@@ -16,7 +16,6 @@
 
 #include <cstdlib>
 
-#include "starboard/memory.h"
 
 namespace base {
 

diff --git a/base/strings/safe_sprintf_unittest.cc b/base/strings/safe_sprintf_unittest.cc
@@ -19,7 +19,6 @@
 
 #if defined(STARBOARD)
 #include "starboard/common/string.h"
-#include "starboard/memory.h"
 #include "starboard/types.h"
 #endif
 

diff --git a/base/strings/string_number_conversions_unittest.cc b/base/strings/string_number_conversions_unittest.cc
@@ -19,7 +19,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #if defined(STARBOARD)
-#include "starboard/memory.h"
 #include "starboard/types.h"
 #endif
 

diff --git a/base/strings/string_util_starboard.h b/base/strings/string_util_starboard.h
@@ -22,7 +22,6 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "starboard/common/string.h"
-#include "starboard/memory.h"
 #include "starboard/types.h"
 
 namespace base {

diff --git a/base/strings/string_util_unittest.cc b/base/strings/string_util_unittest.cc
@@ -18,7 +18,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "starboard/common/string.h"
-#include "starboard/memory.h"
 #include "starboard/types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/base/task/thread_pool/thread_group_impl_unittest.cc b/base/task/thread_pool/thread_group_impl_unittest.cc
@@ -53,6 +53,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
+#if defined(STARBOARD)
+#include "starboard/configuration_constants.h"
+#endif
+
 namespace base {
 namespace internal {
 namespace {

diff --git a/cobalt/audio/audio_buffer.cc b/cobalt/audio/audio_buffer.cc
@@ -21,7 +21,6 @@
 
 #include "cobalt/audio/audio_helpers.h"
 #include "cobalt/web/dom_exception.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace audio {

diff --git a/cobalt/audio/audio_file_reader_wav.cc b/cobalt/audio/audio_file_reader_wav.cc
@@ -21,7 +21,6 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "cobalt/media/base/endian_util.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace audio {

diff --git a/cobalt/base/circular_buffer_shell.cc b/cobalt/base/circular_buffer_shell.cc
@@ -5,16 +5,13 @@
 #include "cobalt/base/circular_buffer_shell.h"
 
 #include <stdint.h>
+#include <string.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 
-#if defined(STARBOARD)
-#include "starboard/memory.h"
-#endif
-
 static inline void* add_to_pointer(void* pointer, size_t amount) {
   return static_cast<uint8_t*>(pointer) + amount;
 }

diff --git a/cobalt/browser/memory_settings/calculations_test.cc b/cobalt/browser/memory_settings/calculations_test.cc
@@ -21,7 +21,6 @@
 #include "cobalt/browser/memory_settings/constants.h"
 #include "cobalt/browser/memory_settings/test_common.h"
 #include "cobalt/browser/switches.h"
-#include "starboard/memory.h"
 #include "starboard/system.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/cobalt/browser/memory_settings/pretty_print_test.cc b/cobalt/browser/memory_settings/pretty_print_test.cc
@@ -27,7 +27,6 @@
 #include "cobalt/browser/memory_settings/memory_settings.h"
 #include "cobalt/browser/memory_settings/test_common.h"
 #include "cobalt/browser/switches.h"
-#include "starboard/memory.h"
 #include "starboard/system.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/cobalt/csp/source_list_test.cc b/cobalt/csp/source_list_test.cc
@@ -21,7 +21,6 @@
 #include "cobalt/network/local_network.h"
 #include "net/base/url_util.h"
 #include "starboard/common/socket.h"
-#include "starboard/memory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"

diff --git a/cobalt/css_parser/grammar.h b/cobalt/css_parser/grammar.h
@@ -106,7 +106,6 @@ struct cobalt_yyltype {
 #define YYLTYPE_IS_TRIVIAL 0
 
 #if defined(STARBOARD)
-#include "starboard/memory.h"
 #define YYFREE free
 #define YYMALLOC malloc
 #endif

diff --git a/cobalt/dom/captions/system_caption_settings.cc b/cobalt/dom/captions/system_caption_settings.cc
@@ -28,7 +28,6 @@
 #include "cobalt/dom/captions/caption_state.h"
 #include "cobalt/web/event_target.h"
 #include "starboard/extension/accessibility.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace dom {

diff --git a/cobalt/h5vcc/h5vcc_accessibility.cc b/cobalt/h5vcc/h5vcc_accessibility.cc
@@ -21,7 +21,6 @@
 #include "cobalt/base/accessibility_text_to_speech_settings_changed_event.h"
 #include "cobalt/browser/switches.h"
 #include "starboard/extension/accessibility.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace h5vcc {

diff --git a/cobalt/h5vcc/h5vcc_storage.cc b/cobalt/h5vcc/h5vcc_storage.cc
@@ -32,6 +32,7 @@
 #include "net/http/http_cache.h"
 #include "net/http/http_transaction_factory.h"
 #include "starboard/common/string.h"
+#include "starboard/configuration_constants.h"
 
 namespace cobalt {
 namespace h5vcc {

diff --git a/cobalt/loader/image/animated_webp_image.cc b/cobalt/loader/image/animated_webp_image.cc
@@ -28,7 +28,6 @@
 #include "cobalt/render_tree/image_node.h"
 #include "cobalt/render_tree/node.h"
 #include "cobalt/render_tree/rect_node.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace loader {

diff --git a/cobalt/loader/image/webp_image_decoder.cc b/cobalt/loader/image/webp_image_decoder.cc
@@ -20,7 +20,6 @@
 #include "base/trace_event/trace_event.h"
 #include "cobalt/loader/image/animated_webp_image.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace loader {

diff --git a/cobalt/media/base/audio_bus.cc b/cobalt/media/base/audio_bus.cc
@@ -17,7 +17,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/base/endian_util.h b/cobalt/media/base/endian_util.h
@@ -16,7 +16,6 @@
 #define COBALT_MEDIA_BASE_ENDIAN_UTIL_H_
 
 #include "base/sys_byteorder.h"
-#include "starboard/memory.h"
 
 // TODO: Consider Starboardize functions in this file.
 

diff --git a/cobalt/media/base/interleaved_sinc_resampler.cc b/cobalt/media/base/interleaved_sinc_resampler.cc
@@ -52,7 +52,6 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/base/sbplayer_bridge.cc b/cobalt/media/base/sbplayer_bridge.cc
@@ -34,7 +34,6 @@
 #include "starboard/common/string.h"
 #include "starboard/configuration.h"
 #include "starboard/extension/player_set_max_video_input_size.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/bidirectional_fit_reuse_allocator_test.cc b/cobalt/media/bidirectional_fit_reuse_allocator_test.cc
@@ -21,7 +21,6 @@
 #include "starboard/common/fixed_no_free_allocator.h"
 #include "starboard/common/pointer_arithmetic.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 #include "starboard/types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/cobalt/media/decoder_buffer_allocator.cc b/cobalt/media/decoder_buffer_allocator.cc
@@ -23,7 +23,6 @@
 #include "starboard/common/allocator.h"
 #include "starboard/configuration.h"
 #include "starboard/media.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/progressive/avc_parser.cc b/cobalt/media/progressive/avc_parser.cc
@@ -31,7 +31,6 @@
 #include "media/base/video_transformation.h"
 #include "media/base/video_types.h"
 #include "media/formats/mp4/aac.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/progressive/mp4_map_unittest.cc b/cobalt/media/progressive/mp4_map_unittest.cc
@@ -25,7 +25,6 @@
 #include "cobalt/media/base/endian_util.h"
 #include "cobalt/media/progressive/mock_data_source_reader.h"
 #include "cobalt/media/progressive/mp4_parser.h"
-#include "starboard/memory.h"
 #include "starboard/types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/cobalt/media/sandbox/format_guesstimator.cc b/cobalt/media/sandbox/format_guesstimator.cc
@@ -38,7 +38,6 @@
 #include "net/base/filename_util.h"
 #include "net/base/url_util.h"
 #include "starboard/common/file.h"
-#include "starboard/memory.h"
 #include "starboard/types.h"
 #include "ui/gfx/geometry/size.h"
 

diff --git a/cobalt/media/sandbox/media_source_demuxer.cc b/cobalt/media/sandbox/media_source_demuxer.cc
@@ -28,7 +28,6 @@
 #include "cobalt/media/base/demuxer.h"
 #include "cobalt/media/base/pipeline_status.h"
 #include "cobalt/media/filters/chunk_demuxer.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/media/sandbox/raw_video_decoder_fuzzer.cc b/cobalt/media/sandbox/raw_video_decoder_fuzzer.cc
@@ -26,7 +26,6 @@
 #include "cobalt/media/sandbox/media_sandbox.h"
 #include "cobalt/media/sandbox/media_source_demuxer.h"
 #include "cobalt/media/sandbox/zzuf_fuzzer.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace media {

diff --git a/cobalt/network/custom/url_request_simple_job.cc b/cobalt/network/custom/url_request_simple_job.cc
@@ -35,7 +35,6 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_util.h"
-#include "starboard/memory.h"
 
 namespace net {
 

diff --git a/cobalt/network/socket_address_parser.cc b/cobalt/network/socket_address_parser.cc
@@ -17,7 +17,6 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/base/ip_address.h"
-#include "starboard/memory.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
 #include "url/url_canon_ip.h"

diff --git a/cobalt/overlay_info/overlay_info_registry_test.cc b/cobalt/overlay_info/overlay_info_registry_test.cc
@@ -21,7 +21,6 @@
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
-#include "starboard/memory.h"
 #include "starboard/types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/cobalt/overlay_info/qr_code_overlay.cc b/cobalt/overlay_info/qr_code_overlay.cc
@@ -23,7 +23,6 @@
 #include "base/trace_event/trace_event.h"
 #include "cobalt/overlay_info/overlay_info_registry.h"
 #include "cobalt/render_tree/animations/animate_node.h"
-#include "starboard/memory.h"
 #include "third_party/QR-Code-generator/cpp/QrCode.hpp"
 
 namespace cobalt {

diff --git a/cobalt/renderer/backend/egl/texture_data_cpu.cc b/cobalt/renderer/backend/egl/texture_data_cpu.cc
@@ -21,7 +21,6 @@
 #include "cobalt/renderer/backend/egl/utils.h"
 #include "cobalt/renderer/egl_and_gles.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_callback.cc b/cobalt/renderer/rasterizer/egl/draw_callback.cc
@@ -19,7 +19,6 @@
 #include "cobalt/renderer/egl_and_gles.h"
 #include "egl/generated_shader_impl.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_poly_color.cc b/cobalt/renderer/rasterizer/egl/draw_poly_color.cc
@@ -23,7 +23,6 @@
 #include "cobalt/renderer/egl_and_gles.h"
 #include "egl/generated_shader_impl.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_rect_border.cc b/cobalt/renderer/rasterizer/egl/draw_rect_border.cc
@@ -22,7 +22,6 @@
 #include "cobalt/renderer/rasterizer/common/utils.h"
 #include "egl/generated_shader_impl.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_rect_color_texture.cc b/cobalt/renderer/rasterizer/egl/draw_rect_color_texture.cc
@@ -18,7 +18,6 @@
 #include "cobalt/renderer/backend/egl/utils.h"
 #include "cobalt/renderer/egl_and_gles.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_rect_linear_gradient.cc b/cobalt/renderer/rasterizer/egl/draw_rect_linear_gradient.cc
@@ -21,7 +21,6 @@
 #include "cobalt/renderer/egl_and_gles.h"
 #include "egl/generated_shader_impl.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_rect_radial_gradient.cc b/cobalt/renderer/rasterizer/egl/draw_rect_radial_gradient.cc
@@ -21,7 +21,6 @@
 #include "cobalt/renderer/egl_and_gles.h"
 #include "egl/generated_shader_impl.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_rect_shadow_blur.cc b/cobalt/renderer/rasterizer/egl/draw_rect_shadow_blur.cc
@@ -21,7 +21,6 @@
 #include "cobalt/renderer/backend/egl/utils.h"
 #include "cobalt/renderer/egl_and_gles.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_rect_shadow_spread.cc b/cobalt/renderer/rasterizer/egl/draw_rect_shadow_spread.cc
@@ -20,7 +20,6 @@
 #include "cobalt/renderer/backend/egl/utils.h"
 #include "cobalt/renderer/egl_and_gles.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_rect_texture.cc b/cobalt/renderer/rasterizer/egl/draw_rect_texture.cc
@@ -18,7 +18,6 @@
 #include "cobalt/renderer/backend/egl/utils.h"
 #include "cobalt/renderer/egl_and_gles.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {

diff --git a/cobalt/renderer/rasterizer/egl/draw_rrect_color.cc b/cobalt/renderer/rasterizer/egl/draw_rrect_color.cc
@@ -18,7 +18,6 @@
 #include "cobalt/renderer/egl_and_gles.h"
 #include "egl/generated_shader_impl.h"
 #include "starboard/configuration.h"
-#include "starboard/memory.h"
 
 namespace cobalt {
 namespace renderer {