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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 3c5073ece9ed2a49e3e1a674d88bacba84bed0aa
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 7 03:37:56 2003 +0000

    	Fixed 3476563.  Remove unnecessary call to set view position after load completes.
    
            Reviewed by Gramps.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::checkCompleted):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5414 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fd2ea99..01b4ecc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-11-06  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3476563.  Remove unnecessary call to set view position after load completes.
+ 
+        Reviewed by Gramps.
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::checkCompleted):
+
 2003-11-06  Chris Blumenberg  <cblu at apple.com>
 
         * khtml/rendering/render_image.h:
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index e7336f2..80ff339 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1756,10 +1756,12 @@ void KHTMLPart::checkCompleted()
   if (d->m_view) {
 #endif
 
-  // check that the view has not been moved by the user
+#if !APPLE_CHANGES
+  // check that the view has not been moved by the user  
   if ( m_url.encodedHtmlRef().isEmpty() && d->m_view->contentsY() == 0 )
       d->m_view->setContentsPos( d->m_extension->urlArgs().xOffset,
                                  d->m_extension->urlArgs().yOffset );
+#endif
 
   d->m_view->complete();
 

-- 
WebKit Debian packaging