[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 546196d365acf2f36e9fbf2659995928a8f4692d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 8 16:45:07 2003 +0000

            Reviewed by John.
    
            - fixed 3502347: REGRESSION (100-116): bottom of login window sometimes missing (TR background image)
    
            * khtml/rendering/render_object.h: Added setPixmap.
            * khtml/rendering/render_object.cpp: (RenderObject::setPixmap): Moved this
            function here from RenderBox. This code is needed for the table row class and
            similar classes that supply a background image that is drawn by the table cell,
            and those are not RenderBox subclasses.
    
            * khtml/rendering/render_box.cpp: Removed setPixmap.
            * khtml/rendering/render_box.h: Removed setPixmap.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5714 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 080de95..aeb2ec1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-12-07  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3502347: REGRESSION (100-116): bottom of login window sometimes missing (TR background image)
+
+        * khtml/rendering/render_object.h: Added setPixmap.
+        * khtml/rendering/render_object.cpp: (RenderObject::setPixmap): Moved this
+        function here from RenderBox. This code is needed for the table row class and
+        similar classes that supply a background image that is drawn by the table cell,
+        and those are not RenderBox subclasses.
+
+        * khtml/rendering/render_box.cpp: Removed setPixmap.
+        * khtml/rendering/render_box.h: Removed setPixmap.
+
 2003-12-06  John Sullivan  <sullivan at apple.com>
 
         - fixed <rdar://problem/3502655>: REGRESSION: Repro crash at espn.com
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 7efb484..2bbb8ae 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -185,16 +185,6 @@ void RenderBox::paint(QPainter *p, int _x, int _y, int _w, int _h,
     }
 }
 
-void RenderBox::setPixmap(const QPixmap &, const QRect&, CachedImage *image)
-{
-    if (image && image->pixmap_size() == image->valid_rect().size() && parent()) {
-        if (element() && (element()->id() == ID_HTML || element()->id() == ID_BODY))
-            canvas()->repaint(); // repaint the entire canvas, since the background gets propagated up.
-        else
-            repaint();      //repaint bg when it finished loading
-    }
-}
-
 void RenderBox::paintRootBoxDecorations(QPainter *p,int, int _y,
                                         int, int _h, int _tx, int _ty)
 {
diff --git a/WebCore/khtml/rendering/render_box.h b/WebCore/khtml/rendering/render_box.h
index 2c8e891..0edc97a 100644
--- a/WebCore/khtml/rendering/render_box.h
+++ b/WebCore/khtml/rendering/render_box.h
@@ -95,8 +95,6 @@ public:
     virtual void repaintDuringLayoutIfMoved(int oldX, int oldY);
 #endif
     
-    virtual void setPixmap(const QPixmap &, const QRect&, CachedImage *);
-
     virtual short containingBlockWidth() const;
 
     virtual void calcWidth();
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index dc5faea..a95ce9d 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1980,3 +1980,19 @@ QChar RenderObject::backslashAsCurrencySymbol() const
     return codec->backslashAsCurrencySymbol();
 #endif
 }
+
+void RenderObject::setPixmap(const QPixmap&, const QRect&, CachedImage *image)
+{
+    // Repaint when the background image finishes loading.
+    // This is needed for RenderBox objects, and also for table objects that hold
+    // backgrounds that are then respected by the table cells (which are RenderBox
+    // subclasses). It would be even better to find a more elegant way of doing this that
+    // would avoid putting this function and the CachedObjectClient base class into RenderObject.
+
+    if (image && image->pixmap_size() == image->valid_rect().size() && parent()) {
+        if (element() && (element()->id() == ID_HTML || element()->id() == ID_BODY))
+            canvas()->repaint();    // repaint the entire canvas since the background gets propagated up
+        else
+            repaint();              // repaint object, which is a box or a container with boxes inside it
+    }
+}
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 17bcfb4..0dc3a6d 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -677,6 +677,8 @@ public:
     // Convenience, to avoid repeating the code to dig down to get this.
     QChar backslashAsCurrencySymbol() const;
 
+    virtual void setPixmap(const QPixmap&, const QRect&, CachedImage *);
+
 protected:
     virtual void selectionStartEnd(int& spos, int& epos);
 

-- 
WebKit Debian packaging