Make WebKit properly load a staged framework when soft linking.
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Mar 2012 20:44:18 +0000 (20:44 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Mar 2012 20:44:18 +0000 (20:44 +0000)
commit55bbfb5bef9c57b8ccee813713bbc2b3626f481c
treea3523526be116e042690ecf5a663941ff78460bd
parentd6de09b94c98d46b4f4bb4813dc70dc26f00dee2
Make WebKit properly load a staged framework when soft linking.

https://webkit.org/b/82371
rdar://problem/11125989

Reviewed by Dan Bernstein.

Source/WebCore:

* platform/mac/SoftLinking.h: Replaced SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL with
SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL and made it use the StagedFrameworks path
if the first dlopen failed.

Source/WebKit/mac:

* WebCoreSupport/WebInspectorClient.mm: Use SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL to properly
load the WebInspector framework.

Source/WebKit2:

* UIProcess/mac/WebInspectorProxyMac.mm: Use SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL to properly
load the WebInspector framework.
* WebProcess/WebPage/mac/WebInspectorMac.mm: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112312 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/platform/mac/SoftLinking.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm