Revert accidental push of ps debugging API.

This reverts commits
   6ad8c96fd81e06cea6ada4a83e7c5614f150f914,
   a3f97d1d2e77a0fee4ca03d5dc9968952a440561,
   25abe582982caeb07d1e0af4acca53bb110a33bf

I should know better by now than to push without checking for outstanding
changes.

2 files changed, 46 insertions, 13 deletions

diff --git a/boilerplate/cairo-boilerplate-pdf.c b/boilerplate/cairo-boilerplate-pdf.c
index 985540b2f..d76d13951 100644
--- a/boilerplate/cairo-boilerplate-pdf.c
+++ b/boilerplate/cairo-boilerplate-pdf.c
@@ -29,6 +29,8 @@
 #if CAIRO_CAN_TEST_PDF_SURFACE
 
 #include <cairo-pdf.h>
+#include <cairo-pdf-surface-private.h>
+#include <cairo-paginated-surface-private.h>
 
 #if HAVE_SIGNAL_H
 #include <signal.h>
@@ -219,18 +221,23 @@ _cairo_boilerplate_pdf_cleanup (void *closure)
 }
 
 static void
-_cairo_boilerplate_pdf_force_fallbacks (cairo_surface_t *surface,
+_cairo_boilerplate_pdf_force_fallbacks (cairo_surface_t *abstract_surface,
 				       double		 x_pixels_per_inch,
 				       double		 y_pixels_per_inch)
 {
-    pdf_target_closure_t *ptc =
-	cairo_surface_get_user_data (surface, &pdf_closure_key);
+    pdf_target_closure_t *ptc = cairo_surface_get_user_data (abstract_surface,
+							     &pdf_closure_key);
+
+    cairo_paginated_surface_t *paginated;
+    cairo_pdf_surface_t *surface;
 
     if (ptc->target)
-	surface = ptc->target;
+	abstract_surface = ptc->target;
 
-    cairo_pdf_surface_debug_force_fallbacks (surface);
-    cairo_surface_set_fallback_resolution (surface,
+    paginated = (cairo_paginated_surface_t*) abstract_surface;
+    surface = (cairo_pdf_surface_t*) paginated->target;
+    surface->force_fallbacks = TRUE;
+    cairo_surface_set_fallback_resolution (&paginated->base,
 					   x_pixels_per_inch,
 					   y_pixels_per_inch);
 }
diff --git a/boilerplate/cairo-boilerplate-ps.c b/boilerplate/cairo-boilerplate-ps.c
index a4897fd52..ae61239f3 100644
--- a/boilerplate/cairo-boilerplate-ps.c
+++ b/boilerplate/cairo-boilerplate-ps.c
@@ -30,6 +30,9 @@
 
 #include <cairo-ps.h>
 
+#include <cairo-ps-surface-private.h>
+#include <cairo-paginated-surface-private.h>
+
 #if HAVE_SIGNAL_H
 #include <signal.h>
 #endif
@@ -52,6 +55,24 @@ typedef struct _ps_target_closure {
     cairo_ps_level_t	 level;
 } ps_target_closure_t;
 
+static cairo_status_t
+_cairo_boilerplate_ps_surface_set_creation_date (cairo_surface_t *abstract_surface,
+						 time_t 	  date)
+{
+    cairo_paginated_surface_t *paginated = (cairo_paginated_surface_t*) abstract_surface;
+    cairo_ps_surface_t *surface;
+
+    if (cairo_surface_get_type (abstract_surface) != CAIRO_SURFACE_TYPE_PS)
+	return CAIRO_STATUS_SURFACE_TYPE_MISMATCH;
+
+    surface = (cairo_ps_surface_t*) paginated->target;
+
+    surface->has_creation_date = TRUE;
+    surface->creation_date = date;
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
 static cairo_surface_t *
 _cairo_boilerplate_ps_create_surface (const char		*name,
 				      cairo_content_t		 content,
@@ -85,7 +106,7 @@ _cairo_boilerplate_ps_create_surface (const char		*name,
 	goto CLEANUP_FILENAME;
 
     cairo_ps_surface_restrict_to_level (surface, level);
-    cairo_ps_surface_debug_set_creation_date (surface, 0);
+    _cairo_boilerplate_ps_surface_set_creation_date (surface, 0);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
     if (content == CAIRO_CONTENT_COLOR) {
@@ -262,18 +283,23 @@ _cairo_boilerplate_ps_cleanup (void *closure)
 }
 
 static void
-_cairo_boilerplate_ps_force_fallbacks (cairo_surface_t *surface,
+_cairo_boilerplate_ps_force_fallbacks (cairo_surface_t *abstract_surface,
 				       double		 x_pixels_per_inch,
 				       double		 y_pixels_per_inch)
 {
-    ps_target_closure_t *ptc =
-	cairo_surface_get_user_data (surface, &ps_closure_key);
+    ps_target_closure_t *ptc = cairo_surface_get_user_data (abstract_surface,
+							    &ps_closure_key);
+
+    cairo_paginated_surface_t *paginated;
+    cairo_ps_surface_t *surface;
 
     if (ptc->target)
-	surface = ptc->target;
+	abstract_surface = ptc->target;
 
-    cairo_ps_surface_debug_force_fallbacks (surface);
-    cairo_surface_set_fallback_resolution (surface,
+    paginated = (cairo_paginated_surface_t*) abstract_surface;
+    surface = (cairo_ps_surface_t*) paginated->target;
+    surface->force_fallbacks = TRUE;
+    cairo_surface_set_fallback_resolution (&paginated->base,
 					   x_pixels_per_inch,
 					   y_pixels_per_inch);
 }