Title: [141493] trunk/Source/WebKit2
- Revision
- 141493
- Author
- [email protected]
- Date
- 2013-01-31 15:13:16 -0800 (Thu, 31 Jan 2013)
Log Message
Assertion failure in WebResourceLoadScheduler::remove when loading .webarchives
<rdar://problem/12888145> and https://bugs.webkit.org/show_bug.cgi?id=108520
Reviewed by Alexey Proskuryakov.
* WebProcess/Network/WebResourceLoadScheduler.cpp:
(WebKit::WebResourceLoadScheduler::scheduleLoad): Even if it isn't to be scheduled with the
NetworkProcess, still add this ResourceLoader to the scheduler's records.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (141492 => 141493)
--- trunk/Source/WebKit2/ChangeLog 2013-01-31 23:12:05 UTC (rev 141492)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-31 23:13:16 UTC (rev 141493)
@@ -1,3 +1,14 @@
+2013-01-31 Brady Eidson <[email protected]>
+
+ Assertion failure in WebResourceLoadScheduler::remove when loading .webarchives
+ <rdar://problem/12888145> and https://bugs.webkit.org/show_bug.cgi?id=108520
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/Network/WebResourceLoadScheduler.cpp:
+ (WebKit::WebResourceLoadScheduler::scheduleLoad): Even if it isn't to be scheduled with the
+ NetworkProcess, still add this ResourceLoader to the scheduler's records.
+
2013-01-31 Simon Hausmann <[email protected]>
Unreviewed trivial Unix build fix.
Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (141492 => 141493)
--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2013-01-31 23:12:05 UTC (rev 141492)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2013-01-31 23:13:16 UTC (rev 141493)
@@ -87,14 +87,17 @@
ASSERT(priority != ResourceLoadPriorityUnresolved);
priority = ResourceLoadPriorityHighest;
+ ResourceLoadIdentifier identifier = resourceLoader->identifier();
+ ASSERT(identifier);
+
// If there's a web archive resource for this URL, we don't need to schedule the load since it will never touch the network.
if (resourceLoader->documentLoader()->archiveResourceForURL(resourceLoader->request().url())) {
+ m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
startResourceLoader(resourceLoader);
+
return;
}
- ResourceLoadIdentifier identifier = resourceLoader->identifier();
- ASSERT(identifier);
ContentSniffingPolicy contentSniffingPolicy = resourceLoader->shouldSniffContent() ? SniffContent : DoNotSniffContent;
StoredCredentials allowStoredCredentials = resourceLoader->shouldUseCredentialStorage() ? AllowStoredCredentials : DoNotAllowStoredCredentials;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
