fix text and tspan redraw missing path bug.

Author: zhangjipeng

ext/svg/psx_svg_render.cpp

@@ -1094,7 +1094,7 @@ class svg_render_use : public render_obj_base
 
     void get_xlink(void) const
     {
-        if (!m_linked) {
+        if (!m_linked && m_xlink) {
             render_obj_base* head = m_head;
             while (head) {
                 if (head->id() && strcmp(m_xlink, head->id()) == 0) {
@@ -1264,8 +1264,12 @@ class svg_render_content : public render_obj_base
     {
     }
 
-    virtual void render_content(ps_context* ctx, ps_path* contents, ps_matrix* offset_matrix, float yoffset)
+    virtual void render_content(ps_context* ctx, ps_path* contents, ps_matrix* offset_matrix, float yoffset, bool rebuild_path)
     {
+        if (!rebuild_path) {
+            return;
+        }
+
         ps_path* glyph_path = ps_path_create();
 
         ps_matrix* mtx = ps_matrix_create_copy(offset_matrix);
@@ -1348,19 +1352,21 @@ class svg_render_text : public render_obj_base
         ps_font_info info;
         ps_get_font_info(ctx, &info);
 
+        bool build_path = false;
         if (ps_path_is_empty(m_path)) {
-            // FIXME:  text and span  redraw !!!!!!!!!!!!!!!!!
-            ps_matrix* mtx = ps_matrix_create();
-            ps_matrix_translate(mtx, m_x, m_y);
-
-            // draw text contents and spans
-            for (uint32_t i = 0; i < psx_array_size(&m_contents); i++) {
-                svg_render_content* content = *(psx_array_get(&m_contents, i, svg_render_content*));
-                content->render_content(ctx, m_path, mtx, -info.ascent);
-            }
-            ps_matrix_unref(mtx);
+            build_path = true;
         }
 
+        ps_matrix* mtx = ps_matrix_create();
+        ps_matrix_translate(mtx, m_x, m_y);
+
+        // draw text contents and spans
+        for (uint32_t i = 0; i < psx_array_size(&m_contents); i++) {
+            svg_render_content* content = *(psx_array_get(&m_contents, i, svg_render_content*));
+            content->render_content(ctx, m_path, mtx, -info.ascent, build_path);
+        }
+        ps_matrix_unref(mtx);
+
         ps_set_font(ctx, old_font);
 
         ps_set_path(ctx, m_path);
@@ -1454,7 +1460,7 @@ class svg_render_tspan : public svg_render_content
         this->svg_render_tspan::~svg_render_tspan();
     }
 
-    virtual void render_content(ps_context* ctx, ps_path*, ps_matrix* offset_matrix, float)
+    virtual void render_content(ps_context* ctx, ps_path*, ps_matrix* offset_matrix, float, bool)
     {
         ps_save(ctx);
         prepare(ctx);

unit_tests/ext_svg_render.cpp

@@ -414,6 +414,18 @@ TEST_F(SVGRenderTest, TextTest)
                                     "</text></svg>";
     draw_svg(svg_text_gradient);
     EXPECT_SYS_SNAPSHOT_EQ(svg_text_gradient);
+
+    const char* svg_text_use_gradient = "<svg><defs><linearGradient id=\"g1\">"
+                                        "<stop offset=\"0.1\" stop-color=\"blue\"/>"
+                                        "<stop offset =\"0.8\" stop-color=\"red\"/>"
+                                        "</linearGradient></defs>"
+                                        "<text id=\"text1\" fill=\"url(#g1)\" x=20 y=60"
+                                        " font-family=\"sans-serif\" font-size=\"48px\" font-weight=\"bold\">"
+                                        "hello <tspan fill=\"green\" font-size=\"24px\">all</tspan> world"
+                                        "</text><use x=\"20\" y=\"100\" xlink:href=\"#text1\"/></svg>";
+    draw_svg(svg_text_use_gradient);
+    EXPECT_SYS_SNAPSHOT_EQ(svg_text_use_gradient);
+
 }
 
 TEST_F(SVGRenderTest, ImageTest)