Title: [132811] tags/Safari-537.16/Source/WebKit2
Diff
Modified: tags/Safari-537.16/Source/WebKit2/ChangeLog (132810 => 132811)
--- tags/Safari-537.16/Source/WebKit2/ChangeLog 2012-10-29 16:59:51 UTC (rev 132810)
+++ tags/Safari-537.16/Source/WebKit2/ChangeLog 2012-10-29 17:03:14 UTC (rev 132811)
@@ -1,5 +1,22 @@
2012-10-29 Lucas Forschler <[email protected]>
+ Merge r132714.
+
+ 2012-10-26 Brady Eidson <[email protected]>
+
+ Crash in WebProces at WebCore::ResourceLoadScheduler::crossOriginRedirectReceived + 78
+ https://bugs.webkit.org/show_bug.cgi?id=100554
+
+ Reviewed by Alexey Proskuryakov.
+
+ For now, just have WebPlatformStrategies return the same default resourceLoadScheduler that
+ WebCore knows about.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::resourceLoadScheduler):
+
+2012-10-29 Lucas Forschler <[email protected]>
+
Merge r132738.
2012-10-27 Sam Weinig <[email protected]>
Modified: tags/Safari-537.16/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (132810 => 132811)
--- tags/Safari-537.16/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2012-10-29 16:59:51 UTC (rev 132810)
+++ tags/Safari-537.16/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2012-10-29 17:03:14 UTC (rev 132811)
@@ -107,11 +107,7 @@
ResourceLoadScheduler* WebPlatformStrategies::resourceLoadScheduler()
{
- static ResourceLoadScheduler* scheduler;
- if (!scheduler)
- scheduler = &WebProcess::shared().webResourceLoadScheduler();
-
- return scheduler;
+ return WebCore::resourceLoadScheduler();
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
