[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ap at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 696df3d52eb7ab043c2d1bc640df6513b83de05e
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 16 00:40:57 2010 +0000

            Trying to fix crashes on Leopard buildbot.
    
            * loader/loader.cpp:
            (WebCore::Loader::Host::didFinishLoading):
            (WebCore::Loader::Host::didFail):
            Moved logging higher in the function - it seems that CachedResource can be already destroyed.
    
            * platform/Logging.cpp: (WebCore::getChannelFromName):
            * platform/mac/LoggingMac.mm: (WebCore::InitializeLoggingChannelsIfNecessary):
            Initialize the new channel (oops).
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69898 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8fbddc0..259c17f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-15  Alexey Proskuryakov  <ap at apple.com>
+
+        Trying to fix crashes on Leopard buildbot.
+
+        * loader/loader.cpp:
+        (WebCore::Loader::Host::didFinishLoading):
+        (WebCore::Loader::Host::didFail):
+        Moved logging higher in the function - it seems that CachedResource can be already destroyed.
+
+        * platform/Logging.cpp: (WebCore::getChannelFromName):
+        * platform/mac/LoggingMac.mm: (WebCore::InitializeLoggingChannelsIfNecessary):
+        Initialize the new channel (oops).
+
 2010-10-15  Mike Lawther  <mikelawther at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp
index a466d5a..aa3f246 100644
--- a/WebCore/loader/loader.cpp
+++ b/WebCore/loader/loader.cpp
@@ -412,6 +412,8 @@ void Loader::Host::didFinishLoading(SubresourceLoader* loader)
     CachedResource* resource = request->cachedResource();
     ASSERT(!resource->resourceToRevalidate());
 
+    LOG(ResourceLoading, "Host '%s' received %s. Current count %d\n", m_name.string().latin1().data(), resource->url().latin1().data(), m_requestsLoading.size());
+
     // If we got a 4xx response, we're pretending to have received a network
     // error, so we can't send the successful data() and finish() callbacks.
     if (!resource->errorOccurred()) {
@@ -426,8 +428,6 @@ void Loader::Host::didFinishLoading(SubresourceLoader* loader)
     
     cachedResourceLoader->checkForPendingPreloads();
 
-    LOG(ResourceLoading, "Host '%s' received %s. Current count %d\n", m_name.string().latin1().data(), resource->url().latin1().data(), m_requestsLoading.size());
-
     servePendingRequests();
 }
 
@@ -456,7 +456,9 @@ void Loader::Host::didFail(SubresourceLoader* loader, bool cancelled)
         cachedResourceLoader->decrementRequestCount(request->cachedResource());
 
     CachedResource* resource = request->cachedResource();
-    
+
+    LOG(ResourceLoading, "Host '%s' failed to load %s (cancelled=%d). Current count %d\n", m_name.string().latin1().data(), resource->url().latin1().data(), cancelled, m_requestsLoading.size());
+
     if (resource->resourceToRevalidate())
         cache()->revalidationFailed(resource);
 
@@ -473,8 +475,6 @@ void Loader::Host::didFail(SubresourceLoader* loader, bool cancelled)
     
     cachedResourceLoader->checkForPendingPreloads();
 
-    LOG(ResourceLoading, "Host '%s' failed to load %s (cancelled=%d). Current count %d\n", m_name.string().latin1().data(), resource->url().latin1().data(), cancelled, m_requestsLoading.size());
-
     servePendingRequests();
 }
 
diff --git a/WebCore/platform/Logging.cpp b/WebCore/platform/Logging.cpp
index b383697..8f64282 100644
--- a/WebCore/platform/Logging.cpp
+++ b/WebCore/platform/Logging.cpp
@@ -105,6 +105,9 @@ WTFLogChannel* getChannelFromName(const String& channelName)
     if (equalIgnoringCase(channelName, String("PlatformLeaks")))
         return &LogPlatformLeaks;
 
+    if (equalIgnoringCase(channelName, String("ResourceLoading")))
+        return &LogResourceLoading;
+
     if (equalIgnoringCase(channelName, String("Plugins")))
         return &LogPlugins;
 
diff --git a/WebCore/platform/mac/LoggingMac.mm b/WebCore/platform/mac/LoggingMac.mm
index 3e83579..ee2f39e 100644
--- a/WebCore/platform/mac/LoggingMac.mm
+++ b/WebCore/platform/mac/LoggingMac.mm
@@ -62,6 +62,7 @@ void InitializeLoggingChannelsIfNecessary()
     initializeWithUserDefault(LogHistory);
     initializeWithUserDefault(LogPageCache);
     initializeWithUserDefault(LogPlatformLeaks);
+    initializeWithUserDefault(LogResourceLoading);
     initializeWithUserDefault(LogNetwork);
     initializeWithUserDefault(LogFTP);
     initializeWithUserDefault(LogThreading);

-- 
WebKit Debian packaging