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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1e9b1926e9230c1f7c59bfddcf06b01e6c7f8d4b
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 15:36:52 2010 +0000

    Only track resource identifiers in DRT when dumpResourceLoadCallbacks is on
    
    This reverts Windows to our pre-r71097 behavior. That patch made us
    track all resource identifiers, including the main resource, so the
    main resource's URL started appearing in test output instead of
    "<unknown>". Arguably having the main resource's URL is better, but all
    other platforms print "<unknown>" and we want to match.
    
    Fixes <http://webkit.org/b/48837> <rdar://problem/8620351> REGRESSION
    (r71097): Many http tests failing on Windows
    
    Reviewed by Anders Carlsson.
    
    * DumpRenderTree/win/ResourceLoadDelegate.cpp:
    (ResourceLoadDelegate::identifierForInitialRequest): Don't add the
    identifier to the URL map if we're not supposed to dump resource load
    callbacks.
    (ResourceLoadDelegate::removeIdentifierForRequest): Always remove the
    identifier from the URL map even if we're already "done". There's no
    point in keeping out-of-date identifiers around.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71116 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0413cda..ff821ab 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,27 @@
+2010-11-02  Adam Roben  <aroben at apple.com>
+
+        Only track resource identifiers in DRT when dumpResourceLoadCallbacks
+        is on
+
+        This reverts Windows to our pre-r71097 behavior. That patch made us
+        track all resource identifiers, including the main resource, so the
+        main resource's URL started appearing in test output instead of
+        "<unknown>". Arguably having the main resource's URL is better, but all
+        other platforms print "<unknown>" and we want to match.
+
+        Fixes <http://webkit.org/b/48837> <rdar://problem/8620351> REGRESSION
+        (r71097): Many http tests failing on Windows
+
+        Reviewed by Anders Carlsson.
+
+        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+        (ResourceLoadDelegate::identifierForInitialRequest): Don't add the
+        identifier to the URL map if we're not supposed to dump resource load
+        callbacks.
+        (ResourceLoadDelegate::removeIdentifierForRequest): Always remove the
+        identifier from the URL map even if we're already "done". There's no
+        point in keeping out-of-date identifiers around.
+
 2010-11-01  Jenn Braithwaite  <jennb at chromium.org>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp b/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
index cf17987..09b07d6 100644
--- a/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
+++ b/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
@@ -216,7 +216,7 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::identifierForInitialRequest(
     /* [in] */ IWebDataSource* dataSource,
     /* [in] */ unsigned long identifier)
 { 
-    if (!done) {
+    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
         BSTR urlStr;
         if (FAILED(request->URL(&urlStr)))
             return E_FAIL;
@@ -232,10 +232,7 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::removeIdentifierForRequest(
     /* [in] */ IWebView* webView,
     /* [in] */ unsigned long identifier)
 {
-    if (!done) {
-        ASSERT(urlMap().contains(identifier));
-        urlMap().remove(identifier);
-    }
+    urlMap().remove(identifier);
 
     return S_OK;
 }

-- 
WebKit Debian packaging