Fix missing import and work around pycairo/cairocffi API incompat [0]

[0]: Kozea/cairocffi#219
web-platform-tests · Oct 18, 2024 · c3b1974 · c3b1974
1 parent 5934179
commit c3b1974
Show file tree

Hide file tree

Showing 21 changed files with 8,329 additions and 5 deletions.
diff --git a/html/canvas/element/text/2d.text.draw.fill.basic.png b/html/canvas/element/text/2d.text.draw.fill.basic.png
diff --git a/html/canvas/element/text/2d.text.draw.fill.maxWidth.large.png b/html/canvas/element/text/2d.text.draw.fill.maxWidth.large.png
diff --git a/html/canvas/element/text/2d.text.draw.fill.rtl.png b/html/canvas/element/text/2d.text.draw.fill.rtl.png
diff --git a/html/canvas/element/text/2d.text.draw.stroke.basic.png b/html/canvas/element/text/2d.text.draw.stroke.basic.png
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.filter.no_shadow.drawImage.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.filter.no_shadow.drawImage.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.filter.no_shadow.fillRect.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.filter.no_shadow.fillRect.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.filter.no_shadow.pattern.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.filter.no_shadow.pattern.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.filter.shadow.drawImage.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.filter.shadow.drawImage.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.filter.shadow.fillRect.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.filter.shadow.fillRect.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.filter.shadow.pattern.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.filter.shadow.pattern.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.no_shadow.drawImage.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.no_shadow.drawImage.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.no_shadow.fillRect.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.no_shadow.fillRect.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.no_shadow.pattern.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.no_shadow.pattern.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.shadow.drawImage.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.shadow.drawImage.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.shadow.fillRect.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.shadow.fillRect.worker.js
diff --git a/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.shadow.pattern.worker.js b/html/canvas/offscreen/compositing/2d.composite.grid.no_filter.shadow.pattern.worker.js
diff --git a/html/canvas/offscreen/text/2d.text.draw.fill.basic.png b/html/canvas/offscreen/text/2d.text.draw.fill.basic.png
diff --git a/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large.png b/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.large.png
diff --git a/html/canvas/offscreen/text/2d.text.draw.fill.rtl.png b/html/canvas/offscreen/text/2d.text.draw.fill.rtl.png
diff --git a/html/canvas/offscreen/text/2d.text.draw.stroke.basic.png b/html/canvas/offscreen/text/2d.text.draw.stroke.basic.png
diff --git a/html/canvas/tools/yaml-new/compositing.yaml b/html/canvas/tools/yaml-new/compositing.yaml
@@ -281,7 +281,7 @@
     cr.paint()
     {% endif %}
 
-    cr.set_operator(cairo.Operator.{{ cairo_operator }})
+    cr.set_operator(cairo.OPERATOR_{{ cairo_operator }})
 
     {% if cairo_operator != 'SOURCE' %}
     {{ cairo_shadow_code }}
@@ -357,11 +357,11 @@
       js_filter_code: ctx.filter = 'drop-shadow(5px -5px 0px rgb(255, 154, 0))'
       cairo_filter_code: |-
         cr.push_group()
-        cr.set_operator(cairo.Operator.OVER)
+        cr.set_operator(cairo.OPERATOR_OVER)
         cr.translate(5, -5)  # Filter offset.
         cr.set_source(foreground)
         cr.paint()
-        cr.set_operator(cairo.Operator.IN)
+        cr.set_operator(cairo.OPERATOR_IN)
         cr.set_source_rgba(1, 154/255, 0)
         cr.paint()
         cr.pop_group_to_source()
@@ -377,11 +377,11 @@
         ctx.shadowColor = 'rgb(154, 0, 154)';
       cairo_shadow_code: |-
         cr.push_group()
-        cr.set_operator(cairo.Operator.OVER)
+        cr.set_operator(cairo.OPERATOR_OVER)
         cr.translate(20, 20)  # Shadow offset.
         cr.set_source(filtered_foreground)
         cr.paint()
-        cr.set_operator(cairo.Operator.IN)
+        cr.set_operator(cairo.OPERATOR_IN)
         cr.set_source_rgb(154/255, 0, 154/255)
         cr.paint()
         cr.pop_group_to_source()