Modified: trunk/Source/WebKit2/ChangeLog (197749 => 197750)
--- trunk/Source/WebKit2/ChangeLog 2016-03-08 09:47:11 UTC (rev 197749)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-08 09:48:32 UTC (rev 197750)
@@ -1,3 +1,10 @@
+2016-03-08 Csaba Osztrogonác <[email protected]>
+
+ Unreviewed speculative buildfix after r197728.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+
2016-03-08 Timothy Hatcher <[email protected]>
Web Inspector: Make WebAutomationSession::closeBrowsingContext work as expected
Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (197749 => 197750)
--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-03-08 09:47:11 UTC (rev 197749)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-03-08 09:48:32 UTC (rev 197750)
@@ -203,7 +203,7 @@
ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == DoNotAskClientForAnyCredentials);
if (!WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
- WEBLOADERSTRATEGY_LOG_ALWAYS_ERROR("WebLoaderStrategy::scheduleLoad: Unable to schedule resource with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu", static_cast<int>(resourceLoader->request().priority()), loadParameters.webPageID, loadParameters.webFrameID);
+ WEBLOADERSTRATEGY_LOG_ALWAYS_ERROR("WebLoaderStrategy::scheduleLoad: Unable to schedule resource with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu", static_cast<int>(resourceLoader->request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID));
// We probably failed to schedule this load with the NetworkProcess because it had crashed.
// This load will never succeed so we will schedule it to fail asynchronously.
scheduleInternallyFailedLoad(resourceLoader);
@@ -211,7 +211,7 @@
}
auto webResourceLoader = WebResourceLoader::create(resourceLoader);
- WEBLOADERSTRATEGY_LOG_ALWAYS("WebLoaderStrategy::scheduleLoad: Resource will be scheduled with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu, WebResourceLoader = %p", static_cast<int>(resourceLoader->request().priority()), loadParameters.webPageID, loadParameters.webFrameID, webResourceLoader.ptr());
+ WEBLOADERSTRATEGY_LOG_ALWAYS("WebLoaderStrategy::scheduleLoad: Resource will be scheduled with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu, WebResourceLoader = %p", static_cast<int>(resourceLoader->request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID), webResourceLoader.ptr());
m_webResourceLoaders.set(identifier, WTFMove(webResourceLoader));
}
