Title: [140018] tags/Safari-537.26.1/Source/WebKit2
- Revision
- 140018
- Author
- lforsch...@apple.com
- Date
- 2013-01-17 11:49:24 -0800 (Thu, 17 Jan 2013)
Log Message
Merged r139960. <rdar://problem/12951765>
Modified Paths
Diff
Modified: tags/Safari-537.26.1/Source/WebKit2/ChangeLog (140017 => 140018)
--- tags/Safari-537.26.1/Source/WebKit2/ChangeLog 2013-01-17 19:48:14 UTC (rev 140017)
+++ tags/Safari-537.26.1/Source/WebKit2/ChangeLog 2013-01-17 19:49:24 UTC (rev 140018)
@@ -1,5 +1,20 @@
2013-01-17 Lucas Forschler <lforsch...@apple.com>
+ Merge r139960
+
+ 2013-01-16 Sam Weinig <s...@webkit.org>
+
+ Fix crashes on the bots.
+
+ The WebKit LoaderStrategy for loading synchronously was only implemented
+ for the case where you have a network process. When you don't, we should
+ be using the base implementation.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::loadResourceSynchronously):
+
+2013-01-17 Lucas Forschler <lforsch...@apple.com>
+
Merge r139935
2013-01-16 Brady Eidson <beid...@apple.com>
Modified: tags/Safari-537.26.1/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (140017 => 140018)
--- tags/Safari-537.26.1/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2013-01-17 19:48:14 UTC (rev 140017)
+++ tags/Safari-537.26.1/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2013-01-17 19:49:24 UTC (rev 140018)
@@ -216,6 +216,11 @@
void WebPlatformStrategies::loadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
{
+ if (!WebProcess::shared().usesNetworkProcess()) {
+ LoaderStrategy::loadResourceSynchronously(context, request, storedCredentials, error, response, data);
+ return;
+ }
+
CoreIPC::DataReference dataReference;
NetworkResourceLoadParameters loadParameters(request, ResourceLoadPriorityHighest, SniffContent, storedCredentials, context->storageSession().isPrivateBrowsingSession());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
