Changeset 71116 in webkit
- Timestamp:
- Nov 2, 2010 8:36:52 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r71097 r71116 1 2010-11-02 Adam Roben <aroben@apple.com> 2 3 Only track resource identifiers in DRT when dumpResourceLoadCallbacks 4 is on 5 6 This reverts Windows to our pre-r71097 behavior. That patch made us 7 track all resource identifiers, including the main resource, so the 8 main resource's URL started appearing in test output instead of 9 "<unknown>". Arguably having the main resource's URL is better, but all 10 other platforms print "<unknown>" and we want to match. 11 12 Fixes <http://webkit.org/b/48837> <rdar://problem/8620351> REGRESSION 13 (r71097): Many http tests failing on Windows 14 15 Reviewed by Anders Carlsson. 16 17 * DumpRenderTree/win/ResourceLoadDelegate.cpp: 18 (ResourceLoadDelegate::identifierForInitialRequest): Don't add the 19 identifier to the URL map if we're not supposed to dump resource load 20 callbacks. 21 (ResourceLoadDelegate::removeIdentifierForRequest): Always remove the 22 identifier from the URL map even if we're already "done". There's no 23 point in keeping out-of-date identifiers around. 24 1 25 2010-11-01 Jenn Braithwaite <jennb@chromium.org> 2 26 -
trunk/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
r71097 r71116 217 217 /* [in] */ unsigned long identifier) 218 218 { 219 if (!done ) {219 if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) { 220 220 BSTR urlStr; 221 221 if (FAILED(request->URL(&urlStr))) … … 233 233 /* [in] */ unsigned long identifier) 234 234 { 235 if (!done) { 236 ASSERT(urlMap().contains(identifier)); 237 urlMap().remove(identifier); 238 } 235 urlMap().remove(identifier); 239 236 240 237 return S_OK;
Note: See TracChangeset
for help on using the changeset viewer.