Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/d4ca800268987eb04e93f5fca6fb22a4e71ab416
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/d4ca800268987eb04e93f5fca6fb22a4e71ab416
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/d4ca800268987eb04e93f5fca6fb22a4e71ab416

The branch, master has been updated
       via  d4ca800268987eb04e93f5fca6fb22a4e71ab416 (commit)
       via  4581375209bbba2687bf6a1f42af4cc7e677652c (commit)
       via  9202c137b252456ddee91fdc28eff99cf6107ea1 (commit)
       via  8fc0eab89b2424a2d44b40cce9d051316c8b9cd9 (commit)
       via  014fb9db8dab9c5e93ce949318e430edbf6fd8f5 (commit)
       via  a11de47b644d88dc5951f82b3f4bec589b7da3ff (commit)
       via  daf10f00a6c19ac279f53190bfaa39d04772809a (commit)
       via  400ce416234e37889e2f2410f86d115373f39c82 (commit)
       via  854e5560415063226499d018af9146a238d49ab8 (commit)
      from  2d6da52f38ea078b0d67eb262e2507ee83902f6d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/d4ca800268987eb04e93f5fca6fb22a4e71ab416
commit d4ca800268987eb04e93f5fca6fb22a4e71ab416
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Use proper function for box tree dump.

diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index abcf846..fc497e3 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -1314,13 +1314,7 @@ MENUHANDLER(save_box_tree)
                        struct browser_window *bw;
                        bw = nsbeos_get_browser_window(gw->top_level);
 
-                       if (bw->current_content && 
-                                       bw->current_content->type == 
-                                       CONTENT_HTML) {
-                               box_dump(fh, 
-                                       bw->current_content->data.html.layout,
-                                       0);
-                       }
+                       browser_window_debug_dump(bw, f);
 
                        fclose(fh);
                }


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/4581375209bbba2687bf6a1f42af4cc7e677652c
commit 4581375209bbba2687bf6a1f42af4cc7e677652c
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Use proper function for box tree dump.

diff --git a/riscos/gui.c b/riscos/gui.c
index e11679b..2926f63 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -65,9 +65,7 @@
 #include "desktop/sslcert.h"
 #include "desktop/tree.h"
 #include "desktop/tree_url_node.h"
-#include "render/box.h"
 #include "render/font.h"
-#include "render/html.h"
 #include "riscos/content-handlers/artworks.h"
 #include "riscos/bitmap.h"
 #include "riscos/buffer.h"
@@ -2224,7 +2222,7 @@ void ro_gui_view_source_bounce(wimp_message *message)
  * Send the debug dump of a content to a text editor.
  */
 
-void ro_gui_dump_content(hlcache_handle *c)
+void ro_gui_dump_browser_window(struct browser_window *bw)
 {
        os_error *error;
 
@@ -2236,14 +2234,7 @@ void ro_gui_dump_content(hlcache_handle *c)
                return;
        }
 
-       /* output debug information to file */
-       switch (content_get_type(c)) {
-       case CONTENT_HTML:
-               box_dump(stream, html_get_box_tree(c), 0);
-               break;
-       default:
-               break;
-        }
+       browser_window_debug_dump(bw, stream);
 
        fclose(stream);
 
diff --git a/riscos/gui.h b/riscos/gui.h
index cd70a39..aa9873c 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -116,7 +116,7 @@ extern struct gui_window *ro_gui_current_redraw_gui;
 void ro_gui_open_window_request(wimp_open *open);
 void ro_gui_screen_size(int *width, int *height);
 void ro_gui_view_source(struct hlcache_handle *c);
-void ro_gui_dump_content(struct hlcache_handle *c);
+void ro_gui_dump_browser_window(struct browser_window *bw);
 void ro_gui_drag_box_start(wimp_pointer *pointer);
 bool ro_gui_prequit(void);
 const char *ro_gui_default_language(void);
diff --git a/riscos/window.c b/riscos/window.c
index deae43c..085e02a 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1993,7 +1993,7 @@ bool ro_gui_window_handle_local_keypress(struct 
gui_window *g, wimp_key *key,
 
        case IS_WIMP_KEY + wimp_KEY_F9:
                /* Dump content for debugging. */
-               ro_gui_dump_content(h);
+               ro_gui_dump_browser_window(g->bw);
                return true;
 
        case IS_WIMP_KEY + wimp_KEY_CONTROL + wimp_KEY_F9:


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/9202c137b252456ddee91fdc28eff99cf6107ea1
commit 9202c137b252456ddee91fdc28eff99cf6107ea1
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Remove unused includes.

diff --git a/gtk/gui.c b/gtk/gui.c
index 1e23d07..4956677 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -71,7 +71,6 @@
 #include "gtk/window.h"
 #include "gtk/schedule.h"
 
-#include "render/box.h"
 #include "render/form.h"
 #include "utils/filepath.h"
 #include "utils/log.h"
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 10a0987..84c20ee 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -76,7 +76,6 @@
 #include "gtk/compat.h"
 #include "gtk/gdk.h"
 #include "image/ico.h"
-#include "render/box.h"
 #include "render/font.h"
 #include "render/form.h"
 #include "render/html.h"


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/8fc0eab89b2424a2d44b40cce9d051316c8b9cd9
commit 8fc0eab89b2424a2d44b40cce9d051316c8b9cd9
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Use proper function for dumping box tree.

diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 990444e..10a0987 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -1232,13 +1232,7 @@ MULTIHANDLER(saveboxtree)
                        struct browser_window *bw;
                        bw = nsgtk_get_browser_window(g->top_level);
 
-                       if (bw->current_content &&
-                                       content_get_type(bw->current_content) ==
-                                       CONTENT_HTML) {
-                               box_dump(fh,
-                                       html_get_box_tree(bw->current_content),
-                                       0);
-                       }
+                       browser_window_debug_dump(bw, fh);
 
                        fclose(fh);
                }


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/014fb9db8dab9c5e93ce949318e430edbf6fd8f5
commit 014fb9db8dab9c5e93ce949318e430edbf6fd8f5
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Function for front ends to get debug dump from bw.

diff --git a/desktop/browser.c b/desktop/browser.c
index a721d73..a33bbff 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -648,6 +648,13 @@ bool browser_window_drop_file_at_point(struct 
browser_window *bw,
        return false;
 }
 
+/* exported interface, documented in browser.h */
+void browser_window_debug_dump(struct browser_window *bw, FILE *f)
+{
+       if (bw->current_content != NULL)
+               content_debug_dump(bw->current_content, f);
+}
+
 
 /**
  * Create and open a new root browser window with the given page.
diff --git a/desktop/browser.h b/desktop/browser.h
index b776b27..cdf8395 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -457,6 +457,15 @@ void browser_window_set_selection(struct browser_window 
*bw,
 struct selection *browser_window_get_selection(struct browser_window *bw);
 
 
+/**
+ * Dump debug info concerning the browser window's contents to file
+ *
+ * \param  bw    The browser window
+ * \param  bw    The file to dump to
+ */
+void browser_window_debug_dump(struct browser_window *bw, FILE *f);
+
+
 /* In platform specific hotlist.c. */
 void hotlist_visited(struct hlcache_handle *c);
 


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/a11de47b644d88dc5951f82b3f4bec589b7da3ff
commit a11de47b644d88dc5951f82b3f4bec589b7da3ff
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Implement debug dump content call for HTML.

diff --git a/render/html.c b/render/html.c
index 0dde26b..17ca801 100644
--- a/render/html.c
+++ b/render/html.c
@@ -2892,6 +2892,23 @@ static bool html_drop_file_at_point(struct content *c, 
int x, int y, char *file)
 
 
 /**
+ * Dump debug info concerning the html_content
+ *
+ * \param  bw    The browser window
+ * \param  bw    The file to dump to
+ */
+static void html_debug_dump(struct content *c, FILE *f)
+{
+       html_content *html = (html_content *) c;
+
+       assert(html != NULL);
+       assert(html->layout != NULL);
+
+       box_dump(f, html->layout, 0);
+}
+
+
+/**
  * Set an HTML content's search context
  *
  * \param c    content of type html
@@ -3219,6 +3236,7 @@ static const content_handler html_content_handler = {
        .get_contextual_content = html_get_contextual_content,
        .scroll_at_point = html_scroll_at_point,
        .drop_file_at_point = html_drop_file_at_point,
+       .debug_dump = html_debug_dump,
        .clone = html_clone,
        .type = html_content_type,
        .no_share = true,


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/daf10f00a6c19ac279f53190bfaa39d04772809a
commit daf10f00a6c19ac279f53190bfaa39d04772809a
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    API for content debug dump.

diff --git a/content/content.c b/content/content.c
index 57d3708..b65e110 100644
--- a/content/content.c
+++ b/content/content.c
@@ -762,6 +762,16 @@ bool content_drop_file_at_point(struct hlcache_handle *h,
 }
 
 
+void content_debug_dump(struct hlcache_handle *h, FILE *f)
+{
+       struct content *c = hlcache_handle_get_content(h);
+       assert(c != 0);
+
+       if (c->handler->debug_dump != NULL)
+               c->handler->debug_dump(c, f);
+}
+
+
 void content_add_error(struct content *c, const char *token,
                unsigned int line)
 {
diff --git a/content/content.h b/content/content.h
index 562bcd7..b07af4f 100644
--- a/content/content.h
+++ b/content/content.h
@@ -27,6 +27,7 @@
 #define _NETSURF_CONTENT_CONTENT_H_
 
 #include <stdbool.h>
+#include <stdio.h>
 
 #include <libwapcaplet/libwapcaplet.h>
 
@@ -226,6 +227,7 @@ bool content_scroll_at_point(struct hlcache_handle *h,
                int x, int y, int scrx, int scry);
 bool content_drop_file_at_point(struct hlcache_handle *h,
                int x, int y, char *file);
+void content_debug_dump(struct hlcache_handle *h, FILE *f);
 struct content_rfc5988_link *content_find_rfc5988_link(struct hlcache_handle 
*c,
                lwc_string *rel);
 
diff --git a/content/content_protected.h b/content/content_protected.h
index a52a51b..36a053b 100644
--- a/content/content_protected.h
+++ b/content/content_protected.h
@@ -71,6 +71,7 @@ struct content_handler {
                        int scrx, int scry);
        bool (*drop_file_at_point)(struct content *c, int x, int y,
                        char *file);
+       void (*debug_dump)(struct content *c, FILE *f);
        nserror (*clone)(const struct content *old, struct content **newc);
        bool (*matches_quirks)(const struct content *c, bool quirks);
        content_type (*type)(void);


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/400ce416234e37889e2f2410f86d115373f39c82
commit 400ce416234e37889e2f2410f86d115373f39c82
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Remove unused includes.

diff --git a/riscos/save.c b/riscos/save.c
index b9dbe51..064b252 100644
--- a/riscos/save.c
+++ b/riscos/save.c
@@ -45,9 +45,7 @@
 #include "desktop/selection.h"
 #include "desktop/thumbnail.h"
 #include "image/bitmap.h"
-#include "render/box.h"
 #include "render/form.h"
-#include "render/html.h"
 #include "riscos/dialog.h"
 #include "riscos/gui.h"
 #include "riscos/menus.h"


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commitdiff/854e5560415063226499d018af9146a238d49ab8
commit 854e5560415063226499d018af9146a238d49ab8
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    Remove unused includes.

diff --git a/beos/gui.cpp b/beos/gui.cpp
index 6795efd..c557723 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -55,9 +55,7 @@ extern "C" {
 #include "desktop/netsurf.h"
 #include "desktop/options.h"
 
-//#include "render/box.h"
 #include "render/form.h"
-//#include "render/html.h"
 #include "utils/filename.h"
 #include "utils/log.h"
 #include "utils/messages.h"
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index 8dde6e5..abcf846 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -49,10 +49,8 @@ extern "C" {
 #include "desktop/options.h"
 #include "desktop/selection.h"
 #include "desktop/textinput.h"
-//#include "render/box.h"
 #include "render/font.h"
 #include "render/form.h"
-//#include "render/html.h"
 #include "utils/messages.h"
 #include "utils/schedule.h"
 #include "utils/utils.h"
diff --git a/beos/window.cpp b/beos/window.cpp
index 845c8ac..1879892 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -29,7 +29,6 @@ extern "C" {
 #include "desktop/selection.h"
 #include "desktop/textinput.h"
 #include "render/font.h"
-#include "render/box.h"
 #include "utils/log.h"
 #include "utils/types.h"
 #include "utils/utf8.h"


-----------------------------------------------------------------------

Summary of changes:
 beos/gui.cpp                |    2 --
 beos/scaffolding.cpp        |   10 +---------
 beos/window.cpp             |    1 -
 content/content.c           |   10 ++++++++++
 content/content.h           |    2 ++
 content/content_protected.h |    1 +
 desktop/browser.c           |    7 +++++++
 desktop/browser.h           |    9 +++++++++
 gtk/gui.c                   |    1 -
 gtk/scaffolding.c           |    9 +--------
 render/html.c               |   18 ++++++++++++++++++
 riscos/gui.c                |   13 ++-----------
 riscos/gui.h                |    2 +-
 riscos/save.c               |    2 --
 riscos/window.c             |    2 +-
 15 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/beos/gui.cpp b/beos/gui.cpp
index 6795efd..c557723 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -55,9 +55,7 @@ extern "C" {
 #include "desktop/netsurf.h"
 #include "desktop/options.h"
 
-//#include "render/box.h"
 #include "render/form.h"
-//#include "render/html.h"
 #include "utils/filename.h"
 #include "utils/log.h"
 #include "utils/messages.h"
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index 8dde6e5..fc497e3 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -49,10 +49,8 @@ extern "C" {
 #include "desktop/options.h"
 #include "desktop/selection.h"
 #include "desktop/textinput.h"
-//#include "render/box.h"
 #include "render/font.h"
 #include "render/form.h"
-//#include "render/html.h"
 #include "utils/messages.h"
 #include "utils/schedule.h"
 #include "utils/utils.h"
@@ -1316,13 +1314,7 @@ MENUHANDLER(save_box_tree)
                        struct browser_window *bw;
                        bw = nsbeos_get_browser_window(gw->top_level);
 
-                       if (bw->current_content && 
-                                       bw->current_content->type == 
-                                       CONTENT_HTML) {
-                               box_dump(fh, 
-                                       bw->current_content->data.html.layout,
-                                       0);
-                       }
+                       browser_window_debug_dump(bw, f);
 
                        fclose(fh);
                }
diff --git a/beos/window.cpp b/beos/window.cpp
index 845c8ac..1879892 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -29,7 +29,6 @@ extern "C" {
 #include "desktop/selection.h"
 #include "desktop/textinput.h"
 #include "render/font.h"
-#include "render/box.h"
 #include "utils/log.h"
 #include "utils/types.h"
 #include "utils/utf8.h"
diff --git a/content/content.c b/content/content.c
index 57d3708..b65e110 100644
--- a/content/content.c
+++ b/content/content.c
@@ -762,6 +762,16 @@ bool content_drop_file_at_point(struct hlcache_handle *h,
 }
 
 
+void content_debug_dump(struct hlcache_handle *h, FILE *f)
+{
+       struct content *c = hlcache_handle_get_content(h);
+       assert(c != 0);
+
+       if (c->handler->debug_dump != NULL)
+               c->handler->debug_dump(c, f);
+}
+
+
 void content_add_error(struct content *c, const char *token,
                unsigned int line)
 {
diff --git a/content/content.h b/content/content.h
index 562bcd7..b07af4f 100644
--- a/content/content.h
+++ b/content/content.h
@@ -27,6 +27,7 @@
 #define _NETSURF_CONTENT_CONTENT_H_
 
 #include <stdbool.h>
+#include <stdio.h>
 
 #include <libwapcaplet/libwapcaplet.h>
 
@@ -226,6 +227,7 @@ bool content_scroll_at_point(struct hlcache_handle *h,
                int x, int y, int scrx, int scry);
 bool content_drop_file_at_point(struct hlcache_handle *h,
                int x, int y, char *file);
+void content_debug_dump(struct hlcache_handle *h, FILE *f);
 struct content_rfc5988_link *content_find_rfc5988_link(struct hlcache_handle 
*c,
                lwc_string *rel);
 
diff --git a/content/content_protected.h b/content/content_protected.h
index a52a51b..36a053b 100644
--- a/content/content_protected.h
+++ b/content/content_protected.h
@@ -71,6 +71,7 @@ struct content_handler {
                        int scrx, int scry);
        bool (*drop_file_at_point)(struct content *c, int x, int y,
                        char *file);
+       void (*debug_dump)(struct content *c, FILE *f);
        nserror (*clone)(const struct content *old, struct content **newc);
        bool (*matches_quirks)(const struct content *c, bool quirks);
        content_type (*type)(void);
diff --git a/desktop/browser.c b/desktop/browser.c
index a721d73..a33bbff 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -648,6 +648,13 @@ bool browser_window_drop_file_at_point(struct 
browser_window *bw,
        return false;
 }
 
+/* exported interface, documented in browser.h */
+void browser_window_debug_dump(struct browser_window *bw, FILE *f)
+{
+       if (bw->current_content != NULL)
+               content_debug_dump(bw->current_content, f);
+}
+
 
 /**
  * Create and open a new root browser window with the given page.
diff --git a/desktop/browser.h b/desktop/browser.h
index b776b27..cdf8395 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -457,6 +457,15 @@ void browser_window_set_selection(struct browser_window 
*bw,
 struct selection *browser_window_get_selection(struct browser_window *bw);
 
 
+/**
+ * Dump debug info concerning the browser window's contents to file
+ *
+ * \param  bw    The browser window
+ * \param  bw    The file to dump to
+ */
+void browser_window_debug_dump(struct browser_window *bw, FILE *f);
+
+
 /* In platform specific hotlist.c. */
 void hotlist_visited(struct hlcache_handle *c);
 
diff --git a/gtk/gui.c b/gtk/gui.c
index 1e23d07..4956677 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -71,7 +71,6 @@
 #include "gtk/window.h"
 #include "gtk/schedule.h"
 
-#include "render/box.h"
 #include "render/form.h"
 #include "utils/filepath.h"
 #include "utils/log.h"
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 990444e..84c20ee 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -76,7 +76,6 @@
 #include "gtk/compat.h"
 #include "gtk/gdk.h"
 #include "image/ico.h"
-#include "render/box.h"
 #include "render/font.h"
 #include "render/form.h"
 #include "render/html.h"
@@ -1232,13 +1231,7 @@ MULTIHANDLER(saveboxtree)
                        struct browser_window *bw;
                        bw = nsgtk_get_browser_window(g->top_level);
 
-                       if (bw->current_content &&
-                                       content_get_type(bw->current_content) ==
-                                       CONTENT_HTML) {
-                               box_dump(fh,
-                                       html_get_box_tree(bw->current_content),
-                                       0);
-                       }
+                       browser_window_debug_dump(bw, fh);
 
                        fclose(fh);
                }
diff --git a/render/html.c b/render/html.c
index 0dde26b..17ca801 100644
--- a/render/html.c
+++ b/render/html.c
@@ -2892,6 +2892,23 @@ static bool html_drop_file_at_point(struct content *c, 
int x, int y, char *file)
 
 
 /**
+ * Dump debug info concerning the html_content
+ *
+ * \param  bw    The browser window
+ * \param  bw    The file to dump to
+ */
+static void html_debug_dump(struct content *c, FILE *f)
+{
+       html_content *html = (html_content *) c;
+
+       assert(html != NULL);
+       assert(html->layout != NULL);
+
+       box_dump(f, html->layout, 0);
+}
+
+
+/**
  * Set an HTML content's search context
  *
  * \param c    content of type html
@@ -3219,6 +3236,7 @@ static const content_handler html_content_handler = {
        .get_contextual_content = html_get_contextual_content,
        .scroll_at_point = html_scroll_at_point,
        .drop_file_at_point = html_drop_file_at_point,
+       .debug_dump = html_debug_dump,
        .clone = html_clone,
        .type = html_content_type,
        .no_share = true,
diff --git a/riscos/gui.c b/riscos/gui.c
index e11679b..2926f63 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -65,9 +65,7 @@
 #include "desktop/sslcert.h"
 #include "desktop/tree.h"
 #include "desktop/tree_url_node.h"
-#include "render/box.h"
 #include "render/font.h"
-#include "render/html.h"
 #include "riscos/content-handlers/artworks.h"
 #include "riscos/bitmap.h"
 #include "riscos/buffer.h"
@@ -2224,7 +2222,7 @@ void ro_gui_view_source_bounce(wimp_message *message)
  * Send the debug dump of a content to a text editor.
  */
 
-void ro_gui_dump_content(hlcache_handle *c)
+void ro_gui_dump_browser_window(struct browser_window *bw)
 {
        os_error *error;
 
@@ -2236,14 +2234,7 @@ void ro_gui_dump_content(hlcache_handle *c)
                return;
        }
 
-       /* output debug information to file */
-       switch (content_get_type(c)) {
-       case CONTENT_HTML:
-               box_dump(stream, html_get_box_tree(c), 0);
-               break;
-       default:
-               break;
-        }
+       browser_window_debug_dump(bw, stream);
 
        fclose(stream);
 
diff --git a/riscos/gui.h b/riscos/gui.h
index cd70a39..aa9873c 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -116,7 +116,7 @@ extern struct gui_window *ro_gui_current_redraw_gui;
 void ro_gui_open_window_request(wimp_open *open);
 void ro_gui_screen_size(int *width, int *height);
 void ro_gui_view_source(struct hlcache_handle *c);
-void ro_gui_dump_content(struct hlcache_handle *c);
+void ro_gui_dump_browser_window(struct browser_window *bw);
 void ro_gui_drag_box_start(wimp_pointer *pointer);
 bool ro_gui_prequit(void);
 const char *ro_gui_default_language(void);
diff --git a/riscos/save.c b/riscos/save.c
index b9dbe51..064b252 100644
--- a/riscos/save.c
+++ b/riscos/save.c
@@ -45,9 +45,7 @@
 #include "desktop/selection.h"
 #include "desktop/thumbnail.h"
 #include "image/bitmap.h"
-#include "render/box.h"
 #include "render/form.h"
-#include "render/html.h"
 #include "riscos/dialog.h"
 #include "riscos/gui.h"
 #include "riscos/menus.h"
diff --git a/riscos/window.c b/riscos/window.c
index deae43c..085e02a 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1993,7 +1993,7 @@ bool ro_gui_window_handle_local_keypress(struct 
gui_window *g, wimp_key *key,
 
        case IS_WIMP_KEY + wimp_KEY_F9:
                /* Dump content for debugging. */
-               ro_gui_dump_content(h);
+               ro_gui_dump_browser_window(g->bw);
                return true;
 
        case IS_WIMP_KEY + wimp_KEY_CONTROL + wimp_KEY_F9:


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to