diff --git a/pdfium/annots/annotation_circle_dash_expected_skia.pdf.0.png b/pdfium/annots/annotation_circle_dash_expected_skia.pdf.0.png
new file mode 100644
index 0000000..2ca6387
--- /dev/null
+++ b/pdfium/annots/annotation_circle_dash_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_circle_dash_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_circle_dash_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..c37ee8f
--- /dev/null
+++ b/pdfium/annots/annotation_circle_dash_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_circle_expected_skia.pdf.0.png b/pdfium/annots/annotation_circle_expected_skia.pdf.0.png
new file mode 100644
index 0000000..15eeecd
--- /dev/null
+++ b/pdfium/annots/annotation_circle_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_circle_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_circle_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..1051090
--- /dev/null
+++ b/pdfium/annots/annotation_circle_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_circle_hidden_expected_skia.pdf.0.png b/pdfium/annots/annotation_circle_hidden_expected_skia.pdf.0.png
new file mode 100644
index 0000000..815d105
--- /dev/null
+++ b/pdfium/annots/annotation_circle_hidden_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ellipse_expected_skia.pdf.0.png b/pdfium/annots/annotation_ellipse_expected_skia.pdf.0.png
new file mode 100644
index 0000000..d6faa52
--- /dev/null
+++ b/pdfium/annots/annotation_ellipse_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ellipse_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_ellipse_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..c6d775f
--- /dev/null
+++ b/pdfium/annots/annotation_ellipse_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ellipse_fill_dash_expected_skia.pdf.0.png b/pdfium/annots/annotation_ellipse_fill_dash_expected_skia.pdf.0.png
new file mode 100644
index 0000000..2284726
--- /dev/null
+++ b/pdfium/annots/annotation_ellipse_fill_dash_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ellipse_fill_dash_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_ellipse_fill_dash_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..d35f756
--- /dev/null
+++ b/pdfium/annots/annotation_ellipse_fill_dash_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ellipse_fill_expected_skia.pdf.0.png b/pdfium/annots/annotation_ellipse_fill_expected_skia.pdf.0.png
new file mode 100644
index 0000000..65ad599
--- /dev/null
+++ b/pdfium/annots/annotation_ellipse_fill_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ellipse_fill_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_ellipse_fill_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..66f7d07
--- /dev/null
+++ b/pdfium/annots/annotation_ellipse_fill_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ellipse_hidden_expected_skia.pdf.0.png b/pdfium/annots/annotation_ellipse_hidden_expected_skia.pdf.0.png
new file mode 100644
index 0000000..815d105
--- /dev/null
+++ b/pdfium/annots/annotation_ellipse_hidden_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_freetext_expected_skia.pdf.0.png b/pdfium/annots/annotation_freetext_expected_skia.pdf.0.png
new file mode 100644
index 0000000..ddf163b
--- /dev/null
+++ b/pdfium/annots/annotation_freetext_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_author_content_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_author_content_expected_skia.pdf.0.png
new file mode 100644
index 0000000..b86f239
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_author_content_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_author_content_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_highlight_author_content_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..c9aa65d
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_author_content_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_empty_content_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_empty_content_expected_skia.pdf.0.png
new file mode 100644
index 0000000..523d762
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_empty_content_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_expected_skia.pdf.0.png
new file mode 100644
index 0000000..523d762
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_hidden_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_hidden_expected_skia.pdf.0.png
new file mode 100644
index 0000000..6b66458
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_hidden_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_long_content_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_long_content_expected_skia.pdf.0.png
new file mode 100644
index 0000000..7b5b73a
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_long_content_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_long_content_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_highlight_long_content_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..5326c9b
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_long_content_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_no_author_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_no_author_expected_skia.pdf.0.png
new file mode 100644
index 0000000..7cc3cf4
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_no_author_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_no_author_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_highlight_no_author_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..05c3450
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_no_author_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_no_author_no_content_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_no_author_no_content_expected_skia.pdf.0.png
new file mode 100644
index 0000000..523d762
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_no_author_no_content_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_no_content_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_no_content_expected_skia.pdf.0.png
new file mode 100644
index 0000000..523d762
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_no_content_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_highlight_opacity_expected_skia.pdf.0.png b/pdfium/annots/annotation_highlight_opacity_expected_skia.pdf.0.png
new file mode 100644
index 0000000..658be50
--- /dev/null
+++ b/pdfium/annots/annotation_highlight_opacity_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ink_dash_expected_skia.pdf.0.png b/pdfium/annots/annotation_ink_dash_expected_skia.pdf.0.png
new file mode 100644
index 0000000..a1bff37
--- /dev/null
+++ b/pdfium/annots/annotation_ink_dash_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ink_dash_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_ink_dash_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..6d880dc
--- /dev/null
+++ b/pdfium/annots/annotation_ink_dash_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ink_expected_skia.pdf.0.png b/pdfium/annots/annotation_ink_expected_skia.pdf.0.png
new file mode 100644
index 0000000..3e3f9c7
--- /dev/null
+++ b/pdfium/annots/annotation_ink_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ink_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_ink_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..dcc144e
--- /dev/null
+++ b/pdfium/annots/annotation_ink_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ink_hidden_expected_skia.pdf.0.png b/pdfium/annots/annotation_ink_hidden_expected_skia.pdf.0.png
new file mode 100644
index 0000000..f910069
--- /dev/null
+++ b/pdfium/annots/annotation_ink_hidden_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ink_multiple_expected_skia.pdf.0.png b/pdfium/annots/annotation_ink_multiple_expected_skia.pdf.0.png
new file mode 100644
index 0000000..5748ab7
--- /dev/null
+++ b/pdfium/annots/annotation_ink_multiple_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_ink_multiple_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_ink_multiple_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..3a224eb
--- /dev/null
+++ b/pdfium/annots/annotation_ink_multiple_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_polygon_expected_skia.pdf.0.png b/pdfium/annots/annotation_polygon_expected_skia.pdf.0.png
new file mode 100644
index 0000000..14bfc6e
--- /dev/null
+++ b/pdfium/annots/annotation_polygon_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_square_expected_skia.pdf.0.png b/pdfium/annots/annotation_square_expected_skia.pdf.0.png
new file mode 100644
index 0000000..a14c21b
--- /dev/null
+++ b/pdfium/annots/annotation_square_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_square_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_square_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..35f854f
--- /dev/null
+++ b/pdfium/annots/annotation_square_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_square_fill_negative_border_expected_skia.pdf.0.png b/pdfium/annots/annotation_square_fill_negative_border_expected_skia.pdf.0.png
new file mode 100644
index 0000000..92010c2
--- /dev/null
+++ b/pdfium/annots/annotation_square_fill_negative_border_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_square_hidden_expected_skia.pdf.0.png b/pdfium/annots/annotation_square_hidden_expected_skia.pdf.0.png
new file mode 100644
index 0000000..8ab874e
--- /dev/null
+++ b/pdfium/annots/annotation_square_hidden_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_squiggly_expected_skia.pdf.0.png b/pdfium/annots/annotation_squiggly_expected_skia.pdf.0.png
new file mode 100644
index 0000000..620f0fc
--- /dev/null
+++ b/pdfium/annots/annotation_squiggly_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_squiggly_opacity_expected_skia.pdf.0.png b/pdfium/annots/annotation_squiggly_opacity_expected_skia.pdf.0.png
new file mode 100644
index 0000000..6045729
--- /dev/null
+++ b/pdfium/annots/annotation_squiggly_opacity_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_stamp_expected_skia.pdf.0.png b/pdfium/annots/annotation_stamp_expected_skia.pdf.0.png
new file mode 100644
index 0000000..a406153
--- /dev/null
+++ b/pdfium/annots/annotation_stamp_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_strikeout_expected_skia.pdf.0.png b/pdfium/annots/annotation_strikeout_expected_skia.pdf.0.png
new file mode 100644
index 0000000..e9a55e5
--- /dev/null
+++ b/pdfium/annots/annotation_strikeout_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_strikeout_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_strikeout_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..85396eb
--- /dev/null
+++ b/pdfium/annots/annotation_strikeout_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_strikeout_hidden_expected_skia.pdf.0.png b/pdfium/annots/annotation_strikeout_hidden_expected_skia.pdf.0.png
new file mode 100644
index 0000000..bba361a
--- /dev/null
+++ b/pdfium/annots/annotation_strikeout_hidden_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_strikeout_opacity_expected_skia.pdf.0.png b/pdfium/annots/annotation_strikeout_opacity_expected_skia.pdf.0.png
new file mode 100644
index 0000000..7c3506f
--- /dev/null
+++ b/pdfium/annots/annotation_strikeout_opacity_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_strikeout_opacity_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_strikeout_opacity_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..9e2d725
--- /dev/null
+++ b/pdfium/annots/annotation_strikeout_opacity_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_text_expected_skia.pdf.0.png b/pdfium/annots/annotation_text_expected_skia.pdf.0.png
new file mode 100644
index 0000000..f8d524d
--- /dev/null
+++ b/pdfium/annots/annotation_text_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_text_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_text_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..0d2d081
--- /dev/null
+++ b/pdfium/annots/annotation_text_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_underline_expected_skia.pdf.0.png b/pdfium/annots/annotation_underline_expected_skia.pdf.0.png
new file mode 100644
index 0000000..bb371d8
--- /dev/null
+++ b/pdfium/annots/annotation_underline_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_underline_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_underline_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..64055ce
--- /dev/null
+++ b/pdfium/annots/annotation_underline_expected_skiapaths.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_underline_hidden_expected_skia.pdf.0.png b/pdfium/annots/annotation_underline_hidden_expected_skia.pdf.0.png
new file mode 100644
index 0000000..46beaf6
--- /dev/null
+++ b/pdfium/annots/annotation_underline_hidden_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_underline_opacity_expected_skia.pdf.0.png b/pdfium/annots/annotation_underline_opacity_expected_skia.pdf.0.png
new file mode 100644
index 0000000..ac5304e
--- /dev/null
+++ b/pdfium/annots/annotation_underline_opacity_expected_skia.pdf.0.png
Binary files differ
diff --git a/pdfium/annots/annotation_underline_opacity_expected_skiapaths.pdf.0.png b/pdfium/annots/annotation_underline_opacity_expected_skiapaths.pdf.0.png
new file mode 100644
index 0000000..72bf518
--- /dev/null
+++ b/pdfium/annots/annotation_underline_opacity_expected_skiapaths.pdf.0.png
Binary files differ