Title: [86878] branches/safari-534.36-branch/Source/WebKit2
Diff
Modified: branches/safari-534.36-branch/Source/WebKit2/ChangeLog (86877 => 86878)
--- branches/safari-534.36-branch/Source/WebKit2/ChangeLog 2011-05-19 20:01:06 UTC (rev 86877)
+++ branches/safari-534.36-branch/Source/WebKit2/ChangeLog 2011-05-19 20:05:33 UTC (rev 86878)
@@ -1,3 +1,18 @@
+2011-05-19 Lucas Forschler <[email protected]>
+
+ Merge r86734.
+
+ 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 Sheriff Bot <[email protected]>
Unreviewed, rolling out r86668.
Modified: branches/safari-534.36-branch/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm (86877 => 86878)
--- branches/safari-534.36-branch/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-05-19 20:01:06 UTC (rev 86877)
+++ branches/safari-534.36-branch/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2011-05-19 20:05:33 UTC (rev 86878)
@@ -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
