Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 97f0a33

Browse files
LongCatIsLooongLongCatIsLooong
committed
Merge remote-tracking branch 'upstream/main' into ios-adjust-markedTextRange
2 parents 62ae972 + 2eef9b4 commit 97f0a33

File tree

311 files changed

+12675
-7195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+12675
-7195
lines changed

‎.ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ targets:
360360
{"download_emsdk": true}
361361
dependencies: >-
362362
[
363-
{"dependency": "chrome_and_driver", "version": "version:117.0"},
363+
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
364364
{"dependency": "curl", "version": "version:7.64.0"}
365365
]
366366
framework: "true"

‎.github/workflows/scorecards-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
persist-credentials: false
2828
- name: "Run analysis"
29-
uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af
29+
uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398
3030
with:
3131
results_file: results.sarif
3232
results_format: sarif

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ pubspec.lock
2828
docs/doxygen/
2929
xcuserdata
3030

31-
third_party/gn/
32-
third_party/ninja/ninja*
33-
3431
# Miscellaneous
3532
*.class
3633
*.lock
@@ -133,3 +130,4 @@ app.*.symbols
133130

134131
# Prebuilt binaries.
135132
/prebuilts/
133+
/build/secondary/third_party/protobuf

‎DEPS‎

Lines changed: 51 additions & 57 deletions
Large diffs are not rendered by default.

‎build/bin_to_obj.gni‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# Generates an assembly file defining a given symbol with the bytes from a
6+
# binary file. Places the symbol in a text section if 'executable' is true,
7+
# otherwise places the symbol in a read-only data section.
8+
template("bin_to_assembly") {
9+
assert(defined(invoker.deps), "Must define deps")
10+
assert(defined(invoker.input), "Must define input binary file")
11+
assert(defined(invoker.symbol), "Must define symbol name")
12+
assert(defined(invoker.executable), "Must define boolean executable")
13+
14+
action(target_name) {
15+
deps = invoker.deps
16+
script = "//third_party/dart/runtime/tools/bin_to_assembly.py"
17+
output = "$target_gen_dir/${invoker.input}.S"
18+
args = [
19+
"--input",
20+
rebase_path(invoker.input),
21+
"--output",
22+
rebase_path(output),
23+
"--symbol_name",
24+
invoker.symbol,
25+
"--target_os",
26+
current_os,
27+
]
28+
if (defined(invoker.size_symbol)) {
29+
args += [
30+
"--size_symbol_name",
31+
invoker.size_symbol,
32+
"--target_arch",
33+
current_cpu,
34+
]
35+
}
36+
if (invoker.executable) {
37+
args += [ "--executable" ]
38+
}
39+
if (current_os != "win") {
40+
args += [ "--incbin" ]
41+
}
42+
inputs = [
43+
script,
44+
invoker.input,
45+
]
46+
outputs = [ output ]
47+
}
48+
}
49+
50+
# Generates an object file defining a given symbol with the bytes from a
51+
# binary file. Places the symbol in the read-only data section.
52+
template("bin_to_coff") {
53+
assert(defined(invoker.deps), "Must define deps")
54+
assert(defined(invoker.input), "Must define input binary file")
55+
assert(defined(invoker.symbol), "Must define symbol name")
56+
assert(defined(invoker.executable), "Must define executable")
57+
58+
action(target_name) {
59+
deps = invoker.deps
60+
script = "//third_party/dart/runtime/tools/bin_to_coff.py"
61+
output = "$target_gen_dir/${invoker.input}.o"
62+
args = [
63+
"--input",
64+
rebase_path(invoker.input),
65+
"--output",
66+
rebase_path(output),
67+
"--symbol_name",
68+
invoker.symbol,
69+
]
70+
71+
if (defined(invoker.size_symbol)) {
72+
args += [
73+
"--size_symbol_name",
74+
invoker.size_symbol,
75+
]
76+
}
77+
78+
if (invoker.executable) {
79+
args += [ "--executable" ]
80+
}
81+
82+
args += [ "--arch=$current_cpu" ]
83+
inputs = [ invoker.input ]
84+
outputs = [ output ]
85+
}
86+
}
87+
88+
# Generates a linkable output file defining the specified symbol with the bytes
89+
# from the binary file. Emits a COFF object file when targeting Windows,
90+
# otherwise assembly.
91+
template("bin_to_linkable") {
92+
assert(defined(invoker.deps), "Must define deps")
93+
assert(defined(invoker.input), "Must define input binary file")
94+
assert(defined(invoker.symbol), "Must define symbol name")
95+
target_type = "bin_to_assembly"
96+
if (is_win) {
97+
target_type = "bin_to_coff"
98+
}
99+
100+
target(target_type, target_name) {
101+
forward_variables_from(invoker, "*")
102+
}
103+
}

‎build/secondary/flutter/third_party/glfw/BUILD.gn‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
import("glfw_args.gni")
6+
7+
_checkout_dir = "//flutter/third_party/glfw"
8+
9+
config("relative_glfw_headers") {
10+
include_dirs = [
11+
"$_checkout_dir/include",
12+
"$_checkout_dir/include/GLFW",
13+
]
14+
}
15+
16+
source_set("glfw") {
17+
public = [
18+
"$_checkout_dir/include/GLFW/glfw3.h",
19+
"$_checkout_dir/include/GLFW/glfw3native.h",
20+
]
21+
22+
sources = [
23+
"$_checkout_dir/src/context.c",
24+
"$_checkout_dir/src/egl_context.c",
25+
"$_checkout_dir/src/init.c",
26+
"$_checkout_dir/src/input.c",
27+
"$_checkout_dir/src/monitor.c",
28+
"$_checkout_dir/src/null_init.c",
29+
"$_checkout_dir/src/null_joystick.c",
30+
"$_checkout_dir/src/null_joystick.h",
31+
"$_checkout_dir/src/null_monitor.c",
32+
"$_checkout_dir/src/null_platform.h",
33+
"$_checkout_dir/src/null_window.c",
34+
"$_checkout_dir/src/osmesa_context.c",
35+
"$_checkout_dir/src/platform.c",
36+
"$_checkout_dir/src/vulkan.c",
37+
"$_checkout_dir/src/window.c",
38+
]
39+
40+
include_dirs = [ "$_checkout_dir/src" ]
41+
42+
public_configs = [ ":relative_glfw_headers" ]
43+
44+
if (is_win) {
45+
sources += [
46+
"$_checkout_dir/src/wgl_context.c",
47+
"$_checkout_dir/src/win32_init.c",
48+
"$_checkout_dir/src/win32_joystick.c",
49+
"$_checkout_dir/src/win32_joystick.h",
50+
"$_checkout_dir/src/win32_module.c",
51+
"$_checkout_dir/src/win32_monitor.c",
52+
"$_checkout_dir/src/win32_platform.h",
53+
"$_checkout_dir/src/win32_thread.c",
54+
"$_checkout_dir/src/win32_time.c",
55+
"$_checkout_dir/src/win32_window.c",
56+
]
57+
58+
defines = [ "_GLFW_WIN32" ]
59+
} else if (is_linux) {
60+
sources += [
61+
"$_checkout_dir/src/glx_context.c",
62+
"$_checkout_dir/src/linux_joystick.c",
63+
"$_checkout_dir/src/linux_joystick.h",
64+
"$_checkout_dir/src/posix_module.c",
65+
"$_checkout_dir/src/posix_poll.c",
66+
"$_checkout_dir/src/posix_poll.h",
67+
"$_checkout_dir/src/posix_thread.c",
68+
"$_checkout_dir/src/posix_thread.h",
69+
"$_checkout_dir/src/posix_time.c",
70+
"$_checkout_dir/src/posix_time.h",
71+
"$_checkout_dir/src/x11_init.c",
72+
"$_checkout_dir/src/x11_monitor.c",
73+
"$_checkout_dir/src/x11_platform.h",
74+
"$_checkout_dir/src/x11_window.c",
75+
"$_checkout_dir/src/xkb_unicode.c",
76+
"$_checkout_dir/src/xkb_unicode.h",
77+
]
78+
79+
defines = [
80+
"_GLFW_X11",
81+
"_GLFW_HAS_XF86VM",
82+
]
83+
84+
libs = [
85+
"X11",
86+
"Xcursor",
87+
"Xinerama",
88+
"Xrandr",
89+
"Xxf86vm",
90+
]
91+
} else if (is_mac) {
92+
sources += [
93+
"$_checkout_dir/src/cocoa_init.m",
94+
"$_checkout_dir/src/cocoa_joystick.h",
95+
"$_checkout_dir/src/cocoa_joystick.m",
96+
"$_checkout_dir/src/cocoa_monitor.m",
97+
"$_checkout_dir/src/cocoa_platform.h",
98+
"$_checkout_dir/src/cocoa_time.c",
99+
"$_checkout_dir/src/cocoa_window.m",
100+
"$_checkout_dir/src/nsgl_context.m",
101+
"$_checkout_dir/src/posix_module.c",
102+
"$_checkout_dir/src/posix_thread.c",
103+
"$_checkout_dir/src/posix_thread.h",
104+
]
105+
106+
defines = [ "_GLFW_COCOA" ]
107+
108+
cflags = [
109+
"-Wno-deprecated-declarations",
110+
"-Wno-objc-multiple-method-names",
111+
]
112+
113+
frameworks = [
114+
"CoreVideo.framework",
115+
"IOKit.framework",
116+
]
117+
}
118+
119+
if (glfw_vulkan_library != "") {
120+
defines += [ "_GLFW_VULKAN_LIBRARY=" + glfw_vulkan_library ]
121+
}
122+
123+
configs -= [ "//build/config/compiler:chromium_code" ]
124+
configs += [ "//build/config/compiler:no_chromium_code" ]
125+
}

‎build/secondary/flutter/third_party/glfw/README‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Name: GLFW
2+
License: zlib/libpng (BSD-like)
3+
Upstream Git: https://github.com/glfw/glfw
4+
Version: 3.2.1
5+
Description:
6+
7+
GLFW is an Open Source, multi-platform library for OpenGL, OpenGL ES and
8+
Vulkan development on the desktop.
9+
10+
To update:
11+
- Advance the pinned hash in DEPS, which should map the repository to
12+
//third_party/glfw
13+
- Update BUILD.gn if necessary for changes.

‎build/secondary/flutter/third_party/glfw/glfw_args.gni‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
declare_args() {
6+
glfw_vulkan_library = ""
7+
}

‎build/secondary/flutter/third_party/imgui/BUILD.gn‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
source_root = "//flutter/third_party/imgui"
6+
7+
source_set("imgui") {
8+
public = [
9+
"$source_root/imgui.h",
10+
"$source_root/imgui_internal.h",
11+
"$source_root/imstb_rectpack.h",
12+
"$source_root/imstb_textedit.h",
13+
"$source_root/imstb_truetype.h",
14+
]
15+
16+
include_dirs = [ "$source_root" ]
17+
18+
sources = [
19+
"$source_root/imgui.cpp",
20+
"$source_root/imgui.h",
21+
"$source_root/imgui_demo.cpp",
22+
"$source_root/imgui_draw.cpp",
23+
"$source_root/imgui_internal.h",
24+
"$source_root/imgui_tables.cpp",
25+
"$source_root/imgui_widgets.cpp",
26+
"$source_root/imstb_rectpack.h",
27+
"$source_root/imstb_textedit.h",
28+
"$source_root/imstb_truetype.h",
29+
]
30+
}
31+
32+
config("imgui_headers") {
33+
include_dirs = [ "$source_root" ]
34+
}
35+
36+
source_set("imgui_glfw") {
37+
public_deps = [
38+
":imgui",
39+
"//flutter/third_party/glfw",
40+
]
41+
42+
public_configs = [ ":imgui_headers" ]
43+
44+
sources = [
45+
"$source_root/backends/imgui_impl_glfw.cpp",
46+
"$source_root/backends/imgui_impl_glfw.h",
47+
]
48+
}

‎build/secondary/testing/gmock/BUILD.gn‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Copyright 2014 The Chromium Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
config("gmock_config") {
6+
# Gmock headers need to be able to find themselves.
7+
include_dirs = [ "include" ]
8+
}
9+
10+
static_library("gmock") {
11+
# TODO http://crbug.com/412064 enable this flag all the time.
12+
testonly = !is_component_build
13+
sources = [
14+
# Sources based on files in r173 of gmock.
15+
"include/gmock/gmock-actions.h",
16+
"include/gmock/gmock-cardinalities.h",
17+
"include/gmock/gmock-generated-actions.h",
18+
"include/gmock/gmock-generated-function-mockers.h",
19+
"include/gmock/gmock-generated-matchers.h",
20+
"include/gmock/gmock-generated-nice-strict.h",
21+
"include/gmock/gmock-matchers.h",
22+
"include/gmock/gmock-spec-builders.h",
23+
"include/gmock/gmock.h",
24+
"include/gmock/internal/gmock-generated-internal-utils.h",
25+
"include/gmock/internal/gmock-internal-utils.h",
26+
"include/gmock/internal/gmock-port.h",
27+
28+
#"src/gmock-all.cc", # Not needed by our build.
29+
"src/gmock-cardinalities.cc",
30+
"src/gmock-internal-utils.cc",
31+
"src/gmock-matchers.cc",
32+
"src/gmock-spec-builders.cc",
33+
"src/gmock.cc",
34+
]
35+
36+
# This project includes some stuff form gtest's guts.
37+
include_dirs = [ "../gtest/include" ]
38+
39+
public_configs = [
40+
":gmock_config",
41+
"//testing/gtest:gtest_config",
42+
]
43+
}
44+
45+
static_library("gmock_main") {
46+
# TODO http://crbug.com/412064 enable this flag all the time.
47+
testonly = !is_component_build
48+
sources = [ "src/gmock_main.cc" ]
49+
deps = [ ":gmock" ]
50+
}

0 commit comments

Comments
 (0)