Title: [132744] trunk/Source
- Revision
- 132744
- Author
- [email protected]
- Date
- 2012-10-27 23:10:56 -0700 (Sat, 27 Oct 2012)
Log Message
All tests crash in WebKit1 mode
https://bugs.webkit.org/show_bug.cgi?id=100602
Reviewed by Sam Weinig.
* WebView/WebView.mm: (+[WebView _setLoadResourcesSerially:]): Resource load
scheduler is created via a strategy, so strategies need to be initialized before
using it.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132743 => 132744)
--- trunk/Source/WebCore/ChangeLog 2012-10-28 05:49:45 UTC (rev 132743)
+++ trunk/Source/WebCore/ChangeLog 2012-10-28 06:10:56 UTC (rev 132744)
@@ -1,3 +1,13 @@
+2012-10-27 Alexey Proskuryakov <[email protected]>
+
+ All tests crash in WebKit1 mode
+ https://bugs.webkit.org/show_bug.cgi?id=100602
+
+ Reviewed by Sam Weinig.
+
+ * platform/PlatformStrategies.cpp: (WebCore::setPlatformStrategies): Fix an incorrect
+ assertion - if this function is called twice, it should be with the same strategy.
+
2012-10-27 Anders Carlsson <[email protected]>
Fix AVFoundation build.
Modified: trunk/Source/WebCore/platform/PlatformStrategies.cpp (132743 => 132744)
--- trunk/Source/WebCore/platform/PlatformStrategies.cpp 2012-10-28 05:49:45 UTC (rev 132743)
+++ trunk/Source/WebCore/platform/PlatformStrategies.cpp 2012-10-28 06:10:56 UTC (rev 132744)
@@ -49,7 +49,7 @@
// FIXME: This happens when mixing different platform strategies, and we should probably
// throw an exception here in release builds.
- ASSERT(platformStrategies != s_platformStrategies);
+ ASSERT(platformStrategies == s_platformStrategies);
}
bool hasPlatformStrategies()
Modified: trunk/Source/WebKit/mac/ChangeLog (132743 => 132744)
--- trunk/Source/WebKit/mac/ChangeLog 2012-10-28 05:49:45 UTC (rev 132743)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-10-28 06:10:56 UTC (rev 132744)
@@ -1,3 +1,14 @@
+2012-10-27 Alexey Proskuryakov <[email protected]>
+
+ All tests crash in WebKit1 mode
+ https://bugs.webkit.org/show_bug.cgi?id=100602
+
+ Reviewed by Sam Weinig.
+
+ * WebView/WebView.mm: (+[WebView _setLoadResourcesSerially:]): Resource load
+ scheduler is created via a strategy, so strategies need to be initialized before
+ using it.
+
2012-10-27 Dan Bernstein <[email protected]>
REAL_PLATFORM_NAME build setting is no longer needed
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (132743 => 132744)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2012-10-28 05:49:45 UTC (rev 132743)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2012-10-28 06:10:56 UTC (rev 132744)
@@ -3029,6 +3029,7 @@
+ (void)_setLoadResourcesSerially:(BOOL)serialize
{
+ WebPlatformStrategies::initialize();
resourceLoadScheduler()->setSerialLoadingEnabled(serialize);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
