You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
78 lines
5.0 KiB
78 lines
5.0 KiB
11 months ago
|
diff -up chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py.me chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py
|
||
|
|
--- chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py.me 2024-01-15 20:48:28.177397102 +0100
|
||
|
|
+++ chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py 2024-01-15 20:48:46.427768328 +0100
|
||
|
|
@@ -18,7 +18,7 @@ class HTMLGenerationController(object):
|
||
|
|
|
||
|
|
def GetHTMLForInlineStylesheet(self, contents):
|
||
|
|
if self.current_module is None:
|
||
|
|
- if re.search('url\(.+\)', contents):
|
||
|
|
+ if re.search(r'url\(.+\)', contents):
|
||
|
|
raise Exception(
|
||
|
|
'Default HTMLGenerationController cannot handle inline style urls')
|
||
|
|
return contents
|
||
|
|
diff -up chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py.me chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py
|
||
|
|
--- chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py.me 2024-01-15 20:49:39.363845083 +0100
|
||
|
|
+++ chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py 2024-01-15 20:49:57.407212098 +0100
|
||
|
|
@@ -4,4 +4,4 @@
|
||
|
|
|
||
|
|
|
||
|
|
def EscapeJSIfNeeded(js):
|
||
|
|
- return js.replace('</script>', '<\/script>')
|
||
|
|
+ return js.replace(r'</script>', r'<\/script>')
|
||
|
|
diff -up chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py.me chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py
|
||
|
|
--- chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py.me 2024-01-15 20:50:11.819505254 +0100
|
||
|
|
+++ chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py 2024-01-15 20:50:38.611050213 +0100
|
||
|
|
@@ -293,6 +293,6 @@ class HTMLModuleParser():
|
||
|
|
html = ''
|
||
|
|
else:
|
||
|
|
if html.find('< /script>') != -1:
|
||
|
|
- raise Exception('Escape script tags with <\/script>')
|
||
|
|
+ raise Exception(r'Escape script tags with <\/script>')
|
||
|
|
|
||
|
|
return HTMLModuleParserResults(html)
|
||
|
|
diff -up chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py.me chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py
|
||
|
|
--- chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py.me 2024-01-15 20:48:59.917042709 +0100
|
||
|
|
+++ chromium-121.0.6167.57/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py 2024-01-15 20:49:24.402540761 +0100
|
||
|
|
@@ -60,7 +60,7 @@ class ParsedStyleSheet(object):
|
||
|
|
return 'url(data:image/%s;base64,%s)' % (ext[1:], data.decode('utf-8'))
|
||
|
|
|
||
|
|
# I'm assuming we only have url()'s associated with images
|
||
|
|
- return re.sub('url\((?P<quote>"|\'|)(?P<url>[^"\'()]*)(?P=quote)\)',
|
||
|
|
+ return re.sub(r'url\((?P<quote>"|\'|)(?P<url>[^"\'()]*)(?P=quote)\)',
|
||
|
|
InlineUrl, self.contents)
|
||
|
|
|
||
|
|
def AppendDirectlyDependentFilenamesTo(self, dependent_filenames):
|
||
|
|
@@ -72,7 +72,7 @@ class ParsedStyleSheet(object):
|
||
|
|
raise Exception('@imports are not supported')
|
||
|
|
|
||
|
|
matches = re.findall(
|
||
|
|
- 'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)',
|
||
|
|
+ r'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)',
|
||
|
|
self.contents)
|
||
|
|
|
||
|
|
def resolve_url(url):
|
||
|
|
diff -up chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-tools/src/scripts/gn/generate_vulkan_icd_json.py.me chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-tools/src/scripts/gn/generate_vulkan_icd_json.py
|
||
|
|
--- chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-tools/src/scripts/gn/generate_vulkan_icd_json.py.me 2024-01-15 20:50:56.810420400 +0100
|
||
|
|
+++ chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-tools/src/scripts/gn/generate_vulkan_icd_json.py 2024-01-15 20:52:33.506387261 +0100
|
||
|
|
@@ -28,7 +28,7 @@ import platform
|
||
|
|
import sys
|
||
|
|
|
||
|
|
def glob_slash(dirname):
|
||
|
|
- """Like regular glob but replaces \ with / in returned paths."""
|
||
|
|
+ """Like regular glob but replaces \\ with / in returned paths."""
|
||
|
|
return [s.replace('\\', '/') for s in glob.glob(dirname)]
|
||
|
|
|
||
|
|
def main():
|
||
|
|
diff -up chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py.me chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py
|
||
|
|
--- chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py.me 2024-01-15 20:52:38.016479000 +0100
|
||
|
|
+++ chromium-121.0.6167.57/third_party/vulkan-deps/vulkan-validation-layers/src/scripts/gn/generate_vulkan_layers_json.py 2024-01-15 20:52:48.863699640 +0100
|
||
|
|
@@ -28,7 +28,7 @@ import platform
|
||
|
|
import sys
|
||
|
|
|
||
|
|
def glob_slash(dirname):
|
||
|
|
- """Like regular glob but replaces \ with / in returned paths."""
|
||
|
|
+ """Like regular glob but replaces \\ with / in returned paths."""
|
||
|
|
return [s.replace('\\', '/') for s in glob.glob(dirname)]
|
||
|
|
|
||
|
|
def main():
|