https://github.com/mozilla/gecko-dev
Raw File
Tip revision: 5b86cb847fb9988650d7b74accd00295af0517ea authored by Ryan VanderMeulen on 01 April 2014, 14:44:12 UTC
Merge b2g18 to v1.1hd. a=merge
Tip revision: 5b86cb8
ensure-text-flushed.patch
diff --git a/gfx/cairo/cairo/src/cairo-pdf-operators.c b/gfx/cairo/cairo/src/cairo-pdf-operators.c
--- a/gfx/cairo/cairo/src/cairo-pdf-operators.c
+++ b/gfx/cairo/cairo/src/cairo-pdf-operators.c
@@ -480,6 +480,12 @@ _cairo_pdf_operators_clip (cairo_pdf_ope
     const char *pdf_operator;
     cairo_status_t status;
 
+    if (pdf_operators->in_text_object) {
+	status = _cairo_pdf_operators_end_text (pdf_operators);
+	if (unlikely (status))
+	    return status;
+    }
+
     if (! path->has_current_point) {
 	/* construct an empty path */
 	_cairo_output_stream_printf (pdf_operators->stream, "0 0 m ");
back to top