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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 98f6709bc25c9f6fd1b3feab5c950c4270997287
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 27 07:10:27 2004 +0000

            - fixed bug where all pages with images would cause a crash
            - fixed Deployment build
    
            * kwq/KWQPainter.mm: (QPainter::drawPixmap): Put #if 0 around placeholder code
            for setting up the graphics context.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6699 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 71c795f..2450fe2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2004-05-27  Darin Adler  <darin at apple.com>
+
+        - fixed bug where all pages with images would cause a crash
+        - fixed Deployment build
+
+        * kwq/KWQPainter.mm: (QPainter::drawPixmap): Put #if 0 around placeholder code
+        for setting up the graphics context.
+
 2004-05-26  Richard Williamson   <rjw at apple.com>
 
 	Added shadow support (w/ Louch).
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 91394f3..0611386 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -487,11 +487,13 @@ void QPainter::drawPixmap( int x, int y, const QPixmap &pixmap,
     if (data->state.paintingDisabled)
         return;
         
+#if 0
     NSGraphicsContext *oldContext = 0;
     if (context) {
         oldContext = [NSGraphicsContext currentContext];
         // Somehow set up a NSGraphicsContext using the context parameter.
     }
+#endif
     
     if (sw == -1)
         sw = pixmap.width();
@@ -506,7 +508,11 @@ void QPainter::drawPixmap( int x, int y, const QPixmap &pixmap,
                                       fromRect:fromRect compositeOperator:(NSCompositingOperation)compositeOperator];
     KWQ_UNBLOCK_EXCEPTIONS;
 
-    [NSGraphicsContext setCurrentContext:oldContext];
+#if 0
+    if (context) {
+        [NSGraphicsContext setCurrentContext:oldContext];
+    }
+#endif
 }
 
 void QPainter::drawTiledPixmap( int x, int y, int w, int h,

-- 
WebKit Debian packaging