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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 5c9c503a8474e42cf512a1d304f005ae86502ebe
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat May 31 02:04:19 2003 +0000

            Reviewed by Chris.
    
    	- fixed 3169067 - PEOPLESOFT: left frame missing; frame RenderRoot height and width are both zero
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::gotoAnchor):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4460 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4544baf..79811d8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2003-05-30  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Chris.
+
+	- fixed 3169067 - PEOPLESOFT: left frame missing; frame RenderRoot height and width are both zero
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::gotoAnchor):
+
+2003-05-30  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Ken.
 
 	- fixed 3273544 - REGRESSION: Page disappears at http://www.urban-advantage.com/
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4544baf..79811d8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-05-30  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Chris.
+
+	- fixed 3169067 - PEOPLESOFT: left frame missing; frame RenderRoot height and width are both zero
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::gotoAnchor):
+
+2003-05-30  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Ken.
 
 	- fixed 3273544 - REGRESSION: Page disappears at http://www.urban-advantage.com/
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 7e4f00e..2ed0df0 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1984,6 +1984,16 @@ bool KHTMLPart::gotoAnchor( const QString &name )
       return false;
   }
 
+  // We need to update the layout before scrolling, otherwise we could
+  // really mess things up if an anchor scroll comes at a bad moment.
+  if ( d->m_doc ) {
+    d->m_doc->updateRendering();
+    // Only do a layout if changes have occurred that make it necessary.      
+    if ( d->m_view && d->m_doc->renderer() && d->m_doc->renderer()->needsLayout() ) {
+      d->m_view->layout();
+    }
+  }
+  
   int x = 0, y = 0;
   HTMLElementImpl *a = static_cast<HTMLElementImpl *>(n);
   a->getUpperLeftCorner(x, y);

-- 
WebKit Debian packaging