Reviewed by Dave Hyatt and Sam Weinig.

        Build fix

        * platform/graphics/cg/ImageCG.cpp:
        (WebCore::Image::drawPattern):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5bd9dab..37e1e4e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt and Sam Weinig.
+
+        Build fix
+
+        * platform/graphics/cg/ImageCG.cpp:
+        (WebCore::Image::drawPattern):
+
 2007-10-23  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 
         Reviewed by Alp.
@@ -359,7 +368,6 @@
 
         * WebCore.vcproj/WebCore.vcproj:
 
->>>>>>> .r27047
 2007-10-24  Alice Liu  <alice.liu@apple.com>
 
         Reviewed by Oliver.
@@ -394,7 +402,6 @@
         (WebCore::DatabaseTracker::fullPathForDatabase): Return the member variable
         * storage/DatabaseTracker.h:
 
->>>>>>> .r27005
 2007-10-24  David Hyatt  <hyatt@apple.com>
 
         Don't try to gap fill transformed selections.  Fix the invalidation of selection to use the clip to visible content

diff --git a/WebCore/platform/graphics/cg/ImageCG.cpp b/WebCore/platform/graphics/cg/ImageCG.cpp
index 848adfe..cbbc318 100644 (file)
--- a/WebCore/platform/graphics/cg/ImageCG.cpp
+++ b/WebCore/platform/graphics/cg/ImageCG.cpp
@@ -200,12 +200,12 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const
     CGContextTranslateCTM(context, 0, -destRect.height());
     
     // Compute the scaled tile size.
-    float scaledTileHeight = tileRect.height() * narrowPrecisionToCGFloat(patternTransform.d());
+    float scaledTileHeight = tileRect.height() * narrowPrecisionToFloat(patternTransform.d());
     
     // We have to adjust the phase to deal with the fact we're in Cartesian space now (with the bottom left corner of destRect being
     // the origin).
-    float adjustedX = phase.x() - destRect.x() + tileRect.x() * patternTransform.a(); // We translated the context so that destRect.x() is the origin, so subtract it out.
-    float adjustedY = destRect.height() - (phase.y() - destRect.y() + tileRect.y() * patternTransform.d() + scaledTileHeight);
+    float adjustedX = phase.x() - destRect.x() + tileRect.x() * narrowPrecisionToFloat(patternTransform.a()); // We translated the context so that destRect.x() is the origin, so subtract it out.
+    float adjustedY = destRect.height() - (phase.y() - destRect.y() + tileRect.y() * narrowPrecisionToFloat(patternTransform.d()) + scaledTileHeight);
 
     CGImageRef tileImage = nativeImageForCurrentFrame();
     float h = CGImageGetHeight(tileImage);
@@ -216,7 +216,7 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const
     // overall image buffer needs to tile with "gaps", we can't use the optimized tiling call in that case.  We also avoid this optimization
     // when tiling portions of an image, since until we can actually cache the subimage we want to tile, this code won't be any faster.
     // FIXME: Could create WebKitSystemInterface SPI for CGCreatePatternWithImage2 and probably make Tiger tile faster as well.
-    float scaledTileWidth = tileRect.width() * narrowPrecisionToCGFloat(patternTransform.a());
+    float scaledTileWidth = tileRect.width() * narrowPrecisionToFloat(patternTransform.a());
     float w = CGImageGetWidth(tileImage);
     if (w == size().width() && h == size().height() && tileRect.size() == size())
         CGContextDrawTiledImage(context, FloatRect(adjustedX, adjustedY, scaledTileWidth, scaledTileHeight), tileImage);