<rdar://problem/9458300> REGRESSION (r86724): Repro crash loading any webpage in...

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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@86734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 164b40d4a0c51ba4621e3de79ab45c8133a06f76..91a2b9a212ba03311af183e24b35f85339d5a26e 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-17  Dan Bernstein  <mitz@apple.com>
+
+        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  <beidson@apple.com>
 
         Rubberstamped by Sam Weinig.

diff --git a/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm b/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm
index 128f877b97cb02fe998b0f65de1fee978d9f3a16..35ebb150090c902e8826a55153bb11fd3f2a32c4 100644 (file)
--- a/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm
+++ b/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm
@@ -90,9 +90,11 @@ int WebProcessMain(const CommandLine& commandLine)
     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());