Skip to content

Commit 6254fdf

Browse files
author
apavlov@chromium.org
committed
Revert of DevTools: Avoid build errors when dynamic module and application names clash (patchset #2 id:20001 of https://codereview.chromium.org/607893002/)
Reason for revert: This patch makes the "build_applications" target always dirty. Original issue's description: > DevTools: Avoid build errors when dynamic module and application names clash > > This is a provisional fix that should let developers name > dynamically loaded modules the same as existing applications. > > Drive-by: > - Clean up devtools.gypi > - Stop generating obsolete code when concatenating workers > > R=dgozman, pfeldman, yurys > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=182769 TBR=dgozman@chromium.org,pfeldman@chromium.org,yurys@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/607113002 git-svn-id: svn://svn.chromium.org/blink/trunk@182775 bbb929c8-8fbe-4397-9dbb-9b2b20218538
1 parent e48d3d4 commit 6254fdf

File tree

5 files changed

+72
-68
lines changed

5 files changed

+72
-68
lines changed

‎Source/devtools/BUILD.gn

+24-26
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@ gypi_values = exec_script(
1111
# Some of the files in the .gypi use GYP variable expansions, go through and
1212
# fix them.
1313
devtools_core_base_files = gypi_values.devtools_core_base_files - [
14+
"<@(devtools_main_js_files)",
1415
"<@(devtools_standalone_files)",
15-
] + gypi_values.devtools_standalone_files
16+
] + gypi_values.devtools_main_js_files + gypi_values.devtools_standalone_files
1617

1718
devtools_core_files =
1819
devtools_core_base_files +
19-
gypi_values.devtools_bindings_js_files +
2020
gypi_values.devtools_common_js_files +
21+
gypi_values.devtools_sdk_js_files +
22+
gypi_values.devtools_ui_js_files +
2123
gypi_values.devtools_components_js_files +
2224
gypi_values.devtools_host_js_files +
23-
gypi_values.devtools_main_js_files +
24-
gypi_values.devtools_sdk_js_files +
2525
gypi_values.devtools_screencast_js_files +
2626
gypi_values.devtools_toolbox_js_files +
27-
gypi_values.devtools_toolbox_bootstrap_js_files +
28-
gypi_values.devtools_ui_js_files +
29-
gypi_values.devtools_workspace_js_files
27+
gypi_values.devtools_toolbox_bootstrap_js_files
3028

3129
devtools_extensions_js_files = gypi_values.devtools_extensions_js_files -
3230
[ "<@(devtools_extension_api_files)" ] +
@@ -74,24 +72,24 @@ action("generate_devtools_grd") {
7472
"$root_out_dir/resources/inspector/toolbox.css",
7573
"$root_out_dir/resources/inspector/toolbox.html",
7674
"$root_out_dir/resources/inspector/toolbox.js",
77-
"$root_out_dir/resources/inspector/audits_module.js",
78-
"$root_out_dir/resources/inspector/console_module.js",
79-
"$root_out_dir/resources/inspector/devices_module.js",
80-
"$root_out_dir/resources/inspector/documentation_module.js",
81-
"$root_out_dir/resources/inspector/elements_module.js",
82-
"$root_out_dir/resources/inspector/extensions_module.js",
83-
"$root_out_dir/resources/inspector/heap_snapshot_worker_module.js",
84-
"$root_out_dir/resources/inspector/layers_module.js",
85-
"$root_out_dir/resources/inspector/network_module.js",
86-
"$root_out_dir/resources/inspector/profiler_module.js",
87-
"$root_out_dir/resources/inspector/promises_module.js",
88-
"$root_out_dir/resources/inspector/resources_module.js",
89-
"$root_out_dir/resources/inspector/script_formatter_worker_module.js",
90-
"$root_out_dir/resources/inspector/settings_module.js",
91-
"$root_out_dir/resources/inspector/source_frame_module.js",
92-
"$root_out_dir/resources/inspector/sources_module.js",
93-
"$root_out_dir/resources/inspector/temp_storage_shared_worker_module.js",
94-
"$root_out_dir/resources/inspector/timeline_module.js",
75+
"$root_out_dir/resources/inspector/audits.js",
76+
"$root_out_dir/resources/inspector/console.js",
77+
"$root_out_dir/resources/inspector/devices.js",
78+
"$root_out_dir/resources/inspector/documentation.js",
79+
"$root_out_dir/resources/inspector/elements.js",
80+
"$root_out_dir/resources/inspector/extensions.js",
81+
"$root_out_dir/resources/inspector/heap_snapshot_worker.js",
82+
"$root_out_dir/resources/inspector/layers.js",
83+
"$root_out_dir/resources/inspector/network.js",
84+
"$root_out_dir/resources/inspector/profiler.js",
85+
"$root_out_dir/resources/inspector/promises.js",
86+
"$root_out_dir/resources/inspector/resources.js",
87+
"$root_out_dir/resources/inspector/script_formatter_worker.js",
88+
"$root_out_dir/resources/inspector/settings.js",
89+
"$root_out_dir/resources/inspector/source_frame.js",
90+
"$root_out_dir/resources/inspector/sources.js",
91+
"$root_out_dir/resources/inspector/temp_storage_shared_worker.js",
92+
"$root_out_dir/resources/inspector/timeline.js",
9593
"$root_out_dir/resources/inspector/devtools_extension_api.js",
9694
] + gypi_values.devtools_standalone_files + gypi_values.devtools_cm_css_files
9795

@@ -290,7 +288,7 @@ template("concatenate_module_scripts") {
290288
input = "front_end/" + module_name + "/module.json"
291289
inputs = [ input ] + invoker.imported_files
292290

293-
output = "$root_out_dir/resources/inspector/" + module_name + "_module.js"
291+
output = "$root_out_dir/resources/inspector/" + module_name + ".js"
294292
outputs = [ output ]
295293

296294
args = [

‎Source/devtools/devtools.gyp

+36-36
Original file line numberDiff line numberDiff line change
@@ -131,24 +131,24 @@
131131
'<(PRODUCT_DIR)/resources/inspector/toolbox.css',
132132
'<(PRODUCT_DIR)/resources/inspector/toolbox.html',
133133
'<(PRODUCT_DIR)/resources/inspector/toolbox.js',
134-
'<(PRODUCT_DIR)/resources/inspector/audits_module.js',
135-
'<(PRODUCT_DIR)/resources/inspector/console_module.js',
136-
'<(PRODUCT_DIR)/resources/inspector/devices_module.js',
137-
'<(PRODUCT_DIR)/resources/inspector/documentation_module.js',
138-
'<(PRODUCT_DIR)/resources/inspector/elements_module.js',
139-
'<(PRODUCT_DIR)/resources/inspector/extensions_module.js',
140-
'<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker_module.js',
141-
'<(PRODUCT_DIR)/resources/inspector/layers_module.js',
142-
'<(PRODUCT_DIR)/resources/inspector/network_module.js',
143-
'<(PRODUCT_DIR)/resources/inspector/profiler_module.js',
144-
'<(PRODUCT_DIR)/resources/inspector/promises_module.js',
145-
'<(PRODUCT_DIR)/resources/inspector/resources_module.js',
146-
'<(PRODUCT_DIR)/resources/inspector/script_formatter_worker_module.js',
147-
'<(PRODUCT_DIR)/resources/inspector/settings_module.js',
148-
'<(PRODUCT_DIR)/resources/inspector/source_frame_module.js',
149-
'<(PRODUCT_DIR)/resources/inspector/sources_module.js',
150-
'<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker_module.js',
151-
'<(PRODUCT_DIR)/resources/inspector/timeline_module.js',
134+
'<(PRODUCT_DIR)/resources/inspector/audits.js',
135+
'<(PRODUCT_DIR)/resources/inspector/console.js',
136+
'<(PRODUCT_DIR)/resources/inspector/devices.js',
137+
'<(PRODUCT_DIR)/resources/inspector/documentation.js',
138+
'<(PRODUCT_DIR)/resources/inspector/elements.js',
139+
'<(PRODUCT_DIR)/resources/inspector/extensions.js',
140+
'<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker.js',
141+
'<(PRODUCT_DIR)/resources/inspector/layers.js',
142+
'<(PRODUCT_DIR)/resources/inspector/network.js',
143+
'<(PRODUCT_DIR)/resources/inspector/profiler.js',
144+
'<(PRODUCT_DIR)/resources/inspector/promises.js',
145+
'<(PRODUCT_DIR)/resources/inspector/resources.js',
146+
'<(PRODUCT_DIR)/resources/inspector/script_formatter_worker.js',
147+
'<(PRODUCT_DIR)/resources/inspector/settings.js',
148+
'<(PRODUCT_DIR)/resources/inspector/source_frame.js',
149+
'<(PRODUCT_DIR)/resources/inspector/sources.js',
150+
'<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker.js',
151+
'<(PRODUCT_DIR)/resources/inspector/timeline.js',
152152
'<(PRODUCT_DIR)/resources/inspector/devtools_extension_api.js',
153153
'<@(devtools_standalone_files)',
154154
'<@(devtools_cm_css_files)',
@@ -432,7 +432,7 @@
432432
'<@(_input_file)',
433433
'<@(devtools_audits_js_files)',
434434
],
435-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/audits_module.js'],
435+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/audits.js'],
436436
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
437437
}],
438438
},
@@ -463,7 +463,7 @@
463463
'<@(_input_file)',
464464
'<@(devtools_console_js_files)',
465465
],
466-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/console_module.js'],
466+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/console.js'],
467467
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
468468
}],
469469
},
@@ -494,7 +494,7 @@
494494
'<@(_input_file)',
495495
'<@(devtools_devices_js_files)',
496496
],
497-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/devices_module.js'],
497+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/devices.js'],
498498
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
499499
}],
500500
},
@@ -525,7 +525,7 @@
525525
'<@(_input_file)',
526526
'<@(devtools_documentation_js_files)',
527527
],
528-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/documentation_module.js'],
528+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/documentation.js'],
529529
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
530530
}],
531531
},
@@ -556,7 +556,7 @@
556556
'<@(_input_file)',
557557
'<@(devtools_elements_js_files)',
558558
],
559-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/elements_module.js'],
559+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/elements.js'],
560560
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
561561
}],
562562
},
@@ -587,7 +587,7 @@
587587
'<@(_input_file)',
588588
'<@(devtools_extensions_js_files)',
589589
],
590-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/extensions_module.js'],
590+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/extensions.js'],
591591
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
592592
}],
593593
},
@@ -618,7 +618,7 @@
618618
'<@(_input_file)',
619619
'<@(devtools_heap_snapshot_worker_js_files)',
620620
],
621-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker_module.js'],
621+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/heap_snapshot_worker.js'],
622622
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
623623
}],
624624
},
@@ -649,7 +649,7 @@
649649
'<@(_input_file)',
650650
'<@(devtools_layers_js_files)',
651651
],
652-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/layers_module.js'],
652+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/layers.js'],
653653
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
654654
}],
655655
},
@@ -680,7 +680,7 @@
680680
'<@(_input_file)',
681681
'<@(devtools_network_js_files)',
682682
],
683-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/network_module.js'],
683+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/network.js'],
684684
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
685685
}],
686686
},
@@ -711,7 +711,7 @@
711711
'<@(_input_file)',
712712
'<@(devtools_profiler_js_files)',
713713
],
714-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/profiler_module.js'],
714+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/profiler.js'],
715715
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
716716
}],
717717
},
@@ -742,7 +742,7 @@
742742
'<@(_input_file)',
743743
'<@(devtools_promises_js_files)',
744744
],
745-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/promises_module.js'],
745+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/promises.js'],
746746
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
747747
}],
748748
},
@@ -773,7 +773,7 @@
773773
'<@(_input_file)',
774774
'<@(devtools_resources_js_files)',
775775
],
776-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/resources_module.js'],
776+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/resources.js'],
777777
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
778778
}],
779779
},
@@ -805,7 +805,7 @@
805805
'<@(devtools_script_formatter_worker_js_files)',
806806
'<@(devtools_uglify_files)'
807807
],
808-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/script_formatter_worker_module.js'],
808+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/script_formatter_worker.js'],
809809
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
810810
}],
811811
},
@@ -843,7 +843,7 @@
843843
'<@(_input_file)',
844844
'<@(devtools_settings_js_files)',
845845
],
846-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/settings_module.js'],
846+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/settings.js'],
847847
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
848848
}],
849849
},
@@ -875,7 +875,7 @@
875875
'<@(devtools_source_frame_js_files)',
876876
'<@(devtools_cm_js_files)',
877877
],
878-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/source_frame_module.js'],
878+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/source_frame.js'],
879879
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
880880
}],
881881
'copies': [
@@ -921,7 +921,7 @@
921921
'<@(_input_file)',
922922
'<@(devtools_sources_js_files)',
923923
],
924-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/sources_module.js'],
924+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/sources.js'],
925925
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
926926
}],
927927
},
@@ -952,7 +952,7 @@
952952
'<@(_input_file)',
953953
'<@(devtools_temp_storage_shared_worker_js_files)'
954954
],
955-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker_module.js'],
955+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/temp_storage_shared_worker.js'],
956956
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
957957
}],
958958
},
@@ -983,7 +983,7 @@
983983
'<@(_input_file)',
984984
'<@(devtools_timeline_js_files)',
985985
],
986-
'outputs': ['<(PRODUCT_DIR)/resources/inspector/timeline_module.js'],
986+
'outputs': ['<(PRODUCT_DIR)/resources/inspector/timeline.js'],
987987
'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_outputs)'],
988988
}],
989989
},

‎Source/devtools/devtools.gypi

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
'<@(devtools_components_js_files)',
4141
'<@(devtools_core_base_files)',
4242
'<@(devtools_host_js_files)',
43-
'<@(devtools_main_js_files)',
4443
'<@(devtools_screencast_js_files)',
4544
'<@(devtools_sdk_js_files)',
4645
'<@(devtools_toolbox_bootstrap_js_files)',
@@ -65,6 +64,7 @@
6564
'front_end/splitView.css',
6665
'front_end/suggestBox.css',
6766
'front_end/tabbedPane.css',
67+
'<@(devtools_main_js_files)',
6868
'<@(devtools_standalone_files)',
6969
],
7070
'devtools_common_js_files': [
@@ -454,6 +454,7 @@
454454
'front_end/cm/xml.js',
455455
'front_end/common/WebInspector.js',
456456
'front_end/common/utilities.js',
457+
'front_end/common/utilities.js',
457458
'front_end/script_formatter_worker/CSSFormatter.js',
458459
'front_end/script_formatter_worker/JavaScriptFormatter.js',
459460
'front_end/script_formatter_worker/ScriptFormatterWorker.js',
@@ -575,7 +576,6 @@
575576
'<@(devtools_promises_js_files)',
576577
'<@(devtools_resources_js_files)',
577578
'<@(devtools_script_formatter_worker_js_files)',
578-
'<@(devtools_settings_js_files)',
579579
'<@(devtools_source_frame_js_files)',
580580
'<@(devtools_sources_js_files)',
581581
'<@(devtools_temp_storage_shared_worker_js_files)',

‎Source/devtools/front_end/Runtime.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Runtime.isReleaseMode = function()
167167
Runtime.startSharedWorker = function(moduleName, workerName)
168168
{
169169
if (Runtime.isReleaseMode())
170-
return new SharedWorker(moduleName + "_module.js", workerName);
170+
return new SharedWorker(moduleName + ".js", workerName);
171171

172172
var content = loadResource(moduleName + "/module.json");
173173
if (!content)
@@ -185,7 +185,7 @@ Runtime.startSharedWorker = function(moduleName, workerName)
185185
Runtime.startWorker = function(moduleName)
186186
{
187187
if (Runtime.isReleaseMode())
188-
return new Worker(moduleName + "_module.js");
188+
return new Worker(moduleName + ".js");
189189

190190
var content = loadResource(moduleName + "/module.json");
191191
if (!content)
@@ -670,7 +670,7 @@ Runtime.Module.prototype = {
670670
this._manager.loadModule(dependencies[i]);
671671
if (this._descriptor.scripts) {
672672
if (Runtime.isReleaseMode()) {
673-
loadScript(this._name + "_module.js");
673+
loadScript(this._name + ".js");
674674
} else {
675675
var scripts = this._descriptor.scripts;
676676
for (var i = 0; i < scripts.length; ++i)

‎Source/devtools/scripts/concatenate_application_code.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def concatenate_worker(module_name, descriptors, application_dir, output_dir, mi
8080
if not scripts:
8181
return
8282
worker_dir = path.join(application_dir, module_name)
83-
output_file_path = path.join(output_dir, module_name, module_name + '_module.js')
83+
output_file_path = path.join(output_dir, module_name, module_name + '.js')
8484

8585
output = StringIO()
8686
output.write('/* Worker %s */\n' % module_name)
@@ -96,6 +96,12 @@ def concatenate_worker(module_name, descriptors, application_dir, output_dir, mi
9696
output.write('\n/* Module %s */\n' % dep_name)
9797
modular_build.concatenate_scripts(scripts, path.join(application_dir, dep_name), output_dir, output)
9898

99+
output.write('\n/* Initialize worker */\n')
100+
# Tell Runtime we are in the compiled mode.
101+
output.write('allDescriptors = ')
102+
output.write(json.dumps(dep_descriptors))
103+
output.write(';\nRuntime.initializeWorker("%s");' % module_name)
104+
99105
write_file(output_file_path, minify_if_needed(output.getvalue(), minify))
100106
output.close()
101107

0 commit comments

Comments
 (0)