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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:19:53 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 2011e401aca43da28a22912c587d96f7584864a2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jun 16 03:27:57 2002 +0000

    	* kwq/KWQKloader.mm:
    	(-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
    	(-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
    	(-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
    	Fixed the order so the URL handles are removed before we send notifications
    	as before my change. This seems to fix the rest of the breakage.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3b77517..b0832b1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQKloader.mm:
+	(-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
+	(-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
+	(-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+	Fixed the order so the URL handles are removed before we send notifications
+	as before my change. This seems to fix the rest of the breakage.
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
 	* kwq/KWQKloader.mm: (-[KWQURLLoadClient initWithLoader:bridge:]):
         Fix bridge/m_bridge typo that was responsible for at least some of the breakage
         I caused.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3b77517..b0832b1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQKloader.mm:
+	(-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
+	(-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
+	(-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+	Fixed the order so the URL handles are removed before we send notifications
+	as before my change. This seems to fix the rest of the breakage.
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
 	* kwq/KWQKloader.mm: (-[KWQURLLoadClient initWithLoader:bridge:]):
         Fix bridge/m_bridge typo that was responsible for at least some of the breakage
         I caused.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3b77517..b0832b1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQKloader.mm:
+	(-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
+	(-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
+	(-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+	Fixed the order so the URL handles are removed before we send notifications
+	as before my change. This seems to fix the rest of the breakage.
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
 	* kwq/KWQKloader.mm: (-[KWQURLLoadClient initWithLoader:bridge:]):
         Fix bridge/m_bridge typo that was responsible for at least some of the breakage
         I caused.
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index c427e17..e0ec55e 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -126,8 +126,8 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "bridge = %p for URL %s", m_bridge, DEBUG_OBJECT([handle url]));
 
-    [m_bridge didCancelLoadingWithHandle:handle];
     [self doneWithHandle:handle error:YES];
+    [m_bridge didCancelLoadingWithHandle:handle];
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data:(NSData *)data
@@ -137,16 +137,16 @@ using khtml::Request;
     KWQ_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
     KWQ_ASSERT((int)[data length] == [handle contentLengthReceived]);
 
-    [m_bridge didFinishLoadingWithHandle:handle];
     [self doneWithHandle:handle error:NO];
+    [m_bridge didFinishLoadingWithHandle:handle];
 }
 
 - (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
 {
     KWQDEBUGLEVEL (KWQ_LOG_LOADING, "bridge = %p, result = %s, URL = %s", m_bridge, DEBUG_OBJECT([result errorDescription]), DEBUG_OBJECT([handle url]));
 
-    [m_bridge didFailToLoadWithHandle:handle error:result];
     [self doneWithHandle:handle error:YES];
+    [m_bridge didFailToLoadWithHandle:handle error:result];
 }
 
 - (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index c427e17..e0ec55e 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -126,8 +126,8 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "bridge = %p for URL %s", m_bridge, DEBUG_OBJECT([handle url]));
 
-    [m_bridge didCancelLoadingWithHandle:handle];
     [self doneWithHandle:handle error:YES];
+    [m_bridge didCancelLoadingWithHandle:handle];
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data:(NSData *)data
@@ -137,16 +137,16 @@ using khtml::Request;
     KWQ_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
     KWQ_ASSERT((int)[data length] == [handle contentLengthReceived]);
 
-    [m_bridge didFinishLoadingWithHandle:handle];
     [self doneWithHandle:handle error:NO];
+    [m_bridge didFinishLoadingWithHandle:handle];
 }
 
 - (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
 {
     KWQDEBUGLEVEL (KWQ_LOG_LOADING, "bridge = %p, result = %s, URL = %s", m_bridge, DEBUG_OBJECT([result errorDescription]), DEBUG_OBJECT([handle url]));
 
-    [m_bridge didFailToLoadWithHandle:handle error:result];
     [self doneWithHandle:handle error:YES];
+    [m_bridge didFailToLoadWithHandle:handle error:result];
 }
 
 - (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index c427e17..e0ec55e 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -126,8 +126,8 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "bridge = %p for URL %s", m_bridge, DEBUG_OBJECT([handle url]));
 
-    [m_bridge didCancelLoadingWithHandle:handle];
     [self doneWithHandle:handle error:YES];
+    [m_bridge didCancelLoadingWithHandle:handle];
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data:(NSData *)data
@@ -137,16 +137,16 @@ using khtml::Request;
     KWQ_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
     KWQ_ASSERT((int)[data length] == [handle contentLengthReceived]);
 
-    [m_bridge didFinishLoadingWithHandle:handle];
     [self doneWithHandle:handle error:NO];
+    [m_bridge didFinishLoadingWithHandle:handle];
 }
 
 - (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
 {
     KWQDEBUGLEVEL (KWQ_LOG_LOADING, "bridge = %p, result = %s, URL = %s", m_bridge, DEBUG_OBJECT([result errorDescription]), DEBUG_OBJECT([handle url]));
 
-    [m_bridge didFailToLoadWithHandle:handle error:result];
     [self doneWithHandle:handle error:YES];
+    [m_bridge didFailToLoadWithHandle:handle error:result];
 }
 
 - (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list