Merge 80579

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

Index: Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
===================================================================
--- Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	(revision 81430)
+++ Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	(working copy)
@@ -781,8 +781,7 @@
 
         CGFloat smallEigenvalue = narrowPrecisionToCGFloat(sqrt(0.5 * ((A + D) - sqrt(4 * B * C + (A - D) * (A - D)))));
 
-        // Extreme "blur" values can make text drawing crash or take crazy long times, so clamp
-        blurRadius = min(blur * smallEigenvalue, narrowPrecisionToCGFloat(1000.0));
+        blurRadius = blur * smallEigenvalue;
 
         CGSize offsetInBaseSpace = CGSizeApplyAffineTransform(offset, userToBaseCTM);
 
@@ -790,6 +789,9 @@
         yOffset = offsetInBaseSpace.height;
     }
 
+    // Extreme "blur" values can make text drawing crash or take crazy long times, so clamp
+    blurRadius = min(blurRadius, narrowPrecisionToCGFloat(1000.0));
+
     // 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);