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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 203b9adf4003107593057f479f5a38ea34f2f5e2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 8 22:54:49 2004 +0000

    	Fix for the table layout test that failed because of a change in how innerText worked.  We need to do
    	updateLayout now when using innerText, since the method has been changed to use line boxes in the render tree
    	that might otherwise be out of date.
    
            Reviewed by kocienda
    
            * khtml/html/html_elementimpl.cpp:
            (HTMLElementImpl::innerText):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6982 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 55613ca..44c287e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-07-08  David Hyatt  <hyatt at apple.com>
+
+	Fix for the table layout test that failed because of a change in how innerText worked.  We need to do
+	updateLayout now when using innerText, since the method has been changed to use line boxes in the render tree
+	that might otherwise be out of date.
+	
+        Reviewed by kocienda
+
+        * khtml/html/html_elementimpl.cpp:
+        (HTMLElementImpl::innerText):
+
 2004-07-08  John Sullivan  <sullivan at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 8010059..1c785db 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -703,6 +703,9 @@ DOMString HTMLElementImpl::outerHTML() const
 
 DOMString HTMLElementImpl::innerText() const
 {
+    // We need to update layout, since innerText uses line boxes in the render tree.
+    getDocument()->updateLayout();
+    
     Node startContainer(const_cast<HTMLElementImpl *>(this));
     long startOffset = 0;
     Node endContainer(const_cast<HTMLElementImpl *>(this));

-- 
WebKit Debian packaging