Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/be23d522db03f412bc9a855aac7598419336d4f1
...commit
http://git.netsurf-browser.org/netsurf.git/commit/be23d522db03f412bc9a855aac7598419336d4f1
...tree
http://git.netsurf-browser.org/netsurf.git/tree/be23d522db03f412bc9a855aac7598419336d4f1
The branch, master has been updated
via be23d522db03f412bc9a855aac7598419336d4f1 (commit)
from 170dc5d52419450edc440c054a94135c1cc1296a (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/commit/?id=be23d522db03f412bc9a855aac7598419336d4f1
commit be23d522db03f412bc9a855aac7598419336d4f1
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
HTML: Box coordinates: Take fast route to float container.
And assert that floats have a float_container.
diff --git a/content/handlers/html/box.c b/content/handlers/html/box.c
index d9e6495..30cb4e2 100644
--- a/content/handlers/html/box.c
+++ b/content/handlers/html/box.c
@@ -307,11 +307,11 @@ void box_coords(struct box *box, int *x, int *y)
*y = box->y;
while (box->parent) {
if (box_is_float(box)) {
- do {
- box = box->parent;
- } while (!box->float_children);
- } else
+ assert(box->float_container);
+ box = box->float_container;
+ } else {
box = box->parent;
+ }
*x += box->x - scrollbar_get_offset(box->scroll_x);
*y += box->y - scrollbar_get_offset(box->scroll_y);
}
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/box.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/content/handlers/html/box.c b/content/handlers/html/box.c
index d9e6495..30cb4e2 100644
--- a/content/handlers/html/box.c
+++ b/content/handlers/html/box.c
@@ -307,11 +307,11 @@ void box_coords(struct box *box, int *x, int *y)
*y = box->y;
while (box->parent) {
if (box_is_float(box)) {
- do {
- box = box->parent;
- } while (!box->float_children);
- } else
+ assert(box->float_container);
+ box = box->float_container;
+ } else {
box = box->parent;
+ }
*x += box->x - scrollbar_get_offset(box->scroll_x);
*y += box->y - scrollbar_get_offset(box->scroll_y);
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
