Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/2d6da52f38ea078b0d67eb262e2507ee83902f6d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/2d6da52f38ea078b0d67eb262e2507ee83902f6d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/2d6da52f38ea078b0d67eb262e2507ee83902f6d
The branch, master has been updated
via 2d6da52f38ea078b0d67eb262e2507ee83902f6d (commit)
via 6219ee7b24326322c1522926d25b7054b594c791 (commit)
via 9a82677312778c13d01bc832b329a9de7b8660a9 (commit)
via edef40bbc432c092b1e5f4f6f5d408180ba188b3 (commit)
via 971058cd67f738e4d64d1bbce234fa9340cb2668 (commit)
from 427fb928c56988fcacfae87ba45ece8fc8e5f2c5 (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/2d6da52f38ea078b0d67eb262e2507ee83902f6d
commit 2d6da52f38ea078b0d67eb262e2507ee83902f6d
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Remove box use from maiga plugin hack. May need a new way to get
dimensions?
diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c
index e7ce0de..89e80e3 100644
--- a/amiga/plugin_hack.c
+++ b/amiga/plugin_hack.c
@@ -25,7 +25,6 @@
#include "content/content_protected.h"
#include "content/hlcache.h"
#include "desktop/plotters.h"
-#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
@@ -50,8 +49,7 @@ static bool amiga_plugin_hack_redraw(struct content *c,
struct content_redraw_data *data, const struct rect *clip,
const struct redraw_context *ctx);
static void amiga_plugin_hack_open(struct content *c, struct browser_window
*bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
static void amiga_plugin_hack_close(struct content *c);
static nserror amiga_plugin_hack_clone(const struct content *old, struct
content **newc);
static content_type amiga_plugin_hack_content_type(void);
@@ -173,15 +171,15 @@ bool amiga_plugin_hack_redraw(struct content *c,
* \param params object parameters, or 0 if not an object
*/
void amiga_plugin_hack_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
LOG(("amiga_plugin_hack_open %s", nsurl_access(content_get_url(c))));
- if(c && box)
+ if(c)
{
- c->width = box->width;
- c->height = box->height;
+ /* TODO: Do we need valid dimensions at this point? */
+ c->width = 0;
+ c->height = 0;
}
return;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/6219ee7b24326322c1522926d25b7054b594c791
commit 6219ee7b24326322c1522926d25b7054b594c791
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Remove box stuff from amiga content handlers.
diff --git a/amiga/dt_anim.c b/amiga/dt_anim.c
index d92bfae..9d79257 100644
--- a/amiga/dt_anim.c
+++ b/amiga/dt_anim.c
@@ -27,7 +27,6 @@
#include "content/content_protected.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
-#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
@@ -66,8 +65,7 @@ static bool amiga_dt_anim_redraw(struct content *c,
struct content_redraw_data *data, const struct rect *clip,
const struct redraw_context *ctx);
static void amiga_dt_anim_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
static void amiga_dt_anim_close(struct content *c);
static nserror amiga_dt_anim_clone(const struct content *old, struct content
**newc);
static content_type amiga_dt_anim_content_type(void);
@@ -285,8 +283,7 @@ bool amiga_dt_anim_redraw(struct content *c,
* \param params object parameters, or 0 if not an object
*/
void amiga_dt_anim_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
LOG(("amiga_dt_anim_open"));
diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c
index b6e0a91..0768479 100644
--- a/amiga/dt_picture.c
+++ b/amiga/dt_picture.c
@@ -27,7 +27,6 @@
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/image_cache.h"
-#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
diff --git a/amiga/dt_sound.c b/amiga/dt_sound.c
index 4b69402..8ca7d13 100644
--- a/amiga/dt_sound.c
+++ b/amiga/dt_sound.c
@@ -25,7 +25,6 @@
#include "amiga/datatypes.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
-#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
@@ -53,8 +52,7 @@ static bool amiga_dt_sound_redraw(struct content *c,
struct content_redraw_data *data, const struct rect *clip,
const struct redraw_context *ctx);
static void amiga_dt_sound_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
static nserror amiga_dt_sound_clone(const struct content *old, struct content
**newc);
static content_type amiga_dt_sound_content_type(void);
@@ -216,8 +214,7 @@ bool amiga_dt_sound_redraw(struct content *c,
void amiga_dt_sound_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
amiga_dt_sound_content *plugin = (amiga_dt_sound_content *) c;
struct object_param *param;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/9a82677312778c13d01bc832b329a9de7b8660a9
commit 9a82677312778c13d01bc832b329a9de7b8660a9
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Remove declaration of nonexistent function.
diff --git a/desktop/browser.h b/desktop/browser.h
index 306124d..b776b27 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -292,8 +292,6 @@ struct browser_window *browser_window_find_target(
struct browser_window *bw, const char *target,
browser_mouse_state mouse);
-void browser_redraw_box(struct hlcache_handle *c, struct box *box);
-
void browser_select_menu_callback(void *client_data,
int x, int y, int width, int height);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/edef40bbc432c092b1e5f4f6f5d408180ba188b3
commit edef40bbc432c092b1e5f4f6f5d408180ba188b3
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Don't pass struct box to content open.
diff --git a/content/content.c b/content/content.c
index e78ead2..57d3708 100644
--- a/content/content.c
+++ b/content/content.c
@@ -670,22 +670,20 @@ void content_broadcast(struct content *c, content_msg msg,
* \param bw browser window containing the content
* \param page content of type CONTENT_HTML containing c, or 0 if
not an
* object within a page
- * \param box box containing c, or 0 if not an object
* \param params object parameters, or 0 if not an object
*
* Calls the open function for the content.
*/
void content_open(hlcache_handle *h, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
struct content *c = hlcache_handle_get_content(h);
assert(c != 0);
LOG(("content %p %s", c,
nsurl_access(llcache_handle_get_url(c->llcache))));
if (c->handler->open != NULL)
- c->handler->open(c, bw, page, box, params);
+ c->handler->open(c, bw, page, params);
}
diff --git a/content/content.h b/content/content.h
index 8987e2c..562bcd7 100644
--- a/content/content.h
+++ b/content/content.h
@@ -40,7 +40,6 @@
#include "desktop/mouse.h"
#include "desktop/plot_style.h"
-struct box;
struct browser_window;
struct content;
struct llcache_handle;
@@ -218,8 +217,7 @@ void content_mouse_action(struct hlcache_handle *h, struct
browser_window *bw,
bool content_redraw(struct hlcache_handle *h, struct content_redraw_data *data,
const struct rect *clip, const struct redraw_context *ctx);
void content_open(struct hlcache_handle *h, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
void content_close(struct hlcache_handle *h);
struct selection *content_get_selection(struct hlcache_handle *h);
void content_get_contextual_content(struct hlcache_handle *h,
diff --git a/content/content_protected.h b/content/content_protected.h
index e375734..a52a51b 100644
--- a/content/content_protected.h
+++ b/content/content_protected.h
@@ -62,9 +62,7 @@ struct content_handler {
const struct rect *clip,
const struct redraw_context *ctx);
void (*open)(struct content *c, struct browser_window *bw,
- struct content *page,
- struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
void (*close)(struct content *c);
struct selection * (*get_selection)(struct content *c);
void (*get_contextual_content)(struct content *c, int x, int y,
diff --git a/desktop/browser.c b/desktop/browser.c
index 3fe16f5..a721d73 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1247,7 +1247,7 @@ nserror browser_window_callback(hlcache_handle *c,
/* new content; set scroll_to_top */
browser_window_update(bw, true);
- content_open(c, bw, 0, 0, 0);
+ content_open(c, bw, 0, 0);
browser_window_set_status(bw, content_get_status_message(c));
/* history */
diff --git a/render/html.c b/render/html.c
index 79ca026..0dde26b 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1119,7 +1119,6 @@ html_object_callback(hlcache_handle *object,
if (c->base.status != CONTENT_STATUS_LOADING && c->bw != NULL)
content_open(object,
c->bw, &c->base,
- box,
box->object_params);
break;
@@ -2554,7 +2553,6 @@ static void
html_open(struct content *c,
struct browser_window *bw,
struct content *page,
- struct box *box,
struct object_params *params)
{
html_content *html = (html_content *) c;
@@ -2577,7 +2575,6 @@ html_open(struct content *c,
content_open(object->content,
bw, c,
- object->box,
object->box->object_params);
}
}
diff --git a/render/textplain.c b/render/textplain.c
index 78539b4..1877f32 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -113,8 +113,7 @@ static void textplain_destroy(struct content *c);
static bool textplain_redraw(struct content *c, struct content_redraw_data
*data,
const struct rect *clip, const struct redraw_context *ctx);
static void textplain_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
void textplain_close(struct content *c);
struct selection *textplain_get_selection(struct content *c);
struct search_context *textplain_get_search(struct content *c);
@@ -855,8 +854,7 @@ bool textplain_redraw(struct content *c, struct
content_redraw_data *data,
*/
void textplain_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
textplain_content *text = (textplain_content *) c;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/971058cd67f738e4d64d1bbce234fa9340cb2668
commit 971058cd67f738e4d64d1bbce234fa9340cb2668
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Remove unused struct box.
diff --git a/gtk/window.c b/gtk/window.c
index 5d37842..89248e4 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -59,7 +59,6 @@ struct gui_window {
/** mouse state and events. */
struct {
struct gui_window *gui;
- struct box *box;
gdouble pressed_x;
gdouble pressed_y;
-----------------------------------------------------------------------
Summary of changes:
amiga/dt_anim.c | 7 ++-----
amiga/dt_picture.c | 1 -
amiga/dt_sound.c | 7 ++-----
amiga/plugin_hack.c | 14 ++++++--------
content/content.c | 6 ++----
content/content.h | 4 +---
content/content_protected.h | 4 +---
desktop/browser.c | 2 +-
desktop/browser.h | 2 --
gtk/window.c | 1 -
render/html.c | 3 ---
render/textplain.c | 6 ++----
12 files changed, 17 insertions(+), 40 deletions(-)
diff --git a/amiga/dt_anim.c b/amiga/dt_anim.c
index d92bfae..9d79257 100644
--- a/amiga/dt_anim.c
+++ b/amiga/dt_anim.c
@@ -27,7 +27,6 @@
#include "content/content_protected.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
-#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
@@ -66,8 +65,7 @@ static bool amiga_dt_anim_redraw(struct content *c,
struct content_redraw_data *data, const struct rect *clip,
const struct redraw_context *ctx);
static void amiga_dt_anim_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
static void amiga_dt_anim_close(struct content *c);
static nserror amiga_dt_anim_clone(const struct content *old, struct content
**newc);
static content_type amiga_dt_anim_content_type(void);
@@ -285,8 +283,7 @@ bool amiga_dt_anim_redraw(struct content *c,
* \param params object parameters, or 0 if not an object
*/
void amiga_dt_anim_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
LOG(("amiga_dt_anim_open"));
diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c
index b6e0a91..0768479 100644
--- a/amiga/dt_picture.c
+++ b/amiga/dt_picture.c
@@ -27,7 +27,6 @@
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/image_cache.h"
-#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
diff --git a/amiga/dt_sound.c b/amiga/dt_sound.c
index 4b69402..8ca7d13 100644
--- a/amiga/dt_sound.c
+++ b/amiga/dt_sound.c
@@ -25,7 +25,6 @@
#include "amiga/datatypes.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
-#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
@@ -53,8 +52,7 @@ static bool amiga_dt_sound_redraw(struct content *c,
struct content_redraw_data *data, const struct rect *clip,
const struct redraw_context *ctx);
static void amiga_dt_sound_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
static nserror amiga_dt_sound_clone(const struct content *old, struct content
**newc);
static content_type amiga_dt_sound_content_type(void);
@@ -216,8 +214,7 @@ bool amiga_dt_sound_redraw(struct content *c,
void amiga_dt_sound_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
amiga_dt_sound_content *plugin = (amiga_dt_sound_content *) c;
struct object_param *param;
diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c
index e7ce0de..89e80e3 100644
--- a/amiga/plugin_hack.c
+++ b/amiga/plugin_hack.c
@@ -25,7 +25,6 @@
#include "content/content_protected.h"
#include "content/hlcache.h"
#include "desktop/plotters.h"
-#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
@@ -50,8 +49,7 @@ static bool amiga_plugin_hack_redraw(struct content *c,
struct content_redraw_data *data, const struct rect *clip,
const struct redraw_context *ctx);
static void amiga_plugin_hack_open(struct content *c, struct browser_window
*bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
static void amiga_plugin_hack_close(struct content *c);
static nserror amiga_plugin_hack_clone(const struct content *old, struct
content **newc);
static content_type amiga_plugin_hack_content_type(void);
@@ -173,15 +171,15 @@ bool amiga_plugin_hack_redraw(struct content *c,
* \param params object parameters, or 0 if not an object
*/
void amiga_plugin_hack_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
LOG(("amiga_plugin_hack_open %s", nsurl_access(content_get_url(c))));
- if(c && box)
+ if(c)
{
- c->width = box->width;
- c->height = box->height;
+ /* TODO: Do we need valid dimensions at this point? */
+ c->width = 0;
+ c->height = 0;
}
return;
diff --git a/content/content.c b/content/content.c
index e78ead2..57d3708 100644
--- a/content/content.c
+++ b/content/content.c
@@ -670,22 +670,20 @@ void content_broadcast(struct content *c, content_msg msg,
* \param bw browser window containing the content
* \param page content of type CONTENT_HTML containing c, or 0 if
not an
* object within a page
- * \param box box containing c, or 0 if not an object
* \param params object parameters, or 0 if not an object
*
* Calls the open function for the content.
*/
void content_open(hlcache_handle *h, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
struct content *c = hlcache_handle_get_content(h);
assert(c != 0);
LOG(("content %p %s", c,
nsurl_access(llcache_handle_get_url(c->llcache))));
if (c->handler->open != NULL)
- c->handler->open(c, bw, page, box, params);
+ c->handler->open(c, bw, page, params);
}
diff --git a/content/content.h b/content/content.h
index 8987e2c..562bcd7 100644
--- a/content/content.h
+++ b/content/content.h
@@ -40,7 +40,6 @@
#include "desktop/mouse.h"
#include "desktop/plot_style.h"
-struct box;
struct browser_window;
struct content;
struct llcache_handle;
@@ -218,8 +217,7 @@ void content_mouse_action(struct hlcache_handle *h, struct
browser_window *bw,
bool content_redraw(struct hlcache_handle *h, struct content_redraw_data *data,
const struct rect *clip, const struct redraw_context *ctx);
void content_open(struct hlcache_handle *h, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
void content_close(struct hlcache_handle *h);
struct selection *content_get_selection(struct hlcache_handle *h);
void content_get_contextual_content(struct hlcache_handle *h,
diff --git a/content/content_protected.h b/content/content_protected.h
index e375734..a52a51b 100644
--- a/content/content_protected.h
+++ b/content/content_protected.h
@@ -62,9 +62,7 @@ struct content_handler {
const struct rect *clip,
const struct redraw_context *ctx);
void (*open)(struct content *c, struct browser_window *bw,
- struct content *page,
- struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
void (*close)(struct content *c);
struct selection * (*get_selection)(struct content *c);
void (*get_contextual_content)(struct content *c, int x, int y,
diff --git a/desktop/browser.c b/desktop/browser.c
index 3fe16f5..a721d73 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1247,7 +1247,7 @@ nserror browser_window_callback(hlcache_handle *c,
/* new content; set scroll_to_top */
browser_window_update(bw, true);
- content_open(c, bw, 0, 0, 0);
+ content_open(c, bw, 0, 0);
browser_window_set_status(bw, content_get_status_message(c));
/* history */
diff --git a/desktop/browser.h b/desktop/browser.h
index 306124d..b776b27 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -292,8 +292,6 @@ struct browser_window *browser_window_find_target(
struct browser_window *bw, const char *target,
browser_mouse_state mouse);
-void browser_redraw_box(struct hlcache_handle *c, struct box *box);
-
void browser_select_menu_callback(void *client_data,
int x, int y, int width, int height);
diff --git a/gtk/window.c b/gtk/window.c
index 5d37842..89248e4 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -59,7 +59,6 @@ struct gui_window {
/** mouse state and events. */
struct {
struct gui_window *gui;
- struct box *box;
gdouble pressed_x;
gdouble pressed_y;
diff --git a/render/html.c b/render/html.c
index 79ca026..0dde26b 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1119,7 +1119,6 @@ html_object_callback(hlcache_handle *object,
if (c->base.status != CONTENT_STATUS_LOADING && c->bw != NULL)
content_open(object,
c->bw, &c->base,
- box,
box->object_params);
break;
@@ -2554,7 +2553,6 @@ static void
html_open(struct content *c,
struct browser_window *bw,
struct content *page,
- struct box *box,
struct object_params *params)
{
html_content *html = (html_content *) c;
@@ -2577,7 +2575,6 @@ html_open(struct content *c,
content_open(object->content,
bw, c,
- object->box,
object->box->object_params);
}
}
diff --git a/render/textplain.c b/render/textplain.c
index 78539b4..1877f32 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -113,8 +113,7 @@ static void textplain_destroy(struct content *c);
static bool textplain_redraw(struct content *c, struct content_redraw_data
*data,
const struct rect *clip, const struct redraw_context *ctx);
static void textplain_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params);
+ struct content *page, struct object_params *params);
void textplain_close(struct content *c);
struct selection *textplain_get_selection(struct content *c);
struct search_context *textplain_get_search(struct content *c);
@@ -855,8 +854,7 @@ bool textplain_redraw(struct content *c, struct
content_redraw_data *data,
*/
void textplain_open(struct content *c, struct browser_window *bw,
- struct content *page, struct box *box,
- struct object_params *params)
+ struct content *page, struct object_params *params)
{
textplain_content *text = (textplain_content *) c;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
