Move logic for extracting the OS X marketing version in to WebCore
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Dec 2012 02:05:38 +0000 (02:05 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Dec 2012 02:05:38 +0000 (02:05 +0000)
commit84d9c0b71f77ce82a599dd8e6095d6240856956d
treec2779474f4df824b0eaeed0beb9b41e5e214e554
parented5bdb3b30d1b0ca0ff580d21ebf636610d65164
Move logic for extracting the OS X marketing version in to WebCore
<http://webkit.org/b/105841> / <rdar://problem/10736041>

Reviewed by Dan Bernstein.

Source/WebCore:

The logic for extracting the OS X markerting version is moved in to systemMarketingVersion
from WebKitSystemInterface (post-10.8) and WebKit (pre-10.8).

* WebCore.exp.in: Export systemMarketingVersion and remove the old WKSI symbol.
* WebCore.xcodeproj/project.pbxproj: Add the new files.
* platform/mac/SystemVersionMac.h: Added.
* platform/mac/SystemVersionMac.mm: Added.
(WebCore::createSystemMarketingVersion): Read the marketing version out of SystemVersion.plist
(WebCore::callGestalt):
(WebCore::createSystemMarketingVersion): Build the marketing version by piecing together the results
of calls to Gestalt.
(WebCore::systemMarketingVersion): Return the cached string.
* platform/mac/WebCoreSystemInterface.h: Remove the old WKSI symbol.
* platform/mac/WebCoreSystemInterface.mm: Ditto.

Source/WebKit/mac:

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Remove the code related to the WKSI symbol.
* WebView/WebView.mm:
(systemMarketingVersionForUserAgentString): Call the WebCore function instead of the WKSI function.
(+[WebView _standardUserAgentWithApplicationName:]): Retain the result now that our helper doesn't
do that for us.

Source/WebKit2:

* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::systemMarketingVersionForUserAgentString): Call the WebCore function instead
of the WKSI function.
(WebKit::WebPageProxy::standardUserAgent):
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Remove the code related to the WKSI symbol.

WebKitLibraries:

* WebKitSystemInterface.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@138553 268f45cc-cd09-0410-ab3c-d52691b4dbfc
15 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/mac/SystemVersionMac.h [new file with mode: 0644]
Source/WebCore/platform/mac/SystemVersionMac.mm [new file with mode: 0644]
Source/WebCore/platform/mac/WebCoreSystemInterface.h
Source/WebCore/platform/mac/WebCoreSystemInterface.mm
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
WebKitLibraries/ChangeLog
WebKitLibraries/WebKitSystemInterface.h