Skip to content

Commit 6129c3a

Browse files
committed
Update DevTools to revision 202726.
1 parent 381d045 commit 6129c3a

561 files changed

Lines changed: 53116 additions & 32245 deletions

File tree

Some content is hidden

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

app/devtools/BUILD.gn

Lines changed: 55 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ devtools_core_files =
1717
gypi_values.devtools_bindings_js_files +
1818
gypi_values.devtools_common_js_files +
1919
gypi_values.devtools_components_js_files +
20-
gypi_values.devtools_devtools_app_js_files +
20+
gypi_values.devtools_emulation_js_files +
2121
gypi_values.devtools_host_js_files +
2222
gypi_values.devtools_main_js_files +
2323
gypi_values.devtools_platform_js_files +
24-
gypi_values.devtools_screencast_js_files +
2524
gypi_values.devtools_sdk_js_files +
26-
gypi_values.devtools_toolbox_js_files +
2725
gypi_values.devtools_toolbox_bootstrap_js_files +
2826
gypi_values.devtools_ui_js_files +
2927
gypi_values.devtools_workspace_js_files +
@@ -34,20 +32,28 @@ devtools_extensions_js_files = gypi_values.devtools_extensions_js_files -
3432
gypi_values.devtools_extension_api_files
3533

3634
devtools_modules_js_files =
35+
gypi_values.devtools_accessibility_js_files +
3736
gypi_values.devtools_audits_js_files +
37+
gypi_values.devtools_animation_js_files +
38+
gypi_values.devtools_cm_modes_js_files +
3839
gypi_values.devtools_components_lazy_js_files +
3940
gypi_values.devtools_console_js_files +
4041
gypi_values.devtools_devices_js_files +
42+
gypi_values.devtools_diff_js_files +
4143
gypi_values.devtools_elements_js_files +
44+
gypi_values.devtools_emulated_devices_js_files +
4245
devtools_extensions_js_files +
4346
gypi_values.devtools_heap_snapshot_worker_js_files +
4447
gypi_values.devtools_layers_js_files +
4548
gypi_values.devtools_network_js_files +
4649
gypi_values.devtools_profiler_js_files +
4750
gypi_values.devtools_promises_js_files +
4851
gypi_values.devtools_resources_js_files +
52+
gypi_values.devtools_security_js_files +
53+
gypi_values.devtools_screencast_js_files +
4954
gypi_values.devtools_script_formatter_worker_js_files +
5055
gypi_values.devtools_settings_js_files +
56+
gypi_values.devtools_snippets_js_files +
5157
gypi_values.devtools_source_frame_js_files +
5258
gypi_values.devtools_sources_js_files +
5359
gypi_values.devtools_temp_storage_shared_worker_js_files +
@@ -60,7 +66,7 @@ all_devtools_files =
6066
devtools_core_files +
6167
gypi_values.devtools_module_json_files +
6268
devtools_modules_js_files +
63-
gypi_values.devtools_uglify_files
69+
gypi_values.devtools_acorn_files
6470

6571
# FIXME: Fix the generate_devtools_grd.py script to accept trailing slashes.
6672
resources_out_dir_no_slash = "$root_out_dir/resources/inspector"
@@ -76,8 +82,10 @@ generated_scripts = [
7682
visibility = [ "//third_party/WebKit/*" ]
7783

7884
group("devtools_frontend_resources") {
79-
deps = [
85+
public_deps = [
86+
":copy_compatibility_scripts",
8087
":copy_inspector_images",
88+
":copy_emulated_devices_images",
8189
":devtools_extension_api",
8290
":frontend_protocol_sources",
8391
":supported_css_properties",
@@ -87,63 +95,73 @@ group("devtools_frontend_resources") {
8795
if (!debug_devtools) {
8896
# This overwrites application-specific core CSS (devtools.css),
8997
# and thus should be guarded out in Debug builds.
90-
deps += [
91-
":concatenated_devtools_css",
98+
public_deps += [
9299
":concatenated_inspector_css",
93100
":concatenated_toolbox_css",
94101
]
95102
}
96103
}
97104

105+
copy("copy_compatibility_scripts") {
106+
sources = gypi_values.devtools_compatibility_scripts
107+
outputs = [ resources_out_dir + "{{source_file_part}}" ]
108+
}
109+
98110
copy("copy_inspector_images") {
99111
sources = gypi_values.devtools_image_files
100112
outputs = [ resources_out_dir + "Images/{{source_file_part}}" ]
101113
}
102114

115+
copy("copy_emulated_devices_images") {
116+
sources = gypi_values.devtools_emulated_devices_images
117+
outputs = [ resources_out_dir + "emulated_devices/{{source_file_part}}" ]
118+
}
119+
103120
action("generate_devtools_grd") {
104121
script = "scripts/generate_devtools_grd.py"
105122

106123
deps = [ ":devtools_frontend_resources" ]
107124
static_files_list = "$target_gen_dir/devtools_static_grd_files.tmp"
108-
inputs = gypi_values.devtools_image_files + all_devtools_files + [
109-
static_files_list
110-
]
125+
inputs = gypi_values.devtools_image_files + all_devtools_files
126+
inputs += gypi_values.devtools_compatibility_scripts
127+
inputs += [ static_files_list ]
111128

112129
static_files = []
113130

114131
if (debug_devtools) {
115132
# Debug: all files are picked as-is.
116133
generated_files = generated_scripts + [
117-
resources_out_dir + "devtools.html",
118134
resources_out_dir + "inspector.html",
119135
resources_out_dir + "toolbox.html",
120136
]
121137
static_files += all_devtools_files + [ "front_end/Runtime.js" ]
122138
} else {
123-
# Release: pick compiled files and lazy-loaded CSS.
139+
# Release: pick compiled non-remote files and lazy-loaded CSS.
124140
generated_files = [
125-
resources_out_dir + "devtools.css",
126-
resources_out_dir + "devtools.html",
127-
resources_out_dir + "devtools.js",
128141
resources_out_dir + "inspector.css",
129142
resources_out_dir + "inspector.html",
130143
resources_out_dir + "inspector.js",
131144
resources_out_dir + "toolbox.css",
132145
resources_out_dir + "toolbox.html",
133146
resources_out_dir + "toolbox.js",
147+
resources_out_dir + "accessibility_module.js",
134148
resources_out_dir + "audits_module.js",
149+
resources_out_dir + "animation_module.js",
135150
resources_out_dir + "components_lazy_module.js",
136151
resources_out_dir + "console_module.js",
137152
resources_out_dir + "devices_module.js",
153+
resources_out_dir + "diff_module.js",
138154
resources_out_dir + "elements_module.js",
139155
resources_out_dir + "heap_snapshot_worker_module.js",
140156
resources_out_dir + "layers_module.js",
141157
resources_out_dir + "network_module.js",
142158
resources_out_dir + "profiler_module.js",
143159
resources_out_dir + "promises_module.js",
144160
resources_out_dir + "resources_module.js",
161+
resources_out_dir + "security_module.js",
145162
resources_out_dir + "script_formatter_worker_module.js",
146163
resources_out_dir + "settings_module.js",
164+
resources_out_dir + "snippets_module.js",
147165
resources_out_dir + "source_frame_module.js",
148166
resources_out_dir + "sources_module.js",
149167
resources_out_dir + "temp_storage_shared_worker_module.js",
@@ -167,7 +185,8 @@ action("generate_devtools_grd") {
167185
]
168186

169187
args = rebase_path(generated_files, root_build_dir) +
170-
rebase_path(generated_files, root_build_dir) + [
188+
rebase_path(generated_files, root_build_dir) +
189+
rebase_path(gypi_values.devtools_compatibility_scripts, root_build_dir) + [
171190
"--static_files_list", rebase_path(static_files_list, root_build_dir),
172191
"--relative_path_dirs" ] +
173192
rebase_path(relative_path_dirs, root_build_dir) + [
@@ -217,56 +236,61 @@ action("build_applications") {
217236
]
218237

219238
inputs = helper_scripts + all_devtools_files + generated_scripts + [
220-
"front_end/devtools.html",
221239
"front_end/inspector.html",
222240
"front_end/toolbox.html",
223241
]
224242

225243
outputs = [
226-
resources_out_dir + "devtools.html",
227244
resources_out_dir + "inspector.html",
228245
resources_out_dir + "toolbox.html",
229246
]
230247

248+
deps = [
249+
":supported_css_properties",
250+
":frontend_protocol_sources",
251+
]
252+
231253
if (debug_devtools) {
232-
deps = [ ":copy_debug_non_modules" ]
254+
deps += [ ":copy_debug_non_modules" ]
233255

234256
debug_mode = "1"
235257
} else {
236258
outputs += [
237-
resources_out_dir + "devtools.js",
238259
resources_out_dir + "inspector.js",
239260
resources_out_dir + "toolbox.js",
261+
resources_out_dir + "accessibility_module.js",
240262
resources_out_dir + "audits_module.js",
263+
resources_out_dir + "animation_module.js",
264+
resources_out_dir + "cm_modes_module.js",
241265
resources_out_dir + "components_lazy_module.js",
242266
resources_out_dir + "console_module.js",
243267
resources_out_dir + "devices_module.js",
268+
resources_out_dir + "diff_module.js",
244269
resources_out_dir + "elements_module.js",
270+
resources_out_dir + "emulated_devices_module.js",
245271
resources_out_dir + "heap_snapshot_worker_module.js",
246272
resources_out_dir + "layers_module.js",
247273
resources_out_dir + "network_module.js",
248274
resources_out_dir + "profiler_module.js",
249275
resources_out_dir + "promises_module.js",
250276
resources_out_dir + "resources_module.js",
277+
resources_out_dir + "security_module.js",
278+
resources_out_dir + "screencast_module.js",
251279
resources_out_dir + "script_formatter_worker_module.js",
252280
resources_out_dir + "settings_module.js",
281+
resources_out_dir + "snippets_module.js",
253282
resources_out_dir + "source_frame_module.js",
254283
resources_out_dir + "sources_module.js",
255284
resources_out_dir + "temp_storage_shared_worker_module.js",
256285
resources_out_dir + "timeline_module.js",
257286
resources_out_dir + "ui_lazy_module.js",
258287
]
259288

260-
deps = [
261-
":supported_css_properties",
262-
":frontend_protocol_sources",
263-
]
264-
265289
debug_mode = "0"
266290
}
267291

268292
args = [
269-
"devtools", "inspector", "toolbox",
293+
"inspector", "toolbox",
270294
"--input_path", rebase_path("front_end", root_build_dir),
271295
"--output_path", rebase_path(resources_out_dir, root_build_dir),
272296
"--debug", debug_mode
@@ -276,9 +300,9 @@ action("build_applications") {
276300
if (debug_devtools) {
277301
# Debug: copy non-module directories and core into resources_out_dir as-is.
278302
group("copy_debug_non_modules") {
279-
deps = [
303+
public_deps = [
280304
":copy_runtime_core",
281-
":copy_uglify_js_files",
305+
":copy_acorn_js_files",
282306
":copy_codemirror_files",
283307
]
284308
}
@@ -289,9 +313,9 @@ if (debug_devtools) {
289313
outputs = [ resources_out_dir + "/{{source_file_part}}" ]
290314
}
291315

292-
copy("copy_uglify_js_files") {
293-
sources = gypi_values.devtools_uglify_files
294-
outputs = [ resources_out_dir + "UglifyJS/{{source_file_part}}" ]
316+
copy("copy_acorn_js_files") {
317+
sources = gypi_values.devtools_acorn_files
318+
outputs = [ resources_out_dir + "acorn/{{source_file_part}}" ]
295319
}
296320

297321
copy("copy_codemirror_files") {
@@ -320,10 +344,6 @@ if (!debug_devtools) {
320344
}
321345
}
322346

323-
concatenate_css("concatenated_devtools_css") {
324-
app_name = "devtools"
325-
}
326-
327347
concatenate_css("concatenated_inspector_css") {
328348
app_name = "inspector"
329349
}

app/devtools/Inspector-0.1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@
12821282
"id": "PseudoIdRules",
12831283
"type": "object",
12841284
"properties": [
1285-
{ "name": "pseudoId", "type": "integer", "description": "Pseudo style identifier (see <code>enum PseudoId</code> in <code>LayoutStyleConstants.h</code>)."},
1285+
{ "name": "pseudoId", "type": "integer", "description": "Pseudo style identifier (see <code>enum PseudoId</code> in <code>ComputedStyleConstants.h</code>)."},
12861286
{ "name": "rules", "type": "array", "items": { "$ref": "CSSRule" }, "description": "CSS rules applicable to the pseudo style."}
12871287
],
12881288
"description": "CSS rule collection for a single pseudo style."

app/devtools/Inspector-1.0.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@
15961596
"id": "PseudoIdRules",
15971597
"type": "object",
15981598
"properties": [
1599-
{ "name": "pseudoId", "type": "integer", "description": "Pseudo style identifier (see <code>enum PseudoId</code> in <code>LayoutStyleConstants.h</code>)."},
1599+
{ "name": "pseudoId", "type": "integer", "description": "Pseudo style identifier (see <code>enum PseudoId</code> in <code>ComputedStyleConstants.h</code>)."},
16001600
{ "name": "rules", "type": "array", "items": { "$ref": "CSSRule" }, "description": "CSS rules applicable to the pseudo style."}
16011601
],
16021602
"description": "CSS rule collection for a single pseudo style."

app/devtools/Inspector-1.1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2337,7 +2337,7 @@
23372337
"id": "PseudoIdMatches",
23382338
"type": "object",
23392339
"properties": [
2340-
{ "name": "pseudoId", "type": "integer", "description": "Pseudo style identifier (see <code>enum PseudoId</code> in <code>LayoutStyleConstants.h</code>)."},
2340+
{ "name": "pseudoId", "type": "integer", "description": "Pseudo style identifier (see <code>enum PseudoId</code> in <code>ComputedStyleConstants.h</code>)."},
23412341
{ "name": "matches", "type": "array", "items": { "$ref": "RuleMatch" }, "description": "Matches of CSS rules applicable to the pseudo style."}
23422342
],
23432343
"description": "CSS rule collection for a single pseudo style."

app/devtools/OWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
dgozman@chromium.org
12
pfeldman@chromium.org
2-
vsevik@chromium.org
33
yurys@chromium.org
4-
per-file devtools.gyp*=apavlov@chromium.org
5-
per-file BUILD.gn=apavlov@chromium.org
4+
per-file devtools.gyp*=sergeyv@chromium.org
5+
per-file BUILD.gn=sergeyv@chromium.org

app/devtools/PRESUBMIT.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,13 @@ def _CompileDevtoolsFrontend(input_api, output_api):
4242
# FIXME: The compilation does not actually run if injected script-related files
4343
# have changed, as they reside in core/inspector, which is not affected
4444
# by this presubmit.
45-
# Once this is fixed, InjectedScriptHost.idl and JavaScriptCallFrame.idl
45+
# Once this is fixed, injected_script_externs.js
4646
# should be added to the list of triggers.
4747
devtools_front_end = input_api.os_path.join("devtools", "front_end")
4848
if (any(devtools_front_end in path for path in local_paths) or
4949
any("protocol.json" in path for path in local_paths) or
5050
any("compile_frontend.py" in path for path in local_paths) or
51-
any("InjectedScriptSource.js" in path for path in local_paths) or
52-
any("InjectedScriptCanvasModuleSource.js" in path for path in local_paths)):
51+
any("InjectedScriptSource.js" in path for path in local_paths)):
5352
lint_path = input_api.os_path.join(input_api.PresubmitLocalPath(),
5453
"scripts", "compile_frontend.py")
5554
out, _ = input_api.subprocess.Popen(
@@ -115,11 +114,25 @@ def _CheckOptimizePNGHashes(input_api, output_api):
115114
return [output_api.PresubmitError(error_message)]
116115

117116

117+
def _CheckCSSViolations(input_api, output_api):
118+
results = []
119+
for f in input_api.AffectedFiles(include_deletes=False):
120+
if not f.LocalPath().endswith(".css"):
121+
continue
122+
for line_number, line in f.ChangedContents():
123+
if "/deep/" in line:
124+
results.append(output_api.PresubmitError(("%s:%d uses /deep/ selector") % (f.LocalPath(), line_number)))
125+
if "::shadow" in line:
126+
results.append(output_api.PresubmitError(("%s:%d uses ::shadow selector") % (f.LocalPath(), line_number)))
127+
return results
128+
129+
118130
def CheckChangeOnUpload(input_api, output_api):
119131
results = []
120132
results.extend(_CompileDevtoolsFrontend(input_api, output_api))
121133
results.extend(_CheckConvertSVGToPNGHashes(input_api, output_api))
122134
results.extend(_CheckOptimizePNGHashes(input_api, output_api))
135+
results.extend(_CheckCSSViolations(input_api, output_api))
123136
return results
124137

125138

0 commit comments

Comments
 (0)