Skip to content

Commit

Permalink
Enable "gn check" for //third_party/blink/renderer/platform/heap
Browse files Browse the repository at this point in the history
* It has circular dependencies with platform:platform,
  platform/instrumentation:instrumentation, and
  platform/scheduler:scheduler. This CL updates
  |allow_circular_includes_from|s for them.

* Change visibility of platform:platform_export to be used by
  platform/heap:heap_unsanitized.

This CL has no behavior changes.

Bug: 800764
Change-Id: Iba08daca769d5c41f20fd678ef2d3cbc3c72e3ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2400782
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Auto-Submit: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805619}
  • Loading branch information
tkent-google authored and Commit Bot committed Sep 10, 2020
1 parent a909fcd commit 8deb067
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gn
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ no_check_targets = [
"//third_party/blink/renderer/modules/peerconnection:*", # 43 errors
"//third_party/blink/renderer/modules/webtransport:*", # 16 errors
"//third_party/blink/renderer/modules:*", # 321 errors
"//third_party/blink/renderer/platform/heap:*", # 65 errors
"//third_party/blink/renderer/platform/loader:*", # 180 errors
"//third_party/blink/renderer/platform/network:*", # 15 errors
"//third_party/blink/renderer/platform:*", # 72 errors
Expand Down
5 changes: 3 additions & 2 deletions third_party/blink/renderer/platform/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ source_set("platform_export") {

visibility = [] # Allow re-assignment of list.
visibility = [
":platform",
"//mojo/public/cpp/bindings:wtf_support",
"//third_party/blink/renderer/platform/*",
]
}

Expand All @@ -250,8 +250,8 @@ component("platform") {
"//services/device/public/mojom:mojom_blink",
"//services/media_session/public/mojom:mojom_blink",
"//third_party/blink/*",
"//url/mojom:url_mojom_origin_blink",
"//url/mojom:url_mojom_gurl_blink",
"//url/mojom:url_mojom_origin_blink",
]
output_name = "blink_platform"

Expand Down Expand Up @@ -1561,6 +1561,7 @@ component("platform") {

allow_circular_includes_from = [
"//third_party/blink/renderer/platform/blob",
"//third_party/blink/renderer/platform/heap:heap",
"//third_party/blink/renderer/platform/instrumentation",
"//third_party/blink/renderer/platform/scheduler",
]
Expand Down
6 changes: 6 additions & 0 deletions third_party/blink/renderer/platform/heap/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ source_set("heap_unsanitized") {
"//base",
"//third_party/blink/renderer/platform/wtf",
]
public_deps = [ "//third_party/blink/renderer/platform:platform_export" ]
}

blink_platform_sources("heap") {
Expand Down Expand Up @@ -138,7 +139,9 @@ source_set("test_support") {
"//testing/gtest",
"//third_party/blink/public/mojom:mojom_platform_blink_headers",
"//third_party/blink/renderer/platform:bindings_buildflags",
"//third_party/blink/renderer/platform:platform",
]
public_deps = [ "//base/test:test_support" ]
}

test("blink_heap_unittests") {
Expand Down Expand Up @@ -190,8 +193,11 @@ source_set("blink_heap_unittests_sources") {
]

deps = [
":test_support",
"//base",
"//base/test:test_support",
"//mojo/core/embedder:embedder",
"//skia:test_fonts",
"//testing/gmock",
"//testing/gtest",
"//third_party/blink/renderer/platform:test_support",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ blink_platform_sources("instrumentation") {
"//services/service_manager/public/cpp",
]
public_deps = [ "//third_party/blink/renderer/platform/heap:heap" ]
allow_circular_includes_from = public_deps
}

source_set("unit_tests") {
Expand Down
6 changes: 4 additions & 2 deletions third_party/blink/renderer/platform/scheduler/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,10 @@ blink_platform_sources("scheduler") {
"//v8",
]

allow_circular_includes_from =
[ "//third_party/blink/renderer/platform/instrumentation" ]
allow_circular_includes_from = [
"//third_party/blink/renderer/platform/heap:heap",
"//third_party/blink/renderer/platform/instrumentation",
]
}

source_set("test_support") {
Expand Down

0 comments on commit 8deb067

Please sign in to comment.