Reviewed by Ander.

        - fix http://bugs.webkit.org/show_bug.cgi?id=11453
          REGRESSION: Status bar always shows cancelled opening the page

        * platform/network/mac/ResourceHandleMac.mm:
        (WebCore::ResourceHandle::~ResourceHandle): Removed call to cancel.
        Since the subresource owns the resource handle, there's no need to cancel.
        This arrangement is only temporary, anyway, since Maciej will soon change
        things so that the subresource loader uses the resource handle and the
        resource handle doesn't know anything about the subresource loader.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5f4e731dbf104a1f54b8565a49634464f4930997..38ef0d6aece22d387b9887ac0f817156a0e29725 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2006-11-04  Darin Adler  <darin@apple.com>
+
+        Reviewed by Ander.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=11453
+          REGRESSION: Status bar always shows cancelled opening the page
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::~ResourceHandle): Removed call to cancel.
+        Since the subresource owns the resource handle, there's no need to cancel.
+        This arrangement is only temporary, anyway, since Maciej will soon change
+        things so that the subresource loader uses the resource handle and the
+        resource handle doesn't know anything about the subresource loader.
+
 2006-11-04  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/platform/network/mac/ResourceHandleMac.mm b/WebCore/platform/network/mac/ResourceHandleMac.mm
index eed65794aa38e1c21b969d1bf6ea07f9aece7b40..4a3606e4fed0013c3828c1e6dbd2bc519fe3fc6f 100644 (file)
--- a/WebCore/platform/network/mac/ResourceHandleMac.mm
+++ b/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -44,8 +44,6 @@ ResourceHandleInternal::~ResourceHandleInternal()
 
 ResourceHandle::~ResourceHandle()
 {
-    if (d->m_subresourceLoader)
-        d->m_subresourceLoader->cancel();
     delete d;
 }