Skip to content

Commit

Permalink
Adapt Cobalt Media and js_profiler to use absl instead of shim.
Browse files Browse the repository at this point in the history
This adapts Cobalt Media and js_profiler to use absl::optional instead
of a shim to base::Optional.
  • Loading branch information
jellefoks committed Jan 10, 2024
1 parent c85458f commit 40fb583
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 33 deletions.
1 change: 1 addition & 0 deletions cobalt/js_profiler/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ static_library("js_profiler") {
"//cobalt/script",
"//cobalt/script/v8c:engine",
"//cobalt/web",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/chromium/media:media",
"//third_party/v8:cppgc",
]
Expand Down
2 changes: 1 addition & 1 deletion cobalt/js_profiler/profiler_trace_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "base/time/time.h"
#include "cobalt/script/sequence.h"
#include "third_party/chromium/media/cobalt/third_party/abseil-cpp/absl/types/optional.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "v8/include/v8-profiler.h"

namespace cobalt {
Expand Down
7 changes: 4 additions & 3 deletions third_party/chromium/media/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.

config("media_config") {
include_dirs = [ "//third_party/abseil-cpp" ]
if (is_win) {
cflags = [
"/wd4267", # Conversion from 'size_t' to 'type', possible loss of data.
Expand All @@ -33,11 +34,11 @@ config("media_config") {

config("media_config_public") {
# TODO: Make include_dirs other than the first one private.
include_dirs = [ "..", "cobalt", "../../skia" ]
include_dirs = [ "//third_party/abseil-cpp", "..", "cobalt", "../../skia" ]
}

config("external_config") {
include_dirs = [ "..", "cobalt", "../../skia" ]
include_dirs = [ "//third_party/abseil-cpp", "..", "cobalt", "../../skia" ]
}

component("media") {
Expand Down Expand Up @@ -202,7 +203,6 @@ component("media") {
]

sources += [
"cobalt/third_party/abseil-cpp/absl/types/optional.h",
"cobalt/ui/gfx/geometry/point3_f.h",
"cobalt/ui/gfx/geometry/point_base.h",
"cobalt/ui/gfx/geometry/rect.h",
Expand Down Expand Up @@ -248,6 +248,7 @@ component("media") {
"//build:chromeos_buildflags",
"//net",
"//starboard:starboard_group",
"//third_party/abseil-cpp/absl/types:optional",
"//url",
]
}
Expand Down

This file was deleted.

0 comments on commit 40fb583

Please sign in to comment.