Title: [95427] branches/chromium/874
- Revision
- 95427
- Author
- infe...@chromium.org
- Date
- 2011-09-19 09:52:24 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95301
BUG=95072
Review URL: http://codereview.chromium.org/7947002
Modified Paths
Added Paths
Diff
Copied: branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash-expected.txt (from rev 95301, trunk/LayoutTests/svg/text/text-style-recalc-crash-expected.txt) (0 => 95427)
--- branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash-expected.txt (rev 0)
+++ branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash-expected.txt 2011-09-19 16:52:24 UTC (rev 95427)
@@ -0,0 +1,3 @@
+Test passes if it does not crash.
+PASS
+
Copied: branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash.html (from rev 95301, trunk/LayoutTests/svg/text/text-style-recalc-crash.html) (0 => 95427)
--- branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash.html (rev 0)
+++ branches/chromium/874/LayoutTests/svg/text/text-style-recalc-crash.html 2011-09-19 16:52:24 UTC (rev 95427)
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+Test passes if it does not crash.
+<svg viewBox="0 0 1 1">
+<font-face font-family="A">
+<font-face-src>
+<font-face-uri xlink:href=""
+</font-face-src>
+</font-face>
+<g font-family="A">
+<text>PASS</text>
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ document.execCommand("SelectAll");
+</script>
+<g>
+<text></text>
+</g>
+</g>
+</svg>
+</html>
Modified: branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp (95426 => 95427)
--- branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp 2011-09-19 16:49:29 UTC (rev 95426)
+++ branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp 2011-09-19 16:52:24 UTC (rev 95427)
@@ -87,8 +87,6 @@
// The text metrics may be influenced by style changes.
if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(this))
textRenderer->setNeedsPositioningValuesUpdate();
-
- updateScaledFont();
}
const RenderStyle* newStyle = style();
@@ -223,6 +221,19 @@
return createVisiblePosition(offset + closestDistanceBox->start(), offset > 0 ? VP_UPSTREAM_IF_POSSIBLE : DOWNSTREAM);
}
+void RenderSVGInlineText::setStyle(PassRefPtr<RenderStyle> style)
+{
+ RenderText::setStyle(style);
+
+ // The cached scaledFont needs to be updated on every style set call. It
+ // is not similar to m_style which can get derived from parent's style and
+ // hence will get automatically updated on ancestor's style change. This is
+ // required, otherwise we will maintain stale font list in cached scaledFont
+ // when custom fonts are retired on Document::recalcStyle. See webkit bug
+ // https://bugs.webkit.org/show_bug.cgi?id=68060.
+ updateScaledFont();
+}
+
void RenderSVGInlineText::updateScaledFont()
{
computeNewScaledFontForStyle(this, style(), m_scalingFactor, m_scaledFont);
Modified: branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.h (95426 => 95427)
--- branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.h 2011-09-19 16:49:29 UTC (rev 95426)
+++ branches/chromium/874/Source/WebCore/rendering/svg/RenderSVGInlineText.h 2011-09-19 16:52:24 UTC (rev 95427)
@@ -49,6 +49,8 @@
virtual const char* renderName() const { return "RenderSVGInlineText"; }
virtual void willBeDestroyed();
+
+ virtual void setStyle(PassRefPtr<RenderStyle>);
virtual void styleDidChange(StyleDifference, const RenderStyle*);
// FIXME: We need objectBoundingBox for DRT results and filters at the moment.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
