[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 1906f5a61c747b7ee9cd5b87ac110e8422ec420a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 2 23:24:02 2004 +0000

    	Correctly size the <CANVAS> if margins, borders, or
    	padding is added.
    
            Reviewed by Trey.
    
            * khtml/rendering/render_canvasimage.cpp:
            (RenderCanvasImage::createDrawingContext):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 781a3b1..d874204 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-06-02  Richard Williamson   <rjw at apple.com>
+
+	Correctly size the <CANVAS> if margins, borders, or
+	padding is added.
+
+        Reviewed by Trey.
+
+        * khtml/rendering/render_canvasimage.cpp:
+        (RenderCanvasImage::createDrawingContext):
+
 2004-06-01  Trey Matteson  <trey at apple.com>
 
 	First cut at the source side of DHTML dragging.  Following IE, new events are added:
diff --git a/WebCore/khtml/rendering/render_canvasimage.cpp b/WebCore/khtml/rendering/render_canvasimage.cpp
index 7395d54..d6a1370 100644
--- a/WebCore/khtml/rendering/render_canvasimage.cpp
+++ b/WebCore/khtml/rendering/render_canvasimage.cpp
@@ -91,10 +91,13 @@ void RenderCanvasImage::createDrawingContext()
     }
     free (_drawingContextData);
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+
+    int cWidth = contentWidth();
+    int cHeight = contentHeight();
     size_t numComponents = CGColorSpaceGetNumberOfComponents(colorSpace);
-    size_t bytesPerRow = BYTES_PER_ROW(width(),BITS_PER_COMPONENT,(numComponents+1)); // + 1 for alpha
+    size_t bytesPerRow = BYTES_PER_ROW(cWidth,BITS_PER_COMPONENT,(numComponents+1)); // + 1 for alpha
     _drawingContextData = malloc(height() * bytesPerRow);
-    _drawingContext = CGBitmapContextCreate(_drawingContextData, width(), height(), BITS_PER_COMPONENT, bytesPerRow, colorSpace, kCGImageAlphaPremultipliedLast);
+    _drawingContext = CGBitmapContextCreate(_drawingContextData, cWidth, cHeight, BITS_PER_COMPONENT, bytesPerRow, colorSpace, kCGImageAlphaPremultipliedLast);
     
 #ifdef DEBUG_CANVAS_BACKGROUND
     CGContextSetRGBFillColor(_drawingContext, 1.0, 0., 0., 1.);

-- 
WebKit Debian packaging