Changeset 95207 in webkit

Timestamp:

Sep 15, 2011 12:00:42 PM (13 years ago)

Author:

mdelaney@apple.com

Message:

REGRESSION (Safari 5.1-r95043): Incorrect box-shadow offset
​https://bugs.webkit.org/show_bug.cgi?id=68041

Reviewed by Dan Bernstein.

Source/WebCore:

Test: fast/box-shadow/no-blur-multiple-offsets.html

• platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::GraphicsContext::setPlatformShadow): Add hack back in for Lion if
context is not accelerated.

LayoutTests:

• fast/box-shadow/no-blur-multiple-offsets-expected.txt: Added.
• fast/box-shadow/no-blur-multiple-offsets.html: Added.
• platform/mac/fast/box-shadow/no-blur-multiple-offsets-expected.png: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/box-shadow/no-blur-multiple-offsets-expected.txt (added)
• LayoutTests/fast/box-shadow/no-blur-multiple-offsets.html (added)
• LayoutTests/platform/mac/fast/box-shadow/no-blur-multiple-offsets-expected.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-15  Matthew Delaney  <mdelaney@apple.com>
+
+        REGRESSION (Safari 5.1-r95043): Incorrect box-shadow offset
+        https://bugs.webkit.org/show_bug.cgi?id=68041
+
+        Reviewed by Dan Bernstein.
+
+        * fast/box-shadow/no-blur-multiple-offsets-expected.txt: Added.
+        * fast/box-shadow/no-blur-multiple-offsets.html: Added.
+        * platform/mac/fast/box-shadow/no-blur-multiple-offsets-expected.png: Added.
+
 2011-09-15  James Simonsen  <simonjam@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-15  Matthew Delaney  <mdelaney@apple.com>
+
+        REGRESSION (Safari 5.1-r95043): Incorrect box-shadow offset
+        https://bugs.webkit.org/show_bug.cgi?id=68041
+
+        Reviewed by Dan Bernstein.
+
+        Test: fast/box-shadow/no-blur-multiple-offsets.html
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::setPlatformShadow): Add hack back in for Lion if
+        context is not accelerated.
+
 2011-09-15  James Simonsen  <simonjam@chromium.org>
 

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -1025 +1025 @@
     blurRadius = min(blurRadius, narrowPrecisionToCGFloat(1000.0));
 
-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
-    // Work around <rdar://problem/5539388> by ensuring that the offsets will get truncated
-    // to the desired integer.
-    static const CGFloat extraShadowOffset = narrowPrecisionToCGFloat(1.0 / 128);
-    if (xOffset > 0)
-        xOffset += extraShadowOffset;
-    else if (xOffset < 0)
-        xOffset -= extraShadowOffset;
-
-    if (yOffset > 0)
-        yOffset += extraShadowOffset;
-    else if (yOffset < 0)
-        yOffset -= extraShadowOffset;
-#endif
+
+    if (!isAcceleratedContext()) {
+        // Work around <rdar://problem/5539388> by ensuring that the offsets will get truncated
+        // to the desired integer. Also see: <rdar://problem/10056277>
+        static const CGFloat extraShadowOffset = narrowPrecisionToCGFloat(1.0 / 128);
+        if (xOffset > 0)
+            xOffset += extraShadowOffset;
+        else if (xOffset < 0)
+            xOffset -= extraShadowOffset;
+
+        if (yOffset > 0)
+            yOffset += extraShadowOffset;
+        else if (yOffset < 0)
+            yOffset -= extraShadowOffset;
+    }
 
     // Check for an invalid color, as this means that the color was not set for the shadow