Strip comments and whitespace from javascript resources

tools/grit/grit/node/include.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Handling of the <include> element.
 """
 
 import os
 import sys
 
 from grit import exception
 from grit import util
 import grit.format.gzip_string
 import grit.format.html_inline
 import grit.format.rc
 import grit.format.rc_header
+from grit.format import minifier
 from grit.node import base
 
 class IncludeNode(base.Node):
   """An <include> element."""
 
   RESERVED_HEADER = '\xff\x1f\x8b'
 
   def __init__(self):
     super(IncludeNode, self).__init__()
 
@@ skipping 49 matching lines @@
     input_path = self.GetInputPath()
     if input_path is None:
       return None
 
     return self.ToRealPath(input_path)
 
   def GetDataPackPair(self, lang, encoding):
     """Returns a (id, string) pair that represents the resource id and raw
     bytes of the data.  This is used to generate the data pack data file.
     """
     # TODO(benrg/joi): Move this and other implementations of GetDataPackPair

[Lei Zhang, 2016/08/02 16:47:48]

So there's another GetDataPackPair() in structure.py. Would JS minification
there help?

[aberent, 2016/08/02 20:27:42]

Done, indirectly, in chrome_html.py

     # to grit.format.data_pack?
     from grit.format import rc_header
     id_map = rc_header.GetIds(self.GetRoot())
     id = id_map[self.GetTextualIds()[0]]
+    filename = self.ToRealPath(self.GetInputPath())
     if self.attrs['flattenhtml'] == 'true':
       allow_external_script = self.attrs['allowexternalscript'] == 'true'
       data = self._GetFlattenedData(allow_external_script=allow_external_script)
     else:
-      filename = self.ToRealPath(self.GetInputPath())
       data = util.ReadFile(filename, util.BINARY)
-
+    # Note that the minifier will only do anything if a minifier command
+    # has been set in the command line.
+    data = minifier.Minify(data, os.path.splitext(filename)[1])
     if 'compress' in self.attrs and self.attrs['compress'] == 'gzip':
       # We only use rsyncable compression on Linux.
       # We exclude ChromeOS since ChromeOS bots are Linux based but do not have
       # the --rsyncable option built in for gzip. See crbug.com/617950.
       if sys.platform == 'linux2' and 'chromeos' not in self.GetRoot().defines:
         data = grit.format.gzip_string.GzipStringRsyncable(data)
       else:
         data = grit.format.gzip_string.GzipString(data)
       data = self.RESERVED_HEADER[0] + data
     elif data[:3] == self.RESERVED_HEADER:
@@ skipping 59 matching lines @@
     node.StartParsing('include', parent)
     node.HandleAttribute('name', name)
     node.HandleAttribute('type', type)
     node.HandleAttribute('file', file)
     node.HandleAttribute('translateable', translateable)
     node.HandleAttribute('filenameonly', filenameonly)
     node.HandleAttribute('mkoutput', mkoutput)
     node.HandleAttribute('relativepath', relativepath)
     node.EndParsing()
     return node