modify code.

git-svn-id: http://svn.sourceforge.jp/svnroot/bchan/bchanf/trunk@549 20a0b8eb-f62a-4a12-8fe1-b598822500fb

diff --git a/src/css/cssrendering_box.c b/src/css/cssrendering_box.c
index 57db513..58ab453 100644 (file)
--- a/src/css/cssrendering_box.c
+++ b/src/css/cssrendering_box.c
@@ -156,37 +156,36 @@ EXPORT Bool cssrendering_drawtraversal_next(cssrendering_drawtraversal_t *traver
 
        for (;;) {
                cont = treebase_preordertraversal_next(&traversal->base, (treebase_node_t**)&box, &dir);
-               if (cont != False) {
-                       if (dir == TREEBASE_TRAVERSAL_DIRECTION_DOWN) {
-                               if ((box->base.type == CSSRENDEREING_BOX_TYPE_BLOCK)||(box->base.type == CSSRENDEREING_BOX_TYPE_ANONYMOUS)) {
-                                       traversal->origin.x += box->base.content_edge.c.left;
-                                       traversal->origin.y += box->base.content_edge.c.top;
-                               } else if (box->base.type == CSSRENDEREING_BOX_TYPE_LINE) {
-                                       r = box->base.content_edge;
-                                       r.c.left += traversal->origin.x;
-                                       r.c.top += traversal->origin.y;
-                                       r.c.right += traversal->origin.x;
-                                       r.c.bottom += traversal->origin.y;
-                                       ok = cssmetric_rectangle_andrect(r, traversal->draw);
-                                       if (ok == False) {
-                                               continue;
-                                       }
-
-                                       result->type = CSSRENDERING_DRAWTRAVERSAL_RESULTTYPE_TEXT;
-                                       result->data.text.content_edge = r;
-                                       result->data.text.fragment = &(box->l.text);
-                                       result->data.text.nodedata = box->base.userdata;
-                                       break;
-                               }
-                       } else {
-                               if ((box->base.type == CSSRENDEREING_BOX_TYPE_BLOCK)||(box->base.type == CSSRENDEREING_BOX_TYPE_ANONYMOUS)) {
-                                       traversal->origin.x -= box->base.content_edge.c.left;
-                                       traversal->origin.y -= box->base.content_edge.c.top;
-                               } else {
+               if (cont == False) {
+                       break;
+               }
+               if (dir == TREEBASE_TRAVERSAL_DIRECTION_DOWN) {
+                       if ((box->base.type == CSSRENDEREING_BOX_TYPE_BLOCK)||(box->base.type == CSSRENDEREING_BOX_TYPE_ANONYMOUS)) {
+                               traversal->origin.x += box->base.content_edge.c.left;
+                               traversal->origin.y += box->base.content_edge.c.top;
+                       } else if (box->base.type == CSSRENDEREING_BOX_TYPE_LINE) {
+                               r = box->base.content_edge;
+                               r.c.left += traversal->origin.x;
+                               r.c.top += traversal->origin.y;
+                               r.c.right += traversal->origin.x;
+                               r.c.bottom += traversal->origin.y;
+                               ok = cssmetric_rectangle_andrect(r, traversal->draw);
+                               if (ok == False) {
+                                       continue;
                                }
+
+                               result->type = CSSRENDERING_DRAWTRAVERSAL_RESULTTYPE_TEXT;
+                               result->data.text.content_edge = r;
+                               result->data.text.fragment = &(box->l.text);
+                               result->data.text.nodedata = box->base.userdata;
+                               break;
                        }
                } else {
-                       break;
+                       if ((box->base.type == CSSRENDEREING_BOX_TYPE_BLOCK)||(box->base.type == CSSRENDEREING_BOX_TYPE_ANONYMOUS)) {
+                               traversal->origin.x -= box->base.content_edge.c.left;
+                               traversal->origin.y -= box->base.content_edge.c.top;
+                       } else {
+                       }
                }
        }
 

diff --git a/src/css/cssrendering_box.h b/src/css/cssrendering_box.h
index 6aa8fe9..95c02ad 100644 (file)
--- a/src/css/cssrendering_box.h
+++ b/src/css/cssrendering_box.h
@@ -73,7 +73,6 @@ typedef struct cssrendering_linebox_t_ cssrendering_linebox_t;
 /* Detail name: anonymousbox */
 struct cssrendering_anonymousbox_t_ {
        cssrendering_basebox_t base;
-       cssmetric_rectangle_t view;
 };
 typedef struct cssrendering_anonymousbox_t_ cssrendering_anonymousbox_t;