[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
rwlbuis at webkit.org
rwlbuis at webkit.org
Wed Dec 22 14:42:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d2f536374274b3fb553ff306736a88910bfcb058
Author: rwlbuis at webkit.org <rwlbuis at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Oct 17 10:53:28 2010 +0000
2010-10-17 Rob Buis <rwlbuis at gmail.com>
Reviewed by Dirk Schulze.
Text under nested link dropped
https://bugs.webkit.org/show_bug.cgi?id=46460
Allow links inside of tspan and textPath elements.
* svg/SVGTSpanElement.cpp:
(WebCore::SVGTSpanElement::childShouldCreateRenderer):
* svg/SVGTextPathElement.cpp:
(WebCore::SVGTextPathElement::childShouldCreateRenderer):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69922 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0c1d187..a238531 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-17 Rob Buis <rwlbuis at gmail.com>
+
+ Reviewed by Dirk Schulze.
+
+ Text under nested link dropped
+ https://bugs.webkit.org/show_bug.cgi?id=46460
+
+ Adjust test to also check that links inside a tspan or
+ textPath work.
+
+ * platform/mac-leopard/svg/custom/text-linking-expected.checksum:
+ * platform/mac-leopard/svg/custom/text-linking-expected.png:
+ * platform/mac/svg/custom/text-linking-expected.checksum:
+ * platform/mac/svg/custom/text-linking-expected.png:
+ * platform/mac/svg/custom/text-linking-expected.txt:
+ * svg/custom/text-linking.svg:
+
2010-10-14 Antonio Gomes <agomes at rim.com>
Reviewed by Martin Robinson and Xan Lopez.
diff --git a/LayoutTests/platform/mac-leopard/svg/custom/text-linking-expected.checksum b/LayoutTests/platform/mac-leopard/svg/custom/text-linking-expected.checksum
index 3801314..5803ce0 100644
--- a/LayoutTests/platform/mac-leopard/svg/custom/text-linking-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/svg/custom/text-linking-expected.checksum
@@ -1 +1 @@
-86085bdff3814d28f70fe45e4b8f4263
\ No newline at end of file
+ac0742bf900cf26d33b69078c2f2e25c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/svg/custom/text-linking-expected.png b/LayoutTests/platform/mac-leopard/svg/custom/text-linking-expected.png
index bf5e170..a25183a 100644
Binary files a/LayoutTests/platform/mac-leopard/svg/custom/text-linking-expected.png and b/LayoutTests/platform/mac-leopard/svg/custom/text-linking-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum b/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum
index 4975c7e..5803ce0 100644
--- a/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum
+++ b/LayoutTests/platform/mac/svg/custom/text-linking-expected.checksum
@@ -1 +1 @@
-4fad709f74a4510163796360884babc7
\ No newline at end of file
+ac0742bf900cf26d33b69078c2f2e25c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/custom/text-linking-expected.png b/LayoutTests/platform/mac/svg/custom/text-linking-expected.png
index 586b3ad..a25183a 100644
Binary files a/LayoutTests/platform/mac/svg/custom/text-linking-expected.png and b/LayoutTests/platform/mac/svg/custom/text-linking-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt b/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt
index 61b3dd0..88a85fd 100644
--- a/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/text-linking-expected.txt
@@ -1,12 +1,13 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (97,36) size 235x168
+ RenderSVGRoot {svg} at (97,36) size 235x268
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGText {text} at (0,-14) size 163x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 163x18
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 25 width 163.00: "Referenced character data"
RenderSVGPath {path} at (100,140) size 100x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 150 L 150 140 L 200 150"]
+ RenderSVGPath {path} at (100,240) size 200x10 [fill={[type=SOLID] [color=#000000]}] [data="M 100 250 L 150 240 L 200 250 L 250 240 L 300 250"]
RenderSVGText {text} at (100,36) size 77x18 contains 1 chunk(s)
RenderSVGInline {a} at (0,0) size 77x18
RenderSVGTSpan {tspan} at (0,0) size 77x18
@@ -48,3 +49,42 @@ layer at (0,0) size 800x600
chunk 1 text run 1 at (112.00,200.00) startOffset 0 endOffset 15 width 98.00: "ltGlyph content"
RenderSVGText {text}
RenderSVGInline {a} at (0,0) size 0x0
+ RenderSVGText {text} at (100,286) size 130x18 contains 1 chunk(s)
+ RenderSVGTSpan {tspan} at (0,0) size 130x18
+ RenderSVGInline {a} at (0,0) size 130x18
+ RenderSVGTSpan {tspan} at (0,0) size 130x18
+ RenderSVGInlineText {#text} at (0,0) size 130x18
+ chunk 1 text run 1 at (100.00,300.00) startOffset 0 endOffset 22 width 130.00: "tspan in link in tspan"
+ RenderSVGText {text} at (97,226) size 169x29 contains 1 chunk(s)
+ RenderSVGTextPath {textPath} at (0,0) size 169x29
+ RenderSVGInline {a} at (0,0) size 169x29
+ RenderSVGTextPath {textPath} at (0,0) size 169x29
+ RenderSVGInlineText {#text} at (0,0) size 169x29
+ chunk 1 text run 1 at (101.96,249.61) startOffset 0 endOffset 1 width 4.00: "t"
+ chunk 1 text run 2 at (107.35,248.53) startOffset 1 endOffset 2 width 7.00: "e"
+ chunk 1 text run 3 at (114.71,247.06) startOffset 2 endOffset 3 width 8.00: "x"
+ chunk 1 text run 4 at (120.59,245.88) startOffset 3 endOffset 4 width 4.00: "t"
+ chunk 1 text run 5 at (126.97,244.61) startOffset 4 endOffset 5 width 9.00: "P"
+ chunk 1 text run 6 at (134.81,243.04) startOffset 5 endOffset 6 width 7.00: "a"
+ chunk 1 text run 7 at (140.20,241.96) startOffset 6 endOffset 7 width 4.00: "t"
+ chunk 1 text run 8 at (146.09,240.78) startOffset 7 endOffset 8 width 8.00: "h"
+ chunk 1 text run 9 at (151.97,240.39) startOffset 8 endOffset 9 width 4.00: " "
+ chunk 1 text run 10 at (155.89,241.18) startOffset 9 endOffset 10 width 4.00: "i"
+ chunk 1 text run 11 at (161.78,242.36) startOffset 10 endOffset 11 width 8.00: "n"
+ chunk 1 text run 12 at (167.66,243.53) startOffset 11 endOffset 12 width 4.00: " "
+ chunk 1 text run 13 at (171.58,244.32) startOffset 12 endOffset 13 width 4.00: "l"
+ chunk 1 text run 14 at (175.50,245.10) startOffset 13 endOffset 14 width 4.00: "i"
+ chunk 1 text run 15 at (181.39,246.28) startOffset 14 endOffset 15 width 8.00: "n"
+ chunk 1 text run 16 at (189.23,247.85) startOffset 15 endOffset 16 width 8.00: "k"
+ chunk 1 text run 17 at (195.12,249.02) startOffset 16 endOffset 17 width 4.00: " "
+ chunk 1 text run 18 at (199.04,249.81) startOffset 17 endOffset 18 width 4.00: "i"
+ chunk 1 text run 19 at (204.92,249.02) startOffset 18 endOffset 19 width 8.00: "n"
+ chunk 1 text run 20 at (210.81,247.84) startOffset 19 endOffset 20 width 4.00: " "
+ chunk 1 text run 21 at (214.73,247.05) startOffset 20 endOffset 21 width 4.00: "t"
+ chunk 1 text run 22 at (220.12,245.98) startOffset 21 endOffset 22 width 7.00: "e"
+ chunk 1 text run 23 at (227.48,244.50) startOffset 22 endOffset 23 width 8.00: "x"
+ chunk 1 text run 24 at (233.36,243.33) startOffset 23 endOffset 24 width 4.00: "t"
+ chunk 1 text run 25 at (239.73,242.05) startOffset 24 endOffset 25 width 9.00: "P"
+ chunk 1 text run 26 at (247.58,240.48) startOffset 25 endOffset 26 width 7.00: "a"
+ chunk 1 text run 27 at (252.97,240.59) startOffset 26 endOffset 27 width 4.00: "t"
+ chunk 1 text run 28 at (258.85,241.77) startOffset 27 endOffset 28 width 8.00: "h"
diff --git a/LayoutTests/svg/custom/text-linking.svg b/LayoutTests/svg/custom/text-linking.svg
index bae2aeb..eba6c64 100644
--- a/LayoutTests/svg/custom/text-linking.svg
+++ b/LayoutTests/svg/custom/text-linking.svg
@@ -8,6 +8,7 @@
Referenced character data
</text>
<path id="path1" d="M 100 150 L 150 140 L 200 150"/>
+ <path id="path2" d="M 100 250 L 150 240 L 200 250 L 250 240 L 300 250"/>
<font id="Font1" horiz-adv-x="5">
<font-face font-family="HappySad" font-weight="bold" font-style="normal" units-per-em="8" cap-height="8" x-height="4" ascent="8" descent="2" alphabetic="0" mathematical="4" ideographic="-2" hanging="8"/>
<missing-glyph d="M1,3h2v2h-2z"/>
@@ -22,5 +23,7 @@
<text><a xlink:href="http://www.webkit.org"><textPath xlink:href="#path1">textPath in link</textPath></a></text>
<text x="100" y="200"><a xlink:href="http://www.webkit.org"><altGlyph xlink:href="#Asmile">A</altGlyph>ltGlyph content</a></text>
<text x="100" y="250"><a xlink:href="http://www.webkit.org"><a>This should not be rendered</a></a></text>
+ <text x="100" y="300"><tspan><a xlink:href="http://www.webkit.org"><tspan>tspan in link in tspan</tspan></a></tspan></text>
+ <text><textPath><a xlink:href="http://www.webkit.org"><textPath xlink:href="#path2">textPath in link in textPath</textPath></a></textPath></text>
</svg>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 696e160..cd1384b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-17 Rob Buis <rwlbuis at gmail.com>
+
+ Reviewed by Dirk Schulze.
+
+ Text under nested link dropped
+ https://bugs.webkit.org/show_bug.cgi?id=46460
+
+ Allow links inside of tspan and textPath elements.
+
+ * svg/SVGTSpanElement.cpp:
+ (WebCore::SVGTSpanElement::childShouldCreateRenderer):
+ * svg/SVGTextPathElement.cpp:
+ (WebCore::SVGTextPathElement::childShouldCreateRenderer):
+
2010-10-16 Kwang Yul Seo <skyul at company100.net>
Reviewed by Kent Tamura.
diff --git a/WebCore/svg/SVGTSpanElement.cpp b/WebCore/svg/SVGTSpanElement.cpp
index d1deb70..b88600a 100644
--- a/WebCore/svg/SVGTSpanElement.cpp
+++ b/WebCore/svg/SVGTSpanElement.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann at kde.org>
- * Copyright (C) 2004, 2005, 2006 Rob Buis <buis at kde.org>
+ * Copyright (C) 2004, 2005, 2006, 2010 Rob Buis <buis at kde.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -45,7 +45,10 @@ bool SVGTSpanElement::childShouldCreateRenderer(Node* child) const
#if ENABLE(SVG_FONTS)
|| child->hasTagName(SVGNames::altGlyphTag)
#endif
- || child->hasTagName(SVGNames::tspanTag) || child->hasTagName(SVGNames::trefTag) || child->hasTagName(SVGNames::textPathTag))
+ || child->hasTagName(SVGNames::tspanTag)
+ || child->hasTagName(SVGNames::trefTag)
+ || child->hasTagName(SVGNames::aTag)
+ || child->hasTagName(SVGNames::textPathTag))
return true;
return false;
diff --git a/WebCore/svg/SVGTextPathElement.cpp b/WebCore/svg/SVGTextPathElement.cpp
index 82adb29..bbfa0e2 100644
--- a/WebCore/svg/SVGTextPathElement.cpp
+++ b/WebCore/svg/SVGTextPathElement.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2007 Nikolas Zimmermann <zimmermann at kde.org>
+ * Copyright (C) 2010 Rob Buis <rwlbuis at gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -119,7 +120,10 @@ bool SVGTextPathElement::childShouldCreateRenderer(Node* child) const
#if ENABLE(SVG_FONTS)
|| child->hasTagName(SVGNames::altGlyphTag)
#endif
- || child->hasTagName(SVGNames::trefTag) || child->hasTagName(SVGNames::tspanTag) || child->hasTagName(SVGNames::textPathTag))
+ || child->hasTagName(SVGNames::trefTag)
+ || child->hasTagName(SVGNames::tspanTag)
+ || child->hasTagName(SVGNames::aTag)
+ || child->hasTagName(SVGNames::textPathTag))
return true;
return false;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list