Add chrome_html gatherer, which inlines html and automatically generates image set…

grit/node/structure.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.
 
 '''The <structure> element.
 '''
 
 import os
 
 from grit.node import base
 from grit.node import variant
 
 from grit import constants
 from grit import exception
 from grit import util
 
 import grit.gather.admin_template
+import grit.gather.chrome_html
 import grit.gather.igoogle_strings
 import grit.gather.muppet_strings
 import grit.gather.policy_json
 import grit.gather.rc
 import grit.gather.tr_html
 import grit.gather.txt
 
 import grit.format.rc
 import grit.format.rc_header
 
 # Type of the gatherer to use for each type attribute
 _GATHERERS = {
   'accelerators' : grit.gather.rc.Accelerators,
   'admin_template' : grit.gather.admin_template.AdmGatherer,
+  'chrome_html' : grit.gather.chrome_html.ChromeHtml,
   'dialog'  : grit.gather.rc.Dialog,
   'igoogle' : grit.gather.igoogle_strings.IgoogleStrings,
   'menu'    : grit.gather.rc.Menu,
   'muppet'  : grit.gather.muppet_strings.MuppetStrings,
   'rcdata'  : grit.gather.rc.RCData,
   'tr_html' : grit.gather.tr_html.TrHtml,
   'txt'     : grit.gather.txt.TxtFile,
   'version' : grit.gather.rc.Version,
   'policy_template_metafile' : grit.gather.policy_json.PolicyJson,
 }
 
 
 # Formatter instance to use for each type attribute
 # when formatting .rc files.
 _RC_FORMATTERS = {
   'accelerators' : grit.format.rc.RcSection(),
   'admin_template' : grit.format.rc.RcInclude('ADM'),
+  'chrome_html' : grit.format.rc.RcInclude('HTML'),
   'dialog'  : grit.format.rc.RcSection(),
   'igoogle' : grit.format.rc.RcInclude('XML'),
   'menu'    : grit.format.rc.RcSection(),
   'muppet'  : grit.format.rc.RcInclude('XML'),
   'rcdata'  : grit.format.rc.RcSection(),
   'tr_html' : grit.format.rc.RcInclude('HTML'),
   'txt'     : grit.format.rc.RcInclude('TXT'),
   'version' : grit.format.rc.RcSection(),
   'policy_template_metafile': None,
 }
@@ skipping 19 matching lines @@
 
   def DefaultAttributes(self):
     return { 'encoding' : 'cp1252',
              'exclude_from_rc' : 'false',
              'line_end' : 'unix',
              'output_encoding' : 'utf-8',
              'generateid': 'true',
              'expand_variables' : 'false',
              'output_filename' : '',
              'fold_whitespace': 'false',
+             'scale_factors' : '',

[Jói, 2012/05/17 19:39:12]

I think we had discussed either figuring out the scale factors in the Python
implementation of chrome_html.py based on preprocessor defines, or passing in an
explicit preprocessor define that sets the scale factors.  You had mentioned a
goal of not having to specify the scale factors per item or maybe even per file,
and a preprocessor flag that gets set by GYP seems ideal for that.

[flackr, 2012/05/22 21:25:03]

Yes, I hadn't gotten that far yet. Done now :-).

              'run_command' : '',
              # TODO(joi) this is a hack - should output all generated files
              # as SCons dependencies; however, for now there is a bug I can't
              # find where GRIT doesn't build the matching fileset, therefore
              # this hack so that only the files you really need are marked as
              # dependencies.
              'sconsdep' : 'false',
              }
 
   def IsExcludedFromRc(self):
@@ skipping 12 matching lines @@
     else:
       raise exception.UnexpectedAttribute(
         "Attribute 'line_end' must be one of 'linux' (default), 'windows' or 'mac'")
 
   def GetCliques(self):
     if self.gatherer:
       return self.gatherer.GetCliques()
     else:
       return []
 
+  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.
+    """
+    from grit.format import rc_header
+    id_map = rc_header.Item.tids_
+    id = id_map[self.GetTextualIds()[0]]
+    data = ''
+    if self.gatherer:
+      data = self.gatherer.GetData(lang, encoding)
+    return id, data
+
   def GetTextualIds(self):
-    if self.gatherer and self.attrs['type'] not in ['tr_html', 'admin_template', 'txt']:
+    if self.gatherer and self.attrs['type'] not in ['chrome_html', 'tr_html', 'admin_template', 'txt']:
       return self.gatherer.GetTextualIds()
     else:
       return [self.attrs['name']]
 
   def ItemFormatter(self, t):
     if t == 'rc_header':
       return grit.format.rc_header.Item()
     elif (t in ['rc_all', 'rc_translateable', 'rc_nontranslateable'] and
           self.SatisfiesOutputCondition()):
       return _RC_FORMATTERS[self.attrs['type']]
@@ skipping 150 matching lines @@
   def SubstituteMessages(self, substituter):
     '''Propagates substitution to gatherer.
 
     Args:
       substituter: a grit.util.Substituter object.
     '''
     assert self.gatherer
     if self.ExpandVariables():
       self.gatherer.SubstituteMessages(substituter)