Remove closure-annotations.js files (#10272)

* Remove closure-annotations.js files.

* Annotate WebIDL binder for Closure

* Only retain comments if --preserveComments is passed.

* Add comment and ChangeLog entry

Author: juj

ChangeLog.md

@@ -17,6 +17,10 @@ See docs/process.md for how version tagging works.
 
 Current Trunk
 -------------
+- Added support for specifying JSDoc minification annotations for Closure in
+  JS library, pre and post files. See
+  https://github.com/google/closure-compiler/wiki/Annotating-JavaScript-for-the-Closure-Compiler
+  (#10272)
 - Add new Fibers API for context switching, that supercedes the old coroutine
   API that only ran on fastcomp. See #9859
 - Added new linker option -s WASM=2 which produces a dual Wasm+JS build, which

src/closure-annotations.js

@@ -27,6 +27,10 @@ mergeInto(LibraryManager.library, {
     addAtMain('FS.ignorePermissions = false;');
     addAtExit('FS.quit();');
     return 'FS.staticInit();' +
+#if USE_CLOSURE_COMPILER
+           // Declare variable for Closure, FS.createPreloadedFile() below calls Browser.init()
+           '/**@suppress {duplicate, undefinedVars}*/var Browser;' +
+#endif
            // Get module methods from settings
            '{{{ EXPORTED_RUNTIME_METHODS.filter(function(func) { return func.substr(0, 3) === 'FS_' }).map(function(func){return 'Module["' + func + '"] = FS.' + func.substr(3) + ";"}).reduce(function(str, func){return str + func;}, '') }}}';
   },

src/closure-defined-fs-annotation.js

@@ -11,7 +11,43 @@
 var LibraryGLEmulation = {
   // GL emulation: provides misc. functionality not present in OpenGL ES 2.0 or WebGL
   $GLEmulation__deps: ['$GLImmediateSetup', 'glEnable', 'glDisable', 'glIsEnabled', 'glGetBooleanv', 'glGetIntegerv', 'glGetString', 'glCreateShader', 'glShaderSource', 'glCompileShader', 'glAttachShader', 'glDetachShader', 'glUseProgram', 'glDeleteProgram', 'glBindAttribLocation', 'glLinkProgram', 'glBindBuffer', 'glGetFloatv', 'glHint', 'glEnableVertexAttribArray', 'glDisableVertexAttribArray', 'glVertexAttribPointer', 'glActiveTexture', '$stringToNewUTF8'],
-  $GLEmulation__postset: 'GLEmulation.init();',
+  $GLEmulation__postset:
+#if USE_CLOSURE_COMPILER
+    // Forward declare GL functions that are overridden by GLEmulation here to appease Closure compiler.
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawArrays;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDrawElements;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glActiveTexture;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnable;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisable;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvf;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvi;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glTexEnvfv;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetIntegerv;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glIsEnabled;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetBooleanv;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetString;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCreateShader;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glShaderSource;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glCompileShader;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glAttachShader;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDetachShader;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glUseProgram;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDeleteProgram;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindAttribLocation;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glLinkProgram;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glBindBuffer;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glGetFloatv;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glHint;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glEnableVertexAttribArray;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glDisableVertexAttribArray;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _emscripten_glVertexAttribPointer;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _glTexEnvf;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _glTexEnvi;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _glTexEnvfv;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnviv;' +
+    '/**@suppress {duplicate, undefinedVars}*/var _glGetTexEnvfv;' +
+#endif
+    'GLEmulation.init();',
   $GLEmulation: {
     // Fog support. Partial, we assume shaders are used that implement fog. We just pass them uniforms
     fogStart: 0,