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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 6851f8fc28d7e467e255dcf620b210953f842f3d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jun 16 04:12:05 2002 +0000

    	* kwq/KWQKloader.mm:
    	(-[KWQURLLoadClient IFURLHandle:didRedirectToURL:]):
    	Rolled out an assert I added by accident that will break Deployment builds.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1381 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b0832b1..5da7a6c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,6 +1,12 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKloader.mm:
+	(-[KWQURLLoadClient IFURLHandle:didRedirectToURL:]):
+	Rolled out an assert I added by accident that will break Deployment builds.
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm:
 	(-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
 	(-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
 	(-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b0832b1..5da7a6c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,6 +1,12 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKloader.mm:
+	(-[KWQURLLoadClient IFURLHandle:didRedirectToURL:]):
+	Rolled out an assert I added by accident that will break Deployment builds.
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm:
 	(-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
 	(-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
 	(-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b0832b1..5da7a6c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,6 +1,12 @@
 2002-06-15  Darin Adler  <darin at apple.com>
 
 	* kwq/KWQKloader.mm:
+	(-[KWQURLLoadClient IFURLHandle:didRedirectToURL:]):
+	Rolled out an assert I added by accident that will break Deployment builds.
+
+2002-06-15  Darin Adler  <darin at apple.com>
+
+	* kwq/KWQKloader.mm:
 	(-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
 	(-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
 	(-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index e0ec55e..2853ab9 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -153,9 +153,6 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "url = %s", DEBUG_OBJECT(URL));
     
-    void *userData = [[handle attributeForKey:IFURLHandleUserData] pointerValue];
-    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
-    KWQ_ASSERT(handle == job->handle());
     KWQ_ASSERT(m_currentURL != nil);
 
     [m_bridge didRedirectWithHandle:handle fromURL:m_currentURL];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index e0ec55e..2853ab9 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -153,9 +153,6 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "url = %s", DEBUG_OBJECT(URL));
     
-    void *userData = [[handle attributeForKey:IFURLHandleUserData] pointerValue];
-    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
-    KWQ_ASSERT(handle == job->handle());
     KWQ_ASSERT(m_currentURL != nil);
 
     [m_bridge didRedirectWithHandle:handle fromURL:m_currentURL];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index e0ec55e..2853ab9 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -153,9 +153,6 @@ using khtml::Request;
 {
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "url = %s", DEBUG_OBJECT(URL));
     
-    void *userData = [[handle attributeForKey:IFURLHandleUserData] pointerValue];
-    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
-    KWQ_ASSERT(handle == job->handle());
     KWQ_ASSERT(m_currentURL != nil);
 
     [m_bridge didRedirectWithHandle:handle fromURL:m_currentURL];

-- 
WebKit Debian packaging