[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 e60eb31ac64151cfc8d6e4ecdac50d7c5d8b58f4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 17 18:12:10 2002 +0000

    	Fixed bug where some images would get left behind when scrolling. Turned out it
    	was all the tiled images that were getting left behind.
    
    	* kwq/KWQPainter.mm: (QPainter::drawTiledPixmap): Fixed to get the view for
    	coordinates from [NSView focusView] the way drawPixmap does, rather than using
    	data->widget->getView(), which gives the scroll view instead of the scrolled view.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1388 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 82c1bb3..c149c20 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-06-17  Darin Adler  <darin at apple.com>
+
+	Fixed bug where some images would get left behind when scrolling. Turned out it
+	was all the tiled images that were getting left behind.
+
+	* kwq/KWQPainter.mm: (QPainter::drawTiledPixmap): Fixed to get the view for
+	coordinates from [NSView focusView] the way drawPixmap does, rather than using
+	data->widget->getView(), which gives the scroll view instead of the scrolled view.
+
 2002-06-16  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::frames):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 82c1bb3..c149c20 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-06-17  Darin Adler  <darin at apple.com>
+
+	Fixed bug where some images would get left behind when scrolling. Turned out it
+	was all the tiled images that were getting left behind.
+
+	* kwq/KWQPainter.mm: (QPainter::drawTiledPixmap): Fixed to get the view for
+	coordinates from [NSView focusView] the way drawPixmap does, rather than using
+	data->widget->getView(), which gives the scroll view instead of the scrolled view.
+
 2002-06-16  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::frames):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 82c1bb3..c149c20 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-06-17  Darin Adler  <darin at apple.com>
+
+	Fixed bug where some images would get left behind when scrolling. Turned out it
+	was all the tiled images that were getting left behind.
+
+	* kwq/KWQPainter.mm: (QPainter::drawTiledPixmap): Fixed to get the view for
+	coordinates from [NSView focusView] the way drawPixmap does, rather than using
+	data->widget->getView(), which gives the scroll view instead of the scrolled view.
+
 2002-06-16  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKHTMLPart.mm: (KWQKHTMLPartImpl::frames):
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index f1a4baf..81d5c15 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -406,13 +406,13 @@ void QPainter::drawPixmap(const QPoint &p, const QPixmap &pix, const QRect &r)
 }
 
 void QPainter::drawPixmap( int x, int y, const QPixmap &pixmap,
-			int sx, int sy, int sw, int sh )
+                           int sx, int sy, int sw, int sh )
 {
     _lockFocus();
 
     id <WebCoreImageRenderer>imageRenderer = pixmap.getImageRenderer();
     
-    if (imageRenderer != nil){
+    if (imageRenderer != nil) {
         if (sw == -1)
             sw = (int)[imageRenderer size].width;
         if (sh == -1)
@@ -420,9 +420,9 @@ void QPainter::drawPixmap( int x, int y, const QPixmap &pixmap,
         NSRect ir = NSMakeRect(x, y, sw, sh);
         NSRect fr = NSMakeRect(sx, sy, sw, sh);
         
-		[imageRenderer beginAnimationInView: [NSView focusView]
-		                    inRect: ir
-		                    fromRect: fr];
+        [imageRenderer beginAnimationInView: [NSView focusView]
+                                     inRect: ir
+                                   fromRect: fr];
     }
     
     _unlockFocus();
@@ -440,8 +440,7 @@ void QPainter::drawTiledPixmap( int x, int y, int w, int h,
     NSColor *patternColor;
     int sw = pixmap.width();
     int sh = pixmap.height();
-    NSView *view = data->widget->getView();
-    NSPoint p = [view convertPoint: NSMakePoint (x, y) toView: nil];
+    NSPoint p = [[NSView focusView] convertPoint: NSMakePoint (x, y) toView: nil];
     CGContextRef cgContext;
 
     [NSGraphicsContext saveGraphicsState];

-- 
WebKit Debian packaging