Changeset 202913 in webkit

Timestamp:

Jul 7, 2016, 10:19:56 AM (10 years ago)

Author:

pvollan@apple.com

Message:

[Win] The test http/tests/loading/main-resource-delegates-on-back-navigation.html is failing.
​https://bugs.webkit.org/show_bug.cgi?id=159509

Reviewed by Alex Christensen.

We should always insert the url in the url map when identifierForInitialRequest
is called. Otherwise we can end up with identifiers not having an entry in the
url map when urls are written to the test output file.

• DumpRenderTree/win/ResourceLoadDelegate.cpp:

(ResourceLoadDelegate::identifierForInitialRequest):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/win/ResourceLoadDelegate.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-07-07  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] The test http/tests/loading/main-resource-delegates-on-back-navigation.html is failing.
+        https://bugs.webkit.org/show_bug.cgi?id=159509
+
+        Reviewed by Alex Christensen.
+
+        We should always insert the url in the url map when identifierForInitialRequest
+        is called. Otherwise we can end up with identifiers not having an entry in the
+        url map when urls are written to the test output file. 
+
+        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+        (ResourceLoadDelegate::identifierForInitialRequest):
+
 2016-07-06  Tim Horton  <timothy_horton@apple.com>
 

trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp

@@ -200 +200 @@
     _In_opt_ IWebDataSource* dataSource, unsigned long identifier)
 { 
-    if (!done && gTestRunner->dumpResourceLoadCallbacks()) {
-        _bstr_t urlStr;
-        if (FAILED(request->URL(&urlStr.GetBSTR())))
-            return E_FAIL;
-
-        ASSERT(!urlMap().contains(identifier));
-        urlMap().set(identifier, wstringFromBSTR(urlStr));
-    }
+    _bstr_t urlStr;
+    if (FAILED(request->URL(&urlStr.GetBSTR())))
+        return E_FAIL;
+
+    ASSERT(!urlMap().contains(identifier));
+    urlMap().set(identifier, wstringFromBSTR(urlStr));
 
     return S_OK;