Commit d0c4482b authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

Enable "gn check" for //third_party/blink/renderer/core/mojo

* Move core_export.h from core:core to core:core_common to avoid a
  circular dependency between core:core and core/mojo:mojo.

* Move v8:bindings_core_v8_generated from 'deps' to 'public_deps' in
  core:prerequisites.
  v8:bindings_core_v8_generated is used by a target depending on
  core:prerequisites.

* Move some test helper sources from core:unit_tests to
  core:unit_test_support, and change core:unit_tests dependency to
  core:unit_test_support in controller:blink_bindings_test_sources in
  order to avoid a circular dependency between
  controller:blink_bindings_test_sources and mojo:unit_tests.

This CL has no behavior changes.

Bug: 800764
Change-Id: I8d8f78e0eb6f18464d4e270360a62b212cd9da27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2402460Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Auto-Submit: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805671}
parent 9ffc9f3c
...@@ -231,7 +231,6 @@ no_check_targets = [ ...@@ -231,7 +231,6 @@ no_check_targets = [
"//third_party/blink/renderer/core/loader:*", # 421 errors "//third_party/blink/renderer/core/loader:*", # 421 errors
"//third_party/blink/renderer/core/mathml:*", # 11 errors "//third_party/blink/renderer/core/mathml:*", # 11 errors
"//third_party/blink/renderer/core/messaging:*", # 30 errors "//third_party/blink/renderer/core/messaging:*", # 30 errors
"//third_party/blink/renderer/core/mojo:*", # 44 errors
"//third_party/blink/renderer/core/offscreencanvas:*", # 22 errors "//third_party/blink/renderer/core/offscreencanvas:*", # 22 errors
"//third_party/blink/renderer/core/origin_trials:*", # 12 errors "//third_party/blink/renderer/core/origin_trials:*", # 12 errors
"//third_party/blink/renderer/core/page:*", # 500 errors "//third_party/blink/renderer/core/page:*", # 500 errors
......
...@@ -176,7 +176,7 @@ source_set("blink_bindings_test_sources") { ...@@ -176,7 +176,7 @@ source_set("blink_bindings_test_sources") {
"//testing/gtest", "//testing/gtest",
"//third_party/blink/public:test_headers", "//third_party/blink/public:test_headers",
"//third_party/blink/renderer/core:testing", "//third_party/blink/renderer/core:testing",
"//third_party/blink/renderer/core:unit_tests", "//third_party/blink/renderer/core:unit_test_support",
"//third_party/blink/renderer/modules:modules", "//third_party/blink/renderer/modules:modules",
"//third_party/blink/renderer/platform:platform", "//third_party/blink/renderer/platform:platform",
"//third_party/blink/renderer/platform:test_support", "//third_party/blink/renderer/platform:test_support",
......
...@@ -19,8 +19,8 @@ import("//third_party/blink/renderer/platform/platform_generated.gni") ...@@ -19,8 +19,8 @@ import("//third_party/blink/renderer/platform/platform_generated.gni")
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
visibility = [ visibility = [
"//third_party/blink/renderer/*",
"//third_party/blink/public/*", "//third_party/blink/public/*",
"//third_party/blink/renderer/*",
] ]
rel_blink_core_gen_dir = rebase_path(blink_core_output_dir, root_build_dir) rel_blink_core_gen_dir = rebase_path(blink_core_output_dir, root_build_dir)
...@@ -65,6 +65,10 @@ core_config_add += [ ...@@ -65,6 +65,10 @@ core_config_add += [
"//build/config/compiler:noshadowing", "//build/config/compiler:noshadowing",
] ]
source_set("core_common") {
sources = [ "core_export.h" ]
}
source_set("prerequisites") { source_set("prerequisites") {
public_deps = [ public_deps = [
"//services/network/public/cpp:cpp", "//services/network/public/cpp:cpp",
...@@ -73,6 +77,7 @@ source_set("prerequisites") { ...@@ -73,6 +77,7 @@ source_set("prerequisites") {
"//skia", "//skia",
"//third_party/angle:translator", "//third_party/angle:translator",
"//third_party/blink/public/mojom:mojom_broadcastchannel_bindings_blink", "//third_party/blink/public/mojom:mojom_broadcastchannel_bindings_blink",
"//third_party/blink/renderer/bindings/core/v8:bindings_core_v8_generated",
"//third_party/blink/renderer/bindings/core/v8:generated", "//third_party/blink/renderer/bindings/core/v8:generated",
"//third_party/blink/renderer/core/animation:buildflags", "//third_party/blink/renderer/core/animation:buildflags",
"//third_party/blink/renderer/core/inspector:generated", "//third_party/blink/renderer/core/inspector:generated",
...@@ -100,7 +105,6 @@ source_set("prerequisites") { ...@@ -100,7 +105,6 @@ source_set("prerequisites") {
] ]
deps = [ deps = [
"//third_party/blink/public:scaled_resources", "//third_party/blink/public:scaled_resources",
"//third_party/blink/renderer/bindings/core/v8:bindings_core_v8_generated",
# FIXME: don't depend on bindings_modules http://crbug.com/358074 # FIXME: don't depend on bindings_modules http://crbug.com/358074
"//third_party/blink/renderer/bindings/modules/v8:bindings_modules_v8_generated", "//third_party/blink/renderer/bindings/modules/v8:bindings_modules_v8_generated",
...@@ -126,7 +130,6 @@ component("core") { ...@@ -126,7 +130,6 @@ component("core") {
# If you create a new subdirectory, make a new BUILD file for that directory # If you create a new subdirectory, make a new BUILD file for that directory
# and reference it in the deps below rather than adding the sources here. # and reference it in the deps below rather than adding the sources here.
sources = [ sources = [
"core_export.h",
"core_initializer.cc", "core_initializer.cc",
"core_initializer.h", "core_initializer.h",
] ]
...@@ -1136,8 +1139,6 @@ source_set("unit_tests") { ...@@ -1136,8 +1139,6 @@ source_set("unit_tests") {
"frame/frame_overlay_test.cc", "frame/frame_overlay_test.cc",
"frame/frame_serializer_test.cc", "frame/frame_serializer_test.cc",
"frame/frame_test.cc", "frame/frame_test.cc",
"frame/frame_test_helpers.cc",
"frame/frame_test_helpers.h",
"frame/history_test.cc", "frame/history_test.cc",
"frame/local_dom_window_test.cc", "frame/local_dom_window_test.cc",
"frame/local_frame_back_forward_cache_test.cc", "frame/local_frame_back_forward_cache_test.cc",
...@@ -1390,7 +1391,6 @@ source_set("unit_tests") { ...@@ -1390,7 +1391,6 @@ source_set("unit_tests") {
"scheduler_integration_tests/virtual_time_test.cc", "scheduler_integration_tests/virtual_time_test.cc",
"script/document_modulator_impl_test.cc", "script/document_modulator_impl_test.cc",
"script/dynamic_module_resolver_test.cc", "script/dynamic_module_resolver_test.cc",
"script/mock_script_element_base.h",
"script/module_map_test.cc", "script/module_map_test.cc",
"script/module_record_resolver_impl_test.cc", "script/module_record_resolver_impl_test.cc",
"script/module_script_test.cc", "script/module_script_test.cc",
...@@ -1416,20 +1416,6 @@ source_set("unit_tests") { ...@@ -1416,20 +1416,6 @@ source_set("unit_tests") {
"svg/svg_text_content_element_test.cc", "svg/svg_text_content_element_test.cc",
"svg/svg_use_element_test.cc", "svg/svg_use_element_test.cc",
"svg/unsafe_svg_attribute_sanitization_test.cc", "svg/unsafe_svg_attribute_sanitization_test.cc",
"testing/fake_web_plugin.cc",
"testing/fake_web_plugin.h",
"testing/sim/sim_canvas.cc",
"testing/sim/sim_canvas.h",
"testing/sim/sim_compositor.cc",
"testing/sim/sim_compositor.h",
"testing/sim/sim_network.cc",
"testing/sim/sim_network.h",
"testing/sim/sim_page.cc",
"testing/sim/sim_page.h",
"testing/sim/sim_request.cc",
"testing/sim/sim_request.h",
"testing/sim/sim_test.cc",
"testing/sim/sim_test.h",
"timing/memory_info_test.cc", "timing/memory_info_test.cc",
"timing/performance_mark_test.cc", "timing/performance_mark_test.cc",
"timing/performance_navigation_timing_test.cc", "timing/performance_navigation_timing_test.cc",
...@@ -1447,7 +1433,6 @@ source_set("unit_tests") { ...@@ -1447,7 +1433,6 @@ source_set("unit_tests") {
"workers/main_thread_worklet_test.cc", "workers/main_thread_worklet_test.cc",
"workers/threaded_worklet_test.cc", "workers/threaded_worklet_test.cc",
"workers/worker_thread_test.cc", "workers/worker_thread_test.cc",
"workers/worker_thread_test_helper.h",
"workers/worklet_global_scope_test_helper.h", "workers/worklet_global_scope_test_helper.h",
"workers/worklet_module_responses_map_test.cc", "workers/worklet_module_responses_map_test.cc",
"xml/parser/shared_buffer_reader_test.cc", "xml/parser/shared_buffer_reader_test.cc",
...@@ -1536,14 +1521,32 @@ source_set("perf_tests") { ...@@ -1536,14 +1521,32 @@ source_set("perf_tests") {
source_set("unit_test_support") { source_set("unit_test_support") {
testonly = true testonly = true
sources = [ sources = [
"frame/frame_test_helpers.cc",
"frame/frame_test_helpers.h",
"script/mock_script_element_base.h",
"testing/core_unit_test_helper.cc", "testing/core_unit_test_helper.cc",
"testing/core_unit_test_helper.h", "testing/core_unit_test_helper.h",
"testing/fake_web_plugin.cc",
"testing/fake_web_plugin.h",
"testing/module_test_base.cc", "testing/module_test_base.cc",
"testing/module_test_base.h", "testing/module_test_base.h",
"testing/page_test_base.cc", "testing/page_test_base.cc",
"testing/page_test_base.h", "testing/page_test_base.h",
"testing/scoped_fake_plugin_registry.cc", "testing/scoped_fake_plugin_registry.cc",
"testing/scoped_fake_plugin_registry.h", "testing/scoped_fake_plugin_registry.h",
"testing/sim/sim_canvas.cc",
"testing/sim/sim_canvas.h",
"testing/sim/sim_compositor.cc",
"testing/sim/sim_compositor.h",
"testing/sim/sim_network.cc",
"testing/sim/sim_network.h",
"testing/sim/sim_page.cc",
"testing/sim/sim_page.h",
"testing/sim/sim_request.cc",
"testing/sim/sim_request.h",
"testing/sim/sim_test.cc",
"testing/sim/sim_test.h",
"workers/worker_thread_test_helper.h",
] ]
configs += [ configs += [
......
...@@ -65,7 +65,10 @@ template("blink_core_sources") { ...@@ -65,7 +65,10 @@ template("blink_core_sources") {
deps += invoker.deps deps += invoker.deps
} }
public_deps = [ "//third_party/blink/renderer/core:all_generators" ] public_deps = [
"//third_party/blink/renderer/core:all_generators",
"//third_party/blink/renderer/core:core_common",
]
if (defined(invoker.public_deps)) { if (defined(invoker.public_deps)) {
public_deps += invoker.public_deps public_deps += invoker.public_deps
} }
......
...@@ -22,7 +22,13 @@ blink_core_sources("mojo") { ...@@ -22,7 +22,13 @@ blink_core_sources("mojo") {
deps = [ deps = [
"//mojo/public/cpp/system", "//mojo/public/cpp/system",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//third_party/blink/renderer/core/dom:dom",
"//third_party/blink/renderer/core/execution_context:execution_context",
"//third_party/blink/renderer/core/frame:frame",
"//third_party/blink/renderer/core/typed_arrays:typed_arrays",
"//third_party/blink/renderer/core/workers:workers",
] ]
public_deps = [ "//third_party/blink/renderer/core:core_generated" ]
} }
source_set("unit_tests") { source_set("unit_tests") {
...@@ -41,8 +47,10 @@ source_set("unit_tests") { ...@@ -41,8 +47,10 @@ source_set("unit_tests") {
":test_bindings_blink", ":test_bindings_blink",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//testing/gtest", "//testing/gtest",
"//third_party/blink/renderer/controller:blink_bindings_test_sources",
"//third_party/blink/renderer/core:core", "//third_party/blink/renderer/core:core",
"//third_party/blink/renderer/core:testing", "//third_party/blink/renderer/core:testing",
"//third_party/blink/renderer/platform:test_support",
] ]
data_deps = [ data_deps = [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment