[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 8d09fe7a860df42feb580a7fb608b0e408ed384d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 20 01:22:05 2003 +0000

    WebCore:
    
            Reviewed by Darin.
    
    	Roll out old fix for 3410980 and do a new better fix.
    
            * khtml/html/html_documentimpl.cpp:
            (HTMLDocumentImpl::close):
            * khtml/khtml_part.h:
            * kwq/KWQKHTMLPart.mm:
            * kwq/WebCoreBridge.h:
    
    WebKit:
    
            Reviewed by Darin.
    
    	Roll out old fix for 3410980.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge goBackOrForward:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 33b6385..c2a52fe 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-09-19  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	Roll out old fix for 3410980 and do a new better fix.
+
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/khtml_part.h:
+        * kwq/KWQKHTMLPart.mm:
+        * kwq/WebCoreBridge.h:
+
 2003-09-19  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 33b6385..c2a52fe 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-09-19  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	Roll out old fix for 3410980 and do a new better fix.
+
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/khtml_part.h:
+        * kwq/KWQKHTMLPart.mm:
+        * kwq/WebCoreBridge.h:
+
 2003-09-19  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index 25cccf7..9c213ef 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -306,7 +306,7 @@ void HTMLDocumentImpl::close()
     // First fire the onload.
     bool doload = !parsing() && m_tokenizer && !processingLoadEvent;
     
-    bool wasNotRedirecting = !view();
+    bool wasNotRedirecting = !view() || view()->part()->d->m_scheduledRedirection == noRedirectionScheduled || view()->part()->d->m_scheduledRedirection == historyNavigationScheduled;
 
     processingLoadEvent = true;
     if (body() && doload) {
@@ -322,9 +322,10 @@ void HTMLDocumentImpl::close()
     // Make sure both the initial layout and reflow happen after the onload
     // fires. This will improve onload scores, and other browsers do it.
     // If they wanna cheat, we can too. -dwh
-    if (doload && wasNotRedirecting && view()
-            && view()->part()->d->m_delayRedirect == 0
-            && m_startTime.elapsed() < 1000) {
+    
+    bool isRedirectingSoon = view() && view()->part()->d->m_scheduledRedirection != noRedirectionScheduled && view()->part()->d->m_scheduledRedirection != historyNavigationScheduled && view()->part()->d->m_delayRedirect == 0;
+
+    if (doload && wasNotRedirecting && isRedirectingSoon && m_startTime.elapsed() < 1000) {
         static int redirectCount = 0;
         if (redirectCount++ % 4) {
             // When redirecting over and over (e.g., i-bench), to avoid the appearance of complete inactivity,
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 643770f..363b62d 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -376,7 +376,7 @@ public:
    * Schedules a history navigation operation (go forward, go back, etc.).
    * This is used for JavaScript-triggered location changes.
    */
-  virtual void scheduleHistoryNavigation( int steps );
+  void scheduleHistoryNavigation( int steps );
 
   /**
    * Clears the widget and prepares it for new content.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 0c9a886..c496386 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -580,13 +580,6 @@ void KWQKHTMLPart::submitForm(const KURL &url, const URLArgs &args)
     clearRecordedFormValues();
 }
 
-void KWQKHTMLPart::scheduleHistoryNavigation( int steps )
-{
-    if ([_bridge canGoBackOrForward:steps]) {
-	KHTMLPart::scheduleHistoryNavigation(steps);
-    }
-}
-
 void KWQKHTMLPart::setEncoding(const QString &name, bool userChosen)
 {
     if (!d->m_workingURL.isEmpty()) {
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 3ba4989..9ec8176 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -325,7 +325,6 @@ typedef enum {
 
 - (int)historyLength;
 - (void)goBackOrForward:(int)distance;
-- (BOOL)canGoBackOrForward:(int)distance;
 
 - (void)controlTextDidBeginEditing:(NSNotification *)obj;
 - (void)controlTextDidEndEditing:(NSNotification *)obj;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fc4781c..d531fd9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-19  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	Roll out old fix for 3410980.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge goBackOrForward:]):
+
 2003-09-19  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 163a3bc..8568c57 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -838,10 +838,10 @@ static BOOL loggedObjectCacheSize = NO;
     return [[[_frame webView] backForwardList] backListCount];
 }
 
-- (WebHistoryItem *)backOrForwardItemWithDistance:(int)distance
+- (void)goBackOrForward:(int)distance
 {
     if (distance == 0) {
-        return nil;
+        return;
     }
     WebView *webView = [_frame webView];
     WebBackForwardList *list = [webView backForwardList];
@@ -859,20 +859,8 @@ static BOOL loggedObjectCacheSize = NO;
             }
         }
     }
-
-    return item;
-}
-
-- (BOOL)canGoBackOrForward:(int)distance
-{
-    return [self backOrForwardItemWithDistance:distance] != nil;
-}
-
-- (void)goBackOrForward:(int)distance
-{
-    WebHistoryItem *item = [self backOrForwardItemWithDistance:distance];
-    if (item != nil) {
-        [[_frame webView] goToBackForwardItem:item];
+    if (item) {
+        [webView goToBackForwardItem:item];
     }
 }
 

-- 
WebKit Debian packaging