Title: [202913] trunk/Tools
- Revision
- 202913
- Author
- [email protected]
- Date
- 2016-07-07 10:19:56 -0700 (Thu, 07 Jul 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (202912 => 202913)
--- trunk/Tools/ChangeLog 2016-07-07 17:19:08 UTC (rev 202912)
+++ trunk/Tools/ChangeLog 2016-07-07 17:19:56 UTC (rev 202913)
@@ -1,3 +1,17 @@
+2016-07-07 Per Arne Vollan <[email protected]>
+
+ [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 <[email protected]>
Email from June 1st containing text 'Today @ 7:10PM' is linkified, but shouldn't be
Modified: trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp (202912 => 202913)
--- trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp 2016-07-07 17:19:08 UTC (rev 202912)
+++ trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp 2016-07-07 17:19:56 UTC (rev 202913)
@@ -199,14 +199,12 @@
HRESULT ResourceLoadDelegate::identifierForInitialRequest(_In_opt_ IWebView* webView, _In_opt_ IWebURLRequest* request,
_In_opt_ IWebDataSource* dataSource, unsigned long identifier)
{
- if (!done && gTestRunner->dumpResourceLoadCallbacks()) {
- _bstr_t urlStr;
- if (FAILED(request->URL(&urlStr.GetBSTR())))
- return E_FAIL;
+ _bstr_t urlStr;
+ if (FAILED(request->URL(&urlStr.GetBSTR())))
+ return E_FAIL;
- ASSERT(!urlMap().contains(identifier));
- urlMap().set(identifier, wstringFromBSTR(urlStr));
- }
+ ASSERT(!urlMap().contains(identifier));
+ urlMap().set(identifier, wstringFromBSTR(urlStr));
return S_OK;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
