Commit 35c1b977 authored by Mason Freed's avatar Mason Freed Committed by Commit Bot

Don't have blink/renderer/core depend on ui/base:base

The [1] CL caused renderer/core to depend on base, without adding deps
for that dependency. The actual dependency is just on ui/base:features,
so this CL makes that change.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1984748

Fixed: 1052085
Change-Id: Ia1fdd06903e920148d26943f4c860dcce0b243aa
Bug: 1052085
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2063630Reviewed-by: default avatarDave Tapuska <dtapuska@chromium.org>
Commit-Queue: Mason Freed <masonfreed@chromium.org>
Auto-Submit: Mason Freed <masonfreed@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743155}
parent 73284533
...@@ -113,10 +113,7 @@ source_set("prerequisites") { ...@@ -113,10 +113,7 @@ source_set("prerequisites") {
"//third_party/ots", "//third_party/ots",
"//third_party/snappy", "//third_party/snappy",
"//third_party/zlib", "//third_party/zlib",
"//ui/base:features",
# TODO: don't depend on ui/base:base it has a bunch of browser related stuff.
# https://crbug.com/1052085
"//ui/base:base",
"//ui/base/ime/mojom", "//ui/base/ime/mojom",
"//ui/display/mojom:mojom_blink", "//ui/display/mojom:mojom_blink",
"//ui/events:dom_keycode_converter", "//ui/events:dom_keycode_converter",
......
...@@ -85,6 +85,7 @@ include_rules = [ ...@@ -85,6 +85,7 @@ include_rules = [
"+ui/base/ime/mojom/ime_types.mojom-blink.h", "+ui/base/ime/mojom/ime_types.mojom-blink.h",
"+ui/base/ime/mojom/ime_types.mojom-blink-forward.h", "+ui/base/ime/mojom/ime_types.mojom-blink-forward.h",
"+ui/base/resource/scale_factor.h", "+ui/base/resource/scale_factor.h",
"+ui/base/ui_base_features.h",
"+ui/display/mojom/display.mojom-blink.h", "+ui/display/mojom/display.mojom-blink.h",
"+ui/gfx/mac/cocoa_scrollbar_painter.h", "+ui/gfx/mac/cocoa_scrollbar_painter.h",
"+ui/gfx/geometry", "+ui/gfx/geometry",
......
specific_include_rules = {
"html_meter_element.cc": [
"+ui/base/ui_base_features.h",
],
}
include_rules = [
"+ui/base/ui_base_features.h",
]
specific_include_rules = { specific_include_rules = {
"file_input_type_test.cc": [ "file_input_type_test.cc": [
"+base/run_loop.h", "+base/run_loop.h",
], ],
} }
\ No newline at end of file
...@@ -2,10 +2,4 @@ specific_include_rules = { ...@@ -2,10 +2,4 @@ specific_include_rules = {
"layout_theme\.cc": [ "layout_theme\.cc": [
"+ui/native_theme/native_theme.h", "+ui/native_theme/native_theme.h",
], ],
"(layout_theme|layout_theme_default|layout_text_control_single_line_test)\.cc": [
"+ui/base/ui_base_features.h",
],
"layout_theme_mac.mm": [
"+ui/base/ui_base_features.h",
],
} }
...@@ -14,9 +14,6 @@ specific_include_rules = { ...@@ -14,9 +14,6 @@ specific_include_rules = {
".*test\.cc": [ ".*test\.cc": [
"+base/test/trace_event_analyzer.h", "+base/test/trace_event_analyzer.h",
], ],
"(object_painter_base|paint_layer_scrollable_area|theme_painter|theme_painter_default)\.cc": [
"+ui/base/ui_base_features.h",
],
"video_painter_test.cc": [ "video_painter_test.cc": [
"+components/paint_preview/common/paint_preview_tracker.h", "+components/paint_preview/common/paint_preview_tracker.h",
], ],
......
specific_include_rules = {
"scrollbar.cc": [
"+ui/base/ui_base_features.h",
],
}
...@@ -17,7 +17,4 @@ specific_include_rules = { ...@@ -17,7 +17,4 @@ specific_include_rules = {
'internals\.cc' : [ 'internals\.cc' : [
"+third_party/blink/renderer/core/exported/web_view_impl.h", "+third_party/blink/renderer/core/exported/web_view_impl.h",
], ],
"internals.cc": [
"+ui/base/ui_base_features.h",
],
} }
...@@ -1529,7 +1529,6 @@ jumbo_component("platform") { ...@@ -1529,7 +1529,6 @@ jumbo_component("platform") {
"//third_party/libyuv", "//third_party/libyuv",
"//third_party/webrtc_overrides:webrtc_component", "//third_party/webrtc_overrides:webrtc_component",
"//third_party/zlib/google:compression_utils", "//third_party/zlib/google:compression_utils",
"//ui/base:base",
"//ui/events/ipc", "//ui/events/ipc",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gfx/mojom", "//ui/gfx/mojom",
......
...@@ -17,10 +17,5 @@ include_rules = [ ...@@ -17,10 +17,5 @@ include_rules = [
"+third_party/blink/renderer/platform/web_test_support.h", "+third_party/blink/renderer/platform/web_test_support.h",
"+third_party/blink/renderer/platform/weborigin", "+third_party/blink/renderer/platform/weborigin",
"+third_party/blink/renderer/platform/wtf", "+third_party/blink/renderer/platform/wtf",
]
specific_include_rules = {
"(locale_mac\.mm|locale_icu\.cc|locale_win\.cc|locale_win_test\.cc)": [
"+ui/base/ui_base_features.h", "+ui/base/ui_base_features.h",
], ]
}
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