Index: Source/devtools/scripts/compile_frontend.py |
diff --git a/Source/devtools/scripts/compile_frontend.py b/Source/devtools/scripts/compile_frontend.py |
index 50002477d373cffe52a1f44728a7969247297b4f..89a154127f77bbea587868d796ee7089da204d26 100755 |
--- a/Source/devtools/scripts/compile_frontend.py |
+++ b/Source/devtools/scripts/compile_frontend.py |
@@ -77,9 +77,7 @@ devtools_frontend_path = path.join(devtools_path, 'front_end') |
patched_es6_externs_file = to_platform_path(path.join(devtools_frontend_path, 'es6.js')) |
global_externs_file = to_platform_path(path.join(devtools_frontend_path, 'externs.js')) |
protocol_externs_file = path.join(devtools_frontend_path, 'protocol_externs.js') |
-webgl_rendering_context_idl_path = path.join(path.dirname(devtools_path), 'core', 'html', 'canvas', 'WebGLRenderingContextBase.idl') |
injected_script_source_name = path.join(inspector_path, 'InjectedScriptSource.js') |
-canvas_injected_script_source_name = path.join(inspector_path, 'InjectedScriptCanvasModuleSource.js') |
injected_script_externs_idl_names = [ |
path.join(inspector_path, 'InjectedScriptHost.idl'), |
path.join(inspector_path, 'JavaScriptCallFrame.idl'), |
@@ -384,12 +382,10 @@ def unclosure_injected_script(sourceFileName, outFileName): |
write_file(outFileName, source) |
injectedScriptSourceTmpFile = to_platform_path(path.join(inspector_path, 'InjectedScriptSourceTmp.js')) |
-injectedScriptCanvasModuleSourceTmpFile = path.join(inspector_path, 'InjectedScriptCanvasModuleSourceTmp.js') |
unclosure_injected_script(injected_script_source_name, injectedScriptSourceTmpFile) |
-unclosure_injected_script(canvas_injected_script_source_name, injectedScriptCanvasModuleSourceTmpFile) |
-print 'Compiling InjectedScriptSource.js and InjectedScriptCanvasModuleSource.js...' |
+print 'Compiling InjectedScriptSource.js...' |
injected_script_externs_file = tempfile.NamedTemporaryFile(mode='wt', delete=False) |
try: |
generate_injected_script_externs.generate_injected_script_externs(injected_script_externs_idl_names, injected_script_externs_file) |
@@ -403,21 +399,14 @@ command += ' --externs ' + to_platform_path_exact(injected_script_externs_fil |
command += ' --externs ' + to_platform_path(protocol_externs_file) |
command += ' --module ' + jsmodule_name_prefix + 'injected_script' + ':1' |
command += ' --js ' + to_platform_path(injectedScriptSourceTmpFile) |
-command += ' --module ' + jsmodule_name_prefix + 'injected_canvas_script' + ':1:' + jsmodule_name_prefix + 'injected_script' |
-command += ' --js ' + to_platform_path(injectedScriptCanvasModuleSourceTmpFile) |
injectedScriptCompileProc = run_in_shell(command) |
print 'Verifying JSDoc comments...' |
-additional_jsdoc_check_files = [injectedScriptSourceTmpFile, injectedScriptCanvasModuleSourceTmpFile] |
+additional_jsdoc_check_files = [injectedScriptSourceTmpFile] |
errors_found |= verify_jsdoc(additional_jsdoc_check_files) |
jsdocValidatorProc, jsdocValidatorFileList = verify_jsdoc_extra(additional_jsdoc_check_files) |
-print 'Checking generated code in InjectedScriptCanvasModuleSource.js...' |
-webgl_check_script_path = path.join(scripts_path, "check_injected_webgl_calls_info.py") |
-check_injected_webgl_calls_command = '%s %s %s' % (webgl_check_script_path, webgl_rendering_context_idl_path, canvas_injected_script_source_name) |
-canvasModuleCompileProc = run_in_shell(check_injected_webgl_calls_command) |
- |
print 'Validating InjectedScriptSource.js...' |
injectedscript_check_script_path = path.join(scripts_path, "check_injected_script_source.py") |
check_injected_script_command = '%s %s' % (injectedscript_check_script_path, injected_script_source_name) |
@@ -490,13 +479,9 @@ if error_count: |
errors_found = True |
(injectedScriptCompileOut, _) = injectedScriptCompileProc.communicate() |
-print 'InjectedScriptSource.js and InjectedScriptCanvasModuleSource.js compilation output:%s' % os.linesep, injectedScriptCompileOut |
+print 'InjectedScriptSource.js compilation output:%s' % os.linesep, injectedScriptCompileOut |
errors_found |= hasErrors(injectedScriptCompileOut) |
-(canvasModuleCompileOut, _) = canvasModuleCompileProc.communicate() |
-print 'InjectedScriptCanvasModuleSource.js generated code check output:%s' % os.linesep, canvasModuleCompileOut |
-errors_found |= hasErrors(canvasModuleCompileOut) |
- |
(validateInjectedScriptOut, _) = validateInjectedScriptProc.communicate() |
print 'Validate InjectedScriptSource.js output:%s' % os.linesep, (validateInjectedScriptOut if validateInjectedScriptOut else '<empty>') |
errors_found |= hasErrors(validateInjectedScriptOut) |
@@ -505,7 +490,6 @@ if errors_found: |
print 'ERRORS DETECTED' |
os.remove(injectedScriptSourceTmpFile) |
-os.remove(injectedScriptCanvasModuleSourceTmpFile) |
os.remove(compiler_args_file.name) |
os.remove(injected_script_externs_file.name) |
os.remove(protocol_externs_file) |