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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 1d156d0688cea42a50300653cee41e2493cdb719
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 30 23:16:59 2004 +0000

    	Fixed: <rdar://problem/3543662>: HITLIST-137: REGRESSION: reproducible hang copying all text at Dave's blog, and other pages
    
            Reviewed by dave.
    
            * khtml/xml/dom2_rangeimpl.cpp:
            (RangeImpl::toHTMLWithOptions): when looping with containingBlock, check the value to see if it is the same
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e393c05..73c76af 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-04-30  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3543662>: HITLIST-137: REGRESSION: reproducible hang copying all text at Dave's blog, and other pages
+
+        Reviewed by dave.
+
+        * khtml/xml/dom2_rangeimpl.cpp:
+        (RangeImpl::toHTMLWithOptions): when looping with containingBlock, check the value to see if it is the same
+
 2004-04-30  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3639530, regression on generated content pages.  They crash because I forgot to null-check the style
diff --git a/WebCore/khtml/xml/dom2_rangeimpl.cpp b/WebCore/khtml/xml/dom2_rangeimpl.cpp
index 91e9538..42bdc4f 100644
--- a/WebCore/khtml/xml/dom2_rangeimpl.cpp
+++ b/WebCore/khtml/xml/dom2_rangeimpl.cpp
@@ -864,7 +864,12 @@ DOMString RangeImpl::toHTMLWithOptions(QPtrList<NodeImpl> *nodes)
         if (commonBlockNode) {
             break;
         }
-        startBlock = startBlock->containingBlock();
+        RenderBlock *newStartBlock = startBlock->containingBlock();
+        if (!newStartBlock || newStartBlock == startBlock) {
+            commonBlockNode = startBlock->element();
+            break;
+        }
+        startBlock = newStartBlock;
     }
     
     return commonBlockNode->recursive_toHTMLWithOptions(true, this, nodes);

-- 
WebKit Debian packaging