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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 9f299059823c8805f446121b9886ef1d7793d50a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 13 17:57:16 2001 +0000

    Fixed bug that was causing background images in body tags to clobber
    the content on the page
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 754863f..c9df49b 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -71,14 +71,12 @@ public:
     {
         underMouse = 0;
         reset();
-        paintBuffer=0;
         formCompletions=0;
         prevScrollbarVisible = true;
     }
     ~KHTMLViewPrivate()
     {
         delete formCompletions;
-        delete paintBuffer; paintBuffer =0;
         if (underMouse)
 	    underMouse->deref();
     }
@@ -108,6 +106,8 @@ public:
 	isDoubleClick = false;
     }
 
+    // The paintBuffer ivar is obsolete, 
+    // and should probably be removed at some point
     QPixmap  *paintBuffer;
     NodeImpl *underMouse;
 
@@ -221,8 +221,6 @@ void KHTMLView::init()
     lstViews->setAutoDelete( FALSE );
     lstViews->append( this );
 
-    if(!d->paintBuffer) d->paintBuffer = new QPixmap(PAINT_BUFFER_HEIGHT, PAINT_BUFFER_HEIGHT);
-    
     setFocusPolicy(QWidget::StrongFocus);
     viewport()->setFocusPolicy( QWidget::WheelFocus );
     viewport()->setFocusProxy(this);
@@ -309,37 +307,19 @@ void KHTMLView::drawContents( QPainter *p, int ex, int ey, int ew, int eh )
         return;
     }
 
-    //kdDebug( 6000 ) << "drawContents x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl;
-
-    if ( d->paintBuffer->width() < visibleWidth() )
-        d->paintBuffer->resize(visibleWidth(),PAINT_BUFFER_HEIGHT);
-
-    int py=0;
-    while (py < eh) {
-        int ph = eh-py < PAINT_BUFFER_HEIGHT ? eh-py : PAINT_BUFFER_HEIGHT;
-        
-        // FIXME!
-        RenderObject *ro;
-        DOM::DocumentImpl *doc;
-        
-        doc = m_part->xmlDocImpl();
-        if (doc){
-            ro = doc->renderer();
-            if (ro){
+    // FIXME!
+    RenderObject *ro;
+    DOM::DocumentImpl *doc;
+    
+    doc = m_part->xmlDocImpl();
+    if (doc){
+        ro = doc->renderer();
+        if (ro){
 #ifdef RENDER_TREE_DEBUG
                 printRenderTree (ro, 0);
 #endif
-                ro->print(p, ex, ey+py, ew, ph, 0, 0);
-            }
+            ro->print(p, ex, ey, ew, eh, 0, 0);
         }
-#ifdef BOX_DEBUG
-	if (m_part->xmlDocImpl()->focusNode())
-	{
-	    p->setBrush(Qt::NoBrush);
-	    p->drawRect(m_part->xmlDocImpl()->focusNode()->getRect());
-	}
-#endif
-        py += PAINT_BUFFER_HEIGHT;
     }
 
     khtml::DrawContentsEvent event( p, ex, ey, ew, eh );
diff --git a/WebCore/src/kdelibs/khtml/khtmlview.cpp b/WebCore/src/kdelibs/khtml/khtmlview.cpp
index 754863f..c9df49b 100644
--- a/WebCore/src/kdelibs/khtml/khtmlview.cpp
+++ b/WebCore/src/kdelibs/khtml/khtmlview.cpp
@@ -71,14 +71,12 @@ public:
     {
         underMouse = 0;
         reset();
-        paintBuffer=0;
         formCompletions=0;
         prevScrollbarVisible = true;
     }
     ~KHTMLViewPrivate()
     {
         delete formCompletions;
-        delete paintBuffer; paintBuffer =0;
         if (underMouse)
 	    underMouse->deref();
     }
@@ -108,6 +106,8 @@ public:
 	isDoubleClick = false;
     }
 
+    // The paintBuffer ivar is obsolete, 
+    // and should probably be removed at some point
     QPixmap  *paintBuffer;
     NodeImpl *underMouse;
 
@@ -221,8 +221,6 @@ void KHTMLView::init()
     lstViews->setAutoDelete( FALSE );
     lstViews->append( this );
 
-    if(!d->paintBuffer) d->paintBuffer = new QPixmap(PAINT_BUFFER_HEIGHT, PAINT_BUFFER_HEIGHT);
-    
     setFocusPolicy(QWidget::StrongFocus);
     viewport()->setFocusPolicy( QWidget::WheelFocus );
     viewport()->setFocusProxy(this);
@@ -309,37 +307,19 @@ void KHTMLView::drawContents( QPainter *p, int ex, int ey, int ew, int eh )
         return;
     }
 
-    //kdDebug( 6000 ) << "drawContents x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl;
-
-    if ( d->paintBuffer->width() < visibleWidth() )
-        d->paintBuffer->resize(visibleWidth(),PAINT_BUFFER_HEIGHT);
-
-    int py=0;
-    while (py < eh) {
-        int ph = eh-py < PAINT_BUFFER_HEIGHT ? eh-py : PAINT_BUFFER_HEIGHT;
-        
-        // FIXME!
-        RenderObject *ro;
-        DOM::DocumentImpl *doc;
-        
-        doc = m_part->xmlDocImpl();
-        if (doc){
-            ro = doc->renderer();
-            if (ro){
+    // FIXME!
+    RenderObject *ro;
+    DOM::DocumentImpl *doc;
+    
+    doc = m_part->xmlDocImpl();
+    if (doc){
+        ro = doc->renderer();
+        if (ro){
 #ifdef RENDER_TREE_DEBUG
                 printRenderTree (ro, 0);
 #endif
-                ro->print(p, ex, ey+py, ew, ph, 0, 0);
-            }
+            ro->print(p, ex, ey, ew, eh, 0, 0);
         }
-#ifdef BOX_DEBUG
-	if (m_part->xmlDocImpl()->focusNode())
-	{
-	    p->setBrush(Qt::NoBrush);
-	    p->drawRect(m_part->xmlDocImpl()->focusNode()->getRect());
-	}
-#endif
-        py += PAINT_BUFFER_HEIGHT;
     }
 
     khtml::DrawContentsEvent event( p, ex, ey, ew, eh );

-- 
WebKit Debian packaging