[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 578b099b82a1313dcc322f5fb62f102bf35fb30f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 17 23:44:44 2003 +0000

            Reviewed by Maciej.
    
            - fixed a bug caught by libgmalloc on Vicki's test machine
    
            * khtml/xml/dom_docimpl.cpp:
            (DocumentImpl::detach): Make sure we don't have a dangling paint device after
            detaching from the KTHMLView.
            (DocumentImpl::setPaintDevice): Allow a 0 parameter.
            * kwq/WebCoreBridge.mm:
            (nowPrinting): Handle the case of a 0 paint device.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4135 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 01d1836..75ef671 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-04-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed a bug caught by libgmalloc on Vicki's test machine
+
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::detach): Make sure we don't have a dangling paint device after
+        detaching from the KTHMLView.
+        (DocumentImpl::setPaintDevice): Allow a 0 parameter.
+        * kwq/WebCoreBridge.mm:
+        (nowPrinting): Handle the case of a 0 paint device.
+
 2003-04-15  David Hyatt  <hyatt at apple.com>
 
 	Missed a piece of the renaming on lowestPosition/rightmostPosition.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 01d1836..75ef671 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-04-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed a bug caught by libgmalloc on Vicki's test machine
+
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::detach): Make sure we don't have a dangling paint device after
+        detaching from the KTHMLView.
+        (DocumentImpl::setPaintDevice): Allow a 0 parameter.
+        * kwq/WebCoreBridge.mm:
+        (nowPrinting): Handle the case of a 0 paint device.
+
 2003-04-15  David Hyatt  <hyatt at apple.com>
 
 	Missed a piece of the renaming on lowestPosition/rightmostPosition.
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index f8fe094..1b67747 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1053,6 +1053,8 @@ void DocumentImpl::detach()
     if ( render )
         render->detach(m_renderArena);
 
+    if (m_paintDevice == m_view)
+        setPaintDevice(0);
     m_view = 0;
     
     if (m_renderArena){
@@ -1096,7 +1098,7 @@ void DocumentImpl::setPaintDevice( QPaintDevice *dev )
     }
     m_paintDevice = dev;
     delete m_paintDeviceMetrics;
-    m_paintDeviceMetrics = new QPaintDeviceMetrics( dev );
+    m_paintDeviceMetrics = dev ? new QPaintDeviceMetrics( dev ) : 0;
 }
 
 void DocumentImpl::open(  )
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index c8d4043..3564884 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -330,7 +330,7 @@ static bool initializedObjectCacheSize = FALSE;
 static BOOL nowPrinting(WebCoreBridge *self)
 {
     DocumentImpl *doc = self->_part->xmlDocImpl();
-    return doc && doc->paintDevice()->devType() == QInternal::Printer;
+    return doc && doc->paintDevice() && doc->paintDevice()->devType() == QInternal::Printer;
 }
 
 // Set or unset the printing mode in the view.  We only toy with this if we're printing.

-- 
WebKit Debian packaging