Rename WebKit2.framework to WebKit.framework
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 May 2014 18:39:39 +0000 (18:39 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 May 2014 18:39:39 +0000 (18:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=132743
<rdar://problem/15920046>

Reviewed by Dan Bernstein.

.:
* Source/Makefile:
Build WebKit.xcodeproj before WebKit2.xcodeproj.

* WebKit.xcworkspace/xcshareddata/xcschemes/:
Ditto.

Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Remove the WebKit framework, it lives inside WebKit2 now.

Source/WebKit2:
* Configurations/BaseLegacyProcess.xcconfig:
Change INSTALL_PATH to WebKit.framework.

* Configurations/BaseTarget.xcconfig:
Change WEBKIT2_FRAMEWORKS_DIR to WEBKIT_FRAMEWORKS_DIR and add WEBKIT_LEGACY_PRIVATE_HEADERS_DIR.

* Configurations/BaseXPCService.xcconfig:
Change WebKit2.framework to WebKit.framework.

* Configurations/WebKit.xcconfig: Copied from Source/WebKit2/Configurations/WebKit2.xcconfig.
New configuration file for WebKit.framework. Re-export WebKitLegacy.framework.

* Configurations/WebKit2.xcconfig:
New configuration file for the WebKit2 shim framework. Re-export WebKit.framework.

* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:
Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.

* PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.

* Shared/API/Cocoa/WKBrowsingContextHandle.h:
* Shared/API/Cocoa/WKRenderingProgressEvents.h:
Update header imports.

* Shared/API/Cocoa/WebKit.h: Renamed from Source/WebKit/mac/WebKitLegacy/WebKit.h.
New umbrella header. Imports the modern WebKit API as well as the legacy API.

* Shared/API/Cocoa/WebKit.m: Renamed from Source/WebKit/mac/WebKitLegacy/WebKit.m.
Export install name symbols on iOS.

* Shared/API/Cocoa/WebKitPrivate.h: Renamed from Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h.
New umbrella SPI header. Imports the modern WebKit SPI.

* Many headers:
Change WebKit2 includes to WebKit includes.

* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
(WebKit::XPCServiceEventHandler):
Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.

* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
(WebKit::XPCServiceEventHandler):
Change bundle identifier from com.apple.WebKit2 to com.apple.WebKit.

* UIProcess/API/Cocoa/WKPreferences.h:
Stop including WKPreferencesRef.h, we have a WebKit2 header that handles this workaround for us now.

* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::addDYLDEnvironmentAdditions):
(WebKit::connectToService):
(WebKit::createProcess):
(WebKit::ProcessLauncher::launchProcess):
Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.

* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::createPropertyListFile):
Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.

* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformDefaultDiskCacheDirectory):
Change bundle identifier from com.apple.WebKit2 to com.apple.WebKit.

* WebKit2.xcodeproj/project.pbxproj:
Copy the python message scripts to the WebKit2 framework.
Rename WebKit2.framework to WebKit.framework everywhere.
Add a new WebKit2 target that builds the shim WebKit2 framework.
Move the build script phase that migrates WebKitLegacy headers to WebKit.
Add a new build script phase that adds forwarding headers from WebKit2 to WebKit.

* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.

* mac/MigrateHeadersFromWebKitLegacy.make: Renamed from Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make.
Move the makefile that migrates WebKitLegacy headers here. On OS X, it copies the header contents and on iOS it creates forarding headers.

* mac/MigrateHeadersToWebKit2.make:
New makefile that creates forwarding headers for the WebKit2 shim framework.

* mac/WKPreferences.h: Added.
Add WebKit2/WKPreferences.h header that imports WebKit2/WKPreferencesref.h.

* mac/WebKit2.m:
Skeleton for the WebKit2 shim framework.

* mac/Info-WebKit2.plist: Added.
New Info.plist file for the WebKit2 shim framework.

Tools:
* Scripts/check-for-inappropriate-files-in-framework:
Use PRODUCT_NAME instead of PROJECT_NAME when matching frameworks.
Change WebKit2 to WebKit.

* Scripts/check-for-webkit-framework-include-consistency:
Change WebKit to WebKitLegacy.

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

245 files changed:
ChangeLog
Source/Makefile
Source/WebKit/ChangeLog
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig
Source/WebKit2/Configurations/BaseTarget.xcconfig
Source/WebKit2/Configurations/BaseXPCService.xcconfig
Source/WebKit2/Configurations/WebKit.xcconfig [new file with mode: 0644]
Source/WebKit2/Configurations/WebKit2.xcconfig
Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist
Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist
Source/WebKit2/Shared/API/Cocoa/WKBrowsingContextHandle.h
Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h
Source/WebKit2/Shared/API/Cocoa/WebKit.h [moved from Source/WebKit/mac/WebKitLegacy/WebKit.h with 92% similarity]
Source/WebKit2/Shared/API/Cocoa/WebKit.m [moved from Source/WebKit/mac/WebKitLegacy/WebKit.m with 92% similarity]
Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h [moved from Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h with 100% similarity]
Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h
Source/WebKit2/Shared/API/Cocoa/_WKNSFileManagerExtras.h
Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.h
Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.h
Source/WebKit2/Shared/API/c/WKArray.h
Source/WebKit2/Shared/API/c/WKBase.h
Source/WebKit2/Shared/API/c/WKCertificateInfo.h
Source/WebKit2/Shared/API/c/WKConnectionRef.h
Source/WebKit2/Shared/API/c/WKContextMenuItem.h
Source/WebKit2/Shared/API/c/WKData.h
Source/WebKit2/Shared/API/c/WKDictionary.h
Source/WebKit2/Shared/API/c/WKError.h
Source/WebKit2/Shared/API/c/WKEvent.h
Source/WebKit2/Shared/API/c/WKGeometry.h
Source/WebKit2/Shared/API/c/WKImage.h
Source/WebKit2/Shared/API/c/WKMutableArray.h
Source/WebKit2/Shared/API/c/WKMutableDictionary.h
Source/WebKit2/Shared/API/c/WKNumber.h
Source/WebKit2/Shared/API/c/WKPluginInformation.h
Source/WebKit2/Shared/API/c/WKRenderLayer.h
Source/WebKit2/Shared/API/c/WKRenderObject.h
Source/WebKit2/Shared/API/c/WKSecurityOrigin.h
Source/WebKit2/Shared/API/c/WKSerializedScriptValue.h
Source/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h
Source/WebKit2/Shared/API/c/WKString.h
Source/WebKit2/Shared/API/c/WKStringPrivate.h
Source/WebKit2/Shared/API/c/WKType.h
Source/WebKit2/Shared/API/c/WKURL.h
Source/WebKit2/Shared/API/c/WKURLRequest.h
Source/WebKit2/Shared/API/c/WKURLResponse.h
Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h
Source/WebKit2/Shared/API/c/cf/WKErrorCF.h
Source/WebKit2/Shared/API/c/cf/WKStringCF.h
Source/WebKit2/Shared/API/c/cf/WKURLCF.h
Source/WebKit2/Shared/API/c/cg/WKImageCG.h
Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h
Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.h
Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h
Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h
Source/WebKit2/Shared/API/c/mac/WKWebArchive.h
Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.h
Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm
Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.h
Source/WebKit2/UIProcess/API/C/WKAuthenticationChallenge.h
Source/WebKit2/UIProcess/API/C/WKAuthenticationDecisionListener.h
Source/WebKit2/UIProcess/API/C/WKBackForwardListItemRef.h
Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.h
Source/WebKit2/UIProcess/API/C/WKContext.h
Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h
Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h
Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h
Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h
Source/WebKit2/UIProcess/API/C/WKContextPrivate.h
Source/WebKit2/UIProcess/API/C/WKCookieManager.h
Source/WebKit2/UIProcess/API/C/WKCredential.h
Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h
Source/WebKit2/UIProcess/API/C/WKDownload.h
Source/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h
Source/WebKit2/UIProcess/API/C/WKFrame.h
Source/WebKit2/UIProcess/API/C/WKFramePolicyListener.h
Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h
Source/WebKit2/UIProcess/API/C/WKGeolocationPermissionRequest.h
Source/WebKit2/UIProcess/API/C/WKGeolocationPosition.h
Source/WebKit2/UIProcess/API/C/WKHitTestResult.h
Source/WebKit2/UIProcess/API/C/WKIconDatabase.h
Source/WebKit2/UIProcess/API/C/WKInspector.h
Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h
Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.h
Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.h
Source/WebKit2/UIProcess/API/C/WKNotification.h
Source/WebKit2/UIProcess/API/C/WKNotificationManager.h
Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.h
Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h
Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.h
Source/WebKit2/UIProcess/API/C/WKOpenPanelResultListener.h
Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h
Source/WebKit2/UIProcess/API/C/WKPage.h
Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h
Source/WebKit2/UIProcess/API/C/WKPageFindClient.h
Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h
Source/WebKit2/UIProcess/API/C/WKPageFormClient.h
Source/WebKit2/UIProcess/API/C/WKPageGroup.h
Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h
Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h
Source/WebKit2/UIProcess/API/C/WKPagePrivate.h
Source/WebKit2/UIProcess/API/C/WKPageUIClient.h
Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h
Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h
Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h
Source/WebKit2/UIProcess/API/C/WKProtectionSpace.h
Source/WebKit2/UIProcess/API/C/WKProtectionSpaceTypes.h
Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h
Source/WebKit2/UIProcess/API/C/WKSessionRef.h
Source/WebKit2/UIProcess/API/C/WebKit2_C.h
Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.h
Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h
Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h
Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h
Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h
Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h
Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h
Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.h
Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroupPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextHistoryDelegate.h
Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h
Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h
Source/WebKit2/UIProcess/API/Cocoa/WKConnection.h
Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.h
Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h
Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h
Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h
Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h
Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h
Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h
Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.h
Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroupPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h
Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h
Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h
Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKTypeRefWrapper.h
Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h
Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h
Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKView.h
Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKWindowFeatures.h
Source/WebKit2/UIProcess/API/Cocoa/WebKit2.h
Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h
Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h
Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h
Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h
Source/WebKit2/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h
Source/WebKit2/UIProcess/API/Cocoa/_WKFindDelegate.h
Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h
Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h
Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h
Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h
Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h
Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h
Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h
Source/WebKit2/UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.h
Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h
Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProviderRegistry.h
Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h
Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.h
Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm
Source/WebKit2/UIProcess/mac/WebContextMac.mm
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.h
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h
Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMDocument.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMElement.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h
Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInPrivate.h
Source/WebKit2/mac/Info-WebKit2.plist [moved from Source/WebKit/mac/WebKitLegacy/Info.plist with 100% similarity]
Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make [moved from Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make with 69% similarity]
Source/WebKit2/mac/MigrateHeadersToWebKit2.make [new file with mode: 0644]
Source/WebKit2/mac/WKPreferences.h [new file with mode: 0644]
Source/WebKit2/mac/WebKit2.m [new file with mode: 0644]
Tools/ChangeLog
Tools/Scripts/check-for-inappropriate-files-in-framework
Tools/Scripts/check-for-webkit-framework-include-consistency
WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme

index 63c21a924b01a71f883bf1eea2e9fce5cd7bdc5a..54b47452d49e110cb7c5ad262152b456d064ee2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2014-05-09  Anders Carlsson  <andersca@apple.com>
+
+        Rename WebKit2.framework to WebKit.framework
+        https://bugs.webkit.org/show_bug.cgi?id=132743
+        <rdar://problem/15920046>
+
+        Reviewed by Dan Bernstein.
+
+        * Source/Makefile:
+        Build WebKit.xcodeproj before WebKit2.xcodeproj.
+
+        * WebKit.xcworkspace/xcshareddata/xcschemes/:
+        Ditto.
+
 2014-05-06  David Kilzer  <ddkilzer@apple.com>
 
         Add Makefile targets for copying static libraries (LLVM and WKSI)
index 8070c9639b612ac532c450aa500fcd25b73d973a..d1d1a4b9c214721d6438dcf1fe63d00a7ed6d532 100644 (file)
@@ -1,4 +1,4 @@
-MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit2 WebKit
+MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
 
 ifneq (,$(findstring iphoneos,$(SDKROOT)))
        MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
index 14881bffed0938a93b3c942950eea28de2131453..4d294e818339f3ecec2bcd423b577a6fee07664a 100644 (file)
@@ -1,3 +1,14 @@
+2014-05-09  Anders Carlsson  <andersca@apple.com>
+
+        Rename WebKit2.framework to WebKit.framework
+        https://bugs.webkit.org/show_bug.cgi?id=132743
+        <rdar://problem/15920046>
+
+        Reviewed by Dan Bernstein.
+
+        * WebKit.xcodeproj/project.pbxproj:
+        Remove the WebKit framework, it lives inside WebKit2 now.
+
 2014-05-07  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Unreviewed 64-bit build fix.
index d5b26014d6cd42b8211677ba77cc27897673aac6..747a8f94276eb16d14f1e91464ecdc046b9cf601 100644 (file)
@@ -33,8 +33,6 @@
                1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */; };
                1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */; };
                1A6A208E1886154600E50F5F /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */; };
-               1A739036190AE622002E3105 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739034190AE5D4002E3105 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739037190AE674002E3105 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1A74A28E0F4F75400082E228 /* WebTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */; };
                1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
                1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
@@ -62,7 +60,6 @@
                1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */; };
                1AB1DAC118BC0232004B6A9F /* WebViewGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */; };
                1AB1DAC218BC0232004B6A9F /* WebViewGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */; };
-               1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKit.m */; };
                1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */; };
                1AEA66D50DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */; };
                1AEA66D80DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D60DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h */; };
                F834AAD80E64B1C700E2737C /* WebTextIterator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F834AAD60E64B1C700E2737C /* WebTextIterator.mm */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-               1A5B250918D0DBD300913729 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 9398100A0824BF01008DF038;
-                       remoteInfo = WebKit;
-               };
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
                065AD5A10B0C32C7005A2B1D /* WebContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebContextMenuClient.h; sourceTree = "<group>"; };
                065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClient.mm; sourceTree = "<group>"; };
                0F30985E11ECFE4500F559DF /* WebRenderLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebRenderLayer.mm; sourceTree = "<group>"; };
                14D8252D0AF955090004F057 /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = "<group>"; };
                14D8252E0AF955090004F057 /* WebChromeClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebChromeClient.mm; sourceTree = "<group>"; };
-               1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MigrateHeadersFromWebKitLegacy.make; sourceTree = "<group>"; };
                1A2DBE9D0F251E3A0036F8A6 /* ProxyInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyInstance.h; sourceTree = "<group>"; };
                1A2DBE9E0F251E3A0036F8A6 /* ProxyInstance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProxyInstance.mm; sourceTree = "<group>"; };
                1A4DF5200EC8C74D006BD4B4 /* WebNetscapePluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginView.h; sourceTree = "<group>"; };
                1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryPropertyList.h; sourceTree = "<group>"; };
                1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProgressTrackerClient.mm; sourceTree = "<group>"; };
                1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProgressTrackerClient.h; sourceTree = "<group>"; };
-               1A739034190AE5D4002E3105 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
-               1A739037190AE674002E3105 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
                1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTextInputWindowController.h; sourceTree = "<group>"; };
                1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
                1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
                1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHostedNetscapePluginView.mm; sourceTree = "<group>"; };
                1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewGroup.mm; sourceTree = "<group>"; };
                1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewGroup.h; sourceTree = "<group>"; };
-               1AD7451218D0D24C006F3A1E /* WebKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; };
-               1AD7451918D0D26C006F3A1E /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
-               1AD7453D18D0D383006F3A1E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; };
                1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapePluginEventHandler.mm; sourceTree = "<group>"; };
                1AEA66D60DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandlerCarbon.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-               1AD7451518D0D26C006F3A1E /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                939811270824BF01008DF038 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        isa = PBXGroup;
                        children = (
                                939811330824BF01008DF038 /* WebKitLegacy.framework */,
-                               1AD7451918D0D26C006F3A1E /* WebKit.framework */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                                F5EBC45202134BB601CA1520 /* Plugins */,
                                511F3FC30CECC7E200852565 /* Storage */,
                                F5B36B400281DE87018635CB /* WebCoreSupport */,
-                               1AD7451118D0D23D006F3A1E /* WebKit Framework */,
                                9C7CABBB0190A37C0ECA16EA /* WebView */,
                                1C68F63F095B5F9C00C2984E /* WebInspector */,
                                F7EBEE5903F9DB2203CA0DE6 /* Carbon */,
                        name = Events;
                        sourceTree = "<group>";
                };
-               1AD7451118D0D23D006F3A1E /* WebKit Framework */ = {
-                       isa = PBXGroup;
-                       children = (
-                               1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */,
-                               1AD7453D18D0D383006F3A1E /* Info.plist */,
-                               1AD7451218D0D24C006F3A1E /* WebKit.m */,
-                               1A739034190AE5D4002E3105 /* WebKit.h */,
-                               1A739037190AE674002E3105 /* WebKitPrivate.h */,
-                       );
-                       name = "WebKit Framework";
-                       path = mac/WebKitLegacy;
-                       sourceTree = "<group>";
-               };
                1C68F63F095B5F9C00C2984E /* WebInspector */ = {
                        isa = PBXGroup;
                        children = (
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-               1A739035190AE603002E3105 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */,
-                               1A739036190AE622002E3105 /* WebKit.h in Headers */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                9398100D0824BF01008DF038 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-               1AD7451818D0D26C006F3A1E /* WebKit */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */;
-                       buildPhases = (
-                               1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */,
-                               1A5B250818D0D90C00913729 /* Migrate Headers */,
-                               1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */,
-                               1A739035190AE603002E3105 /* Headers */,
-                               1AD7451418D0D26C006F3A1E /* Sources */,
-                               1AD7451518D0D26C006F3A1E /* Frameworks */,
-                               1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */,
-                               1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */,
-                               1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               1A5B250A18D0DBD300913729 /* PBXTargetDependency */,
-                       );
-                       name = WebKit;
-                       productName = WebKit;
-                       productReference = 1AD7451918D0D26C006F3A1E /* WebKit.framework */;
-                       productType = "com.apple.product-type.framework";
-               };
                9398100A0824BF01008DF038 /* WebKitLegacy */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
                        projectDirPath = "";
                        projectRoot = "";
                        targets = (
-                               1AD7451818D0D26C006F3A1E /* WebKit */,
                                9398100A0824BF01008DF038 /* WebKitLegacy */,
                        );
                };
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-               1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputPaths = (
-                               "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
-                       );
-                       name = "Check For Inappropriate Macros in External Headers";
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n    ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders || exit $?\nfi";
-               };
-               1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputPaths = (
-                               "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
-                       );
-                       name = "Check For Framework Include Consistency";
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\nexit 0;\nfi\n\n# FIXME: Once WebKit is provided by WebKit2.xcodeproj, this should be re-enabled.\nif [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nif [ -f ../../Tools/Scripts/check-for-webkit-framework-include-consistency ]; then\n../../Tools/Scripts/check-for-webkit-framework-include-consistency || exit $?\nfi\n";
-               };
                1A3193D5191856E500E1CF89 /* Symlink WebKitPluginHost */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        shellPath = /bin/sh;
                        shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n    exit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n    # FIXME: This should be removed once faulty links have been removed on the bots.\n    if [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" ]]; then\n        rm \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n    fi\n\n    if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n        ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n    else\n        ln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n    fi\nfi\n";
                };
-               1A5B250818D0D90C00913729 /* Migrate Headers */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputPaths = (
-                       );
-                       name = "Migrate Headers";
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    if [[ ${PLATFORM_NAME} == \"macosx\" ]]; then\n        mkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n    fi\n    mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n    make -C mac/WebKitLegacy -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
-               };
-               1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputPaths = (
-                               "$(PROJECT_DIR)/mac/Configurations/Version.xcconfig",
-                       );
-                       name = "Update Info.plist with version information";
-                       outputPaths = (
-                               "$(PROJECT_DIR)/mac/WebKitLegacy/Info.plist",
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/WebKitLegacy/Info.plist\";\nfi;\n";
-               };
-               1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 8;
-                       files = (
-                       );
-                       inputPaths = (
-                       );
-                       name = "Add Symlink in /System/Library/PrivateFrameworks";
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-                       shellPath = /bin/sh;
-                       shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n    if [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\n        mkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\n    fi\n    if [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\n        echo \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework already exists and is a directory.\"\n        exit 1\n    fi\n    # If the symlink already exists, remove it and create the new one in its place.\n    ln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nfi";
-               };
-               1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 8;
-                       files = (
-                       );
-                       inputPaths = (
-                               WebKit.xcodeproj,
-                       );
-                       name = "Make Frameworks Symbolic Link";
-                       outputPaths = (
-                               "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp",
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
-                       shellPath = /bin/sh;
-                       shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
-               };
                1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-               1AD7451418D0D26C006F3A1E /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                939810BB0824BF01008DF038 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                };
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-               1A5B250A18D0DBD300913729 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 9398100A0824BF01008DF038 /* WebKitLegacy */;
-                       targetProxy = 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */;
-               };
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
                5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */ = {
                        isa = PBXVariantGroup;
                        };
                        name = Production;
                };
-               1AD7453418D0D26C006F3A1E /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
-                       buildSettings = {
-                       };
-                       name = Debug;
-               };
-               1AD7453518D0D26C006F3A1E /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
-                       buildSettings = {
-                       };
-                       name = Release;
-               };
-               1AD7453618D0D26C006F3A1E /* Production */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
-                       buildSettings = {
-                       };
-                       name = Production;
-               };
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
-               1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               1AD7453418D0D26C006F3A1E /* Debug */,
-                               1AD7453518D0D26C006F3A1E /* Release */,
-                               1AD7453618D0D26C006F3A1E /* Production */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Production;
-               };
 /* End XCConfigurationList section */
        };
        rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
index 7bf802b3dbe6bc874f994f4144e9be3b31a6e4d2..89ddcd0e133e7a31152495c17bbcb4955fd31b68 100644 (file)
@@ -1,3 +1,99 @@
+2014-05-09  Anders Carlsson  <andersca@apple.com>
+
+        Rename WebKit2.framework to WebKit.framework
+        https://bugs.webkit.org/show_bug.cgi?id=132743
+        <rdar://problem/15920046>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/BaseLegacyProcess.xcconfig:
+        Change INSTALL_PATH to WebKit.framework.
+
+        * Configurations/BaseTarget.xcconfig:
+        Change WEBKIT2_FRAMEWORKS_DIR to WEBKIT_FRAMEWORKS_DIR and add WEBKIT_LEGACY_PRIVATE_HEADERS_DIR.
+
+        * Configurations/BaseXPCService.xcconfig:
+        Change WebKit2.framework to WebKit.framework.
+
+        * Configurations/WebKit.xcconfig: Copied from Source/WebKit2/Configurations/WebKit2.xcconfig.
+        New configuration file for WebKit.framework. Re-export WebKitLegacy.framework.
+
+        * Configurations/WebKit2.xcconfig:
+        New configuration file for the WebKit2 shim framework. Re-export WebKit.framework.
+
+        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:
+        Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+
+        * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
+        Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+        
+        * Shared/API/Cocoa/WKBrowsingContextHandle.h:
+        * Shared/API/Cocoa/WKRenderingProgressEvents.h:
+        Update header imports.
+
+        * Shared/API/Cocoa/WebKit.h: Renamed from Source/WebKit/mac/WebKitLegacy/WebKit.h.
+        New umbrella header. Imports the modern WebKit API as well as the legacy API.
+
+        * Shared/API/Cocoa/WebKit.m: Renamed from Source/WebKit/mac/WebKitLegacy/WebKit.m.
+        Export install name symbols on iOS.
+
+        * Shared/API/Cocoa/WebKitPrivate.h: Renamed from Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h.
+        New umbrella SPI header. Imports the modern WebKit SPI.
+
+        * Many headers:
+        Change WebKit2 includes to WebKit includes.
+
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+        (WebKit::XPCServiceEventHandler):
+        Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
+        (WebKit::XPCServiceEventHandler):
+        Change bundle identifier from com.apple.WebKit2 to com.apple.WebKit.
+        
+        * UIProcess/API/Cocoa/WKPreferences.h:
+        Stop including WKPreferencesRef.h, we have a WebKit2 header that handles this workaround for us now.
+
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::addDYLDEnvironmentAdditions):
+        (WebKit::connectToService):
+        (WebKit::createProcess):
+        (WebKit::ProcessLauncher::launchProcess):
+        Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        (WebKit::PluginProcessProxy::createPropertyListFile):
+        Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::platformDefaultDiskCacheDirectory):
+        Change bundle identifier from com.apple.WebKit2 to com.apple.WebKit.
+        
+        * WebKit2.xcodeproj/project.pbxproj:
+        Copy the python message scripts to the WebKit2 framework.
+        Rename WebKit2.framework to WebKit.framework everywhere.
+        Add a new WebKit2 target that builds the shim WebKit2 framework.
+        Move the build script phase that migrates WebKitLegacy headers to WebKit.
+        Add a new build script phase that adds forwarding headers from WebKit2 to WebKit.
+
+        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
+        Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+
+        * mac/MigrateHeadersFromWebKitLegacy.make: Renamed from Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make.
+        Move the makefile that migrates WebKitLegacy headers here. On OS X, it copies the header contents and on iOS it creates forarding headers.
+
+        * mac/MigrateHeadersToWebKit2.make:
+        New makefile that creates forwarding headers for the WebKit2 shim framework.
+
+        * mac/WKPreferences.h: Added.
+        Add WebKit2/WKPreferences.h header that imports WebKit2/WKPreferencesref.h.
+
+        * mac/WebKit2.m:
+        Skeleton for the WebKit2 shim framework.
+
+        * mac/Info-WebKit2.plist: Added.
+        New Info.plist file for the WebKit2 shim framework.
+
 2014-05-09  Martin Hodovan  <mhodovan.u-szeged@partner.samsung.com>
 
         [WK2] Make generate-forwarding-headers.pl work after WebKit2.framework -> WebKit.framework rename
index be33596df37bd62914912e66c73c2cd3a7292e4d..9655200d8da0ffee79eb71fbd1586df2292aba19 100644 (file)
@@ -24,7 +24,7 @@
 #include "BaseTarget.xcconfig"
 
 GCC_ENABLE_OBJC_GC = NO;
-INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
+INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework;
 
 APP_ICON = $(APP_ICON_$(CONFIGURATION));
 APP_ICON_Debug = WebKit.icns;
index ca43f9058a975ffa473ab72229ad3a28477a8ff9..662de606bf4adda537ca8ae0658bf3791f245670 100644 (file)
 
 FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
 GCC_PREFIX_HEADER = WebKit2Prefix.h;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit2
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit
 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
 
 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
 
-NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_WEBKIT_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 
-WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+WEBKIT_FRAMEWORKS_DIR_macosx = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+WEBKIT_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
 
 UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(PLATFORM_NAME));
 UMBRELLA_FRAMEWORKS_DIR_iphoneos = $(UMBRELLA_FRAMEWORKS_DIR_iphoneos_$(CONFIGURATION));
@@ -58,6 +58,7 @@ UMBRELLA_FRAMEWORKS_DIR_macosx_Production_USE_STAGING_INSTALL_PATH_YES = $(NEXT_
 UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
 
 WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.framework/PrivateHeaders;
 
 OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH));
 OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
index 47adce8f7970dc4feb0802c0c826d94d3bc847c9..877c7b651cdce18f3c5d85a7b66f6bb79b3359e3 100644 (file)
@@ -28,8 +28,8 @@ GCC_ENABLE_OBJC_GC = NO;
 INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(WK_XPC_SERVICE_VARIANT));
 
 INSTALL_PATH_ACTUAL_Normal = $(INSTALL_PATH_ACTUAL_Normal_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
-INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
+INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
+INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
 INSTALL_PATH_ACTUAL_Normal_iphonesimulator = $(INSTALL_PATH_ACTUAL_Normal_iphoneos);
 
 INSTALL_PATH_ACTUAL_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
diff --git a/Source/WebKit2/Configurations/WebKit.xcconfig b/Source/WebKit2/Configurations/WebKit.xcconfig
new file mode 100644 (file)
index 0000000..a16a2ee
--- /dev/null
@@ -0,0 +1,49 @@
+// Copyright (C) 2010, 2013, 2014 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "BaseTarget.xcconfig"
+
+PRODUCT_NAME = WebKit;
+INFOPLIST_FILE = Info.plist;
+
+INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+
+FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
+FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileAsset -framework MobileCoreServices -lMobileGestalt -lassertion_extension;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
+
+// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
+UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
+
+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
+OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.DatabaseProcess.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+
+INSTALLHDRS_SCRIPT_PHASE = YES;
index 14e8e6c39beb2f9de461e583eda0bbc9c9b301ce..a9b9dcd0f48099ee288afe6d5200dfa3a9fe7fcc 100644 (file)
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "BaseTarget.xcconfig"
+#include "Version.xcconfig"
 
 PRODUCT_NAME = WebKit2;
-INFOPLIST_FILE = Info.plist;
-
-INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-
-FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileAsset -framework MobileCoreServices -framework WebKit -lMobileGestalt -lassertion_extension;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
-
-// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
-UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
-
-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
-
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.DatabaseProcess.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-
-INSTALLHDRS_SCRIPT_PHASE = YES;
+INFOPLIST_FILE = mac/Info-WebKit2.plist;
+
+OTHER_LDFLAGS = $(inherited) -framework WebKit -sub_umbrella WebKit;
+
+INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
+INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
+INSTALL_PATH_macosx = $(WEBKIT2_FRAMEWORKS_DIR);
+INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
+INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
+
+DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
+DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+DYLIB_INSTALL_NAME_BASE_iphonesimulator =  $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
+
+NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+
+WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos);
+WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT2_FRAMEWORKS_DIR_iphoneos);
+WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
index d8e88cec4ef5a998dcee1cbc1408b1b31be38053..3634f603c6452ef24dd046dd41142aac911913ec 100644 (file)
@@ -43,7 +43,7 @@
                <key>EnvironmentVariables</key>
                <dict>
                        <key>DYLD_INSERT_LIBRARIES</key>
-                       <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
+                       <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
                </dict>
        </dict>
 </dict>
index 18a57fb9184eba608130714e081f82b10ea7ac37..5891d44bbdfee285983d18e8695d4fd91f6352b0 100644 (file)
@@ -49,7 +49,7 @@
                <key>EnvironmentVariables</key>
                <dict>
                        <key>DYLD_INSERT_LIBRARIES</key>
-                       <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
+                       <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
                </dict>
        </dict>
 </dict>
index cb1e0f90efc005a091328b0fb7f7e0d8e1f0e4e5..852f6784971c5ad4d996b15dcf28f0429ddefa3a 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index d653b329dc7710053f71fd2b0c9c341fecd94edc..580257bc93baaf92e22b0018aef604b9a00a76b4 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
similarity index 92%
rename from Source/WebKit/mac/WebKitLegacy/WebKit.h
rename to Source/WebKit2/Shared/API/Cocoa/WebKit.h
index 80f0a1478adf3521b18c916fd9185da7a97e04f3..ad4cc91d426a3cda4c65fcc08ce185c41cb249e7 100644 (file)
@@ -23,8 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// FIXME: Remove this __has_include check once the WebKit framework lives in the right place.
-#if defined(__has_include) && __has_include(<WebKit/WKWebView.h>)
 #import <WebKit/WKBackForwardList.h>
 #import <WebKit/WKBackForwardListItem.h>
 #import <WebKit/WKFoundation.h>
@@ -41,6 +39,4 @@
 #import <WebKit/WKUserContentController.h>
 #import <WebKit/WKWebView.h>
 #import <WebKit/WKWebViewConfiguration.h>
-#endif
-
 #import <WebKit/WebKitLegacy.h>
similarity index 92%
rename from Source/WebKit/mac/WebKitLegacy/WebKit.m
rename to Source/WebKit2/Shared/API/Cocoa/WebKit.m
index 98c465ad96cbf497c00e6ba689587ee090568184..e2cf1dd9578e40bee3ce419f4bb7b43838f75b11 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <TargetConditionals.h>
+#import "config.h"
 
-// FIXME: This file is only temporary; WebKit.framework is going to be provided by the WebKit2 project.
-
-#if TARGET_OS_IPHONE
+#if PLATFORM(IOS)
 
 #define DEFINE_INSTALL_NAME(major, minor) \
     extern __attribute__((visibility ("default"))) const char install_name_ ##major## _ ##minor __asm("$ld$install_name$os" #major "." #minor "$/System/Library/PrivateFrameworks/WebKit.framework/WebKit"); \
index 4e18eae6fd9b7f262b9a44072b2779b3faa0b4ab..36604210b5a3bbfc22a5c84d95588a03e6ac47f9 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index ec028e0e8ae31e8b5258332d22e436f677dc273a..6d83c49032baea9d62b2651563d1fc69cdaf3290 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if TARGET_OS_IPHONE
 
index 17aa227a0db497b735a95a1cf7694a22509dbc8f..7a3d072c5c3d97adf19fbf0f8f5816dc15283350 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 5906202fec059c7c5e69f9debddae61a0b8dec0a..e0acf04d138744b2871fc19ccfce26f67d3f98d7 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 25900f3139ed903c7afa47c25b1064514bc04687..ff8d39bfe906751a4ae64263052e286b47a2ce11 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKArray_h
 #define WKArray_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #include <stddef.h>
 
index 749c76d90194a66b9c410939fad7a2aae662b2e7..0b94e0866b9beaa7fd2c7a0cc68b7a3cbd702167 100644 (file)
 #ifndef WKBase_h
 #define WKBase_h
 
-#include <WebKit2/WKDeclarationSpecifiers.h>
+#include <WebKit/WKDeclarationSpecifiers.h>
 #include <stdint.h>
 
 #if defined(BUILDING_GTK__)
-#include <WebKit2/WKBaseGtk.h>
+#include <WebKit/WKBaseGtk.h>
 #endif
 
 #if defined(WTF_USE_SOUP)
-#include <WebKit2/WKBaseSoup.h>
+#include <WebKit/WKBaseSoup.h>
 #endif
 
 #if defined(BUILDING_EFL__)
-#include <WebKit2/WKBaseEfl.h>
+#include <WebKit/WKBaseEfl.h>
 #endif
 
 #if defined(__APPLE__)
-#include <WebKit2/WKBaseMac.h>
+#include <WebKit/WKBaseMac.h>
 #endif
 
 /* WebKit2 shared types */
index d4a2ed91d041fc11f211bf74233379b0234c2450..f88f93c1a337af5d66a4bff8d9ef477737d9919d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKCertificateInfo_h
 #define WKCertificateInfo_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 61402457554dd4a95336484f501d338e6b94942e..6aba3aa41d23a10942a9d28f288fb38be2e6b68f 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKConnectionRef_h
 #define WKConnectionRef_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 9b978400c8b3c5eb57b7f0e65b1f1ddd295534df..caf1b7632bf99008674e06d2465af528e8171a9b 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKContextMenuItem_h
 #define WKContextMenuItem_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContextMenuItemTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKContextMenuItemTypes.h>
 
 #ifdef __cplusplus
 extern "C" {
index a647ee4e43af9757c0a3eda8f8fd0237e182b6ec..19e1fff7cfcb26bdbc581f485c87485732653e1d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKData_h
 #define WKData_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #include <stddef.h>
 
index c416e3c296626c6e35f049d0d4e86285606c2197..e486cc2a83dfea49899677db0384bacb8cac6f90 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKDictionary_h
 #define WKDictionary_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #include <stddef.h>
 
index b099b732cda4f97f1358c6987423eeeef74a5107..89e15cb758e525e45216e19e7c48d949484e0483 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKError_h
 #define WKError_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index b15c47ad2e686a168e703486cf375376ce98a0e7..05c43a58dfe220c87ea368b19e95b3a027d58b65 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKEvent_h
 #define WKEvent_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 97bf242e9b023a98c118f63cb6c71cc7ab267ad9..124fe24988c6b831c84231f184742b52d5c21fe3 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKGeometry_h
 #define WKGeometry_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 07437bd76af94f7130457beef42d9672206332e0..ce6efe56617b002defa800fc37c6706e481dddfb 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKImage_h
 #define WKImage_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index 7f05c2830772475d959478d06f2f4fe2e201302a..80bd8c029e28d6483dffa3c450d604bf6fc018cc 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKMutableArray_h
 #define WKMutableArray_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <stddef.h>
 
 #ifndef __cplusplus
index e8297daa89d15377070483e4370babde0ed39c34..0c3b33a122f318ff9e869444942c9e73334ebc7b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKMutableDictionary_h
 #define WKMutableDictionary_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
index c8c912965b0e1a312b244ffec8451e6c79df5e3c..2ebe73a8cf4d97f46fd51d8cc57d3d660930fb6e 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKNumber_h
 #define WKNumber_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 0bcaef192e741aa7dfa0acaf80579da61d2f5705..08970844ba2ca0982ab57fafb18efa2f636cc28e 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPluginInformation_h
 #define WKPluginInformation_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 72f28e0b93dd166b9a5b0777df7399c6ba09b1fa..ac5595fd884c57e92bfa2abb0c81f717dee02507 100644 (file)
@@ -27,8 +27,8 @@
 #define WKRenderLayer_h
 
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index 965cf2a96763222e44534241310a429c83005995..51d3712688f581aa7ae8e2e4ec8465732daeef4d 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKRenderObject_h
 #define WKRenderObject_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index d932e93a4a33b83691a15ce8e3f2fbe3b6a49353..f2d110ede096a4609ea2a9d622f243e5521004f5 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKSecurityOrigin_h
 #define WKSecurityOrigin_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 3f73d7a06dab9eefe772dd4b7631e1eaa6d986e8..625afe05bdf2d79cc20dddbe5cb19e64e06edada 100644 (file)
@@ -27,7 +27,7 @@
 #define WKSerializedScriptValue_h
 
 #include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 27e1849061853de48fd0d90b4305cedbf43ea251..837067fb765b310e0606442b3a0e57cb06e7f712 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKSerializedScriptValuePrivate_h
 #define WKSerializedScriptValuePrivate_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index dd5b877a77fb89c75a0e38f1a4738329e6e0d625..fc1b71d618592d6968b74a807c70e65e133f5eb8 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKString_h
 #define WKString_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <stddef.h>
 
 #ifndef __cplusplus
index f174f01661953a99e3de5a5c1b0be10324469c84..74bc8a1f02013005673cd1ffdd7b6f6b34bb6812 100644 (file)
@@ -27,7 +27,7 @@
 #define WKStringPrivate_h
 
 #include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 02f036c6f8f845a3b4a53dd75b66765839a9969b..e57ea379c39cf0d2ea932ac8cf0015c20837f77d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKType_h
 #define WKType_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 2c0a02cc4b2d83c2533d1719651902fca371d9f8..6bbc2b3920bdf20fe587226c0c2305ec8f332251 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKURL_h
 #define WKURL_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 85df3d389628ffc90bfad0d9f192c1e96255fa76..c7418c33265b135491be426eea34a51a9081b25b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKURLRequest_h
 #define WKURLRequest_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index d56027ae94776b6a25f8f8c0a5a852b1daac1771..9093b779176ac8a3e92eb1300f4757edbd49c38e 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKURLResponse_h
 #define WKURLResponse_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 6e4c6c132aeb64b18cd3077de8e3439a8412c7b4..407729663c7cdbc4daea414e8498891faf615682 100644 (file)
@@ -27,7 +27,7 @@
 #define WKUserContentURLPattern_h
 
 #include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 00a4dfe8861cc8c1b2a1c5af4ddc8fd8e81c48af..345f039361ec58bdc49b28fb627590e5207b243f 100644 (file)
@@ -27,7 +27,7 @@
 #define WKErrorCF_h
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 0d266d3e715672c9ebec827fe7b7c281accbbb98..1e1b0b461a8e6fd6d23d41ff7106bffce30c6993 100644 (file)
@@ -27,7 +27,7 @@
 #define WKStringCF_h
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index f704a131a665ca1b71e6d929b2a90ff498588cf1..6f9a57df534e4bb8be7426101b9355c5b8e99daa 100644 (file)
@@ -27,7 +27,7 @@
 #define WKURLCF_h
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 582d0b3190475f7abe66e2ee40d0024a8a5bf2e1..c8d78b5a28f14acf49a5c175a4dc0c0263f31ffe 100644 (file)
@@ -27,8 +27,8 @@
 #define WKImageCG_h
 
 #include <CoreGraphics/CGImage.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKImage.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKImage.h>
 
 #ifdef __cplusplus
 extern "C" {
index d098f34ca383d983910bb4e5fac5b3581d9e42ef..f502596c38cccab2e805fa1ef01d94bbfe132fc4 100644 (file)
@@ -27,7 +27,7 @@
 #define WKCertificateInfoMac_h
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 7cf79624ccb2f54642922a04bbdbb832725df2b3..35d4943a6cbd307cc0f26bed67dd9e54a5859fce 100644 (file)
@@ -27,7 +27,7 @@
 #define WKObjCTypeWrapperRef_h
 
 #include <Foundation/Foundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index cbc10ea96459d1f84eaefd266ffaaf876fe8ab2e..e0045b82cd97d459af67d332e3a8e98148494826 100644 (file)
@@ -27,7 +27,7 @@
 #define WKURLRequestNS_h
 
 #include <Foundation/Foundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 22b6a8df778dbf3c81007529d0209b60cfe4f586..d7f2807afae3aebbc72f23e2df47d8beefe4ec08 100644 (file)
@@ -27,7 +27,7 @@
 #define WKURLResponseNS_h
 
 #include <Foundation/Foundation.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 757fba573a5d12783b360f342a1359b6acff65cb..b1c494b6b81fda56904aeec2cef236d9ee69ca23 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKWebArchive_h
 #define WKWebArchive_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #include <stddef.h>
 
index 3e14c4ef5c63dd072472be127ed3bb3cafacbda5..77fdc2dbded6d969634f2543bcadc1dffd0a4151 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKWebArchiveResource_h
 #define WKWebArchiveResource_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #include <stddef.h>
 
index 0ed25ae1e09acaec1607983ab1cf5a0186007cfa..a52de16e60be0788532016e01def6f8e1f411560 100644 (file)
@@ -126,13 +126,13 @@ static void XPCServiceEventHandler(xpc_connection_t peer)
                     exit(EXIT_FAILURE);
                 }
 
-                CFBundleRef webKit2Bundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit2"));
+                CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
                 CFStringRef entryPointFunctionName = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
 
                 typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t);
-                InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKit2Bundle, entryPointFunctionName));
+                InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
                 if (!initializerFunctionPtr) {
-                    NSLog(@"Unable to find entry point in WebKit2.framework with name: %@", (NSString *)entryPointFunctionName);
+                    NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (NSString *)entryPointFunctionName);
                     exit(EXIT_FAILURE);
                 }
 
index ca0600b8379a86aa6bb5833ced7805596e4963e2..5ec3ad76f57b5967118a3fc3c38b510fb29a0095 100644 (file)
@@ -42,11 +42,11 @@ static void XPCServiceEventHandler(xpc_connection_t peer)
             assert(type == XPC_TYPE_DICTIONARY);
 
             if (!strcmp(xpc_dictionary_get_string(event, "message-name"), "bootstrap")) {
-                CFBundleRef webKit2Bundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit2"));
+                CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
                 CFStringRef entryPointFunctionName = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
 
                 typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t);
-                InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKit2Bundle, entryPointFunctionName));
+                InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
                 if (!initializerFunctionPtr) {
                     NSLog(@"Unable to find entry point in WebKit2.framework with name: %@", (NSString *)entryPointFunctionName);
                     exit(EXIT_FAILURE);
index c40039e37b7b91e33a540d0712df0cfd0b86d320..065a462d42df3b080ecbf621f7d7b3d750d809d4 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKApplicationCacheManager_h
 #define WKApplicationCacheManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 3802f417f8c002f4b08724328f47bd3e618361d5..bc2cf2e7e2a73c03b07edbdd7a17fb5e835af625 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKAuthenticationChallenge_h
 #define WKAuthenticationChallenge_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index f0724610b6d38c00d209f31e6c17aa358f1e60f9..2134de091514e4f499c8f1aa4a3ea928b4a1cf40 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKAuthenticationDecisionListener_h
 #define WKAuthenticationDecisionListener_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 7008e9a90ab1f2476c668df14848f455579c9d3b..f63ba5f4521334510362b1be15ca050a98dd0291 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKBackForwardListItemRef_h
 #define WKBackForwardListItemRef_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 1c7643986588d7a7cee976a6334360a7d4c4f7c7..97b2209d2cde2ccf14218301b1b03c6f5f914ead 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKBackForwardListRef_h
 #define WKBackForwardListRef_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 435b07010017e7d195bd091324fb9b965f5103d5..256ead4b3fd264bb3592ed8b3f8e6a003e2f44fb 100644 (file)
 #ifndef WKContext_h
 #define WKContext_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContextConnectionClient.h>
-#include <WebKit2/WKContextDownloadClient.h>
-#include <WebKit2/WKContextHistoryClient.h>
-#include <WebKit2/WKContextInjectedBundleClient.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKContextConnectionClient.h>
+#include <WebKit/WKContextDownloadClient.h>
+#include <WebKit/WKContextHistoryClient.h>
+#include <WebKit/WKContextInjectedBundleClient.h>
 
 #ifdef __cplusplus
 extern "C" {
index 82f79d63e8affce5006a2131117dad8f4534c773..787ce9b96fb196202b3fb4f507078a91a4728710 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKContextConnectionClient_h
 #define WKContextConnectionClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 typedef void (*WKContextDidCreateConnection)(WKContextRef context, WKConnectionRef connection, const void* clientInfo);
 
index 0aede7fb6c99cca62f7237724308033f46d97b78..45d5bd4eadf698b2339fdcbb071aa0782f991232 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKContextDownloadClient_h
 #define WKContextDownloadClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 typedef void (*WKContextDownloadDidStartCallback)(WKContextRef context, WKDownloadRef download, const void *clientInfo);
 typedef void (*WKContextDownloadDidReceiveAuthenticationChallengeCallback)(WKContextRef context, WKDownloadRef download, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo);
index 821b0ab42add82da8a387709829b0889648318bc..27391f8deeb046fed12655b6ec4b1497dbd255a6 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKContextHistoryClient_h
 #define WKContextHistoryClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 typedef void (*WKContextDidNavigateWithNavigationDataCallback)(WKContextRef context, WKPageRef page, WKNavigationDataRef navigationData, WKFrameRef frame, const void *clientInfo);
 typedef void (*WKContextDidPerformClientRedirectCallback)(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo);
index d48f8e7bc438ca14400a6a1183cd89c57b092823..8aca9543701d6708c3283471d99e48169d1903ed 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKContextInjectedBundleClient_h
 #define WKContextInjectedBundleClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 // Injected Bundle Client
 typedef void (*WKContextDidReceiveMessageFromInjectedBundleCallback)(WKContextRef page, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo);
index d607d89d90931883b9c6f071246ceb0a135f501f..33360da41b519cf84f7afb2b157ab5b8ee9a4577 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKContextPrivate_h
 #define WKContextPrivate_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContext.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKContext.h>
 
 #ifdef __cplusplus
 extern "C" {
index ac086d289d80cdef17881b416552e7838189cc60..d752c757fcd0f492ce2b1b60f04fe53b872b9c90 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKCookieManager_h
 #define WKCookieManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 560fc419a87d5f4ef90318e6d35d020e438e63e1..57842fbda53835699787a9da1228b8f065dbcbf1 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKCredential_h
 #define WKCredential_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKCredentialTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKCredentialTypes.h>
 
 #ifdef __cplusplus
 extern "C" {
index 12f2dbc83db3250cc07b356a5cfa0614b141f531..c604ba6d57fb5c8e8fe7f303ad18665f58547234 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKDatabaseManager_h
 #define WKDatabaseManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 8acc9106db41cc0d768f2ef25dcded212e6fe5e5..5dbea7e441abddea4cbe79bbf0d5346dec0ec4f4 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKDownload_h
 #define WKDownload_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
index 4b9b79acbdd11ea17f314262a946a46293c657f5..c320b68d40b1f5a3aa5ef0615af1cbd430b22c66 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKFormSubmissionListener_h
 #define WKFormSubmissionListener_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 5f169e48e87b9f3a7b93b5d5fa19d2dd33455821..ee427de801dab62a2cd93781d9b5bad3ff453b7d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKFrame_h
 #define WKFrame_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
index 99b013d549a0d60b5c4d8aa331c34c5470a67ea2..046c68131a4b7e89eb68806f9e5ba17306c9d715 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKFramePolicyListener_h
 #define WKFramePolicyListener_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index f8c19179043b4df799e1a86c07e22d4d0c7e4a15..9d2399a40695717f983dd34522e010b22336d742 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKGeolocationManager_h
 #define WKGeolocationManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index ee27b66ec244c0d5eedc90d6cfdde2730676db19..b1391813a75eb8082c6af466853a2b0843776cd6 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKGeolocationPermissionRequest_h
 #define WKGeolocationPermissionRequest_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 4727e9763388b1fc82dcb137023adc140d93e450..6d67f1d1e1cc2ffb13b57aa6c2f54f8144fff121 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKGeolocationPosition_h
 #define WKGeolocationPosition_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 55fd13768edbfe4b44a9032de25f9b2372f2265f..beb48ac41c806700e171655f1d795d33875cc246 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef WKHitTestResult_h
 #define WKHitTestResult_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 0a10f659632d8ea51c565ba29eac204911430b16..605872809c4744a26176f07622785a7ab1092007 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKIconDatabase_h
 #define WKIconDatabase_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 203e1b3cfbcd406c2dacb9edd72735c899fbce16..ba76489325f1541467a4d7e10c0b20c717d91989 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKInspector_h
 #define WKInspector_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
index e53a3975a4bd127f49893c5a810f6df090407f80..d92adadad3464646a32e6df96863f18c49ba392b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKKeyValueStorageManager_h
 #define WKKeyValueStorageManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index eee1b9291ea52d5dfea875c1d54b9720eac5f2c5..a347ea3fd0439be8b30bd107382597861a86eb7b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKMediaCacheManager_h
 #define WKMediaCacheManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 8d70b76fac835c7e3efc02150d27efc278cae706..b2c5f5b2b887242053eb7fd6d93b946d503845f4 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKNavigationDataRef_h
 #define WKNavigationDataRef_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 7035ef3f88738c272e792e93ff0e5604c9850efe..d3ae98bf74d2cd2f52bf5ad2e3f5ee02c38201ab 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKNotification_h
 #define WKNotification_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 50f50d747984889f8db3fd42d487a819dcb4724c..cb88036bc03ed4e695db5bdea5a1c6908c1fbb1f 100644 (file)
@@ -27,7 +27,7 @@
 #define WKNotificationManager_h
 
 #include "WKNotificationProvider.h"
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 1947a06aabae29515d5d73d04204d5b393bf1817..02be0e63c0b2b8b1a0bf88a48bf27e18574a13cf 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKNotificationPermissionRequest_h
 #define WKNotificationPermissionRequest_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 920e297b370d03225441ebe59cc263882be14d15..526da1525ecab272dde01a606627c94563a20d42 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKNotificationProvider_h
 #define WKNotificationProvider_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 5af2dd24c12db3b5fdeb3077c101ac17c25b85fc..803bff8b4f36035a05eccedc84e5064ae246a156 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef WKOpenPanelParameters_h
 #define WKOpenPanelParameters_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
index d581738a5f97ea7fc7267238e2c53eeea6ed2894..21c92ee247c914dfc091f076b092ecef4cddfd69 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKOpenPanelResultListener_h
 #define WKOpenPanelResultListener_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index f6300593b9f1c30949257995e23e990de5972027..827bd552e8c0db6ccd720c19a7c50dcc4a8568c1 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKOriginDataManager_h
 #define WKOriginDataManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 0c5cb8cb91f893223d1b70c93e3fb979306d3631..650c508b07124ef74895586036b6229cb01cab55 100644 (file)
 #ifndef WKPage_h
 #define WKPage_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKFindOptions.h>
-#include <WebKit2/WKGeometry.h>
-#include <WebKit2/WKNativeEvent.h>
-#include <WebKit2/WKPageContextMenuClient.h>
-#include <WebKit2/WKPageFindClient.h>
-#include <WebKit2/WKPageFindMatchesClient.h>
-#include <WebKit2/WKPageFormClient.h>
-#include <WebKit2/WKPageLoadTypes.h>
-#include <WebKit2/WKPageLoaderClient.h>
-#include <WebKit2/WKPagePolicyClient.h>
-#include <WebKit2/WKPageUIClient.h>
-#include <WebKit2/WKPageVisibilityTypes.h>
-#include <WebKit2/WKSessionRef.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKFindOptions.h>
+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKNativeEvent.h>
+#include <WebKit/WKPageContextMenuClient.h>
+#include <WebKit/WKPageFindClient.h>
+#include <WebKit/WKPageFindMatchesClient.h>
+#include <WebKit/WKPageFormClient.h>
+#include <WebKit/WKPageLoadTypes.h>
+#include <WebKit/WKPageLoaderClient.h>
+#include <WebKit/WKPagePolicyClient.h>
+#include <WebKit/WKPageUIClient.h>
+#include <WebKit/WKPageVisibilityTypes.h>
+#include <WebKit/WKSessionRef.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
index e892c3d5914a4de74317ef27aa750c862a06d4d6..88a1574df6b0738505fce24d4744be8427fede10 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKPageContextMenuClient_h
 #define WKPageContextMenuClient_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index 4d67d69db7c0b606ccbb5054a3f78c6fd60ba217..14ca188e4ef4464a0f0710d52d671ce6147832d4 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPageFindClient_h
 #define WKPageFindClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 15701aac6f18ed437f8b7ffe8c1e31d3eb13242f..99265f50b555bb3f62f6dad3e9e29bc440b16375 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPageFindMatchesClient_h
 #define WKPageFindMatchesClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 98b2c6abea464d8cd276e5be30a95a66f931986b..47968fcbe05d6e73f40244697348b37d9a50221d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPageFormClient_h
 #define WKPageFormClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 530674220bfa659313a9b5faf532f637f877c30a..149b1a30bd97d71b12fb230fb3a0fd4a11e59ddc 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef WKPageGroup_h
 #define WKPageGroup_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKUserContentInjectedFrames.h>
-#include <WebKit2/WKUserScriptInjectionTime.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKUserContentInjectedFrames.h>
+#include <WebKit/WKUserScriptInjectionTime.h>
 
 #ifdef __cplusplus
 extern "C" {
index 98b32e590dcd19b790fb8ce0403a007c98f25c3e..03988b16f2af2c98e12dc593c307a38b074c085a 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef WKPageLoaderClient_h
 #define WKPageLoaderClient_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKPageLoadTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKPageLoadTypes.h>
 
 #ifdef __cplusplus
 extern "C" {
index 15f834835c6af42a734c3fdcf23593669067f67d..d4d7d163d76692b08bada9f7ddedf7efa1baab8e 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef WKPagePolicyClient_h
 #define WKPagePolicyClient_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKPageLoadTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKPageLoadTypes.h>
 
 #ifdef __cplusplus
 extern "C" {
index 5175149e91c4479c9aa962f39df5919a03cd1a15..3cb8858a1fb2feda5dfbb3b0eb192809606c6879 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKPagePrivate_h
 #define WKPagePrivate_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKPage.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKPage.h>
 
 #ifdef __cplusplus
 extern "C" {
index 84c3277a1d860081c9491469faaf0ce4828fde3e..fe66869b934335969a0ef9a0ebea2f3346d1cf6f 100644 (file)
 #ifndef WKPageUIClient_h
 #define WKPageUIClient_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKGeometry.h>
-#include <WebKit2/WKNativeEvent.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKNativeEvent.h>
 
 #ifdef __cplusplus
 extern "C" {
index 66e76fbcd248118050a9fa5ba507730bc35dcca0..9a772b2b5f8322f526afcf3e2e70cfd3f2e1fe39 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPluginSiteDataManager_h
 #define WKPluginSiteDataManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 5b717377e14553b25513c28c7b28572c1ff9bed5..7bec508a14b8c662070c2da623ded0711ef1e958 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPreferencesRef_h
 #define WKPreferencesRef_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
index da2d61a7a9a14c6d2b1bbbd68870e79de47c271f..3200cb285772600bc433763fca74a4d463961577 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPreferencesPrivate_h
 #define WKPreferencesPrivate_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index c77d93ba0cd290da73b7ad0eacbdae8554bdd322..ff7ca87423aaaf2f4b69f160ee28cade93b8943f 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WKProtectionSpace_h
 #define WKProtectionSpace_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKProtectionSpaceTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKProtectionSpaceTypes.h>
 
 #ifdef __cplusplus
 extern "C" {
index fd1bd09d27c59e4e6ab8143fb23d71178b1980dc..4741460490c16f8e15daca02823c79619709f51b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKProtectionSpaceTypes_h
 #define WKProtectionSpaceTypes_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 80c4531ff776af9c22fa8885d35b3eef8674df23..7f4bb6c51c81e6642a0b215ab3b3cc92005bb3bd 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKResourceCacheManager_h
 #define WKResourceCacheManager_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 63fa542777931516d06fd92195eced7ce7a4ad4e..693902677cdb5ef143fcd2e5997cc63cead4ef89 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKSessionRef_h
 #define WKSessionRef_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 21c9eeaab876e3402838d7839d17823eafe00d83..15576c0bc00f15af887a0fc9f7d9dfa5ed0eab2a 100644 (file)
 #ifndef WebKit2_C_h
 #define WebKit2_C_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKType.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKType.h>
 
-#include <WebKit2/WKArray.h>
-#include <WebKit2/WKBackForwardListRef.h>
-#include <WebKit2/WKBackForwardListItemRef.h>
-#include <WebKit2/WKConnectionRef.h>
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKData.h>
-#include <WebKit2/WKDictionary.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKFormSubmissionListener.h>
-#include <WebKit2/WKFrame.h>
-#include <WebKit2/WKFramePolicyListener.h>
-#include <WebKit2/WKGeolocationManager.h>
-#include <WebKit2/WKGeolocationPermissionRequest.h>
-#include <WebKit2/WKGeolocationPosition.h>
-#include <WebKit2/WKHitTestResult.h>
-#include <WebKit2/WKMutableArray.h>
-#include <WebKit2/WKMutableDictionary.h>
-#include <WebKit2/WKNavigationDataRef.h>
-#include <WebKit2/WKNumber.h>
-#include <WebKit2/WKOpenPanelParameters.h>
-#include <WebKit2/WKOpenPanelResultListener.h>
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKPageGroup.h>
-#include <WebKit2/WKPreferencesRef.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKURL.h>
-#include <WebKit2/WKURLRequest.h>
-#include <WebKit2/WKURLResponse.h>
+#include <WebKit/WKArray.h>
+#include <WebKit/WKBackForwardListRef.h>
+#include <WebKit/WKBackForwardListItemRef.h>
+#include <WebKit/WKConnectionRef.h>
+#include <WebKit/WKContext.h>
+#include <WebKit/WKData.h>
+#include <WebKit/WKDictionary.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKFormSubmissionListener.h>
+#include <WebKit/WKFrame.h>
+#include <WebKit/WKFramePolicyListener.h>
+#include <WebKit/WKGeolocationManager.h>
+#include <WebKit/WKGeolocationPermissionRequest.h>
+#include <WebKit/WKGeolocationPosition.h>
+#include <WebKit/WKHitTestResult.h>
+#include <WebKit/WKMutableArray.h>
+#include <WebKit/WKMutableDictionary.h>
+#include <WebKit/WKNavigationDataRef.h>
+#include <WebKit/WKNumber.h>
+#include <WebKit/WKOpenPanelParameters.h>
+#include <WebKit/WKOpenPanelResultListener.h>
+#include <WebKit/WKPage.h>
+#include <WebKit/WKPageGroup.h>
+#include <WebKit/WKPreferencesRef.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKURL.h>
+#include <WebKit/WKURLRequest.h>
+#include <WebKit/WKURLResponse.h>
 
 #if defined(__OBJC__) && __OBJC__
-#import <WebKit2/WKView.h>
+#import <WebKit/WKView.h>
 #elif !(defined(__APPLE__) && __APPLE__)
-#include <WebKit2/WKView.h>
+#include <WebKit/WKView.h>
 #endif
 
 #endif /* WebKit2_C_h */
index 08fcb18cef435e61900bb59a129eedf2a67deab1..8bdd1cef295c3c659694522112c74a2f031c8f07 100644 (file)
@@ -28,8 +28,8 @@
 
 #include <CoreFoundation/CFArray.h>
 #include <CoreGraphics/CGImage.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index 3d2c362f31e56451a34e735bb7686e3c6e1b2a15..4c6db4c68dc49a1b579bd614f9b2504177963d0b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKContextPrivateMac_h
 #define WKContextPrivateMac_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index c4f36eadc8a4acf8aaf7ef07637b7e463178e653..924d9a3b3106959eb0f3c3ef48b4d4ff5ea032f2 100644 (file)
@@ -24,8 +24,8 @@
  */
 
 #import <AppKit/NSWindow.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
-#import <WebKit2/WKInspector.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
+#import <WebKit/WKInspector.h>
 
 #ifdef __cplusplus
 extern "C" {
index b58ac7effd7a17b205c3a4d5354e7d578bfc92b6..4f0aa08f0ca5818a0a6b783dff3a26ef4d65f614 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKPagePrivateMac_h
 #define WKPagePrivateMac_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 #include <sys/types.h>
 
 #ifdef __cplusplus
index 604430ae313ad88178b701ac7c6504fa7e94b7b0..5b45521c7860f1c2af60f7273f35511132dc1e49 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
-#import <WebKit2/WKBackForwardListItem.h>
+#import <WebKit/WKBackForwardListItem.h>
 
 /*! @abstract A @link WKWebView @/link's list of previously-visited webpages that can be reached by
  going back or forward.
index 1c89c7d62e75b2885b34c346c9bd7af6309b4466..9ed3a68c2369dee6a6d5bd9df1e19a9cccccefc5 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 26761bb247d31a3dc3639328681052989c080c22..538d7abeb2dbacaae7881dda0f4f57037c57c538 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKBackForwardList.h>
+#import <WebKit/WKBackForwardList.h>
 
 #if WK_API_ENABLED
 
index 36d75ffd89f45f275124de0668ae31a06b07660f..503cff20f1afba7039451edc3546bc22133c1a9e 100644 (file)
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKBrowsingContextGroup.h>
-#import <WebKit2/WKFoundation.h>
-#import <WebKit2/WKProcessGroup.h>
-#import <WebKit2/WKRenderingProgressEvents.h>
+#import <WebKit/WKBrowsingContextGroup.h>
+#import <WebKit/WKFoundation.h>
+#import <WebKit/WKProcessGroup.h>
+#import <WebKit/WKRenderingProgressEvents.h>
 
 #if WK_API_ENABLED
 
index e726bce405ab08136c029bb3391c76288042e307..254eb61116dc775f950b3e0084b5ec79eee90cb6 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKBrowsingContextController.h>
+#import <WebKit/WKBrowsingContextController.h>
 
 #if WK_API_ENABLED
 
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
 
 typedef NS_ENUM(NSUInteger, WKBrowsingContextPaginationMode) {
     WKPaginationModeUnpaginated,
index cf4bfa7470ef04100662dc7df565c00bd075f4a1..54f34e2d9e06362c4612635a79e80d4e9a24e338 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKUserScriptInjectionTime.h>
+#import <WebKit/WKUserScriptInjectionTime.h>
 
 WK_API_CLASS
 @interface WKBrowsingContextGroup : NSObject
index e74513e97934ba871a1ec595c46157b6540e0b6e..1c57b0cea646aeb6fd389a7ffd8629529a568ca8 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKBrowsingContextGroup.h>
+#import <WebKit/WKBrowsingContextGroup.h>
 
 #if WK_API_ENABLED
 
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
 
 @interface WKBrowsingContextGroup (Private)
 
index 3e237ba1ed57f7a27667bf4ce83d77afa70fa9ac..36623365644b4087a3c80b0b05af8b213a7180a4 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKBrowsingContextController.h>
-#import <WebKit2/WKNavigationData.h>
+#import <WebKit/WKBrowsingContextController.h>
+#import <WebKit/WKNavigationData.h>
 
 @protocol WKBrowsingContextHistoryDelegate <NSObject>
 @optional
index 71008c68aa61283680d6b8857e29937a43763d16..d9c89507f176e4efd3a1e2de9590ae75f9dfce10 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKBrowsingContextController.h>
+#import <WebKit/WKBrowsingContextController.h>
 
 @class WKBackForwardListItem;
 
index 43181b15d934c5141355ee3597f37d7a205b8a43..8ed623191a67ee8101f15a3419c7588ec9e6369e 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKBrowsingContextLoadDelegate.h>
+#import <WebKit/WKBrowsingContextLoadDelegate.h>
 
 @protocol WKBrowsingContextLoadDelegatePrivate <WKBrowsingContextLoadDelegate>
 @optional
index e731880e271ab4d5cd5b001ba5fa76f6ba14bbf6..d270e36de447a46eb944e4e04945081403cd8fa4 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
 
 @class WKBrowsingContextController;
 
index 6e983da08d18381255605e1129d140519400c9b8..c899a0c8948c1dbe4e44147a48cbb3a0d6fc1ad0 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index ecf31a260c5dedc450f43afd2563c973484a40a6..537172e128e044debd7770108cc1b47cd92e57dd 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 4f7d3053648493b1bb5822afe6b64b8a1977de51..bd19e32a8a4b275a4e6d1b600d3fda1ad7e21d7a 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index c298ee823c5ff14da5c42d90c47f3fc78c4035f5..bc4e63852beff43302a3d51af1bac489e72f3ff2 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index d745fb4f5dc6c830ffa7a08e303a90a6a9f25f90..3ef70c9f4bd8ac156759ffcb8b662afb438dcda3 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 78307e3279678a2e158e3f739cc8d8fe8d2a7eb1..9de3dc36aa90f995cc8d08c0ca2fa0b61022db95 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKNavigationAction.h>
+#import <WebKit/WKNavigationAction.h>
 
 #if WK_API_ENABLED
 
index 9d59e38ef0ef363119e2113671eccf39d324fc96..3744bb4331e9de2d3f07d6a8fd60766179c358ef 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <WebKit2/WKNavigationDataRef.h>
+#include <WebKit/WKNavigationDataRef.h>
 
 #ifdef __OBJC__
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 6d32a042b3b1f759d7913b58599ff74ac35357df..f28217a174355cb71de4b3808f9b660189fc8257 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index cc21c8b33cce0665f3ea77e342839708510d1e7b..786cf28ccf9500d42ad7311010f78faf9ee4062b 100644 (file)
@@ -23,8 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKNavigationDelegate.h>
-#import <WebKit2/WKWebViewPrivate.h>
+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKWebViewPrivate.h>
 
 #if WK_API_ENABLED
 
index e87db13e32d6cdde074b686cd68ea91a9a49b7e0..aff6aab84ad960e3c0c554d3b1b59fbd53f5aa0b 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index e8d560dc63af46cf864dae150011c459d2cd3a56..07e3cbcbf514bd7140316455943415183d84c79d 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WKPreferences_h
-#define WKPreferences_h
-
-#include <WebKit2/WKPreferencesRef.h>
-
-#ifdef __OBJC__
-
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
@@ -96,7 +89,3 @@ WK_API_CLASS
 @end
 
 #endif // WK_API_ENABLED
-
-#endif // defined(__OBJC__)
-
-#endif
index 5fa5cc02b2aaacc6df022995986ecc3deca9ef44..0c8af7604ae075a6fbf62498e122d57d984dcc0a 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <WebKit2/WKPreferencesRefPrivate.h>
+#include <WebKit/WKPreferencesRefPrivate.h>
 
 #ifdef __OBJC__
 
-#import <WebKit2/WKPreferences.h>
+#import <WebKit/WKPreferences.h>
 
 #if WK_API_ENABLED
 
index 22aa57ef1d8e0354f11826d3a8e5a8b1e95b13ff..86a346052d8d764766c256aab07808239506bbc6 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKConnection.h>
+#import <WebKit/WKConnection.h>
 
 @class WKProcessGroup;
 
index f9a4333dd3b80668a69fcbc63b81b7b9ddcef0c9..2eed003bf11c72643afbb612cffc83c17e5d20f5 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKProcessGroup.h>
+#import <WebKit/WKProcessGroup.h>
 
 #if WK_API_ENABLED
 
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
 
 #if TARGET_OS_IPHONE
 @class WKGeolocationProviderIOS;
index ffef32951a28e8b7732af16e9b13ff49b3b73801..6ff5a5bb7666e4d5ffae91076b825ccc121bb392 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 63bc657abec6c659c2c5315402c543d5da06546e..dbe542aeb3fd01bc390ac3baff79280e1c2588e2 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKProcessPool.h>
+#import <WebKit/WKProcessPool.h>
 
 #if WK_API_ENABLED
 
index 0841caf97a306b322ee92fa07bedaa014c0ba458..f8639ed2600bffd6f92f460d681b5e8a3f60d1ae 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index d58bac87aef5dcdddcfa9170b35ea433af052d69..12f6caad33840218bc5e9843d06fe806aa79c5bf 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index d17bc05d45fa954c52f15a7fbc3cf79720d1b362..895c890ecd4b6099b4e270b6d176c921e1014389 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKScriptMessage.h>
+#import <WebKit/WKScriptMessage.h>
 
 #if WK_API_ENABLED
 
index a579ac255c339539707aba0e91abe2ae0d6f4b40..664c4af077ebfb0e8b366771686b7d069189dba0 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
 
 WK_API_CLASS
 @interface WKTypeRefWrapper : NSObject
index ace6dd17e713142a1823c06bf5f7f4f3effc1b14..4d3038891d5b9e8a09d6eb2260f63232d6502afc 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 24869ccd985dd011dad33f72a3a318ae8c4b411c..39a8f86dc61e194820bdba4038246d0a262699cd 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKUIDelegate.h>
+#import <WebKit/WKUIDelegate.h>
 
 #if WK_API_ENABLED
 
-#import <WebKit2/_WKActivatedElementInfo.h>
+#import <WebKit/_WKActivatedElementInfo.h>
 
 @protocol WKUIDelegatePrivate <WKUIDelegate>
 
index 91acf6ccc3b34bec8fc9d8b2c72ea1c6b3ffbf69..6b8ce3de2bd1481e69b59525f54a3bf44f280e1f 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 27187e5b0729a5a9d6a8a3537084e888313960fa..c981345fae36186ed51c2d144f033661aa0929d9 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKUserContentController.h>
+#import <WebKit/WKUserContentController.h>
 
 #if WK_API_ENABLED
 
index 309c40c04a41783d88835f997e566133f959e269..2ae46baf9aff7ca5d691f32bd9625f5eb9780978 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
 #else
 #import <Cocoa/Cocoa.h>
 #endif
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
 
 @class WKBrowsingContextController;
 @class WKBrowsingContextGroup;
index 5d7b491e62dd90c19437cba1f93524ec7dd335c7..1cb8ff3bb24423af7a37f28dc676b042864064f9 100644 (file)
@@ -23,8 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKBase.h>
-#import <WebKit2/WKView.h>
+#import <WebKit/WKBase.h>
+#import <WebKit/WKView.h>
 
 @interface WKView (Private)
 
index 45cc16c216936ed561d7cc4c8fc3d135a7791921..fccf20d9e9e5ce5444f31b9b9c861afade5945c6 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 30bfd8f84543c7d3b638e0800929888c8942a68e..357da8f7683ef0c3b7e03472e3b2d2c3707dbde0 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 8eabc288eeb4ce50249b693d5a0ab4ca1a603228..624f7604e3f5e327f57fe558d012c9fbb097775e 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKWebViewConfiguration.h>
+#import <WebKit/WKWebViewConfiguration.h>
 
 #if WK_API_ENABLED
 
index 3d350e0b44e7b8cb9a9ce72d7ffe5b250c3097ff..8b6c2a829d3c9dcda0ed1096f3531c2e6376c27a 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKWebView.h>
+#import <WebKit/WKWebView.h>
 
 #if WK_API_ENABLED
 
index dd0ac25b3c408f9e3ae67a1be7dba2cbe04f1c97..b35804e3bfddae11f81b07dff176bd59dd88743a 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 35b8a0a93a2cc64f80b67a0ededb51f5aa072fe2..c182b1da8e15e89d7cd2d505b7a3daad689b1434 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKBrowsingContextController.h>
-#import <WebKit2/WKBrowsingContextGroup.h>
-#import <WebKit2/WKBrowsingContextLoadDelegate.h>
-#import <WebKit2/WKBrowsingContextPolicyDelegate.h>
-#import <WebKit2/WKConnection.h>
-#import <WebKit2/WKFoundation.h>
-#import <WebKit2/WKProcessGroup.h>
-#import <WebKit2/WKView.h>
+#import <WebKit/WKBrowsingContextController.h>
+#import <WebKit/WKBrowsingContextGroup.h>
+#import <WebKit/WKBrowsingContextLoadDelegate.h>
+#import <WebKit/WKBrowsingContextPolicyDelegate.h>
+#import <WebKit/WKConnection.h>
+#import <WebKit/WKFoundation.h>
+#import <WebKit/WKProcessGroup.h>
+#import <WebKit/WKView.h>
index c01f8b8063178a38672d2ac8d2ccdb232c53cd7d..aab116e1546bc5cf132c27458f936bc7610cf7db 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index e8c01988503a4bebfaae347b64e902fb48a08fe7..fbecadb98461eaed4395ca8b8a7278c6bc2feaa1 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 8f3c9ff70cef317678a06fc83529aff0f0afb968..b3ef2ce797697db5ca8af4f2c01ccc45a086eeaa 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 48f1b79c1f98e0423847a2347248f8407d2e0b1f..b8bd02b3702bdf787a1300a4c98fa220dc9a5924 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
 #if TARGET_OS_IPHONE
 
-#import <WebKit2/_WKActivatedElementInfo.h>
+#import <WebKit/_WKActivatedElementInfo.h>
 
 typedef void (^WKElementActionHandler)(_WKActivatedElementInfo *);
 
index ddb61245913edbc19a150e93b93418e2281c023d..e4079e683438807cc67e370555dd33df379ad750 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
 
 WK_EXPORT extern NSString * const _WKRecoveryAttempterErrorKey;
 
index a1f154797dbda573108529a91f5f41baeeb42e1d..5699ba9bab99fe10b666cb20a0de060974141473 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 76c4a53fb4bba5b054c81a2c7128d949c5cc0292..7eafcf85058012c9a501c1c51cfc10b6aa0a3461 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 850386dccebe89a966533952c64ab24800dfc693..5d027f9c97ba604a45b16f663265ad02c804b4df 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 477fe74d9ca82aef01bf980028e679bf669e4a70..3c262057dda685c773d90324b7057679d0ebf17f 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index a95dd050820d7b5779aa447f106e760ad62164ab..39ab2940f8ba760c92d3dcdf1f108a7c5b57cd5c 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index b4da03e58e836150f5af348369e5a7cdc42d8ba8..7d9f7c67c9c54efc237965ea34b696386635b029 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 7b6a772f904cd8fbf45154c16df3dd5b35d244e6..ce3ccc30fdb2b3bf87681f0d60c57221302f49e8 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index f83c6465003dbc61ebad96f5f0d6559f3884888c..cdcf28a5638663178d511640eab0dbe8aa5b731f 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 6915dd334336f2bb37750ae9e31ac2a0782b7f70..9fb019edd1cd178bc8b064285e4ec9045e138444 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKRetainPtr_h
 #define WKRetainPtr_h
 
-#include <WebKit2/WKType.h>
+#include <WebKit/WKType.h>
 #include <algorithm>
 
 namespace WebKit {
index c230250bc148e8db080103d879dc4de51d17b23d..9da979c63f5cb27fb1bde0db0c53a5ce9b576dd5 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 6ffbb5f9db56bbad71cdc3ded2e2028dc603bc88..274efde472dbdcd7c939a9abdb543233ef7c0cfd 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index b65e130ee0514fd0bd39b5c1acf670b043562fb3..a78ebb70becc1957dfe2f7d1ae6e03fa946a3a61 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 4379a6d1f3265baae2522ff754a85ccffffd2243..ce62ad71c0a4fe7618941cc6d3dbdd9dd5d62a83 100644 (file)
@@ -89,8 +89,8 @@ static void addDYLDEnvironmentAdditions(const ProcessLauncher::LaunchOptions& la
     DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], _NSGetMachExecuteHeader()->cputype);
     environmentExtractor.getExtractedEnvironmentVariables(environmentVariables);
 
-    NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
-    NSString *frameworksPath = [[webKit2Bundle bundlePath] stringByDeletingLastPathComponent];
+    NSBundle *webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
+    NSString *frameworksPath = [[webKitBundle bundlePath] stringByDeletingLastPathComponent];
 
     // To make engineering builds work, if the path is outside of /System set up
     // DYLD_FRAMEWORK_PATH to pick up other frameworks, but don't do it for the
@@ -101,7 +101,7 @@ static void addDYLDEnvironmentAdditions(const ProcessLauncher::LaunchOptions& la
     NSString *processShimPathNSString = nil;
 #if ENABLE(NETSCAPE_PLUGIN_API)
     if (launchOptions.processType == ProcessLauncher::PluginProcess) {
-        NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
+        NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
         NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
 
         processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
@@ -109,14 +109,14 @@ static void addDYLDEnvironmentAdditions(const ProcessLauncher::LaunchOptions& la
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 #if ENABLE(NETWORK_PROCESS)
     if (launchOptions.processType == ProcessLauncher::NetworkProcess) {
-        NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
+        NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
         NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
 
         processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"SecItemShim.dylib"];
     } else
 #endif // ENABLE(NETWORK_PROCESS)
     if (launchOptions.processType == ProcessLauncher::WebProcess) {
-        NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"WebProcess.app"];
+        NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
         NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
 
         processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"WebProcessShim.dylib"];
@@ -202,7 +202,7 @@ static void connectToService(const ProcessLauncher::LaunchOptions& launchOptions
 
     xpc_object_t bootstrapMessage = xpc_dictionary_create(0, 0, 0);
     xpc_dictionary_set_string(bootstrapMessage, "message-name", "bootstrap");
-    xpc_dictionary_set_string(bootstrapMessage, "framework-executable-path", [[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] executablePath] fileSystemRepresentation]);
+    xpc_dictionary_set_string(bootstrapMessage, "framework-executable-path", [[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] executablePath] fileSystemRepresentation]);
     xpc_dictionary_set_mach_send(bootstrapMessage, "server-port", listeningPort);
     xpc_dictionary_set_string(bootstrapMessage, "client-identifier", clientIdentifier.data());
     xpc_dictionary_set_string(bootstrapMessage, "ui-process-name", [[[NSProcessInfo processInfo] processName] UTF8String]);
@@ -374,31 +374,31 @@ static void createProcess(const ProcessLauncher::LaunchOptions& launchOptions, b
     // Insert a send right so we can send to it.
     mach_port_insert_right(mach_task_self(), listeningPort, listeningPort, MACH_MSG_TYPE_MAKE_SEND);
 
-    NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
+    NSBundle *webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
 
     NSString *processPath = nil;
     switch (launchOptions.processType) {
     case ProcessLauncher::WebProcess:
-        processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"WebProcess.app"];
+        processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
         break;
 #if ENABLE(NETSCAPE_PLUGIN_API)
     case ProcessLauncher::PluginProcess:
-        processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
+        processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
         break;
 #endif
 #if ENABLE(NETWORK_PROCESS)
     case ProcessLauncher::NetworkProcess:
-        processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
+        processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
         break;
 #endif
 #if ENABLE(DATABASE_PROCESS)
     case ProcessLauncher::DatabaseProcess:
-        processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"DatabaseProcess.app"];
+        processPath = [webKitBundle pathForAuxiliaryExecutable:@"DatabaseProcess.app"];
         break;
 #endif
     }
 
-    NSString *frameworkExecutablePath = [webKit2Bundle executablePath];
+    NSString *frameworkExecutablePath = [webKitBundle executablePath];
     NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
 
     NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
@@ -520,7 +520,7 @@ void ProcessLauncher::launchProcess()
     if (tryPreexistingProcess(m_launchOptions, this, &ProcessLauncher::didFinishLaunchingProcess))
         return;
 
-    bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];
+    bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];
 
     if (m_launchOptions.useXPC) {
         createService(m_launchOptions, isWebKitDevelopmentBuild, this, &ProcessLauncher::didFinishLaunchingProcess);
index 3ef797bff7c122ec50cac6e0a6b430698cef18c5..a6818a3b569e100e50ee503633fa746efa70cf18 100644 (file)
@@ -77,7 +77,7 @@ bool PluginProcessProxy::pluginNeedsExecutableHeap(const PluginModuleInfo& plugi
 
 bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
 {
-    NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
+    NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
     NSString *frameworksPath = [[webKit2Bundle bundlePath] stringByDeletingLastPathComponent];
     const char* frameworkExecutablePath = [[webKit2Bundle executablePath] fileSystemRepresentation];
     
index 1182f57e09d1ff0d9160172acd72e8abe9f4b381..94bbf0b1f43524042ed15af4ee31ac7b8210bd4c 100644 (file)
@@ -29,7 +29,7 @@
 
 #import <UIKit/UIActionSheet.h>
 #import <UIKit/UIPopoverController.h>
-#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit/WKDeclarationSpecifiers.h>
 #import <wtf/RetainPtr.h>
 
 @protocol WKActionSheetDelegate;
index 9cb0481cc6cfed117b16a42051022ad8d8133075..006b5b7be4737d611088f4eab78554542019d476 100644 (file)
@@ -26,7 +26,7 @@
 #if PLATFORM(IOS)
 
 #import <Foundation/NSObject.h>
-#import <WebKit2/WKBase.h>
+#import <WebKit/WKBase.h>
 
 namespace WebKit {
 class WebContext;
index 7a6fbaafa0601032e5c1d2bdfea1aa994b150844..49eb502a29369f7f890798019f4eeecd3ae121f3 100644 (file)
@@ -34,7 +34,7 @@
 #import "WebSecurityOrigin.h"
 #import <WebGeolocationPosition.h>
 #import <WebCore/GeolocationPosition.h>
-#import <WebKit2/WKGeolocationPermissionRequest.h>
+#import <WebKit/WKGeolocationPermissionRequest.h>
 #import <wtf/Assertions.h>
 #import <wtf/PassRefPtr.h>
 #import <wtf/RefPtr.h>
index c1cb77080ecf5af17d485b66396cf10c3eb121f8..6374b79d83e2423cd85d5473d9c402ed712316ed 100644 (file)
@@ -248,7 +248,7 @@ String WebContext::platformDefaultDiskCacheDirectory() const
 {
     RetainPtr<NSString> cachePath = adoptNS((NSString *)WKCopyFoundationCacheDirectory());
     if (!cachePath)
-        cachePath = @"~/Library/Caches/com.apple.WebKit2.WebProcess";
+        cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
 
     return [cachePath stringByStandardizingPath];
 }
index 0083811985d399c6455d46f8e705b978e51abe99..02ded464211614ef28710ff65fa8eba3a7e5a101 100644 (file)
@@ -16,6 +16,7 @@
                                BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
                        );
                        dependencies = (
+                               1A6280F619199865006AD9F9 /* PBXTargetDependency */,
                                1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */,
                                51A60B2C180CCF1200F3BF50 /* PBXTargetDependency */,
                                510CC8481613C85300D03ED3 /* PBXTargetDependency */,
                0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */; };
                0F931C1D18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */; };
                0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; };
-               0FC08572187CE0B100780D86 /* __init__.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856E187CE0A900780D86 /* __init__.py */; };
-               0FC08573187CE0B300780D86 /* messages.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856F187CE0A900780D86 /* messages.py */; };
-               0FC08574187CE0B400780D86 /* model.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08570187CE0A900780D86 /* model.py */; };
-               0FC08575187CE0B600780D86 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; };
                0FCB4E4618BBE044000FCFC9 /* PageClientImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3618BBE044000FCFC9 /* PageClientImplIOS.h */; };
                0FCB4E4718BBE044000FCFC9 /* PageClientImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */; };
                0FCB4E4818BBE044000FCFC9 /* WKActionSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3818BBE044000FCFC9 /* WKActionSheet.h */; };
                1A043DC2124FF87500FFBFB5 /* PluginProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043DC0124FF87500FFBFB5 /* PluginProxy.cpp */; };
                1A043F6912514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */; };
                1A043F6A12514D8B00FFBFB5 /* WebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */; };
+               1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856E187CE0A900780D86 /* __init__.py */; };
+               1A07D2F91919B3A900ECDA16 /* messages.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856F187CE0A900780D86 /* messages.py */; };
+               1A07D2FA1919B3A900ECDA16 /* model.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08570187CE0A900780D86 /* model.py */; };
+               1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; };
                1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */; };
                1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */; };
                1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */; };
                1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */; };
                1A60224C18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */; };
                1A60224D18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */; };
+               1A6280C51919949F006AD9F9 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C41919949F006AD9F9 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               1A6280F019199800006AD9F9 /* WebKit2.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280EE19199800006AD9F9 /* WebKit2.m */; };
+               1A6280F31919982A006AD9F9 /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280F21919982A006AD9F9 /* WebKit.m */; };
                1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */; };
                1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6420E312DCE2FF00CAAE2C /* ShareableBitmap.h */; };
                1A64229912DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64229712DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp */; };
                1AD60F5E18E20F4C0020C034 /* WKWindowFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */; };
                1AD60F6018E20F740020C034 /* WKWindowFeaturesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */; };
                1AD8790A18B6C38A006CAFD7 /* WKUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1ADCB86A189831B30022EE5A /* NavigationActionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADCB868189831B30022EE5A /* NavigationActionData.cpp */; };
                1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADCB869189831B30022EE5A /* NavigationActionData.h */; };
                1ADF591A1890528E0043C145 /* WKWebViewConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */; };
                37608823150414F700FC82C7 /* WKRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 37608821150414F700FC82C7 /* WKRenderObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */; };
                3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
-               3766F9F0189A1248003CF19B /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
                3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BC87DFA91018101400564216 /* libicucore.dylib */; };
                3769079A18F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079818F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h */; };
                3769079E18F340A2001DFF04 /* APIInjectedBundleFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */; };
                37694525184FC6B600CDE21F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
-               377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
                377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Private, ); }; };
                377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3788A05C14743C90006319E5 /* WKBrowsingContextControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3788A05B14743C90006319E5 /* WKBrowsingContextControllerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */; };
                51F7DC41180CC93600212CA3 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
                51F7DC43180CC93600212CA3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
-               51F7DC44180CC93600212CA3 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+               51F7DC44180CC93600212CA3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
                51FA1E1D180CCADE00C44BE9 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
                51FA1E1F180CCADE00C44BE9 /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
                51FA1E23180CCADE00C44BE9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
                7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */; };
                7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */; };
                7CD5EBB91746A15B000C1C45 /* WKObjCTypeWrapperRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBBC1746B04C000C1C45 /* WKTypeRefWrapper.mm */; };
                7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBD1746B04C000C1C45 /* WKTypeRefWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7CD622771739D863005BD7FF /* PluginSandboxProfile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD622751739D863005BD7FF /* PluginSandboxProfile.mm */; };
                BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82838A16B45EF200A278FE /* PluginProcessMain.mm */; };
                BC82839916B48DC000A278FE /* WebContentServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */; };
                BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */; };
-               BC8283DA16B4DB9300A278FE /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+               BC8283DA16B4DB9300A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
                BC82844D16B5081C00A278FE /* PluginServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */; };
-               BC82844F16B5089800A278FE /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+               BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
                BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */; };
                BC8452A81162C80900CAB9B5 /* DrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8452A61162C80900CAB9B5 /* DrawingArea.h */; };
                BC84EB1812A7100C0083F2DA /* WebPreferencesMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC84EB1712A7100C0083F2DA /* WebPreferencesMac.mm */; };
                BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
                BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */; };
                BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */; };
-               BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
+               BCAE9E08160C1C0700A33217 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
                BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
                BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
                BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
                BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD25F1511D6BDE100169B0E /* WKBundleFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BCD25F1811D6BDE100169B0E /* WKBundleFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD25F1611D6BDE100169B0E /* WKBundleFrame.cpp */; };
                BCD3675C148C26C000447E87 /* WebConnectionToUIProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE9C0CF1485965D00E33D61 /* WebConnectionToUIProcess.cpp */; };
-               BCD597D0112B56AC00EC8C23 /* WKPreferencesRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597CE112B56AC00EC8C23 /* WKPreferencesRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               BCD597D0112B56AC00EC8C23 /* WKPreferencesRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597CE112B56AC00EC8C23 /* WKPreferencesRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BCD597D1112B56AC00EC8C23 /* WKPreferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD597CF112B56AC00EC8C23 /* WKPreferences.cpp */; };
                BCD597D6112B56DC00EC8C23 /* WKPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD597D4112B56DC00EC8C23 /* WKPage.cpp */; };
                BCD597D7112B56DC00EC8C23 /* WKPage.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597D5112B56DC00EC8C23 /* WKPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BCD598AC112B7FDF00EC8C23 /* WebPreferencesStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */; };
                BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */; };
                BCDB86C11200FB97007254BE /* APIURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* APIURL.h */; };
-               BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */; };
                BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
                BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; };
                        remoteGlobalIDString = 1A50DB1D110A3BDC000D3FE5;
                        remoteInfo = WebProcess;
                };
+               1A6280EB191997D3006AD9F9 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+                       remoteInfo = WebKit;
+               };
+               1A6280F519199865006AD9F9 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 1A6280CF191997BD006AD9F9;
+                       remoteInfo = WebKit2;
+               };
                37F7407812721F740093869B /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+               1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = PrivateHeaders/webkit2;
+                       dstSubfolderSpec = 1;
+                       files = (
+                               1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */,
+                               1A07D2F91919B3A900ECDA16 /* messages.py in Copy Message Generation Scripts */,
+                               1A07D2FA1919B3A900ECDA16 /* model.py in Copy Message Generation Scripts */,
+                               1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */,
+                       );
+                       name = "Copy Message Generation Scripts";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                1A50DB70110A3D67000D3FE5 /* Copy Files */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
-                       dstPath = WebKit2.framework;
+                       dstPath = WebKit.framework;
                        dstSubfolderSpec = 1;
                        files = (
                                510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */,
                        name = "Copy WebProcessShim";
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               5D1A239015E75B100023E981 /* Copy Message Generation Scripts */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = PrivateHeaders/webkit2;
-                       dstSubfolderSpec = 1;
-                       files = (
-                               0FC08572187CE0B100780D86 /* __init__.py in Copy Message Generation Scripts */,
-                               0FC08573187CE0B300780D86 /* messages.py in Copy Message Generation Scripts */,
-                               0FC08574187CE0B400780D86 /* model.py in Copy Message Generation Scripts */,
-                               0FC08575187CE0B600780D86 /* parser.py in Copy Message Generation Scripts */,
-                       );
-                       name = "Copy Message Generation Scripts";
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
                1A4F976E100E7B6600637A18 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
                1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };
+               1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
                1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigation.mm; sourceTree = "<group>"; };
                1A5B1C4F1898606F004FCF9B /* WKNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigation.h; sourceTree = "<group>"; };
                1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDocumentLoader.cpp; sourceTree = "<group>"; };
                1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = VisitedLinkProvider.messages.in; sourceTree = "<group>"; };
                1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProviderMessageReceiver.cpp; sourceTree = "<group>"; };
                1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProviderMessages.h; sourceTree = "<group>"; };
+               1A6280C41919949F006AD9F9 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
+               1A6280C61919950C006AD9F9 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
+               1A6280D0191997BD006AD9F9 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-WebKit2.plist"; sourceTree = "<group>"; };
+               1A6280EE19199800006AD9F9 /* WebKit2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKit2.m; sourceTree = "<group>"; };
+               1A6280F21919982A006AD9F9 /* WebKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; };
                1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableBitmap.cpp; sourceTree = "<group>"; };
                1A6420E312DCE2FF00CAAE2C /* ShareableBitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareableBitmap.h; sourceTree = "<group>"; };
                1A64228A12DD024700CAAE2C /* DrawingArea.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawingArea.messages.in; sourceTree = "<group>"; };
                1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeatures.h; sourceTree = "<group>"; };
                1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeaturesInternal.h; sourceTree = "<group>"; };
                1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUIDelegate.h; sourceTree = "<group>"; };
+               1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */ = {isa = PBXFileReference; lastKnownFileType = text; path = MigrateHeadersToWebKit2.make; sourceTree = "<group>"; };
+               1ADAE12D1919A5B400F48E21 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
                1ADCB868189831B30022EE5A /* NavigationActionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationActionData.cpp; sourceTree = "<group>"; };
                1ADCB869189831B30022EE5A /* NavigationActionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationActionData.h; sourceTree = "<group>"; };
                1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewConfiguration.mm; sourceTree = "<group>"; };
                86F9536218FF550B001DB2EF /* ProcessAssertion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ProcessAssertion.mm; path = ios/ProcessAssertion.mm; sourceTree = "<group>"; };
                8CFECE931490F140002AAA32 /* EditorState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorState.cpp; sourceTree = "<group>"; };
                8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-               8DC2EF5B0486A6940098B216 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               8DC2EF5B0486A6940098B216 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMemorySampler.mac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                905620E812BC248B000799B6 /* WebMemorySampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMemorySampler.cpp; sourceTree = "<group>"; };
                905620E912BC248B000799B6 /* WebMemorySampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMemorySampler.h; sourceTree = "<group>"; };
                BCB0B0DD12305A8C00B1341E /* InjectedBundleUserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleUserMessageCoders.h; sourceTree = "<group>"; };
                BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageCoders.h; sourceTree = "<group>"; };
                BCB63477116BF10600603215 /* WebKit2_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2_C.h; sourceTree = "<group>"; };
-               BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
+               BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
                BCB9E2411120DACA00A137E0 /* WebContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContext.h; sourceTree = "<group>"; };
                BCB9E2421120DACA00A137E0 /* WebContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContext.cpp; sourceTree = "<group>"; };
                BCB9E2491120E15C00A137E0 /* WKContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContext.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+               1A6280CC191997BD006AD9F9 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                1AC25FAE12A48EA700BD2671 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        buildActionMask = 2147483647;
                        files = (
                                51F7DC43180CC93600212CA3 /* Foundation.framework in Frameworks */,
-                               51F7DC44180CC93600212CA3 /* WebKit2.framework in Frameworks */,
+                               51F7DC44180CC93600212CA3 /* WebKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
                                3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
                                37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
-                               3766F9F0189A1248003CF19B /* WebCore.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        buildActionMask = 2147483647;
                        files = (
                                BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */,
-                               BC8283DA16B4DB9300A278FE /* WebKit2.framework in Frameworks */,
+                               BC8283DA16B4DB9300A278FE /* WebKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               BC82844F16B5089800A278FE /* WebKit2.framework in Frameworks */,
+                               BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        buildActionMask = 2147483647;
                        files = (
                                BC9FA520160D3B430054DF9A /* Foundation.framework in Frameworks */,
-                               BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */,
+                               BCAE9E08160C1C0700A33217 /* WebKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                BCDE094213272496001259FB /* PluginProcess.app */,
                                1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
                                510031F61379CACB00C8DFE4 /* SecItemShim.dylib */,
-                               8DC2EF5B0486A6940098B216 /* WebKit2.framework */,
+                               8DC2EF5B0486A6940098B216 /* WebKit.framework */,
                                1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */,
                                CDC3830617211799008A2FC3 /* WebProcessShim.dylib */,
                                51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */,
                                5180C71D180CCA3100FDA612 /* com.apple.WebKit.Databases.Development.xpc */,
                                51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */,
+                               1A6280D0191997BD006AD9F9 /* WebKit2.framework */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                                51F7DC0A180CC41100212CA3 /* DatabaseProcess */,
                                510CC7DA16138E0100D03ED3 /* NetworkProcess */,
                                1A0EC6B0124BBD36007EF4A5 /* PluginProcess */,
+                               1A6280CA19199754006AD9F9 /* WebKit2 Framework */,
                                C0CE729D1247E71D00BC0EC4 /* Derived Sources */,
                                089C1665FE841158C02AAC07 /* Resources */,
                                C0CE73351247F70E00BC0EC4 /* Scripts */,
                                5DAD7294116FF70B00EE5396 /* WebContentProcess.xcconfig */,
                                BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */,
                                BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
-                               BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */,
+                               BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */,
                                A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */,
+                               1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */,
                        );
                        path = Configurations;
                        sourceTree = "<group>";
                        tabWidth = 8;
                        usesTabs = 0;
                };
+               1A6280CA19199754006AD9F9 /* WebKit2 Framework */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A6280EE19199800006AD9F9 /* WebKit2.m */,
+                               1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */,
+                               1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */,
+                               1ADAE12D1919A5B400F48E21 /* WKPreferences.h */,
+                       );
+                       name = "WebKit2 Framework";
+                       path = mac;
+                       sourceTree = "<group>";
+               };
                1A6FB7AA11E64B4900DB1371 /* Plugins */ = {
                        isa = PBXGroup;
                        children = (
                37DFA6FE1810BB2D001F4A9F /* Cocoa */ = {
                        isa = PBXGroup;
                        children = (
+                               373D122118A473010066D9CC /* _WKFrameHandle.h */,
+                               373D122018A473010066D9CC /* _WKFrameHandle.mm */,
+                               373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
+                               A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */,
+                               A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */,
+                               1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */,
+                               1A9E328C182165A900F5D04C /* _WKRemoteObjectInterface.mm */,
+                               1AABFE391829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.h */,
+                               1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */,
+                               1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */,
+                               1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */,
                                1AC1337E18590AE400F3EC05 /* RemoteObjectRegistry.h */,
                                1AC1338118590B0500F3EC05 /* RemoteObjectRegistry.messages.in */,
                                1AC1337D18590AE400F3EC05 /* RemoteObjectRegistry.mm */,
+                               1A6280C41919949F006AD9F9 /* WebKit.h */,
+                               1A6280F21919982A006AD9F9 /* WebKit.m */,
+                               1A6280C61919950C006AD9F9 /* WebKitPrivate.h */,
                                1AE00D4B182D6EB000087DD7 /* WKBrowsingContextHandle.h */,
                                1AE00D4A182D6EB000087DD7 /* WKBrowsingContextHandle.mm */,
                                1AE00D4E182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h */,
                                1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */,
                                1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */,
                                1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */,
-                               373D122118A473010066D9CC /* _WKFrameHandle.h */,
-                               373D122018A473010066D9CC /* _WKFrameHandle.mm */,
-                               373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
-                               A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */,
-                               A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */,
-                               1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */,
-                               1A9E328C182165A900F5D04C /* _WKRemoteObjectInterface.mm */,
-                               1AABFE391829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.h */,
-                               1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */,
-                               1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */,
-                               1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */,
                        );
                        path = Cocoa;
                        sourceTree = "<group>";
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
+               1A6280CD191997BD006AD9F9 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                1AC25FAC12A48EA700BD2671 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                                1A7E377918E4A4FE003D0FFF /* WKScriptMessage.h in Headers */,
                                1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
                                1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */,
+                               1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */,
                                1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
                                296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
                                379A873A18BBFE0F00588AF2 /* _WKElementAction.h in Headers */,
                                BC40761C124FF0370068F20A /* WKURLCF.h in Headers */,
                                BC40760C124FF0270068F20A /* WKURLRequest.h in Headers */,
                                BC407629124FF0400068F20A /* WKURLRequestNS.h in Headers */,
+                               1A6280C51919949F006AD9F9 /* WebKit.h in Headers */,
                                753E3E0E1887398900188496 /* SessionTracker.h in Headers */,
                                BC40760E124FF0270068F20A /* WKURLResponse.h in Headers */,
                                759CCD5A1808F6160078E8A8 /* WebOriginDataManagerProxy.h in Headers */,
                        productReference = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */;
                        productType = "com.apple.product-type.application";
                };
+               1A6280CF191997BD006AD9F9 /* WebKit2 */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */;
+                       buildPhases = (
+                               1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */,
+                               1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
+                               1A6280CB191997BD006AD9F9 /* Sources */,
+                               1A6280CC191997BD006AD9F9 /* Frameworks */,
+                               1A6280CD191997BD006AD9F9 /* Headers */,
+                               1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               1A6280EC191997D3006AD9F9 /* PBXTargetDependency */,
+                       );
+                       name = WebKit2;
+                       productName = WebKit2;
+                       productReference = 1A6280D0191997BD006AD9F9 /* WebKit2.framework */;
+                       productType = "com.apple.product-type.framework";
+               };
                1AC25FAF12A48EA700BD2671 /* PluginProcessShim */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */;
                        productReference = 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */;
                        productType = "com.apple.product-type.application";
                };
-               8DC2EF4F0486A6940098B216 /* WebKit2 */ = {
+               8DC2EF4F0486A6940098B216 /* WebKit */ = {
                        isa = PBXNativeTarget;
-                       buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit2" */;
+                       buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit" */;
                        buildPhases = (
+                               1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */,
+                               1A07D2F51919AA8A00ECDA16 /* Make Frameworks Symbolic Link */,
                                8DC2EF500486A6940098B216 /* Headers */,
                                375A248817E5048E00C9A086 /* Postprocess WKBase.h */,
+                               1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */,
                                8DC2EF520486A6940098B216 /* Resources */,
                                7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
-                               5D1A239015E75B100023E981 /* Copy Message Generation Scripts */,
                                5D1A239215E760590023E981 /* Remove Compiled Python Files */,
                                8DC2EF540486A6940098B216 /* Sources */,
                                8DC2EF560486A6940098B216 /* Frameworks */,
                                5DF408C6131DD49700130071 /* Check For Framework Include Consistency */,
                                5DF408D1131DDBEC00130071 /* Check For Inappropriate Files In Framework */,
                                A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */,
+                               1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                                37F7407912721F740093869B /* PBXTargetDependency */,
                        );
-                       name = WebKit2;
+                       name = WebKit;
                        productInstallPath = "$(HOME)/Library/Frameworks";
                        productName = WebKit2;
-                       productReference = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */;
+                       productReference = 8DC2EF5B0486A6940098B216 /* WebKit.framework */;
                        productType = "com.apple.product-type.framework";
                };
                BC3DE46515A91763008D26FC /* WebContent */ = {
                        projectRoot = "";
                        targets = (
                                1A50DB38110A3C13000D3FE5 /* All */,
-                               8DC2EF4F0486A6940098B216 /* WebKit2 */,
+                               8DC2EF4F0486A6940098B216 /* WebKit */,
+                               1A6280CF191997BD006AD9F9 /* WebKit2 */,
                                1A50DB1D110A3BDC000D3FE5 /* WebProcess */,
                                BCDE093313272496001259FB /* PluginProcess */,
                                51FA1E17180CCADE00C44BE9 /* DatabaseProcess */,
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+               1A07D2F51919AA8A00ECDA16 /* Make Frameworks Symbolic Link */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                               WebKit2.xcodeproj,
+                       );
+                       name = "Make Frameworks Symbolic Link";
+                       outputPaths = (
+                               "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp",
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
+               };
+               1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Add Symlink in /System/Library/PrivateFrameworks";
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\nmkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\nfi\nif [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\necho \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework already exists and is a directory.\"\nexit 1\nfi\n# If the symlink already exists, remove it and create the new one in its place.\nln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nfi";
+               };
+               1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Migrate WebKitLegacy Headers";
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\nmake -C mac -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
+               };
+               1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Migrate Headers to WebKit2";
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n    mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n    make -C mac -f \"MigrateHeadersToWebKit2.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
+               };
+               1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                               "$(PROJECT_DIR)/Configurations/Version.xcconfig",
+                       );
+                       name = "Update Info.plist with version information";
+                       outputPaths = (
+                               "$(PROJECT_DIR)/Info.plist",
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/Info.plist\";\nfi;\n";
+               };
+               1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                               "$(PROJECT_DIR)/Configurations/Version.xcconfig",
+                       );
+                       name = "Update Info.plist with version information";
+                       outputPaths = (
+                               "${PROJECT_DIR}/mac/WebKit2.plist",
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/Info-WebKit2.plist\";\nfi;\n";
+               };
                3713F0231429063D0036387F /* Check For Inappropriate Objective-C Class Names */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n    rm ${WKBASE_H}.unifdef\n    ;;\n1)\n    mv ${WKBASE_H}{.unifdef,}\n    ;;\n*)\n    exit 1\nesac\n";
+                       shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n    rm ${WKBASE_H}.unifdef\n    ;;\n1)\n    mv ${WKBASE_H}{.unifdef,}\n    ;;\n*)\n    exit 1\nesac\n";
                };
                5D1A239215E760590023E981 /* Remove Compiled Python Files */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        name = "Add XPCServices symlink";
                        outputPaths = (
-                               "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit2.framework/XPCServices",
+                               "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit.framework/XPCServices",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n    ln -sf Versions/Current/XPCServices \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/XPCServices\"\nfi\n";
+                       shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n    ln -sf Versions/Current/XPCServices \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nfi\n";
                };
                BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        name = "Copy XPC services for engineering builds";
                        outputPaths = (
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Networking.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.Development.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.OfflineStorage.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.OfflineStorage.Development.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Databases.xpc",
-                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.Development.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.OfflineStorage.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.OfflineStorage.Development.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
+                               "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n    exit\nfi\n\nif [[ ${PLATFORM_NAME} == iphone* ]]; then\n    XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/XPCServices\"\nelse\n    XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n    ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n    ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n    ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\nfi\n";
+                       shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n    exit\nfi\n\nif [[ ${PLATFORM_NAME} == iphone* ]]; then\n    XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nelse\n    XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n    ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n    ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n    ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\nfi\n";
                };
                C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               1A6280CB191997BD006AD9F9 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               1A6280F019199800006AD9F9 /* WebKit2.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                1AC25FAD12A48EA700BD2671 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                                37FC194A18510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm in Sources */,
                                516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */,
                                513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
+                               1A6280F31919982A006AD9F9 /* WebKit.m in Sources */,
                                51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
                                51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
                                E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
 /* Begin PBXTargetDependency section */
                1A50DB27110A3BEF000D3FE5 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
+                       target = 8DC2EF4F0486A6940098B216 /* WebKit */;
                        targetProxy = 1A50DB26110A3BEF000D3FE5 /* PBXContainerItemProxy */;
                };
                1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */ = {
                        target = 1A50DB1D110A3BDC000D3FE5 /* WebProcess */;
                        targetProxy = 1A50DB3B110A3C19000D3FE5 /* PBXContainerItemProxy */;
                };
+               1A6280EC191997D3006AD9F9 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 8DC2EF4F0486A6940098B216 /* WebKit */;
+                       targetProxy = 1A6280EB191997D3006AD9F9 /* PBXContainerItemProxy */;
+               };
+               1A6280F619199865006AD9F9 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 1A6280CF191997BD006AD9F9 /* WebKit2 */;
+                       targetProxy = 1A6280F519199865006AD9F9 /* PBXContainerItemProxy */;
+               };
                37F7407912721F740093869B /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
                };
                510CC8511613C98D00D03ED3 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
+                       target = 8DC2EF4F0486A6940098B216 /* WebKit */;
                        targetProxy = 510CC8501613C98D00D03ED3 /* PBXContainerItemProxy */;
                };
                51A60B2C180CCF1200F3BF50 /* PBXTargetDependency */ = {
                };
                51FA1E1A180CCADE00C44BE9 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
+                       target = 8DC2EF4F0486A6940098B216 /* WebKit */;
                        targetProxy = 51FA1E1B180CCADE00C44BE9 /* PBXContainerItemProxy */;
                };
                BC77F95616D0459100F8F78A /* PBXTargetDependency */ = {
                };
                BCDE093613272496001259FB /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
+                       target = 8DC2EF4F0486A6940098B216 /* WebKit */;
                        targetProxy = BCDE093713272496001259FB /* PBXContainerItemProxy */;
                };
                BCDE0AC113272712001259FB /* PBXTargetDependency */ = {
                        };
                        name = Release;
                };
+               1A6280E4191997BE006AD9F9 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+                       buildSettings = {
+                       };
+                       name = Debug;
+               };
+               1A6280E5191997BE006AD9F9 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+                       buildSettings = {
+                       };
+                       name = Release;
+               };
+               1A6280E6191997BE006AD9F9 /* Production */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+                       buildSettings = {
+                       };
+                       name = Production;
+               };
                1AC25FB112A48EA700BD2671 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
                };
                1DEB91AE08733DA50010E9CD /* Debug */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
+                       baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
                        buildSettings = {
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
                };
                1DEB91AF08733DA50010E9CD /* Release */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
+                       baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
                        buildSettings = {
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
                };
                5D22D69D11A7534600BF30E5 /* Production */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
+                       baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
                        buildSettings = {
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS)",
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
+               1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               1A6280E4191997BE006AD9F9 /* Debug */,
+                               1A6280E5191997BE006AD9F9 /* Release */,
+                               1A6280E6191997BE006AD9F9 /* Production */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Production;
+               };
                1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
-               1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit2" */ = {
+               1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                1DEB91AE08733DA50010E9CD /* Debug */,
index 3e5696192178ee1f1faa4cab2bcf54ef705633ba..90d350bc8f2ddfb1d5ee8ce17329acb2937928e3 100644 (file)
@@ -51,7 +51,7 @@
                <key>EnvironmentVariables</key>
                <dict>
                        <key>DYLD_INSERT_LIBRARIES</key>
-                       <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
+                       <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
                </dict>
        </dict>
 </dict>
index e57abb5586eebc2226626de652d92b1cddc95996..59840a90e245edb5a6e3652b9c8f0ff64c1e1a74 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 9ab716e3273e2c560a289df3d6b38d8b763c8b4f..86b913f5a8ec8dd23e5e64d49fc2288fee97e28b 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
-#import <WebKit2/WKWebProcessPlugInBrowserContextController.h>
-#import <WebKit2/WKWebProcessPlugInFrame.h>
-#import <WebKit2/WKWebProcessPlugInNodeHandle.h>
+#import <WebKit/WKWebProcessPlugInBrowserContextController.h>
+#import <WebKit/WKWebProcessPlugInFrame.h>
+#import <WebKit/WKWebProcessPlugInNodeHandle.h>
 
 @protocol WKWebProcessPlugInFormDelegatePrivate <NSObject>
 
index 1ea47e43eaf2682598c7b5deb0af3faf75b90918..074c3b4cfec97d58a0cde8181015988a1c90fcd7 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index b713a54633046107b334916667fd0b3cbfbf4eda..019d431ef6f290ec9a401158571663ee11750787 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index a905d95edc909b12f2fca5c864e27f67c0fb283b..44b71668fb7ad4d091443f5244cae9cba18a1f37 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #import <Foundation/Foundation.h>
-#import <WebKit2/WKRenderingProgressEvents.h>
+#import <WebKit/WKRenderingProgressEvents.h>
 
 @class WKWebProcessPlugInBrowsingContextController;
 @class WKWebProcessPlugInFrame;
index 5579cf21966f4367aac3e952d8925f8a6d61e4ce..327f846dca3d95605dcf1576c29c4963c0ca8e2c 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 8b62ed92537be5ef890ec8eaf508750ebb26a197..8752e09cf05db44ab1844113cacf7710a57171f9 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 0ec567e35fe8da52b38e652c6035e82940574150..34414a6bf8e4e04a04944ffad3e9bad02e0dbc40 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit2/WKFoundation.h>
+#import <WebKit/WKFoundation.h>
 
 #if WK_API_ENABLED
 
index 3a3308328a58b11824e40930115a4c7cc78b273e..41a16d5cc664060b7f1ee0a997a2fcb875c2a7d1 100644 (file)
@@ -27,7 +27,7 @@
 #define WKBundle_h
 
 #include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 7aa573aa6c94f56c3f30c1f47eed3a2e60ec33c7..03e36e051203beaa272c0bd54b3721958cad0313 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKBundleBackForwardList_h
 #define WKBundleBackForwardList_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 5ad9abe7975e7cc0ffa95df9fdc8b2a866df5a82..409c16faf7edfb0bd29db21eb5aa625c7370be82 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKBundleBackForwardListItem_h
 #define WKBundleBackForwardListItem_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 409a74289ee44d79dc63b0083a5e832b06b0f45a..61a3a753b6ab9e6f11894c0fd71d3e9399cb24c2 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WKBundleDOMWindowExtension_h
 #define WKBundleDOMWindowExtension_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 #ifdef __cplusplus
 extern "C" {
index 8c2b875f50f40fc3ab31b29abe2abbea408f544f..70cc1647cc387dfbe57f8e1f7469783a874072e5 100644 (file)
@@ -27,9 +27,9 @@
 #define WKBundleFrame_h
 
 #include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKFrame.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKFrame.h>
+#include <WebKit/WKGeometry.h>
 
 #ifdef __cplusplus
 extern "C" {
index fa5cb759dd347cbe94b94c539e5ffb5f475e600c..0c676824e72d5e84c1e6e2f1782650b41fa039b4 100644 (file)
@@ -27,8 +27,8 @@
 #define WKBundleFramePrivate_h
 
 #include <JavaScriptCore/JavaScript.h>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/Source/