[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 cdfc5ce7a8dfa5d983d744e4bde82b08a0933d19
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 2 23:39:29 2004 +0000

    	Corrected typo ID_IMG should have been ID_CANVAS when
    	checking for the canvas composite operator.
    
            Reviewed by Ken.
    
            * khtml/rendering/render_canvasimage.cpp:
            (RenderCanvasImage::paint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6748 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d874204..c3af8e3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2004-06-02  Richard Williamson   <rjw at apple.com>
 
+	Corrected typo ID_IMG should have been ID_CANVAS when
+	checking for the canvas composite operator.
+
+        Reviewed by Ken.
+
+        * khtml/rendering/render_canvasimage.cpp:
+        (RenderCanvasImage::paint):
+
+2004-06-02  Richard Williamson   <rjw at apple.com>
+
 	Correctly size the <CANVAS> if margins, borders, or
 	padding is added.
 
diff --git a/WebCore/khtml/rendering/render_canvasimage.cpp b/WebCore/khtml/rendering/render_canvasimage.cpp
index d6a1370..6866bbb 100644
--- a/WebCore/khtml/rendering/render_canvasimage.cpp
+++ b/WebCore/khtml/rendering/render_canvasimage.cpp
@@ -183,7 +183,7 @@ void RenderCanvasImage::paint(PaintInfo& i, int _tx, int _ty)
     }
     
     if (drawnImage()) {
-        HTMLCanvasElementImpl* i = (element() && element()->id() == ID_IMG) ? static_cast<HTMLCanvasElementImpl*>(element()) : 0;
+        HTMLCanvasElementImpl* i = (element() && element()->id() == ID_CANVAS) ? static_cast<HTMLCanvasElementImpl*>(element()) : 0;
         int oldOperation = 0;
         if (i && !i->compositeOperator().isNull()){
             oldOperation = QPainter::getCompositeOperation(p->currentContext());

-- 
WebKit Debian packaging