Title: [92971] branches/chromium/835
- Revision
- 92971
- Author
- cev...@google.com
- Date
- 2011-08-12 10:33:09 -0700 (Fri, 12 Aug 2011)
Log Message
Merge 92791
BUG=91362
Review URL: http://codereview.chromium.org/7634026
Modified Paths
Added Paths
Diff
Copied: branches/chromium/835/LayoutTests/svg/text/glyphref-renderer-create-crash-expected.txt (from rev 92791, trunk/LayoutTests/svg/text/glyphref-renderer-create-crash-expected.txt) (0 => 92971)
--- branches/chromium/835/LayoutTests/svg/text/glyphref-renderer-create-crash-expected.txt (rev 0)
+++ branches/chromium/835/LayoutTests/svg/text/glyphref-renderer-create-crash-expected.txt 2011-08-12 17:33:09 UTC (rev 92971)
@@ -0,0 +1 @@
+Test passes if it does not crash.
Copied: branches/chromium/835/LayoutTests/svg/text/glyphref-renderer-create-crash.html (from rev 92791, trunk/LayoutTests/svg/text/glyphref-renderer-create-crash.html) (0 => 92971)
--- branches/chromium/835/LayoutTests/svg/text/glyphref-renderer-create-crash.html (rev 0)
+++ branches/chromium/835/LayoutTests/svg/text/glyphref-renderer-create-crash.html 2011-08-12 17:33:09 UTC (rev 92971)
@@ -0,0 +1,14 @@
+<html>
+Test passes if it does not crash.
+<svg>
+<glyphref>
+<foreignObject>
+</foreignObject>
+</glyphref>
+</svg>
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+</html>
+
Modified: branches/chromium/835/Source/WebCore/svg/SVGGlyphRefElement.h (92970 => 92971)
--- branches/chromium/835/Source/WebCore/svg/SVGGlyphRefElement.h 2011-08-12 17:28:12 UTC (rev 92970)
+++ branches/chromium/835/Source/WebCore/svg/SVGGlyphRefElement.h 2011-08-12 17:33:09 UTC (rev 92971)
@@ -49,6 +49,8 @@
private:
SVGGlyphRefElement(const QualifiedName&, Document*);
+ virtual bool rendererIsNeeded(const NodeRenderingContext&) { return false; }
+
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGGlyphRefElement)
DECLARE_ANIMATED_STRING(Href, href)
END_DECLARE_ANIMATED_PROPERTIES
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
