Remove unused thumbnail sources from core and gtk

5 files changed, 2 insertions, 289 deletions

diff --git a/desktop/Makefile b/desktop/Makefile
index 894b51861..f7f660d51 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -2,7 +2,7 @@
 
 S_DESKTOP := cookie_manager.c knockout.c hotlist.c mouse.c		\
 	plot_style.c print.c search.c searchweb.c scrollbar.c		\
-	sslcert_viewer.c textarea.c thumbnail.c tree.c version.c	\
+	sslcert_viewer.c textarea.c tree.c version.c			\
 	system_colour.c global_history.c treeview.c
 
 S_DESKTOP := $(addprefix desktop/,$(S_DESKTOP))
diff --git a/desktop/thumbnail.c b/desktop/thumbnail.c
deleted file mode 100644
index d7aed007a..000000000
--- a/desktop/thumbnail.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2011 Michael Drake <tlsa@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Core thumbnail handling (implementation).
- */
-
-#include <assert.h>
-#include <stdbool.h>
-
-#include "content/content.h"
-#include "content/hlcache.h"
-#include "desktop/browser.h"
-#include "desktop/knockout.h"
-#include "utils/nsoption.h"
-#include "desktop/plotters.h"
-#include "desktop/thumbnail.h"
-#include "utils/log.h"
-
-
-/**
- * Get scale at which thumbnail will be rendered for a given content and
- * thumbnail size.
- *
- * \param  content  The content to redraw for thumbnail
- * \param  width    The thumbnail width
- * \return scale thumbnail will be rendered at
- *
- * Units for width and height are pixels.
- */
-static float thumbnail_get_redraw_scale(struct hlcache_handle *content,
-		int width)
-{
-	assert(content);
-
-	if (content_get_width(content))
-		return (float)width / (float)content_get_width(content);
-	else
-		return 1.0;	
-}
-
-
-/* exported interface, documented in thumbnail.h */
-bool thumbnail_redraw(struct hlcache_handle *content,
-		int width, int height, const struct redraw_context *ctx)
-{
-	struct redraw_context new_ctx = *ctx;
-	struct rect clip;
-	struct content_redraw_data data;
-	float scale;
-	bool plot_ok = true;
-
-	assert(content);
-
-	LOG(("Content %p %dx%d ctx:%p", content, width, height, ctx));
-
-	if (ctx->plot->option_knockout) {
-		knockout_plot_start(ctx, &new_ctx);
-	}
-
-	/* Set clip rectangle to required thumbnail size */
-	clip.x0 = 0;
-	clip.y0 = 0;
-	clip.x1 = width;
-	clip.y1 = height;
-
-	new_ctx.plot->clip(&clip);
-
-	/* Plot white background */
-	plot_ok &= new_ctx.plot->rectangle(clip.x0, clip.y0, clip.x1, clip.y1,
-			plot_style_fill_white);
-
-	/* Find the scale we're using */
-	scale = thumbnail_get_redraw_scale(content, width);
-
-	/* Set up content redraw data */
-	data.x = 0;
-	data.y = 0;
-	data.width = width;
-	data.height = height;
-
-	data.background_colour = 0xFFFFFF;
-	data.scale = scale;
-	data.repeat_x = false;
-	data.repeat_y = false;
-
-	/* Render the content */
-	plot_ok &= content_redraw(content, &data, &clip, &new_ctx);
-	
-	if (ctx->plot->option_knockout) {
-		knockout_plot_end();
-	}
-
-	return plot_ok;
-}
diff --git a/desktop/thumbnail.h b/desktop/thumbnail.h
deleted file mode 100644
index ef31f7ec3..000000000
--- a/desktop/thumbnail.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011 Michael Drake <tlsa@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Thumbail handling (interface).
- */
-
-#ifndef _NETSURF_DESKTOP_THUMBNAIL_H_
-#define _NETSURF_DESKTOP_THUMBNAIL_H_
-
-#include <stdbool.h>
-
-struct hlcache_handle;
-struct redraw_context;
-struct bitmap;
-
-/**
- * Redraw a content for thumbnailing
- *
- * Calls the redraw function for the content, 
- *
- * \param  content  The content to redraw for thumbnail
- * \param  width    The thumbnail width
- * \param  height   The thumbnail height
- * \param  ctx      current redraw context
- * \return true if successful, false otherwise
- *
- * The thumbnail is guaranteed to be filled to its width/height extents, so
- * there is no need to render a solid background first.
- *
- * Units for width and height are pixels.
- */
-bool thumbnail_redraw(struct hlcache_handle *content, int width, int height,
-		      const struct redraw_context *ctx);
-
-
-/* In platform specific thumbnail.c. */
-bool thumbnail_create(struct hlcache_handle *content, struct bitmap *bitmap);
-
-#endif
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 8378c1096..ee757f5f0 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -107,7 +107,7 @@ S_PIXBUF :=
 $(eval $(foreach V,$(filter GTK_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/$(patsubst GTK_IMAGE_%,%,$(V)).c,$(patsubst GTK_IMAGE_%,%,$(V))_pixdata)))
 
 # S_GTK are sources purely for the GTK build
-S_GTK := font_pango.c bitmap.c gui.c schedule.c thumbnail.c plotters.c	\
+S_GTK := font_pango.c bitmap.c gui.c schedule.c plotters.c	\
 	treeview.c scaffolding.c gdk.c completion.c login.c throbber.c	\
 	selection.c history.c window.c fetch.c download.c menu.c	\
 	print.c search.c tabs.c theme.c toolbar.c gettext.c		\
diff --git a/gtk/thumbnail.c b/gtk/thumbnail.c
deleted file mode 100644
index 2ee33fba6..000000000
--- a/gtk/thumbnail.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2006 Rob Kendrick <rjek@rjek.com>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Page thumbnail creation (implementation).
- *
- * Thumbnails are created by setting the current drawing contexts to the
- * bitmap (a gdk pixbuf) we are passed, and plotting the page at a small
- * scale.
- */
-
-#include <assert.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-
-#include "utils/log.h"
-#include "utils/utils.h"
-#include "content/content.h"
-#include "content/hlcache.h"
-#include "desktop/plotters.h"
-#include "desktop/browser.h"
-#include "desktop/thumbnail.h"
-
-#include "gtk/scaffolding.h"
-#include "gtk/plotters.h"
-#include "gtk/bitmap.h"
-
-/**
- * Create a thumbnail of a page.
- *
- * \param  content  content structure to thumbnail
- * \param  bitmap   the bitmap to draw to
- * \return true on success and bitmap updated else false
- */
-bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap)
-{
-	cairo_surface_t *dsurface = bitmap->surface;
-	cairo_surface_t *surface;
-	cairo_t *old_cr;
-	gint dwidth, dheight;
-	int cwidth, cheight;
-	struct redraw_context ctx = {
-		.interactive = false,
-		.background_images = true,
-		.plot = &nsgtk_plotters
-	};
-
-	assert(content);
-	assert(bitmap);
-
-	dwidth = cairo_image_surface_get_width(dsurface);
-	dheight = cairo_image_surface_get_height(dsurface);
-
-	/* Calculate size of buffer to render the content into */
-	/* Get the width from the content width, unless it exceeds 1024,
-	 * in which case we use 1024. This means we never create excessively
-	 * large render buffers for huge contents, which would eat memory and
-	 * cripple performance. 
-	 */
-	cwidth = min(max(content_get_width(content), dwidth), 1024);
-
-	/* The height is set in proportion with the width, according to the
-	 * aspect ratio of the required thumbnail. */
-	cheight = ((cwidth * dheight) + (dwidth / 2)) / dwidth;
-
-	/*  Create surface to render into */
-	surface = cairo_surface_create_similar(dsurface, CAIRO_CONTENT_COLOR_ALPHA, cwidth, cheight);
-
-	if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) {
-		cairo_surface_destroy(surface);
-		return false;
-	}
-
-	old_cr = current_cr;
-	current_cr = cairo_create(surface);
-
-	/* render the content */
-	thumbnail_redraw(content, cwidth, cheight, &ctx);
-
-	cairo_destroy(current_cr);
-	current_cr = old_cr;
-
-	cairo_t *cr = cairo_create(dsurface);
-
-	/* Scale *before* setting the source surface (1) */
-	cairo_scale (cr, (double)dwidth / cwidth, (double)dheight / cheight);
-	cairo_set_source_surface (cr, surface, 0, 0);
-
-	/* To avoid getting the edge pixels blended with 0 alpha,
-	 * which would occur with the default EXTEND_NONE. Use
-	 * EXTEND_PAD for 1.2 or newer (2)
-	 */
-	cairo_pattern_set_extend (cairo_get_source(cr), CAIRO_EXTEND_REFLECT); 
-
-	/* Replace the destination with the source instead of overlaying */
-	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-
-	/* Do the actual drawing */
-	cairo_paint(cr);
-   
-	cairo_destroy(cr);
-
-	cairo_surface_destroy(surface);
-
-	return true;
-}
-