[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 48b34e316f85d6006ceb5b8c70946c9a2ac114e9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 22 00:04:00 2003 +0000

            Reviewed by Dave.
    
            - fixed a problem that was causing layout tests to give inconsistent results
    
            * kwq/KWQPixmap.mm:
            (QPixmap::size): Handle case of nil image so we don't use the uninitialized
            result of dispatching a method to a structure-returning function.
            (QPixmap::rect): Ditto.
            (QPixmap::width): Ditto.
            (QPixmap::height): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f214c00..883ba2d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2003-02-21  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+        - fixed a problem that was causing layout tests to give inconsistent results
+
+        * kwq/KWQPixmap.mm:
+        (QPixmap::size): Handle case of nil image so we don't use the uninitialized
+        result of dispatching a method to a structure-returning function.
+        (QPixmap::rect): Ditto.
+        (QPixmap::width): Ditto.
+        (QPixmap::height): Ditto.
+
+2003-02-21  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         - Made it possible to run the layout tests in a Deployment version
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f214c00..883ba2d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2003-02-21  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+        - fixed a problem that was causing layout tests to give inconsistent results
+
+        * kwq/KWQPixmap.mm:
+        (QPixmap::size): Handle case of nil image so we don't use the uninitialized
+        result of dispatching a method to a structure-returning function.
+        (QPixmap::rect): Ditto.
+        (QPixmap::width): Ditto.
+        (QPixmap::height): Ditto.
+
+2003-02-21  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         - Made it possible to run the layout tests in a Deployment version
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index 13e2c21..b69c918 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -84,23 +84,35 @@ bool QPixmap::isNull() const
 
 QSize QPixmap::size() const
 {
+    if (imageRenderer == nil) {
+        return QSize(0, 0);
+    }
     NSSize sz = [imageRenderer size];
     return QSize((int)sz.width, (int)sz.height);
 }
 
 QRect QPixmap::rect() const
 {
+    if (imageRenderer == nil) {
+        return QRect(0, 0, 0, 0);
+    }
     NSSize sz = [imageRenderer size];
     return QRect(0, 0, (int)sz.width, (int)sz.height);
 }
 
 int QPixmap::width() const
 {
+    if (imageRenderer == nil) {
+        return 0;
+    }
     return (int)[imageRenderer size].width;
 }
 
 int QPixmap::height() const
 {
+    if (imageRenderer == nil) {
+        return 0;
+    }
     return (int)[imageRenderer size].height;
 }
 

-- 
WebKit Debian packaging