Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove starboard/memory.h #4126

Merged
merged 1 commit into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion base/files/file_enumerator_starboard.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion base/files/memory_mapped_file_starboard.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 {

Expand Down
3 changes: 0 additions & 3 deletions base/metrics/persistent_memory_allocator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
#include <sys/prctl.h>
#endif
#endif
#if defined(STARBOARD)
#include "starboard/memory.h"
#endif

namespace {

Expand Down
1 change: 0 additions & 1 deletion base/process/memory_starboard.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <cstdlib>

#include "starboard/memory.h"

namespace base {

Expand Down
1 change: 0 additions & 1 deletion base/strings/safe_sprintf_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

#if defined(STARBOARD)
#include "starboard/common/string.h"
#include "starboard/memory.h"
#include "starboard/types.h"
#endif

Expand Down
1 change: 0 additions & 1 deletion base/strings/string_number_conversions_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion base/strings/string_util_starboard.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion base/strings/string_util_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions base/task/thread_pool/thread_group_impl_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions chrome/updater/utils_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "base/strings/strcat.h"
#include "base/values.h"
#include "gmock/gmock.h"
#include "starboard/configuration_constants.h"
#include "starboard/extension/installation_manager.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
1 change: 0 additions & 1 deletion cobalt/audio/audio_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

#include "cobalt/audio/audio_helpers.h"
#include "cobalt/web/dom_exception.h"
#include "starboard/memory.h"

namespace cobalt {
namespace audio {
Expand Down
1 change: 0 additions & 1 deletion cobalt/audio/audio_file_reader_wav.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 1 addition & 4 deletions cobalt/base/circular_buffer_shell.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion cobalt/browser/memory_settings/calculations_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion cobalt/browser/memory_settings/pretty_print_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion cobalt/csp/source_list_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion cobalt/css_parser/grammar.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion cobalt/dom/captions/system_caption_settings.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/h5vcc/h5vcc_accessibility.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions cobalt/h5vcc/h5vcc_storage.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/loader/image/animated_webp_image.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/loader/image/webp_image_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/media/base/audio_bus.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <algorithm>
#include <limits>

#include "starboard/memory.h"

namespace cobalt {
namespace media {
Expand Down
1 change: 0 additions & 1 deletion cobalt/media/base/endian_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 0 additions & 1 deletion cobalt/media/base/interleaved_sinc_resampler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include <utility>

#include "base/logging.h"
#include "starboard/memory.h"

namespace cobalt {
namespace media {
Expand Down
1 change: 0 additions & 1 deletion cobalt/media/base/sbplayer_bridge.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/media/bidirectional_fit_reuse_allocator_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion cobalt/media/decoder_buffer_allocator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/media/progressive/avc_parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/media/progressive/mp4_map_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion cobalt/media/sandbox/format_guesstimator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion cobalt/media/sandbox/media_source_demuxer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/media/sandbox/raw_video_decoder_fuzzer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/network/custom/url_request_simple_job.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
1 change: 0 additions & 1 deletion cobalt/network/socket_address_parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion cobalt/overlay_info/overlay_info_registry_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion cobalt/overlay_info/qr_code_overlay.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/renderer/backend/egl/texture_data_cpu.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/renderer/rasterizer/egl/draw_callback.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/renderer/rasterizer/egl/draw_poly_color.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/renderer/rasterizer/egl/draw_rect_border.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/renderer/rasterizer/egl/draw_rect_color_texture.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/renderer/rasterizer/egl/draw_rect_shadow_blur.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/renderer/rasterizer/egl/draw_rect_shadow_spread.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion cobalt/renderer/rasterizer/egl/draw_rect_texture.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading