Title: [86734] trunk/Source/WebKit2
- Revision
- 86734
- Author
- [email protected]
- Date
- 2011-05-17 21:43:44 -0700 (Tue, 17 May 2011)
Log Message
<rdar://problem/9458300> REGRESSION (r86724): Repro crash loading any webpage in WebKit2 on SnowLeopard
https://bugs.webkit.org/show_bug.cgi?id=61022
Reviewed by Alice Liu.
* WebProcess/mac/WebProcessMainMac.mm:
(WebKit::WebProcessMain): As long as we are not loading the shim on Snow Leopard, we should not
try to initialize it.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (86733 => 86734)
--- trunk/Source/WebKit2/ChangeLog 2011-05-18 03:56:41 UTC (rev 86733)
+++ trunk/Source/WebKit2/ChangeLog 2011-05-18 04:43:44 UTC (rev 86734)
@@ -1,3 +1,14 @@
+2011-05-17 Dan Bernstein <[email protected]>
+
+ Reviewed by Alice Liu.
+
+ <rdar://problem/9458300> REGRESSION (r86724): Repro crash loading any webpage in WebKit2 on SnowLeopard
+ https://bugs.webkit.org/show_bug.cgi?id=61022
+
+ * WebProcess/mac/WebProcessMainMac.mm:
+ (WebKit::WebProcessMain): As long as we are not loading the shim on Snow Leopard, we should not
+ try to initialize it.
+
2011-05-17 Brady Eidson <[email protected]>
Rubberstamped by Sam Weinig.
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm (86733 => 86734)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-05-18 03:56:41 UTC (rev 86733)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-05-18 04:43:44 UTC (rev 86734)
@@ -90,9 +90,11 @@
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
+#ifndef BUILDING_ON_SNOW_LEOPARD
// Initialize the shim.
WebProcess::shared().initializeShim();
-
+#endif
+
// Create the connection.
WebProcess::shared().initialize(serverPort, RunLoop::main());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
