termux/termux-packages
0
0
Fork 0
mirror of https://github.com/termux/termux-packages.git synced 2025-06-05 08:11:16 +00:00
Code Activity
Files
master
termux-packages/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0009-reland-jumbo-8.patch

2037 lines
61 KiB
Diff
Raw Permalink Blame History

From b0672f17cc84794dac9399bf69d371756a7d94d7 Mon Sep 17 00:00:00 2001
From: Chongyun Lee <licy183@termux.dev>
Date: Fri, 18 Apr 2025 20:35:28 +0800
Subject: [PATCH] reland jumbo 8
Enable jumbo build for the following component(s)/source_set(s):
- //ui/accessibility:ax_base
- //ui/accessibility:accessibility_internal
- //ui/accessibility/platform:platform
- //ui/aura:aura
- //ui/base:base
- //ui/base/clipboard:clipboard_types
- //ui/base/clipboard:url_file_parser
- //ui/base/clipboard:clipboard
- //ui/base/ime:ime_types
- //ui/base/ime:ime
- //ui/base/ime/init:init
- //ui/base/ime/linux:linux
- //ui/base/prediction:prediction
- //ui/base/x:x
- //ui/color:color_headers
- //ui/color:color_provider_key
- //ui/color:color
- //ui/color:mixers
- //ui/compositor:compositor
- //ui/display:display
- //ui/display/manager:manager
- //ui/display/types:types
- //ui/display/util:util
- //ui/events:dom_keycode_converter
- //ui/events:events_base
- //ui/events:events
- //ui/events:keyboard_hook
- //ui/events:gesture_detection
- //ui/events:velocity_tracker
- //ui/events/blink:blink_features
- //ui/events/blink:blink
- //ui/events/devices:devices
- //ui/events/devices/x11:x11
- //ui/events/ipc:ipc
- //ui/events/keycodes:xkb
- //ui/events/keycodes:x11
- //ui/events/platform:platform
- //ui/events/platform/x11:x11
- //ui/gfx:color_utils
- //ui/gfx:gfx_skia
- //ui/gfx:gfx
- //ui/gfx:color_space
- //ui/gfx:memory_buffer_sources
- //ui/gfx:gfx_switches
- //ui/gfx/animation:animation
- //ui/gfx/codec:codec
- //ui/gfx/geometry:geometry
- //ui/gfx/ipc:ipc
- //ui/gfx/ipc/buffer_types:buffer_types
- //ui/gfx/ipc/color:color
- //ui/gfx/ipc/geometry:geometry
- //ui/gfx/ipc/skia:skia
- //ui/gfx/range:range
- //ui/gfx/x:x
- //ui/gl:gl
- //ui/gl/init:init
- //ui/gtk:gtk
- //ui/latency:latency
- //ui/message_center:message_center
- //ui/message_center/public/cpp:cpp
- //ui/native_theme:native_theme
- //ui/native_theme:native_theme_browser
- //ui/ozone:ozone_base
- //ui/ozone:ozone
- //ui/platform_window/stub:stub
- //ui/platform_window/win:win
# - //ui/resources:?
- //ui/shell_dialogs:shell_dialogs
- //ui/snapshot:snapshot
- //ui/snapshot:snapshot_export
- //ui/surface:surface
- //ui/touch_selection:touch_selection
- //ui/views:views
- //ui/views/controls/webview:webview
- //ui/views_content_client:views_content_client
- //ui/web_dialogs:web_dialogs
- //ui/wm:wm
- //ui/wm/public:public
---
ui/accessibility/BUILD.gn | 5 +++--
ui/accessibility/platform/BUILD.gn | 3 ++-
ui/aura/BUILD.gn | 5 +++--
ui/base/BUILD.gn | 11 ++++++++---
ui/base/clipboard/BUILD.gn | 9 +++++----
ui/base/ime/BUILD.gn | 5 +++--
ui/base/ime/ash/BUILD.gn | 4 +++-
ui/base/ime/fuchsia/BUILD.gn | 4 +++-
ui/base/ime/init/BUILD.gn | 3 ++-
ui/base/ime/linux/BUILD.gn | 3 ++-
ui/base/ime/mac/BUILD.gn | 4 +++-
ui/base/ime/win/BUILD.gn | 5 ++++-
ui/base/prediction/BUILD.gn | 4 +++-
ui/base/x/BUILD.gn | 3 ++-
ui/base/x/selection_owner.cc | 6 +++++-
ui/base/x/x11_display_manager.cc | 4 ++++
ui/base/x/x11_drag_context.cc | 12 ++++++++++++
ui/base/x/x11_drag_drop_client.cc | 12 ++++++++++++
ui/color/BUILD.gn | 7 ++++---
ui/compositor/BUILD.gn | 5 +++--
ui/display/BUILD.gn | 5 +++--
ui/display/manager/BUILD.gn | 3 ++-
ui/display/types/BUILD.gn | 4 +++-
ui/display/util/BUILD.gn | 3 ++-
ui/events/BUILD.gn | 15 ++++++++-------
ui/events/blink/BUILD.gn | 5 +++--
ui/events/devices/BUILD.gn | 4 +++-
ui/events/devices/x11/BUILD.gn | 3 ++-
ui/events/ipc/BUILD.gn | 4 +++-
ui/events/keycodes/BUILD.gn | 5 +++--
ui/events/platform/BUILD.gn | 3 ++-
ui/events/platform/x11/BUILD.gn | 3 ++-
ui/gfx/BUILD.gn | 15 ++++++++-------
ui/gfx/animation/BUILD.gn | 3 ++-
ui/gfx/codec/BUILD.gn | 3 ++-
ui/gfx/codec/jpeg_codec.cc | 4 ++++
ui/gfx/codec/png_codec.cc | 4 ++++
ui/gfx/geometry/BUILD.gn | 4 +++-
ui/gfx/ipc/BUILD.gn | 4 +++-
ui/gfx/ipc/buffer_types/BUILD.gn | 4 +++-
ui/gfx/ipc/color/BUILD.gn | 4 +++-
ui/gfx/ipc/geometry/BUILD.gn | 4 +++-
ui/gfx/ipc/skia/BUILD.gn | 4 +++-
ui/gfx/range/BUILD.gn | 4 +++-
ui/gfx/x/BUILD.gn | 3 ++-
ui/gl/BUILD.gn | 19 ++++++++++++++++---
ui/gl/gl_display_egl_util.cc | 4 ++++
ui/gl/init/BUILD.gn | 3 ++-
ui/gtk/BUILD.gn | 10 ++++++++--
ui/latency/BUILD.gn | 5 +++--
ui/message_center/BUILD.gn | 3 ++-
ui/message_center/public/cpp/BUILD.gn | 3 ++-
ui/native_theme/BUILD.gn | 7 ++++---
ui/ozone/BUILD.gn | 11 ++++++-----
ui/platform_window/stub/BUILD.gn | 4 +++-
ui/platform_window/win/BUILD.gn | 4 +++-
ui/resources/BUILD.gn | 1 +
ui/shell_dialogs/BUILD.gn | 9 ++++++++-
ui/snapshot/BUILD.gn | 5 +++--
ui/surface/BUILD.gn | 3 ++-
ui/touch_selection/BUILD.gn | 3 ++-
ui/views/BUILD.gn | 12 +++++++++---
.../accessibility_paint_checks.cc | 1 +
.../accessibility/ax_window_obj_wrapper.cc | 1 +
ui/views/animation/pulsing_ink_drop_mask.cc | 6 ++++++
ui/views/bubble/bubble_frame_view.cc | 2 +-
ui/views/controls/webview/BUILD.gn | 3 ++-
ui/views/examples/BUILD.gn | 5 +++--
.../desktop_native_widget_aura.cc | 2 +-
.../desktop_window_tree_host_platform.cc | 4 ++--
ui/views_content_client/BUILD.gn | 3 ++-
ui/web_dialogs/BUILD.gn | 6 ++++--
ui/wm/BUILD.gn | 5 +++--
ui/wm/public/BUILD.gn | 3 ++-
74 files changed, 271 insertions(+), 107 deletions(-)
diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
index f99f217e04..c1a18bd35a 100644
--- a/ui/accessibility/BUILD.gn
+++ b/ui/accessibility/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni")
import("//extensions/buildflags/buildflags.gni")
@@ -44,7 +45,7 @@ mojom_component("ax_features_mojo") {
# included by Blink. The rule of thumb (for now) is that it's
# anything platform-neutral (no platform/ directory) that
# relates to data structs (actions, nodes, trees, etc) and interfaces. No heavy weight logic yet.
-component("ax_base") {
+jumbo_component("ax_base") {
defines = [ "AX_BASE_IMPLEMENTATION" ]
sources = [
@@ -153,7 +154,7 @@ group("accessibility") {
]
}
-component("accessibility_internal") {
+jumbo_component("accessibility_internal") {
defines = [ "AX_IMPLEMENTATION" ]
sources = [
diff --git a/ui/accessibility/platform/BUILD.gn b/ui/accessibility/platform/BUILD.gn
index 21388d7de9..1ee98d9d0a 100644
--- a/ui/accessibility/platform/BUILD.gn
+++ b/ui/accessibility/platform/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni")
import("//extensions/buildflags/buildflags.gni")
@@ -26,7 +27,7 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
-component("platform") {
+jumbo_component("platform") {
output_name = "accessibility_platform"
defines = [ "IS_AX_PLATFORM_IMPL" ]
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index 5b6d1af1e5..cf29d12a84 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
-component("aura") {
+jumbo_component("aura") {
public = [
"client/aura_constants.h",
"client/capture_client.h",
@@ -178,7 +179,7 @@ component("aura") {
}
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
testonly = true
sources = [
"test/aura_test_base.cc",
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 180bed4b69..d9a38825da 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/buildflag_header.gni")
import("//build/config/compiler/compiler.gni")
import("//build/config/dcheck_always_on.gni")
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/linux/pangocairo/pangocairo.gni")
import("//build/config/locales.gni")
@@ -111,7 +112,7 @@ source_set("types") {
}
}
-component("base") {
+jumbo_component("base") {
output_name = "ui_base"
sources = [
@@ -221,6 +222,10 @@ component("base") {
libs = []
+ jumbo_excluded_sources = [
+ "resource/resource_bundle.cc",
+ ]
+
if (is_android) {
sources += [
"device_form_factor_android.cc",
@@ -709,7 +714,7 @@ component("features") {
}
if (is_win || is_mac || is_linux || is_chromeos) {
- static_library("pixel_diff_test_support") {
+ jumbo_static_library("pixel_diff_test_support") {
testonly = true
sources = [
"test/skia_gold_matching_algorithm.cc",
@@ -751,7 +756,7 @@ if (use_blink) {
}
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
testonly = true
sources = [
"data_transfer_policy/mock_data_transfer_policy_controller.cc",
diff --git a/ui/base/clipboard/BUILD.gn b/ui/base/clipboard/BUILD.gn
index 6bfec5ec97..f1a15101d1 100644
--- a/ui/base/clipboard/BUILD.gn
+++ b/ui/base/clipboard/BUILD.gn
@@ -4,10 +4,11 @@
import("///build/config/ozone.gni")
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
-component("clipboard_types") {
+jumbo_component("clipboard_types") {
output_name = "ui_base_clipboard_types"
sources = [
"clipboard_buffer.h",
@@ -74,7 +75,7 @@ component("file_info") {
# This is a source set because it needs to be included only on the Mac for the
# final executable, but needs to be included on any platform for the fuzzer.
-source_set("url_file_parser") {
+jumbo_source_set("url_file_parser") {
sources = [
"url_file_parser.cc",
"url_file_parser.h",
@@ -83,7 +84,7 @@ source_set("url_file_parser") {
deps = [ "//base" ]
}
-component("clipboard") {
+jumbo_component("clipboard") {
output_name = "ui_base_clipboard"
sources = [
@@ -189,7 +190,7 @@ component("clipboard") {
}
}
-source_set("clipboard_test_support") {
+jumbo_source_set("clipboard_test_support") {
testonly = true
if (use_blink) {
diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn
index 7d597d81b1..795254d6aa 100644
--- a/ui/base/ime/BUILD.gn
+++ b/ui/base/ime/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
source_set("text_input_types") {
@@ -13,7 +14,7 @@ source_set("text_input_types") {
]
}
-component("ime_types") {
+jumbo_component("ime_types") {
output_name = "ui_base_ime_types"
sources = [
"autocorrect_info.h",
@@ -57,7 +58,7 @@ component("ime_types") {
}
}
-component("ime") {
+jumbo_component("ime") {
output_name = "ui_base_ime"
sources = [
"constants.cc",
diff --git a/ui/base/ime/ash/BUILD.gn b/ui/base/ime/ash/BUILD.gn
index a79042808e..48979f29c8 100644
--- a/ui/base/ime/ash/BUILD.gn
+++ b/ui/base/ime/ash/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
+
assert(is_chromeos)
source_set("ime_types") {
@@ -20,7 +22,7 @@ source_set("typing_session_manager") {
]
}
-component("ash") {
+jumbo_component("ash") {
output_name = "ui_base_ime_ash"
sources = [
diff --git a/ui/base/ime/fuchsia/BUILD.gn b/ui/base/ime/fuchsia/BUILD.gn
index f610fcc894..bb444074d6 100644
--- a/ui/base/ime/fuchsia/BUILD.gn
+++ b/ui/base/ime/fuchsia/BUILD.gn
@@ -2,9 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
+
assert(is_fuchsia)
-component("fuchsia") {
+jumbo_component("fuchsia") {
output_name = "ui_base_ime_fuchsia"
sources = [
diff --git a/ui/base/ime/init/BUILD.gn b/ui/base/ime/init/BUILD.gn
index 36d11a1677..5bf1d4a040 100644
--- a/ui/base/ime/init/BUILD.gn
+++ b/ui/base/ime/init/BUILD.gn
@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
-component("init") {
+jumbo_component("init") {
output_name = "ui_base_ime_init"
sources = [
diff --git a/ui/base/ime/linux/BUILD.gn b/ui/base/ime/linux/BUILD.gn
index aa6e9f2437..e6612807fc 100644
--- a/ui/base/ime/linux/BUILD.gn
+++ b/ui/base/ime/linux/BUILD.gn
@@ -2,11 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/linux/pangocairo/pangocairo.gni")
assert(is_linux)
-component("linux") {
+jumbo_component("linux") {
output_name = "ui_base_ime_linux"
sources = [
"fake_input_method_context.cc",
diff --git a/ui/base/ime/mac/BUILD.gn b/ui/base/ime/mac/BUILD.gn
index fc5cb85b07..8e50ead627 100644
--- a/ui/base/ime/mac/BUILD.gn
+++ b/ui/base/ime/mac/BUILD.gn
@@ -2,9 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
+
assert(is_mac)
-component("mac") {
+jumbo_component("mac") {
output_name = "ui_base_ime_mac"
sources = [
diff --git a/ui/base/ime/win/BUILD.gn b/ui/base/ime/win/BUILD.gn
index d4c69a9cda..b352bb9181 100644
--- a/ui/base/ime/win/BUILD.gn
+++ b/ui/base/ime/win/BUILD.gn
@@ -2,9 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
+
assert(is_win)
-component("win") {
+jumbo_component("win") {
output_name = "ui_base_ime_win"
sources = [
"input_method_win_base.cc",
@@ -28,6 +30,7 @@ component("win") {
"virtual_keyboard_debounce_timer.cc",
"virtual_keyboard_debounce_timer.h",
]
+ jumbo_excluded_sources = [ "tsf_text_store.cc" ]
defines = [ "IS_UI_BASE_IME_WIN_IMPL" ]
diff --git a/ui/base/prediction/BUILD.gn b/ui/base/prediction/BUILD.gn
index 2e653b3df7..dae3070134 100644
--- a/ui/base/prediction/BUILD.gn
+++ b/ui/base/prediction/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("prediction") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("prediction") {
sources = [
"empty_filter.cc",
"empty_filter.h",
diff --git a/ui/base/x/BUILD.gn b/ui/base/x/BUILD.gn
index 113877faf2..dfbc2c76a4 100644
--- a/ui/base/x/BUILD.gn
+++ b/ui/base/x/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
@@ -9,7 +10,7 @@ import("//testing/libfuzzer/fuzzer_test.gni")
assert(ozone_platform_x11)
-component("x") {
+jumbo_component("x") {
output_name = "ui_base_x"
sources = [
diff --git a/ui/base/x/selection_owner.cc b/ui/base/x/selection_owner.cc
index d106cb0f2c..c3ee94940b 100644
--- a/ui/base/x/selection_owner.cc
+++ b/ui/base/x/selection_owner.cc
@@ -72,11 +72,13 @@ bool GetAtomPairArrayProperty(
return true;
}
-x11::Window GetSelectionOwner(x11::Atom selection) {
+x11::Window GetSelectionOwner_SelectionOwner(x11::Atom selection) {
auto response = x11::Connection::Get()->GetSelectionOwner({selection}).Sync();
return response ? response->owner : x11::Window::None;
}
+#define GetSelectionOwner GetSelectionOwner_SelectionOwner
+
void SetSelectionOwner(x11::Window window,
x11::Atom selection,
x11::Time time = x11::Time::CurrentTime) {
@@ -346,3 +348,5 @@ SelectionOwner::IncrementalTransfer::operator=(IncrementalTransfer&&) = default;
SelectionOwner::IncrementalTransfer::~IncrementalTransfer() = default;
} // namespace ui
+
+#undef GetSelectionOwner
diff --git a/ui/base/x/x11_display_manager.cc b/ui/base/x/x11_display_manager.cc
index 65af54df3d..9d05d2a71b 100644
--- a/ui/base/x/x11_display_manager.cc
+++ b/ui/base/x/x11_display_manager.cc
@@ -20,6 +20,8 @@
#include "ui/linux/linux_ui.h"
#endif
+#define kMinXrandrVersion kMinXrandrVersion_X11DisplayManager
+
namespace ui {
namespace {
@@ -139,3 +141,5 @@ std::string XDisplayManager::GetCurrentWorkspace() {
}
} // namespace ui
+
+#undef kMinXrandrVersion
diff --git a/ui/base/x/x11_drag_context.cc b/ui/base/x/x11_drag_context.cc
index 1ef1fcf743..844464732e 100644
--- a/ui/base/x/x11_drag_context.cc
+++ b/ui/base/x/x11_drag_context.cc
@@ -14,6 +14,12 @@
#include "ui/gfx/x/connection.h"
#include "ui/gfx/x/xproto.h"
+#define kXdndTypeList kXdndTypeList_DragContext
+#define kXdndActionCopy kXdndActionCopy_DragContext
+#define kXdndActionMove kXdndActionMove_DragContext
+#define kXdndActionLink kXdndActionLink_DragContext
+#define kXdndActionList kXdndActionList_DragContext
+
namespace ui {
namespace {
@@ -213,3 +219,9 @@ bool XDragContext::DispatchPropertyNotifyEvent(
}
} // namespace ui
+
+#undef kXdndTypeList
+#undef kXdndActionCopy
+#undef kXdndActionMove
+#undef kXdndActionLink
+#undef kXdndActionList
diff --git a/ui/base/x/x11_drag_drop_client.cc b/ui/base/x/x11_drag_drop_client.cc
index 408e901a9c..bc63c9c411 100644
--- a/ui/base/x/x11_drag_drop_client.cc
+++ b/ui/base/x/x11_drag_drop_client.cc
@@ -31,6 +31,12 @@
//
// All the readings are freely available online.
+#define kXdndTypeList kXdndTypeList_DragDropClient
+#define kXdndActionCopy kXdndActionCopy_DragDropClient
+#define kXdndActionMove kXdndActionMove_DragDropClient
+#define kXdndActionLink kXdndActionLink_DragDropClient
+#define kXdndActionList kXdndActionList_DragDropClient
+
namespace ui {
// Window property on the source window and message used by the XDS protocol.
@@ -729,3 +735,9 @@ void XDragDropClient::EndMoveLoop() {
}
} // namespace ui
+
+#undef kXdndTypeList
+#undef kXdndActionCopy
+#undef kXdndActionMove
+#undef kXdndActionLink
+#undef kXdndActionList
diff --git a/ui/color/BUILD.gn b/ui/color/BUILD.gn
index edee028ec9..998a0430cc 100644
--- a/ui/color/BUILD.gn
+++ b/ui/color/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/buildflag_header.gni")
+import("//build/config/jumbo.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
import("//ui/base/ui_features.gni")
@@ -31,7 +32,7 @@ source_set("color_headers") {
}
# Keep the deps on this target to a minimum so that chromeos/crosapi can depend on it.
-component("color_provider_key") {
+jumbo_component("color_provider_key") {
sources = [
"color_provider_key.cc",
"color_provider_key.h",
@@ -47,7 +48,7 @@ component("color_provider_key") {
]
}
-component("color") {
+jumbo_component("color") {
sources = [
"color_metrics.cc",
"color_mixer.cc",
@@ -138,7 +139,7 @@ if (is_win) {
}
}
-component("mixers") {
+jumbo_component("mixers") {
sources = [
"color_mixers.cc",
"color_mixers.h",
diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
index f572d899b2..530195a5be 100644
--- a/ui/compositor/BUILD.gn
+++ b/ui/compositor/BUILD.gn
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
-component("compositor") {
+jumbo_component("compositor") {
sources = [
"animation_throughput_reporter.cc",
"animation_throughput_reporter.h",
@@ -122,7 +123,7 @@ component("compositor") {
}
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
testonly = true
sources = [
"test/animation_throughput_reporter_test_base.cc",
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index d62e60c93b..cc99d11e73 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//remoting/remoting_enable.gni")
import("//testing/test.gni")
@@ -17,7 +18,7 @@ component("display_features") {
deps = [ "//base" ]
}
-component("display") {
+jumbo_component("display") {
sources = [
"display.cc",
"display.h",
@@ -179,7 +180,7 @@ if (is_chromeos) {
}
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
testonly = true
sources = [
"test/display_matchers.cc",
diff --git a/ui/display/manager/BUILD.gn b/ui/display/manager/BUILD.gn
index 7c28e0af28..cdf4607db1 100644
--- a/ui/display/manager/BUILD.gn
+++ b/ui/display/manager/BUILD.gn
@@ -2,11 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
assert(is_chromeos)
-component("manager") {
+jumbo_component("manager") {
sources = [
"apply_content_protection_task.cc",
"apply_content_protection_task.h",
diff --git a/ui/display/types/BUILD.gn b/ui/display/types/BUILD.gn
index 3ca5f98c0b..ebbc58be10 100644
--- a/ui/display/types/BUILD.gn
+++ b/ui/display/types/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("types") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("types") {
output_name = "display_types"
sources = [
"display_color_management.cc",
diff --git a/ui/display/util/BUILD.gn b/ui/display/util/BUILD.gn
index cfb992fb9e..fb41100de8 100644
--- a/ui/display/util/BUILD.gn
+++ b/ui/display/util/BUILD.gn
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
-component("util") {
+jumbo_component("util") {
output_name = "display_util"
sources = [
"display_util.cc",
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 8b68190231..662bcbc12d 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
@@ -17,7 +18,7 @@ if (is_ios) {
import("//ios/build/config.gni")
}
-static_library("dom_keycode_converter") {
+jumbo_static_library("dom_keycode_converter") {
public = [
"keycodes/dom/dom_code.h",
"keycodes/dom/dom_codes_array.h",
@@ -95,7 +96,7 @@ source_set("platform_event") {
public_deps = [ "//base" ]
}
-component("events_base") {
+jumbo_component("events_base") {
sources = [
"base_event_utils.cc",
"base_event_utils.h",
@@ -191,7 +192,7 @@ component("events_base") {
}
}
-component("events") {
+jumbo_component("events") {
public = [
"cocoa/cocoa_event_utils.h",
"event.h",
@@ -399,7 +400,7 @@ component("events") {
}
}
-component("keyboard_hook") {
+jumbo_component("keyboard_hook") {
public = [ "keyboard_hook.h" ]
defines = [ "IS_KEYBOARD_HOOK_IMPL" ]
@@ -453,7 +454,7 @@ component("keyboard_hook") {
}
}
-component("gesture_detection") {
+jumbo_component("gesture_detection") {
sources = [
"gesture_detection/filtered_gesture_provider.cc",
"gesture_detection/filtered_gesture_provider.h",
@@ -511,7 +512,7 @@ component("gesture_detection") {
}
}
-component("velocity_tracker") {
+jumbo_component("velocity_tracker") {
sources = [
"velocity_tracker/bitset_32.h",
"velocity_tracker/motion_event.cc",
@@ -534,7 +535,7 @@ component("velocity_tracker") {
]
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
sources = [
"test/event_generator.cc",
"test/event_generator.h",
diff --git a/ui/events/blink/BUILD.gn b/ui/events/blink/BUILD.gn
index d707bb6e0c..8b4d97f467 100644
--- a/ui/events/blink/BUILD.gn
+++ b/ui/events/blink/BUILD.gn
@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
-component("blink_features") {
+jumbo_component("blink_features") {
defines = [ "IS_BLINK_FEATURES_IMPL" ]
sources = [
@@ -15,7 +16,7 @@ component("blink_features") {
deps = [ "//base" ]
}
-source_set("blink") {
+jumbo_source_set("blink") {
sources = [
"blink_event_util.cc",
"blink_event_util.h",
diff --git a/ui/events/devices/BUILD.gn b/ui/events/devices/BUILD.gn
index 4494f52f8a..228f76ea18 100644
--- a/ui/events/devices/BUILD.gn
+++ b/ui/events/devices/BUILD.gn
@@ -2,13 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
+
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")
}
-component("devices") {
+jumbo_component("devices") {
sources = [
"device_data_manager.cc",
"device_data_manager.h",
diff --git a/ui/events/devices/x11/BUILD.gn b/ui/events/devices/x11/BUILD.gn
index c12a3c41aa..0b753b4ef0 100644
--- a/ui/events/devices/x11/BUILD.gn
+++ b/ui/events/devices/x11/BUILD.gn
@@ -2,12 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
assert(ozone_platform_x11)
-component("x11") {
+jumbo_component("x11") {
output_name = "events_devices_x11"
sources = [
diff --git a/ui/events/ipc/BUILD.gn b/ui/events/ipc/BUILD.gn
index 5e2744b86c..ff529c38eb 100644
--- a/ui/events/ipc/BUILD.gn
+++ b/ui/events/ipc/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("ipc") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("ipc") {
output_name = "ui_events_ipc"
sources = [
diff --git a/ui/events/keycodes/BUILD.gn b/ui/events/keycodes/BUILD.gn
index 4f4fbfb769..30a0b6e142 100644
--- a/ui/events/keycodes/BUILD.gn
+++ b/ui/events/keycodes/BUILD.gn
@@ -2,11 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//ui/base/ui_features.gni")
-source_set("xkb") {
+jumbo_source_set("xkb") {
sources = [
"keyboard_code_conversion_xkb.cc",
"keyboard_code_conversion_xkb.h",
@@ -26,7 +27,7 @@ source_set("xkb") {
}
if (ozone_platform_x11) {
- component("x11") {
+ jumbo_component("x11") {
output_name = "keycodes_x11"
sources = [
diff --git a/ui/events/platform/BUILD.gn b/ui/events/platform/BUILD.gn
index 1b54f4b46f..1b6b162b06 100644
--- a/ui/events/platform/BUILD.gn
+++ b/ui/events/platform/BUILD.gn
@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
-component("platform") {
+jumbo_component("platform") {
sources = [
# Allow this target to include events_export.h without depending on the
# events target (which would be circular).
diff --git a/ui/events/platform/x11/BUILD.gn b/ui/events/platform/x11/BUILD.gn
index c8abb820bd..7028f735b4 100644
--- a/ui/events/platform/x11/BUILD.gn
+++ b/ui/events/platform/x11/BUILD.gn
@@ -2,12 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
assert(ozone_platform_x11)
-component("x11") {
+jumbo_component("x11") {
output_name = "x11_events_platform"
sources = [
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index d6cbea3a47..e5a69fc07a 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//device/vr/buildflags/buildflags.gni")
@@ -21,7 +22,7 @@ if (is_android) {
}
# Used for color generation at build time without importing all the gfx.
-component("color_utils") {
+jumbo_component("color_utils") {
sources = [
"color_palette.h",
"color_utils.cc",
@@ -35,7 +36,7 @@ component("color_utils") {
]
}
-component("gfx_skia") {
+jumbo_component("gfx_skia") {
sources = [
"gfx_skia_export.h",
"skia_span_util.cc",
@@ -69,7 +70,7 @@ config("gfx_impl_define") {
defines = [ "IS_GFX_IMPL" ]
}
-component("gfx") {
+jumbo_component("gfx") {
sources = [
"break_list.h",
"color_analysis.cc",
@@ -449,7 +450,7 @@ component("gfx") {
}
}
-component("color_space") {
+jumbo_component("color_space") {
sources = [
"color_conversion_sk_filter_cache.cc",
"color_conversion_sk_filter_cache.h",
@@ -589,7 +590,7 @@ group("memory_buffer") {
}
# Cannot be a static_library in component builds due to exported functions
-source_set("memory_buffer_sources") {
+jumbo_source_set("memory_buffer_sources") {
visibility = [ ":*" ] # Depend on through ":memory_buffer".
# TODO(brettw) refactor this so these sources are in a coherent directory
@@ -689,7 +690,7 @@ source_set("memory_buffer_sources") {
}
# TODO(ccameron): This can be moved into a separate source_set.
-component("gfx_switches") {
+jumbo_component("gfx_switches") {
sources = [
"switches.cc",
"switches.h",
@@ -701,7 +702,7 @@ component("gfx_switches") {
deps = [ "//base" ]
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
testonly = true
sources = [
"animation/animation_test_api.cc",
diff --git a/ui/gfx/animation/BUILD.gn b/ui/gfx/animation/BUILD.gn
index 9d8590b5ec..17440dd634 100644
--- a/ui/gfx/animation/BUILD.gn
+++ b/ui/gfx/animation/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
if (is_android) {
@@ -9,7 +10,7 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
-component("animation") {
+jumbo_component("animation") {
sources = [
"animation.cc",
"animation.h",
diff --git a/ui/gfx/codec/BUILD.gn b/ui/gfx/codec/BUILD.gn
index c9242a0a98..cf096a4990 100644
--- a/ui/gfx/codec/BUILD.gn
+++ b/ui/gfx/codec/BUILD.gn
@@ -3,10 +3,11 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
-component("codec") {
+jumbo_component("codec") {
sources = [
"codec_export.h",
"jpeg_codec.cc",
diff --git a/ui/gfx/codec/jpeg_codec.cc b/ui/gfx/codec/jpeg_codec.cc
index 3959c651bc..8294b6941b 100644
--- a/ui/gfx/codec/jpeg_codec.cc
+++ b/ui/gfx/codec/jpeg_codec.cc
@@ -16,6 +16,8 @@
#include "third_party/skia/include/encode/SkJpegEncoder.h"
#include "ui/gfx/codec/vector_wstream.h"
+#define PreparationOutput PreparationOutput_JPEGCodec
+
namespace gfx {
// Encoder ---------------------------------------------------------------------
@@ -167,3 +169,5 @@ SkBitmap JPEGCodec::Decode(base::span<const uint8_t> input) {
}
} // namespace gfx
+
+#undef PreparationOutput
diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc
index c3837e37f5..40874e1565 100644
--- a/ui/gfx/codec/png_codec.cc
+++ b/ui/gfx/codec/png_codec.cc
@@ -27,6 +27,8 @@
#include "third_party/skia/experimental/rust_png/SkPngRustDecoder.h"
#endif
+#define PreparationOutput PreparationOutput_PNGCodec
+
namespace gfx {
PNGCodec::DecodeOutput::DecodeOutput() = default;
@@ -318,3 +320,5 @@ PNGCodec::Comment::Comment(const std::string& k, const std::string& t)
PNGCodec::Comment::~Comment() = default;
} // namespace gfx
+
+#undef PreparationOutput
diff --git a/ui/gfx/geometry/BUILD.gn b/ui/gfx/geometry/BUILD.gn
index e00e3730f7..b70397d04a 100644
--- a/ui/gfx/geometry/BUILD.gn
+++ b/ui/gfx/geometry/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("geometry") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("geometry") {
sources = [
"axis_transform2d.cc",
"axis_transform2d.h",
diff --git a/ui/gfx/ipc/BUILD.gn b/ui/gfx/ipc/BUILD.gn
index 83f5cd0b14..44f4ad493c 100644
--- a/ui/gfx/ipc/BUILD.gn
+++ b/ui/gfx/ipc/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("ipc") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("ipc") {
output_name = "gfx_ipc"
sources = [
diff --git a/ui/gfx/ipc/buffer_types/BUILD.gn b/ui/gfx/ipc/buffer_types/BUILD.gn
index 550b4f0ed6..957f9d9e66 100644
--- a/ui/gfx/ipc/buffer_types/BUILD.gn
+++ b/ui/gfx/ipc/buffer_types/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("buffer_types") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("buffer_types") {
output_name = "gfx_ipc_buffer_types"
sources = [
diff --git a/ui/gfx/ipc/color/BUILD.gn b/ui/gfx/ipc/color/BUILD.gn
index 38a069456f..9bbf354122 100644
--- a/ui/gfx/ipc/color/BUILD.gn
+++ b/ui/gfx/ipc/color/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("color") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("color") {
output_name = "gfx_ipc_color"
sources = [
diff --git a/ui/gfx/ipc/geometry/BUILD.gn b/ui/gfx/ipc/geometry/BUILD.gn
index 4d0a150406..bd24a217e1 100644
--- a/ui/gfx/ipc/geometry/BUILD.gn
+++ b/ui/gfx/ipc/geometry/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("geometry") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("geometry") {
output_name = "gfx_ipc_geometry"
sources = [
diff --git a/ui/gfx/ipc/skia/BUILD.gn b/ui/gfx/ipc/skia/BUILD.gn
index b96b1c7548..d6178dcba4 100644
--- a/ui/gfx/ipc/skia/BUILD.gn
+++ b/ui/gfx/ipc/skia/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("skia") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("skia") {
output_name = "gfx_ipc_skia"
sources = [
diff --git a/ui/gfx/range/BUILD.gn b/ui/gfx/range/BUILD.gn
index 5bc90314a2..c5ea4cd442 100644
--- a/ui/gfx/range/BUILD.gn
+++ b/ui/gfx/range/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("range") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("range") {
sources = [
"gfx_range_export.h",
"range.cc",
diff --git a/ui/gfx/x/BUILD.gn b/ui/gfx/x/BUILD.gn
index 802404b7c8..d987b2bb2b 100644
--- a/ui/gfx/x/BUILD.gn
+++ b/ui/gfx/x/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//tools/generate_library_loader/generate_library_loader.gni")
@@ -150,7 +151,7 @@ source_set("build_xprotos") {
]
}
-component("x") {
+jumbo_component("x") {
output_name = "gfx_x11"
sources = [
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index f3e7c9cc10..5aa43db13b 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/buildflag_header.gni")
import("//build/config/chrome_build.gni")
+import("//build/config/jumbo.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
@@ -50,7 +51,7 @@ component("gl_enums") {
public_deps = [ "//third_party/angle:includes" ]
}
-component("gl") {
+jumbo_component("gl") {
output_name = "gl_wrapper" # Avoid colliding with OS X"s libGL.dylib.
sources = [
@@ -150,6 +151,7 @@ component("gl") {
"trace_util.cc",
"trace_util.h",
]
+ jumbo_excluded_sources = []
configs += [ "//build/config:precompiled_headers" ]
defines = [ "GL_IMPLEMENTATION" ]
@@ -185,6 +187,9 @@ component("gl") {
"gl_angle_util_vulkan.cc",
"gl_angle_util_vulkan.h",
]
+ jumbo_excluded_sources += [
+ "gl_angle_util_vulkan.cc",
+ ]
}
if (use_ozone) {
@@ -326,6 +331,10 @@ component("gl") {
defines += [ "GL_SILENCE_DEPRECATION" ]
}
+ jumbo_excluded_sources += [
+ "presenter.cc",
+ ]
+
if (is_android) {
sources += [
"android/egl_fence_utils.cc",
@@ -405,11 +414,15 @@ if (is_mac) {
"//third_party/swiftshader/src/Vulkan:icd_file",
"//third_party/swiftshader/src/Vulkan:swiftshader_libvulkan",
]
+
+ jumbo_excluded_sources += [
+ "gl_angle_util_vulkan.cc",
+ ]
}
}
}
-static_library("gl_unittest_utils") {
+jumbo_static_library("gl_unittest_utils") {
testonly = true
sources = [
"egl_bindings_autogen_mock.cc",
@@ -434,7 +447,7 @@ static_library("gl_unittest_utils") {
]
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
testonly = true
sources = [
"test/gl_surface_test_support.cc",
diff --git a/ui/gl/gl_display_egl_util.cc b/ui/gl/gl_display_egl_util.cc
index 7ffc2c859f..9dedc9269e 100644
--- a/ui/gl/gl_display_egl_util.cc
+++ b/ui/gl/gl_display_egl_util.cc
@@ -9,6 +9,8 @@
#include "base/no_destructor.h"
#include "base/scoped_environment_variable_override.h"
+#define g_instance g_instance_gl_display_egl_util
+
namespace gl {
namespace {
@@ -57,3 +59,5 @@ void GLDisplayEglUtil::SetInstance(GLDisplayEglUtil* gl_display_util) {
}
} // namespace gl
+
+#undef g_instance
diff --git a/ui/gl/init/BUILD.gn b/ui/gl/init/BUILD.gn
index 33d87dacc5..f8fd6c7171 100644
--- a/ui/gl/init/BUILD.gn
+++ b/ui/gl/init/BUILD.gn
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//ui/gl/features.gni")
-component("init") {
+jumbo_component("init") {
output_name = "gl_init"
public = [
diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn
index 24f3289316..d855bd5c3d 100644
--- a/ui/gtk/BUILD.gn
+++ b/ui/gtk/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/linux/gtk/gtk.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ozone.gni")
@@ -68,10 +69,9 @@ generate_stubs("gtk_stubs") {
logging_include = "ui/gtk/log_noop.h"
}
-component("gtk") {
+jumbo_component("gtk") {
visibility = [ "//ui/linux:linux_ui_factory" ]
public = [ "gtk_ui_factory.h" ]
-
sources = [
"gtk_color_mixers.cc",
"gtk_color_mixers.h",
@@ -105,6 +105,7 @@ component("gtk") {
"window_frame_provider_gtk.cc",
"window_frame_provider_gtk.h",
]
+ jumbo_excluded_sources = []
defines = [ "IS_GTK_IMPL" ]
configs += [
"//build/config/linux/pangocairo",
@@ -159,6 +160,11 @@ component("gtk") {
"x/gtk_ui_platform_x11.cc",
"x/gtk_ui_platform_x11.h",
]
+ jumbo_excluded_sources += [
+ # invalid operands to binary expression ('x11::EventMask' and 'x11::EventMask')
+ "x/gtk_event_loop_x11.cc",
+ "x/gtk_ui_platform_x11.cc",
+ ]
deps += [
"//ui/base/x",
"//ui/events/platform/x11",
diff --git a/ui/latency/BUILD.gn b/ui/latency/BUILD.gn
index 4690e49781..44d8a67de8 100644
--- a/ui/latency/BUILD.gn
+++ b/ui/latency/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/buildflag_header.gni")
+import("//build/config/jumbo.gni")
import("//testing/test.gni")
declare_args() {
@@ -16,7 +17,7 @@ buildflag_header("jank_tracker_for_experiments_buildflags") {
flags = [ "JANK_TRACKER_FOR_EXPERIMENTS=$use_jank_tracker_for_experiments" ]
}
-source_set("latency") {
+jumbo_source_set("latency") {
sources = [
"latency_info.cc",
"latency_info.h",
@@ -41,7 +42,7 @@ source_set("latency") {
]
}
-source_set("test_support") {
+jumbo_source_set("test_support") {
testonly = true
sources = [ "latency_info_test_support.cc" ]
diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn
index e602c3c450..1855b8ded7 100644
--- a/ui/message_center/BUILD.gn
+++ b/ui/message_center/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//components/vector_icons/vector_icons.gni")
import("//testing/test.gni")
@@ -23,7 +24,7 @@ aggregate_vector_icons("message_center_vector_icons") {
}
# TODO(msw|mukai|dewittj): Move ash-specific files: crbug.com/585175
-component("message_center") {
+jumbo_component("message_center") {
deps = [
"//base",
"//ui/base",
diff --git a/ui/message_center/public/cpp/BUILD.gn b/ui/message_center/public/cpp/BUILD.gn
index e15d9b3c19..5b5cdee474 100644
--- a/ui/message_center/public/cpp/BUILD.gn
+++ b/ui/message_center/public/cpp/BUILD.gn
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
# C++ headers and sources that can be used outside message_center.
-component("cpp") {
+jumbo_component("cpp") {
output_name = "ui_message_center_cpp"
sources = [
diff --git a/ui/native_theme/BUILD.gn b/ui/native_theme/BUILD.gn
index 1bc309bff4..acbbee8328 100644
--- a/ui/native_theme/BUILD.gn
+++ b/ui/native_theme/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
@@ -19,7 +20,7 @@ component("features") {
deps = [ "//base" ]
}
-component("native_theme") {
+jumbo_component("native_theme") {
sources = [
"caption_style.cc",
"caption_style.h",
@@ -125,11 +126,11 @@ if (is_win) {
libs = [ "uxtheme.lib" ]
}
} else {
- source_set("native_theme_browser") {
+ jumbo_source_set("native_theme_browser") {
}
}
-source_set("test_support") {
+jumbo_source_set("test_support") {
testonly = true
deps = [
diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index b7b7256a87..407a2695ca 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/buildflag_header.gni")
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
import("//build/config/python.gni")
import("//build/config/ui.gni")
@@ -78,7 +79,7 @@ constructor_list_cc_file = "$target_gen_dir/constructor_list.cc"
test_constructor_list_cc_file = "$target_gen_dir/test_constructor_list.cc"
-component("ozone_base") {
+jumbo_component("ozone_base") {
sources = [
"public/gl_ozone.h",
"public/gpu_platform_support_host.cc",
@@ -251,7 +252,7 @@ source_set("ozone_switches") {
]
}
-component("ozone") {
+jumbo_component("ozone") {
visibility = []
visibility = [ "*" ]
public_deps = [ ":platform" ]
@@ -268,7 +269,7 @@ source_set("drm_modifiers_filter") {
visibility += [ "//gpu/vulkan" ]
}
-source_set("test_support_internal") {
+jumbo_source_set("test_support_internal") {
testonly = true
sources = [
@@ -291,7 +292,7 @@ source_set("test_support_internal") {
public_deps = [ "//base/test:test_support" ]
}
-static_library("ui_test_support") {
+jumbo_static_library("ui_test_support") {
visibility = []
visibility = [ "//ui/views:test_support" ]
@@ -327,7 +328,7 @@ source_set("ozone_interactive_ui_tests") {
deps = ozone_platform_interactive_ui_tests_sources
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
visibility = []
visibility = [
":*",
diff --git a/ui/platform_window/stub/BUILD.gn b/ui/platform_window/stub/BUILD.gn
index 5f41949321..1d64d126b9 100644
--- a/ui/platform_window/stub/BUILD.gn
+++ b/ui/platform_window/stub/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("stub") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("stub") {
output_name = "stub_window"
deps = [
diff --git a/ui/platform_window/win/BUILD.gn b/ui/platform_window/win/BUILD.gn
index e172d7b2b4..f57d6db0d7 100644
--- a/ui/platform_window/win/BUILD.gn
+++ b/ui/platform_window/win/BUILD.gn
@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-component("win") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("win") {
output_name = "win_window"
deps = [
diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn
index 78d1f14967..69e2c2115f 100644
--- a/ui/resources/BUILD.gn
+++ b/ui/resources/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni")
import("//ui/webui/webui_features.gni")
diff --git a/ui/shell_dialogs/BUILD.gn b/ui/shell_dialogs/BUILD.gn
index 7694889980..87ab27276d 100644
--- a/ui/shell_dialogs/BUILD.gn
+++ b/ui/shell_dialogs/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
@@ -13,7 +14,7 @@ if (is_mac) {
import("//build/config/mac/rules.gni")
}
-component("shell_dialogs") {
+jumbo_component("shell_dialogs") {
sources = [
"base_shell_dialog.cc",
"base_shell_dialog.h",
@@ -28,6 +29,8 @@ component("shell_dialogs") {
"shell_dialogs_export.h",
]
+ jumbo_excluded_sources = []
+
defines = [ "SHELL_DIALOGS_IMPLEMENTATION" ]
deps = [
@@ -109,6 +112,10 @@ component("shell_dialogs") {
"select_file_dialog_android.cc",
"select_file_dialog_android.h",
]
+ jumbo_excluded_sources += [
+ # kUnknown is ambiguous
+ "shell_dialog_linux.cc",
+ ]
deps += [
"//ui/android",
"//ui/base:select_file_dialog_jni_headers",
diff --git a/ui/snapshot/BUILD.gn b/ui/snapshot/BUILD.gn
index e9dbc8b20e..fbfa37b342 100644
--- a/ui/snapshot/BUILD.gn
+++ b/ui/snapshot/BUILD.gn
@@ -2,10 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
-component("snapshot") {
+jumbo_component("snapshot") {
sources = [
"screenshot_grabber.cc",
"screenshot_grabber.h",
@@ -80,7 +81,7 @@ component("snapshot") {
}
}
-source_set("snapshot_export") {
+jumbo_source_set("snapshot_export") {
sources = [ "snapshot_export.h" ]
visibility = [ ":*" ]
}
diff --git a/ui/surface/BUILD.gn b/ui/surface/BUILD.gn
index dace1de6c0..e7f68805e9 100644
--- a/ui/surface/BUILD.gn
+++ b/ui/surface/BUILD.gn
@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
-component("surface") {
+jumbo_component("surface") {
sources = [
"surface_export.h",
"transport_dib.cc",
diff --git a/ui/touch_selection/BUILD.gn b/ui/touch_selection/BUILD.gn
index 2239bbe7da..7c7076ebe4 100644
--- a/ui/touch_selection/BUILD.gn
+++ b/ui/touch_selection/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
@@ -9,7 +10,7 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
-component("touch_selection") {
+jumbo_component("touch_selection") {
output_name = "ui_touch_selection"
sources = [
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index f8e8638374..3d67685c7e 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/buildflag_header.gni")
import("//build/config/features.gni")
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
import("//build/config/ui.gni")
import("//build/nocompile.gni")
@@ -73,7 +74,7 @@ buildflag_header("buildflags") {
]
}
-component("views") {
+jumbo_component("views") {
all_dependent_configs = [ ":flags" ]
public = [
@@ -535,6 +536,11 @@ component("views") {
"windows_stationarity_monitor.cc",
]
+ jumbo_excluded_sources = [
+ # explicit specialization of 'GetProperty<CLASS *>' after instantiation
+ "view_class_properties.cc",
+ ]
+
# Other targets in this file (e.g. tests) get access to the internal headers.
friend = [ ":*" ]
@@ -966,7 +972,7 @@ component("views") {
}
if (is_win || is_mac || is_linux || is_chromeos) {
- static_library("view_pixel_diff_test_support") {
+ jumbo_static_library("view_pixel_diff_test_support") {
testonly = true
sources = [
"test/view_skia_gold_pixel_diff.cc",
@@ -985,7 +991,7 @@ if (is_win || is_mac || is_linux || is_chromeos) {
}
}
-source_set("test_support") {
+jumbo_source_set("test_support") {
testonly = true
sources = [
"animation/test/flood_fill_ink_drop_ripple_test_api.cc",
diff --git a/ui/views/accessibility/accessibility_paint_checks.cc b/ui/views/accessibility/accessibility_paint_checks.cc
index 7ad2cc95c0..54626b40e9 100644
--- a/ui/views/accessibility/accessibility_paint_checks.cc
+++ b/ui/views/accessibility/accessibility_paint_checks.cc
@@ -11,6 +11,7 @@
#include "ui/base/class_property.h"
#include "ui/views/accessibility/view_accessibility.h"
#include "ui/views/view.h"
+#include "ui/views/view_class_properties.h"
#include "ui/views/view_utils.h"
#include "ui/views/widget/widget.h"
diff --git a/ui/views/accessibility/ax_window_obj_wrapper.cc b/ui/views/accessibility/ax_window_obj_wrapper.cc
index e1ce08f029..60ed9ecb83 100644
--- a/ui/views/accessibility/ax_window_obj_wrapper.cc
+++ b/ui/views/accessibility/ax_window_obj_wrapper.cc
@@ -22,6 +22,7 @@
#include "ui/base/ime/text_input_client.h"
#include "ui/compositor/layer.h"
#include "ui/views/accessibility/ax_aura_obj_cache.h"
+#include "ui/views/view_class_properties.h"
#include "ui/views/widget/widget.h"
namespace views {
diff --git a/ui/views/animation/pulsing_ink_drop_mask.cc b/ui/views/animation/pulsing_ink_drop_mask.cc
index c33e817520..9fa720f76b 100644
--- a/ui/views/animation/pulsing_ink_drop_mask.cc
+++ b/ui/views/animation/pulsing_ink_drop_mask.cc
@@ -8,6 +8,9 @@
#include "ui/compositor/paint_recorder.h"
#include "ui/views/view_class_properties.h"
+#define kFeaturePromoPulseDuration kFeaturePromoPulseDuration_PulsingInkDropMask
+#define kFeaturePromoPulseInsetDip kFeaturePromoPulseInsetDip_PulsingInkDropMask
+
namespace {
// Cycle duration of ink drop pulsing animation used for in-product help.
constexpr base::TimeDelta kFeaturePromoPulseDuration = base::Milliseconds(800);
@@ -67,3 +70,6 @@ void PulsingInkDropMask::AnimationProgressed(const gfx::Animation* animation) {
layer_container_->SchedulePaint();
}
} // namespace views
+
+#undef kFeaturePromoPulseDuration
+#undef kFeaturePromoPulseInsetDip
diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc
index 7a70f2da9b..7aa3595c96 100644
--- a/ui/views/bubble/bubble_frame_view.cc
+++ b/ui/views/bubble/bubble_frame_view.cc
@@ -146,7 +146,7 @@ std::unique_ptr<Label> BubbleFrameView::CreateDefaultTitleLabel(
const std::u16string& title_text) {
std::unique_ptr<Label> label = CreateLabelWithContextAndStyle(
title_text, style::CONTEXT_DIALOG_TITLE, style::STYLE_PRIMARY);
- if (base::FeatureList::IsEnabled(features::kBubbleFrameViewTitleIsHeading)) {
+ if (base::FeatureList::IsEnabled(::features::kBubbleFrameViewTitleIsHeading)) {
label->GetViewAccessibility().SetRole(ax::mojom::Role::kHeading);
label->GetViewAccessibility().SetHierarchicalLevel(1);
}
diff --git a/ui/views/controls/webview/BUILD.gn b/ui/views/controls/webview/BUILD.gn
index 429ca44026..c82e429eb2 100644
--- a/ui/views/controls/webview/BUILD.gn
+++ b/ui/views/controls/webview/BUILD.gn
@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ozone.gni")
-component("webview") {
+jumbo_component("webview") {
sources = [
"unhandled_keyboard_event_handler.cc",
"unhandled_keyboard_event_handler.h",
diff --git a/ui/views/examples/BUILD.gn b/ui/views/examples/BUILD.gn
index 4e589dcce6..89860b4b30 100644
--- a/ui/views/examples/BUILD.gn
+++ b/ui/views/examples/BUILD.gn
@@ -2,11 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
import("//tools/grit/grit_rule.gni")
-component("views_examples_lib") {
+jumbo_component("views_examples_lib") {
testonly = true
sources = [
@@ -247,7 +248,7 @@ executable("views_examples") {
}
}
-component("views_examples_with_content_lib") {
+jumbo_component("views_examples_with_content_lib") {
testonly = true
sources = [
"examples_window_with_content.cc",
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index e55ce65374..907338bc9f 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -605,7 +605,7 @@ void DesktopNativeWidgetAura::InitNativeWidget(Widget::InitParams params) {
cursor_manager_->SetDisplay(
display::Screen::GetScreen()->GetDisplayNearestWindow(
host_->window()));
- if (features::IsSystemCursorSizeSupported()) {
+ if (::features::IsSystemCursorSizeSupported()) {
native_cursor_manager_->InitCursorSizeObserver(cursor_manager_);
}
}
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
index 9690d769e8..80fc3d8be0 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -326,7 +326,7 @@ void DesktopWindowTreeHostPlatform::OnActiveWindowChanged(bool active) {
// active, we enter this condition where `active && !is_active_` because
// subwindows do not get active state from the OS on some platforms (E.g.
// Wayland). So we need to ensure Activate is conveyed to the platform_window.
- if (base::FeatureList::IsEnabled(features::kOzoneBubblesUsePlatformWidgets) &&
+ if (base::FeatureList::IsEnabled(::features::kOzoneBubblesUsePlatformWidgets) &&
active && !is_active_ && !window_children_.empty()) {
Activate();
}
@@ -747,7 +747,7 @@ void DesktopWindowTreeHostPlatform::SetFullscreen(bool fullscreen,
if (!weak_ptr)
return;
- if (!base::FeatureList::IsEnabled(features::kAsyncFullscreenWindowState)) {
+ if (!base::FeatureList::IsEnabled(::features::kAsyncFullscreenWindowState)) {
// The state must change synchronously to let media react on fullscreen
// changes.
DCHECK_EQ(fullscreen, IsFullscreen());
diff --git a/ui/views_content_client/BUILD.gn b/ui/views_content_client/BUILD.gn
index fde771e6d2..10dcd9821e 100644
--- a/ui/views_content_client/BUILD.gn
+++ b/ui/views_content_client/BUILD.gn
@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
-component("views_content_client") {
+jumbo_component("views_content_client") {
testonly = true
sources = [
"views_content_browser_client.cc",
diff --git a/ui/web_dialogs/BUILD.gn b/ui/web_dialogs/BUILD.gn
index 53620cb10e..eaf516f983 100644
--- a/ui/web_dialogs/BUILD.gn
+++ b/ui/web_dialogs/BUILD.gn
@@ -4,7 +4,9 @@
assert(!is_android)
-component("web_dialogs") {
+import("//build/config/jumbo.gni")
+
+jumbo_component("web_dialogs") {
sources = [
"web_dialog_delegate.cc",
"web_dialog_delegate.h",
@@ -32,7 +34,7 @@ component("web_dialogs") {
}
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
sources = [
"test/test_web_contents_handler.cc",
"test/test_web_contents_handler.h",
diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
index 04d79b08d5..05e3c8f63e 100644
--- a/ui/wm/BUILD.gn
+++ b/ui/wm/BUILD.gn
@@ -2,13 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
import("//ui/base/ui_features.gni")
assert(use_aura)
-component("wm") {
+jumbo_component("wm") {
output_name = "ui_wm"
sources = [
"core/accelerator_delegate.h",
@@ -108,7 +109,7 @@ component("wm") {
}
}
-static_library("test_support") {
+jumbo_static_library("test_support") {
testonly = true
sources = [
"test/testing_cursor_client_observer.cc",
diff --git a/ui/wm/public/BUILD.gn b/ui/wm/public/BUILD.gn
index 23c7f4df7a..6b98d5dc5d 100644
--- a/ui/wm/public/BUILD.gn
+++ b/ui/wm/public/BUILD.gn
@@ -2,11 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
assert(use_aura)
-component("public") {
+jumbo_component("public") {
output_name = "wm_public"
public = [
--- a/ui/gfx/x/x11_crtc_resizer.cc
+++ b/ui/gfx/x/x11_crtc_resizer.cc
@@ -20,13 +20,13 @@
namespace {
-constexpr auto kInvalidMode = static_cast<x11::RandR::Mode>(0);
-constexpr auto kDisabledCrtc = static_cast<x11::RandR::Crtc>(0);
+constexpr auto kInvalidMode2 = static_cast<x11::RandR::Mode>(0);
+constexpr auto kDisabledCrtc2 = static_cast<x11::RandR::Crtc>(0);
// TODO(jamiewalch): Use the correct DPI for the mode: http://crbug.com/172405.
const int kDefaultDPI = 96;
-int PixelsToMillimeters(int pixels, int dpi) {
+int PixelsToMillimeters2(int pixels, int dpi) {
DCHECK(dpi != 0);
const double kMillimetersPerInch = 25.4;
@@ -121,7 +121,7 @@
return base::Contains(crtc_info.outputs, output);
});
if (iter == active_crtcs_.end()) {
- return kDisabledCrtc;
+ return kDisabledCrtc2;
}
return iter->crtc;
}
@@ -134,7 +134,7 @@
.config_timestamp = config_timestamp,
.x = 0,
.y = 0,
- .mode = kInvalidMode,
+ .mode = kInvalidMode2,
.rotation = x11::RandR::Rotation::Rotate_0,
.outputs = {},
});
@@ -329,8 +329,8 @@
auto dimensions = GetBoundingBox();
// TODO(lambroslambrou): Use the DPI from client size information.
- uint32_t width_mm = PixelsToMillimeters(dimensions.width(), kDefaultDPI);
- uint32_t height_mm = PixelsToMillimeters(dimensions.height(), kDefaultDPI);
+ uint32_t width_mm = PixelsToMillimeters2(dimensions.width(), kDefaultDPI);
+ uint32_t height_mm = PixelsToMillimeters2(dimensions.height(), kDefaultDPI);
randr_->SetScreenSize({root, static_cast<uint16_t>(dimensions.width()),
static_cast<uint16_t>(dimensions.height()), width_mm,
height_mm});
View Git Blame Copy Permalink