Add EvPage so that we can hold a reference to the backend page. Form

2008-04-14  Carlos Garcia Campos  <carlosgc@gnome.org>

	* libdocument/Makefile.am:
	* libdocument/ev-page.[ch]:
	* libdocument/ev-render-context.[ch]: (ev_render_context_dispose),
	(ev_render_context_new), (ev_render_context_set_page):
	* libdocument/ev-form-field.[ch]: (ev_form_field_init),
	(ev_form_field_finalize), (ev_form_field_class_init):
	* libdocument/ev-document-forms.[ch]:
	(ev_document_forms_get_form_fields):
	* libdocument/ev-document.[ch]: (ev_document_get_page),
	(ev_document_get_page_size), (ev_document_get_page_label):
	* shell/ev-jobs.[ch]: (ev_job_thumbnail_dispose),
	(ev_job_render_run), (ev_job_thumbnail_new),
	(ev_job_thumbnail_run), (ev_job_print_run):
	* shell/ev-page-cache.c: (ev_page_cache_new):
	* shell/ev-pixbuf-cache.c: (job_page_ready_cb), (job_finished_cb),
	(check_job_size_and_unref), (add_job):
	* shell/ev-sidebar-thumbnails.c: (add_range):
	* shell/ev-view.c: (ev_view_form_field_get_region),
	(ev_view_form_field_button_create_widget),
	(ev_view_form_field_text_save), (ev_view_form_field_choice_save),
	(ev_view_handle_form_field), (ev_view_size_allocate),
	(get_selected_text):
	* shell/ev-window.c: (ev_window_refresh_window_thumbnail):
	* backend/pdf/ev-poppler.cc: (pdf_document_get_page_size),
	(pdf_document_get_page), (pdf_document_get_page_label),
	(pdf_document_render), (pdf_document_get_info),
	(pdf_document_document_iface_init),
	(pdf_document_thumbnails_get_thumbnail),
	(pdf_document_thumbnails_get_dimensions),
	(pdf_document_file_exporter_do_page),
	(pdf_selection_render_selection),
	(pdf_selection_get_selected_text),
	(pdf_selection_get_selection_region),
	(pdf_selection_get_selection_map),
	(pdf_document_forms_get_form_fields),
	(pdf_document_forms_form_field_text_get_text),
	(pdf_document_forms_form_field_text_set_text),
	(pdf_document_forms_form_field_button_set_state),
	(pdf_document_forms_form_field_button_get_state),
	(pdf_document_forms_form_field_choice_get_item),
	(pdf_document_forms_form_field_choice_get_n_items),
	(pdf_document_forms_form_field_choice_is_item_selected),
	(pdf_document_forms_form_field_choice_select_item),
	(pdf_document_forms_form_field_choice_toggle_item),
	(pdf_document_forms_form_field_choice_unselect_all),
	(pdf_document_forms_form_field_choice_set_text),
	(pdf_document_forms_form_field_choice_get_text):
	* backend/ps/ev-spectre.c: (ps_document_get_page),
	(ps_document_get_page_size), (ps_document_get_page_label),
	(ps_document_render), (ps_document_document_iface_init),
	(ps_document_file_exporter_do_page):
	* backend/tiff/tiff-document.c: (tiff_document_get_page_size),
	(tiff_document_render), (tiff_document_render_pixbuf),
	(tiff_document_file_exporter_do_page):
	* backend/pixbuf/pixbuf-document.c:
	(pixbuf_document_get_page_size):
	* backend/comics/comics-document.c:
	(comics_document_get_page_size), (comics_document_render_pixbuf):
	* backend/djvu/djvu-document.c: (djvu_document_get_page_size),
	(djvu_document_render), (djvu_selection_get_selected_text),
	(djvu_document_thumbnails_get_thumbnail),
	(djvu_document_file_exporter_do_page),
	(djvu_document_find_get_result):
	* backend/dvi/dvi-document.c: (dvi_document_get_page_size),
	(dvi_document_render), (dvi_document_thumbnails_get_dimensions),
	(dvi_document_thumbnails_get_thumbnail),
	(dvi_document_file_exporter_do_page):
	* backend/impress/impress-document.c:
	(impress_document_get_page_size),
	(impress_document_render_pixbuf):
	* thumbnailer/evince-thumbnailer.c: (evince_thumbnail_pngenc_get):

	Add EvPage so that we can hold a reference to the backend
	page. Form fields keep now a reference to the poppler page
	improving performance since we don't have to create/destroy the
	poppler field for every form operation. This will be needed for
	annotations too.

svn path=/trunk/; revision=3004

1 files changed, 19 insertions, 11 deletions

diff --git a/shell/ev-page-cache.c b/shell/ev-page-cache.c
index a1b4d60..8b8bedc 100644
--- a/shell/ev-page-cache.c
+++ b/shell/ev-page-cache.c
@@ -2,6 +2,7 @@
 #include "ev-page-cache.h"
 #include "ev-job-queue.h"
 #include "ev-document-thumbnails.h"
+#include "ev-page.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -289,19 +290,22 @@ ev_page_cache_new (EvDocument *document)
 	has_thumbs = EV_IS_DOCUMENT_THUMBNAILS (document);
 	
 	for (i = 0; i < page_cache->n_pages; i++) {
-		double page_width = 0;
-		double page_height = 0;
-		gint   thumb_width = 0;
-		gint   thumb_height = 0;
+		EvPage *page;
+		double  page_width = 0;
+		double  page_height = 0;
+		gint    thumb_width = 0;
+		gint    thumb_height = 0;
 
-		ev_document_get_page_size (document, i, &page_width, &page_height);
+		page = ev_document_get_page (document, i);
+		
+		ev_document_get_page_size (document, page, &page_width, &page_height);
 
-	    	page_cache->page_labels[i] = ev_document_get_page_label (document, i);
+	    	page_cache->page_labels[i] = ev_document_get_page_label (document, page);
 		
 		if (page_cache->page_labels[i] != NULL) {
 		
-			page_cache->max_label_chars = MAX(page_cache->max_label_chars, 
-							    g_utf8_strlen (page_cache->page_labels[i], 256));
+			page_cache->max_label_chars = MAX (page_cache->max_label_chars, 
+							   g_utf8_strlen (page_cache->page_labels[i], 256));
 			if (!page_cache->has_labels) {
 				gchar *expected_label;
 			
@@ -347,13 +351,15 @@ ev_page_cache_new (EvDocument *document)
 			info->height = page_height;
 		}
 
-		if (!has_thumbs)
+		if (!has_thumbs) {
+			g_object_unref (page);
 			continue;
+		}
 
 		if (!rc) {
-			rc = ev_render_context_new (0, i, (gdouble)THUMBNAIL_WIDTH / page_width);
+			rc = ev_render_context_new (page, 0, (gdouble)THUMBNAIL_WIDTH / page_width);
 		} else {
-			ev_render_context_set_page (rc, i);
+			ev_render_context_set_page (rc, page);
 			ev_render_context_set_scale (rc, (gdouble)THUMBNAIL_WIDTH / page_width);
 		}
 
@@ -393,6 +399,8 @@ ev_page_cache_new (EvDocument *document)
 			thumb_info->width = thumb_width;
 			thumb_info->height = thumb_height;
 		}
+
+		g_object_unref (page);
 	}
 
 	if (rc) {