Fixed: <rdar://problem/3936865> REGRESSION: canvas.drawImage no longer scales properly

        Reviewed by john.

        * WebCoreSupport.subproj/WebImageData.m: use the height of the inRect instead of the fromRect when setting the origin of the context

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 673f4188bed307cdad4cad9ed0a4ee79cb768f09..78bde3da1c4c2408227da43f41cd547592252ad5 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-05  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3936865> REGRESSION: canvas.drawImage no longer scales properly
+
+        Reviewed by john.
+
+        * WebCoreSupport.subproj/WebImageData.m: use the height of the inRect instead of the fromRect when setting the origin of the context
+
 2005-01-04  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3928329> WebKit should pass nil for "language" to checkSpellingOfString:

diff --git a/WebKit/WebCoreSupport.subproj/WebImageData.m b/WebKit/WebCoreSupport.subproj/WebImageData.m
index 9b36fb9446ec8fa8df8488e7a428e6b8aca0849c..a0a0bd21997b9253964a3c090d0f8bddd078e176 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebImageData.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageData.m
@@ -378,7 +378,7 @@ static CFDictionaryRef imageSourceOptions;
         CGContextSetCompositeOperation (aContext, op);
         CGContextTranslateCTM (aContext, ir.origin.x, ir.origin.y);
         CGContextScaleCTM (aContext, 1, -1);
-        CGContextTranslateCTM (aContext, 0, -fr.size.height);
+        CGContextTranslateCTM (aContext, 0, -ir.size.height);
         
         // Translated to origin, now draw at 0,0.
         ir.origin.x = ir.origin.y = 0;