Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit...
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Apr 2014 22:02:19 +0000 (22:02 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Apr 2014 22:02:19 +0000 (22:02 +0000)
commitad25a73bf48ecdc2977ed4c74a894767695769de
tree609b4fd628cd832f7eaca9c9547c35aa6427c5f3
parent7cd528c224bc65dba875e4cea23c9b791c3086a5
Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework
https://bugs.webkit.org/show_bug.cgi?id=132399
<rdar://problem/15920046>

Reviewed by Dan Bernstein.

Source/WebCore:
Allow WebKitLegacy to link against WebCore.

* Configurations/WebCore.xcconfig:

Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Add a new build target that builds the legacy WebKit API in WebKitLegacy.framework. This framework
is then re-exported by WebKit.framework, and its headers are copied to WebKit.framework. All the WebKitLegacy
headers are made private, and the MigrateHeadersFromWebKitLegacy.make Makefile will copy all the headers specified
in WEBKIT_PUBLIC_HEADERS to WebKit/Headers.

Source/WebKit/ios:
Import WebKitLegacy headers instead of WebKit headers.

* DefaultDelegates/WebDefaultFormDelegate.h:
* DefaultDelegates/WebDefaultFrameLoadDelegate.m:
* DefaultDelegates/WebDefaultResourceLoadDelegate.m:
* DefaultDelegates/WebDefaultUIKitDelegate.h:
* Misc/WebGeolocationProviderIOS.h:
* Misc/WebNSStringExtrasIPhone.h:
* WebCoreSupport/WebFrameIOS.h:
* WebCoreSupport/WebFrameIOS.mm:
* WebCoreSupport/WebFrameIPhone.h:
* WebCoreSupport/WebSelectionRect.h:
* WebCoreSupport/WebVisiblePosition.h:
* WebView/WebPDFViewIOS.h:
* WebView/WebPDFViewIOS.mm:
* WebView/WebPDFViewIPhone.h:
* WebView/WebPDFViewPlaceholder.h:
* WebView/WebPDFViewPlaceholder.mm:
* WebView/WebPlainWhiteView.h:
* WebView/WebUIKitDelegate.h:

Source/WebKit/mac:
* Carbon/CarbonUtils.h:
* Carbon/HIViewAdapter.h:
* Carbon/HIWebView.h:
Import WebKitLegacy headers instead of WebKit headers.

* Configurations/WebKit.xcconfig:
Move the definitions needed for building WebKitLegacy.framework to WebKitLegacy.xcconfig and
add the relevant definitions needed for re-exporting WebKitLegacy.framework.

* Configurations/WebKitLegacy.xcconfig:
Add definitions needed for building the "old" WebKit API as WebKitLegacy.framework.

* DOM/WebDOMOperations.h:
* DOM/WebDOMOperations.mm:
* DOM/WebDOMOperationsInternal.h:
* DOM/WebDOMOperationsPrivate.h:
* DefaultDelegates/WebDefaultContextMenuDelegate.h:
* DefaultDelegates/WebDefaultContextMenuDelegate.mm:
* DefaultDelegates/WebDefaultEditingDelegate.m:
* History/WebBackForwardListInternal.h:
* History/WebBackForwardListPrivate.h:
* History/WebHistoryItemPrivate.h:
* History/WebHistoryPrivate.h:
* History/WebURLsWithTitles.m:
Import WebKitLegacy headers instead of WebKit headers.

* MigrateHeaders.make:
Update header paths now that all WebKitLegacy headers are private.
Remove migration of WebKit2 headers, that is done by MigrateHeadersFromWebKitLegacy.make now.

* Misc/WebCoreStatistics.h:
* Misc/WebDownload.h:
* Misc/WebDownload.mm:
* Misc/WebDownloadInternal.h:
* Misc/WebElementDictionary.mm:
* Misc/WebIconDatabasePrivate.h:
* Misc/WebKit.h:
* Misc/WebKitErrors.m:
* Misc/WebKitErrorsPrivate.h:
* Misc/WebKitNSStringExtras.mm:
* Misc/WebLocalizableStrings.mm:
* Misc/WebNSDataExtras.m:
* Misc/WebNSDictionaryExtras.m:
* Misc/WebNSEventExtras.m:
* Misc/WebNSFileManagerExtras.mm:
* Misc/WebNSImageExtras.m:
* Misc/WebNSPasteboardExtras.mm:
* Misc/WebNSViewExtras.h:
* Misc/WebNSViewExtras.m:
* Panels/WebAuthenticationPanel.m:
* Panels/WebPanelAuthenticationHandler.m:
* Plugins/Hosted/HostedNetscapePluginStream.h:
* Plugins/Hosted/NetscapePluginInstanceProxy.h:
* Plugins/Hosted/WebKitPluginAgent.defs:
* Plugins/Hosted/WebKitPluginAgentReply.defs:
* Plugins/Hosted/WebKitPluginClient.defs:
* Plugins/Hosted/WebKitPluginHost.defs:
* Plugins/Hosted/WebKitPluginHostTypes.defs:
* Plugins/WebBaseNetscapePluginView.mm:
* Plugins/WebBasePluginPackage.h:
* Plugins/WebBasePluginPackage.mm:
* Plugins/WebNetscapeContainerCheckPrivate.h:
* Plugins/WebNetscapePluginEventHandlerCocoa.h:
* Plugins/WebNetscapePluginStream.h:
* Plugins/WebNetscapePluginView.h:
* Plugins/WebNetscapePluginView.mm:
* Plugins/WebPlugin.h:
* Plugins/WebPluginController.h:
* Plugins/WebPluginDatabase.h:
* Plugins/WebPluginPackage.h:
* Plugins/WebPluginPackage.mm:
* Plugins/WebPluginViewFactory.h:
* Plugins/WebPluginViewFactoryPrivate.h:
* Plugins/npapi.mm:
* Storage/WebDatabaseManagerPrivate.h:
* WebCoreSupport/WebContextMenuClient.mm:
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebCoreSupport/WebFrameNetworkingContext.mm:
* WebCoreSupport/WebGeolocationClient.mm:
* WebCoreSupport/WebInspectorClient.mm:
* WebCoreSupport/WebJavaScriptTextInputPanel.m:
* WebCoreSupport/WebKeyGenerator.mm:
* WebInspector/WebInspectorPrivate.h:
* WebInspector/WebNodeHighlight.h:
* WebInspector/WebNodeHighlightView.h:
Import WebKitLegacy headers instead of WebKit headers.

* WebKitLegacy/MigrateHeadersFromWebKitLegacy.make: Added.
New makefile that handles copying WebKitLegacy headers to the WebKit framework, rewriting WebKitLegacy
imports to WebKit imports. (On iOS the WebKit headers just forward to the relevant WebKitLegacy headers).
On OS X, this also handles copying WebKit2 headers to the WebKit framework, rewriting WebKit2 imports to WebKit imports
and getting rid of C SPI imports.

* WebKitLegacy/MigrateHeadersToLegacy.make: Removed.
This is no longer needed.

* WebKitLegacy/WebKit.h: Added.
New umbrella header that imports the modern API if available, as well as the legacy API (using WebKit/WebKitLegacy.h).

* WebKitLegacy/WebKit.m:
This is an empty file so we'll have something to link.

* WebKitLegacy/WebKitPrivate.h:
New SPI header that imports the private headers of the modern API.

* WebView/WebDataSource.h:
* WebView/WebDataSource.mm:
* WebView/WebDataSourcePrivate.h:
* WebView/WebDelegateImplementationCaching.h:
* WebView/WebDocument.h:
* WebView/WebDocumentInternal.h:
* WebView/WebDocumentPrivate.h:
* WebView/WebEditingDelegate.h:
* WebView/WebEditingDelegatePrivate.h:
* WebView/WebFrameLoadDelegate.h:
* WebView/WebFrameLoadDelegatePrivate.h:
* WebView/WebFramePrivate.h:
* WebView/WebFrameView.h:
* WebView/WebFrameViewInternal.h:
* WebView/WebFrameViewPrivate.h:
* WebView/WebHTMLRepresentation.h:
* WebView/WebHTMLRepresentation.mm:
* WebView/WebHTMLRepresentationPrivate.h:
* WebView/WebHTMLView.h:
* WebView/WebHTMLView.mm:
* WebView/WebHTMLViewPrivate.h:
* WebView/WebPDFView.h:
* WebView/WebPolicyDelegatePrivate.h:
* WebView/WebPreferencesPrivate.h:
* WebView/WebResourcePrivate.h:
* WebView/WebUIDelegate.h:
* WebView/WebUIDelegatePrivate.h:
* WebView/WebView.h:
* WebView/WebView.mm:
* WebView/WebViewPrivate.h:
Import WebKitLegacy headers instead of WebKit headers.

* migrate-headers.sh:
Derived sources are put in DerivedSources/WebKitLegacy now.

Tools:
* Scripts/check-for-webkit-framework-include-consistency:
Allos WAK headers in WebKitLegacy as well as WebKit.

* TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm:
Update header imports.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168047 268f45cc-cd09-0410-ab3c-d52691b4dbfc
137 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebKit/ChangeLog
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/ios/ChangeLog
Source/WebKit/ios/DefaultDelegates/WebDefaultFormDelegate.h
Source/WebKit/ios/DefaultDelegates/WebDefaultFrameLoadDelegate.m
Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m
Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.h
Source/WebKit/ios/Misc/WebGeolocationProviderIOS.h
Source/WebKit/ios/Misc/WebNSStringExtrasIPhone.h
Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h
Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm
Source/WebKit/ios/WebCoreSupport/WebFrameIPhone.h
Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h
Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.h
Source/WebKit/ios/WebView/WebPDFViewIOS.h
Source/WebKit/ios/WebView/WebPDFViewIOS.mm
Source/WebKit/ios/WebView/WebPDFViewIPhone.h
Source/WebKit/ios/WebView/WebPDFViewPlaceholder.h
Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm
Source/WebKit/ios/WebView/WebPlainWhiteView.h
Source/WebKit/ios/WebView/WebUIKitDelegate.h
Source/WebKit/mac/Carbon/CarbonUtils.h
Source/WebKit/mac/Carbon/HIViewAdapter.h
Source/WebKit/mac/Carbon/HIWebView.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/WebKit.xcconfig
Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig
Source/WebKit/mac/DOM/WebDOMOperations.h
Source/WebKit/mac/DOM/WebDOMOperations.mm
Source/WebKit/mac/DOM/WebDOMOperationsInternal.h
Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h
Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.h
Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m
Source/WebKit/mac/History/WebBackForwardListInternal.h
Source/WebKit/mac/History/WebBackForwardListPrivate.h
Source/WebKit/mac/History/WebHistoryItemPrivate.h
Source/WebKit/mac/History/WebHistoryPrivate.h
Source/WebKit/mac/History/WebURLsWithTitles.m
Source/WebKit/mac/MigrateHeaders.make
Source/WebKit/mac/Misc/WebCoreStatistics.h
Source/WebKit/mac/Misc/WebDownload.h
Source/WebKit/mac/Misc/WebDownload.mm
Source/WebKit/mac/Misc/WebDownloadInternal.h
Source/WebKit/mac/Misc/WebElementDictionary.mm
Source/WebKit/mac/Misc/WebIconDatabasePrivate.h
Source/WebKit/mac/Misc/WebKit.h
Source/WebKit/mac/Misc/WebKitErrors.m
Source/WebKit/mac/Misc/WebKitErrorsPrivate.h
Source/WebKit/mac/Misc/WebKitNSStringExtras.mm
Source/WebKit/mac/Misc/WebLocalizableStrings.mm
Source/WebKit/mac/Misc/WebNSDataExtras.m
Source/WebKit/mac/Misc/WebNSDictionaryExtras.m
Source/WebKit/mac/Misc/WebNSEventExtras.m
Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm
Source/WebKit/mac/Misc/WebNSImageExtras.m
Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
Source/WebKit/mac/Misc/WebNSViewExtras.h
Source/WebKit/mac/Misc/WebNSViewExtras.m
Source/WebKit/mac/Panels/WebAuthenticationPanel.m
Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.m
Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.h
Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgent.defs
Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgentReply.defs
Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs
Source/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs
Source/WebKit/mac/Plugins/Hosted/WebKitPluginHostTypes.defs
Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
Source/WebKit/mac/Plugins/WebBasePluginPackage.h
Source/WebKit/mac/Plugins/WebBasePluginPackage.mm
Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h
Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.h
Source/WebKit/mac/Plugins/WebNetscapePluginStream.h
Source/WebKit/mac/Plugins/WebNetscapePluginView.h
Source/WebKit/mac/Plugins/WebNetscapePluginView.mm
Source/WebKit/mac/Plugins/WebPlugin.h
Source/WebKit/mac/Plugins/WebPluginController.h
Source/WebKit/mac/Plugins/WebPluginDatabase.h
Source/WebKit/mac/Plugins/WebPluginPackage.h
Source/WebKit/mac/Plugins/WebPluginPackage.mm
Source/WebKit/mac/Plugins/WebPluginViewFactory.h
Source/WebKit/mac/Plugins/WebPluginViewFactoryPrivate.h
Source/WebKit/mac/Plugins/npapi.mm
Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h
Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm
Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm
Source/WebKit/mac/WebInspector/WebInspectorPrivate.h
Source/WebKit/mac/WebInspector/WebNodeHighlight.h
Source/WebKit/mac/WebInspector/WebNodeHighlightView.h
Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make [new file with mode: 0644]
Source/WebKit/mac/WebKitLegacy/MigrateHeadersToLegacy.make [deleted file]
Source/WebKit/mac/WebKitLegacy/WebKit.h [new file with mode: 0644]
Source/WebKit/mac/WebKitLegacy/WebKit.m [moved from Source/WebKit/mac/WebKitLegacy/WebKitLegacy.cpp with 88% similarity]
Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h [new file with mode: 0644]
Source/WebKit/mac/WebView/WebDataSource.h
Source/WebKit/mac/WebView/WebDataSource.mm
Source/WebKit/mac/WebView/WebDataSourcePrivate.h
Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h
Source/WebKit/mac/WebView/WebDocument.h
Source/WebKit/mac/WebView/WebDocumentInternal.h
Source/WebKit/mac/WebView/WebDocumentPrivate.h
Source/WebKit/mac/WebView/WebEditingDelegate.h
Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h
Source/WebKit/mac/WebView/WebFrameLoadDelegate.h
Source/WebKit/mac/WebView/WebFrameLoadDelegatePrivate.h
Source/WebKit/mac/WebView/WebFramePrivate.h
Source/WebKit/mac/WebView/WebFrameView.h
Source/WebKit/mac/WebView/WebFrameViewInternal.h
Source/WebKit/mac/WebView/WebFrameViewPrivate.h
Source/WebKit/mac/WebView/WebHTMLRepresentation.h
Source/WebKit/mac/WebView/WebHTMLRepresentation.mm
Source/WebKit/mac/WebView/WebHTMLRepresentationPrivate.h
Source/WebKit/mac/WebView/WebHTMLView.h
Source/WebKit/mac/WebView/WebHTMLView.mm
Source/WebKit/mac/WebView/WebHTMLViewPrivate.h
Source/WebKit/mac/WebView/WebPDFView.h
Source/WebKit/mac/WebView/WebPolicyDelegatePrivate.h
Source/WebKit/mac/WebView/WebPreferencesPrivate.h
Source/WebKit/mac/WebView/WebResourcePrivate.h
Source/WebKit/mac/WebView/WebUIDelegate.h
Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
Source/WebKit/mac/WebView/WebView.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/mac/WebView/WebViewPrivate.h
Source/WebKit/mac/migrate-headers.sh
Tools/ChangeLog
Tools/Scripts/check-for-webkit-framework-include-consistency
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm