Changeset 154856 in webkit

Timestamp:

Aug 29, 2013, 5:07:33 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

SVG clipping, masking, and gradients-on-text do not respect the device scale factor
​https://bugs.webkit.org/show_bug.cgi?id=120377
<rdar://problem/14777944>

Reviewed by Simon Fraser.

Tests: svg/custom/masking-clipping-hidpi.svg

calculateTransformationToOutermostCoordinateSystem should include the page's
device scale factor in its transform.

• rendering/svg/SVGRenderingContext.cpp:

(WebCore::SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem):

Add a test that ensures that when deviceScaleFactor=2, masks, clipping,
gradients, and patterns are rendered @2x.

• svg/custom/masking-clipping-hidpi-expected.svg: Added.
• svg/custom/masking-clipping-hidpi.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/masking-clipping-hidpi-expected.svg (added)
• LayoutTests/svg/custom/masking-clipping-hidpi.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/SVGRenderingContext.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-29  Tim Horton  <timothy_horton@apple.com>
+
+        SVG clipping, masking, and gradients-on-text do not respect the device scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=120377
+        <rdar://problem/14777944>
+
+        Reviewed by Simon Fraser.
+
+        Add a test that ensures that when deviceScaleFactor=2, masks, clipping,
+        gradients, and patterns are rendered @2x.
+
+        * svg/custom/masking-clipping-hidpi-expected.svg: Added.
+        * svg/custom/masking-clipping-hidpi.svg: Added.
+
 2013-08-29  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-29  Tim Horton  <timothy_horton@apple.com>
+
+        SVG clipping, masking, and gradients-on-text do not respect the device scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=120377
+        <rdar://problem/14777944>
+
+        Reviewed by Simon Fraser.
+
+        Tests: svg/custom/masking-clipping-hidpi.svg
+
+        calculateTransformationToOutermostCoordinateSystem should include the page's
+        device scale factor in its transform.
+
+        * rendering/svg/SVGRenderingContext.cpp:
+        (WebCore::SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem):
+
 2013-08-29  Chris Fleizach  <cfleizach@apple.com>
 

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

@@ -31 +31 @@
 #include "Frame.h"
 #include "FrameView.h"
+#include "Page.h"
 #include "RenderLayer.h"
 #include "RenderSVGImage.h"
@@ -199 +200 @@
     absoluteTransform = currentContentTransformation();
 
+    float deviceScaleFactor = 1;
+    if (Page* page = renderer->document().page())
+        deviceScaleFactor = page->deviceScaleFactor();
+
     // Walk up the render tree, accumulating SVG transforms.
     while (renderer) {
@@ -219 +224 @@
         layer = layer->parent();
     }
+
+    absoluteTransform.scale(deviceScaleFactor);
 }