Changeset 87846 in webkit

Timestamp:

Jun 1, 2011 2:00:56 PM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-06-01 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Text is scaled in a stair-step pattern
​https://bugs.webkit.org/show_bug.cgi?id=60317

Stop scaling the specified font to the actual on-screen value when font-rendering:
geometricPrecision is specified, but instead scale the graphics context. This allows
us to scale text up and down smoothly.

Test: svg/text/scaling-font-with-geometric-precision.html

• rendering/svg/RenderSVGInlineText.cpp: (WebCore::RenderSVGInlineText::computeNewScaledFontForStyle):

2011-06-01 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Text is scaled in a stair-step pattern
​https://bugs.webkit.org/show_bug.cgi?id=60317

Stop scaling the specified font to the actual on-screen value when font-rendering:
geometricPrecision is specified, but instead scale the graphics context. This allows
us to scale text up and down smoothly.

• platform/mac/svg/text/scaling-font-with-geometric-precision-expected.png: Added.
• platform/mac/svg/text/scaling-font-with-geometric-precision-expected.txt: Added.
• svg/text/scaling-font-with-geometric-precision.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/text/scaling-font-with-geometric-precision-expected.png (added)
• LayoutTests/platform/mac/svg/text/scaling-font-with-geometric-precision-expected.txt (added)
• LayoutTests/svg/text/scaling-font-with-geometric-precision.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGInlineText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-01  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Text is scaled in a stair-step pattern
+        https://bugs.webkit.org/show_bug.cgi?id=60317
+
+        Stop scaling the specified font to the actual on-screen value when font-rendering: 
+        geometricPrecision is specified, but instead scale the graphics context. This allows
+        us to scale text up and down smoothly.
+
+        * platform/mac/svg/text/scaling-font-with-geometric-precision-expected.png: Added.
+        * platform/mac/svg/text/scaling-font-with-geometric-precision-expected.txt: Added.
+        * svg/text/scaling-font-with-geometric-precision.html: Added.
+
 2011-06-01  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-01  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Text is scaled in a stair-step pattern
+        https://bugs.webkit.org/show_bug.cgi?id=60317
+
+        Stop scaling the specified font to the actual on-screen value when font-rendering: 
+        geometricPrecision is specified, but instead scale the graphics context. This allows
+        us to scale text up and down smoothly.
+
+        Test: svg/text/scaling-font-with-geometric-precision.html
+
+        * rendering/svg/RenderSVGInlineText.cpp:
+        (WebCore::RenderSVGInlineText::computeNewScaledFontForStyle):
+
 2011-06-01  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp

@@ -236 +236 @@
     Document* document = renderer->document();
     ASSERT(document);
-
+    
     CSSStyleSelector* styleSelector = document->styleSelector();
     ASSERT(styleSelector);
 
-    // Alter font-size to the right on-screen value, to avoid scaling the glyphs themselves.
+    // Alter font-size to the right on-screen value to avoid scaling the glyphs themselves, except when GeometricPrecision is specified
     AffineTransform ctm;
     SVGImageBufferTools::calculateTransformationToOutermostSVGCoordinateSystem(renderer, ctm);
     scalingFactor = narrowPrecisionToFloat(sqrt((pow(ctm.xScale(), 2) + pow(ctm.yScale(), 2)) / 2));
-    if (scalingFactor == 1 || !scalingFactor) {
+    if (scalingFactor == 1 || !scalingFactor || style->fontDescription().textRenderingMode() == GeometricPrecision) {
         scalingFactor = 1;
         scaledFont = style->font();