High DPI support for Themes: change chrome_html.py

grit/gather/chrome_html.py

Index: grit/gather/chrome_html.py
diff --git a/grit/gather/chrome_html.py b/grit/gather/chrome_html.py
index d554776fac1aa0ba620173dbae56799104bf54f9..fc47b6bc22f45f7a6384bc8f477dd624b238270b 100644
--- a/grit/gather/chrome_html.py
+++ b/grit/gather/chrome_html.py
@@ -29,7 +29,8 @@ 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>\?[^\']*)?')

[flackr, 2013/06/13 14:57:24]

Since this is only used to search filename matches I think query can match to
the end of the line instead of looking for not a closing quotation. i.e.
(?P<query>\?.*).

[sschmitz, 2013/06/13 16:27:53]

Done.

 # Matches CSS image urls with the capture group 'filename'.
 _CSS_IMAGE_URLS = lazy_re.compile(
     '(?P<attribute>content|background|[\w-]*-image):[ ]*' +
@@ -69,10 +70,14 @@ def GetImageList(
   """
   # 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 = theme_match.group('baseurl') + '@' + scale_factor

[flackr, 2013/06/13 14:57:24]

nit: in python i think constructing a string with format strings like "%s@%s" %
(arg1, arg2) is preferable to string concatenation.

[sschmitz, 2013/06/13 16:27:53]

Done.

+      if theme_match.group('query'):
+        scale_filename += theme_match.group('query')
+      images.append((scale_factor, scale_filename))
     return images
 
   if filename.find(':') != -1: