WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/graphics/cg/PatternCG.cpp

Index: third_party/WebKit/WebCore/platform/graphics/cg/PatternCG.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/cg/PatternCG.cpp	(revision 9391)
+++ third_party/WebKit/WebCore/platform/graphics/cg/PatternCG.cpp	(working copy)
@@ -1,78 +1,78 @@
-/*
- * Copyright (C) 2006, 2007, 2008 Apple Computer, Inc.  All rights reserved.
- * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "Pattern.h"
-
-#include "TransformationMatrix.h"
-#include "GraphicsContext.h"
-
-#include <ApplicationServices/ApplicationServices.h>
-
-namespace WebCore {
-
-static void patternCallback(void* info, CGContextRef context)
-{
-    CGImageRef platformImage = static_cast<Image*>(info)->getCGImageRef();
-    if (!platformImage)
-        return;
-
-    CGRect rect = GraphicsContext(context).roundToDevicePixels(
-        FloatRect(0, 0, CGImageGetWidth(platformImage), CGImageGetHeight(platformImage)));
-    CGContextDrawImage(context, rect, platformImage);
-}
-
-static void patternReleaseCallback(void* info)
-{
-    static_cast<Image*>(info)->deref();
-}
-
-CGPatternRef Pattern::createPlatformPattern(const TransformationMatrix& userSpaceTransformation) const
-{
-    IntRect tileRect = tileImage()->rect();
-
-    TransformationMatrix patternTransform = m_patternSpaceTransformation;
-    patternTransform.multiply(userSpaceTransformation);
-    patternTransform.scale(1, -1);
-    patternTransform.translate(0, -tileRect.height());
-
-    // If FLT_MAX should also be used for xStep or yStep, nothing is rendered. Using fractions of FLT_MAX also
-    // result in nothing being rendered.
-    // INT_MAX is almost correct, but there seems to be some number wrapping occuring making the fill
-    // pattern is not filled correctly. 
-    // So, just pick a really large number that works. 
-    float xStep = m_repeatX ? tileRect.width() : (100000000.0f);
-    float yStep = m_repeatY ? tileRect.height() : (100000000.0f);
-
-    // The pattern will release the tile when it's done rendering in patternReleaseCallback
-    tileImage()->ref();
-
-    const CGPatternCallbacks patternCallbacks = { 0, patternCallback, patternReleaseCallback };
-    return CGPatternCreate(tileImage(), tileRect, patternTransform, xStep, yStep,
-        kCGPatternTilingConstantSpacing, TRUE, &patternCallbacks);
-}
-
-}
+/*
+ * Copyright (C) 2006, 2007, 2008 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#include "config.h"
+#include "Pattern.h"
+
+#include "TransformationMatrix.h"
+#include "GraphicsContext.h"
+
+#include <ApplicationServices/ApplicationServices.h>
+
+namespace WebCore {
+
+static void patternCallback(void* info, CGContextRef context)
+{
+    CGImageRef platformImage = static_cast<Image*>(info)->getCGImageRef();
+    if (!platformImage)
+        return;
+
+    CGRect rect = GraphicsContext(context).roundToDevicePixels(
+        FloatRect(0, 0, CGImageGetWidth(platformImage), CGImageGetHeight(platformImage)));
+    CGContextDrawImage(context, rect, platformImage);
+}
+
+static void patternReleaseCallback(void* info)
+{
+    static_cast<Image*>(info)->deref();
+}
+
+CGPatternRef Pattern::createPlatformPattern(const TransformationMatrix& userSpaceTransformation) const
+{
+    IntRect tileRect = tileImage()->rect();
+
+    TransformationMatrix patternTransform = m_patternSpaceTransformation;
+    patternTransform.multiply(userSpaceTransformation);
+    patternTransform.scaleNonUniform(1, -1);
+    patternTransform.translate(0, -tileRect.height());
+
+    // If FLT_MAX should also be used for xStep or yStep, nothing is rendered. Using fractions of FLT_MAX also
+    // result in nothing being rendered.
+    // INT_MAX is almost correct, but there seems to be some number wrapping occuring making the fill
+    // pattern is not filled correctly. 
+    // So, just pick a really large number that works. 
+    float xStep = m_repeatX ? tileRect.width() : (100000000.0f);
+    float yStep = m_repeatY ? tileRect.height() : (100000000.0f);
+
+    // The pattern will release the tile when it's done rendering in patternReleaseCallback
+    tileImage()->ref();
+
+    const CGPatternCallbacks patternCallbacks = { 0, patternCallback, patternReleaseCallback };
+    return CGPatternCreate(tileImage(), tileRect, patternTransform, xStep, yStep,
+        kCGPatternTilingConstantSpacing, TRUE, &patternCallbacks);
+}
+
+}