[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 e988443a35bdd86d6925bdb3e8e47781af252843
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 1 23:33:45 2003 +0000

    WebCore:
    
            Reviewed by Darin.
    
    	- fixed 3339255 - REGRESSION (73-85): javascript failure at gia.apple.com
    
    	I fixed this by making sure to cancel any pending redirects before
    	telling the bridge to load a URL. We don't want a race between
    	getting back a response and the redirect timer.
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge provisionalLoadStarted]): New method - call equivalent part method.
    	We count on the other side of the bridge to call this once it knows a load will
    	really happen (not cancelled by policy, etc).
            * kwq/KWQKHTMLPart.h:
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::provisionalLoadStarted): cancel pending redirects.
    
    WebKit:
    
            Reviewed by Darin.
    
    	- fixed 3339255 - REGRESSION (73-85): javascript failure at gia.apple.com
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _setState:]): When going to provisional state, tell the bridge that
    	a provisional load started, so it can cancel any pending redirects.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4758 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6c727af..adfa3e7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2003-08-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3339255 - REGRESSION (73-85): javascript failure at gia.apple.com
+
+	I fixed this by making sure to cancel any pending redirects before
+	telling the bridge to load a URL. We don't want a race between
+	getting back a response and the redirect timer.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge provisionalLoadStarted]): New method - call equivalent part method.
+	We count on the other side of the bridge to call this once it knows a load will
+	really happen (not cancelled by policy, etc).
+        * kwq/KWQKHTMLPart.h:
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::provisionalLoadStarted): cancel pending redirects.
+
 === Safari-91 ===
 
 2003-07-31  Dave Hyatt  <hyatt at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6c727af..adfa3e7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2003-08-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3339255 - REGRESSION (73-85): javascript failure at gia.apple.com
+
+	I fixed this by making sure to cancel any pending redirects before
+	telling the bridge to load a URL. We don't want a race between
+	getting back a response and the redirect timer.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge provisionalLoadStarted]): New method - call equivalent part method.
+	We count on the other side of the bridge to call this once it knows a load will
+	really happen (not cancelled by policy, etc).
+        * kwq/KWQKHTMLPart.h:
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::provisionalLoadStarted): cancel pending redirects.
+
 === Safari-91 ===
 
 2003-07-31  Dave Hyatt  <hyatt at apple.com>
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 926b1ec..d372cc9 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -89,6 +89,8 @@ public:
     void setView(KHTMLView *view);
     KHTMLView *view() const;
 
+    void provisionalLoadStarted();
+
     virtual bool openURL(const KURL &);
     virtual bool closeURL();
     void didNotOpenURL(const KURL &);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 4c2acb9..163f532 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -177,6 +177,14 @@ QString KWQKHTMLPart::generateFrameName()
     return QString::fromNSString([_bridge generateFrameName]);
 }
 
+void KWQKHTMLPart::provisionalLoadStarted()
+{
+    // we don't want to wait until we get an actual http response back
+    // to cancel pending redirects, otherwise they might fire before
+    // that happens.
+    cancelRedirection();
+}
+
 bool KWQKHTMLPart::openURL(const KURL &url)
 {
     // FIXME: The lack of args here to get the reload flag from
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index c35de91..15636a4 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -112,6 +112,8 @@ enum FrameBorderStyle {
 
 - (void)setParent:(WebCoreBridge *)parent;
 
+- (void)provisionalLoadStarted;
+
 - (void)openURL:(NSURL *)URL reload:(BOOL)reload
     contentType:(NSString *)contentType refresh:(NSString *)refresh lastModified:(NSDate *)lastModified
     pageCache:(NSDictionary *)pageCache;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 14a5f68..f6d7033 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -160,6 +160,12 @@ static bool initializedObjectCacheSize = FALSE;
     _part->setParent([parent part]);
 }
 
+- (void)provisionalLoadStarted
+{
+    _part->provisionalLoadStarted();
+}
+
+
 - (void)openURL:(NSURL *)URL reload:(BOOL)reload contentType:(NSString *)contentType refresh:(NSString *)refresh lastModified:(NSDate *)lastModified pageCache:(NSDictionary *)pageCache
 {
     if (pageCache) {
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dfdd92b..6c9cc14 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3339255 - REGRESSION (73-85): javascript failure at gia.apple.com
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]): When going to provisional state, tell the bridge that
+	a provisional load started, so it can cancel any pending redirects.
+
 === Safari-91 ===
 
 2003-07-31  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 7bdfd1b..f3f85b0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -816,6 +816,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     _private->state = newState;
     
     if (_private->state == WebFrameStateProvisional) {
+	[_private->bridge provisionalLoadStarted];
+    
         // FIXME: This is OK as long as no one resizes the window,
         // but in the case where someone does, it means garbage outside
         // the occupied part of the scroll view.
@@ -1601,7 +1603,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         // but it's not an obvious case.
         [self _addBackForwardItemClippedAtTarget:NO];
     }
-    
+
     [_private->bridge scrollToAnchorWithURL:URL];
     
     if (!isRedirect) {

-- 
WebKit Debian packaging