High DPI support for Themes: change chrome_html.py

grit/gather/chrome_html.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.
 
 """Prepares a Chrome HTML file by inlining resources and adding references to
 high DPI resources and removing references to unsupported scale factors.
 
 This is a small gatherer that takes a HTML file, looks for src attributes
 and inlines the specified file, producing one HTML file with no external
@@ skipping 11 matching lines @@
 from grit import util
 from grit.format import html_inline
 from grit.gather import interface
 
 
 # Distribution string to replace with distribution.
 DIST_SUBSTR = '%DISTRIBUTION%'
 
 
 # Matches a chrome theme source URL.
-_THEME_SOURCE = lazy_re.compile('chrome://theme/IDR_[A-Z0-9_]*')
+_THEME_SOURCE = lazy_re.compile(
+    '(?P<baseurl>chrome://theme/IDR_[A-Z0-9_]*)(?P<query>\?.*)?')
 # Matches CSS image urls with the capture group 'filename'.
 _CSS_IMAGE_URLS = lazy_re.compile(
     '(?P<attribute>content|background|[\w-]*-image):[ ]*' +
     'url\((?P<quote>"|\'|)(?P<filename>[^"\'()]*)(?P=quote)')
 # Matches CSS image sets.
 _CSS_IMAGE_SETS = lazy_re.compile(
     '(?P<attribute>content|background|[\w-]*-image):[ ]*' +
         '-webkit-image-set\((?P<images>' +
         '([,\r\n ]*url\((?P<quote>"|\'|)[^"\'()]*(?P=quote)\)[ ]*[0-9.]*x)*)\)',
     re.MULTILINE)
@@ skipping 19 matching lines @@
     filename: name of the base image file
     scale_factors: a list of the supported scale factors (i.e. ['2x'])
     distribution: string that should replace %DISTRIBUTION%
 
   Returns:
     array of tuples containing scale factor and image (i.e.
         [('1x', 'image.png'), ('2x', '2x/image.png')]).
   """
   # Any matches for which a chrome URL handler will serve all scale factors
   # can simply request all scale factors.
-  if _THEME_SOURCE.match(filename):
+  theme_match = _THEME_SOURCE.match(filename)
+  if theme_match:
     images = [('1x', filename)]
     for scale_factor in scale_factors:
-      images.append((scale_factor, "%s@%s" % (filename, scale_factor)))
+      scale_filename = "%s@%s" % (theme_match.group('baseurl'), scale_factor)
+      if theme_match.group('query'):
+        scale_filename += theme_match.group('query')
+      images.append((scale_factor, scale_filename))
     return images
 
   if filename.find(':') != -1:
     # filename is probably a URL, only return filename itself.
     return [('1x', filename)]
 
   filename = filename.replace(DIST_SUBSTR, distribution)
   if filename_expansion_function:
     filename = filename_expansion_function(filename)
   filepath = os.path.join(base_path, filename)
@@ skipping 231 matching lines @@
               filename_expansion_function=self.filename_expansion_function),
           filename_expansion_function=self.filename_expansion_function)
     else:
       distribution = html_inline.GetDistribution()
       self.inlined_text_ = ProcessImageSets(
           os.path.dirname(filename),
           util.ReadFile(filename, 'utf-8'),
           self.scale_factors_,
           distribution,
           filename_expansion_function=self.filename_expansion_function)