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)
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

index 5c0d1b75116eff30a74756b2e389145af65a4055..acb394d615b55b902ba62ef683f2593579ffd984 100644 (file)
@@ -1,3 +1,15 @@
+2014-04-30  Anders Carlsson  <andersca@apple.com>
+
+        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.
+
+        Allow WebKitLegacy to link against WebCore.
+
+        * Configurations/WebCore.xcconfig:
+
 2014-04-30  David Hyatt  <hyatt@apple.com>
 
         [New Multicolumn] ASSERTs in fast/dynamic/continuation-detach-crash.html
index 456a92d6e220c0ca6dc4aac9dd70d8d2f04a0ada..f229c54aa6571b663d9e3b4d0e9d10383ac4aa80 100644 (file)
@@ -73,7 +73,7 @@ OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
 OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_iphonesimulator) -framework IOSurface;
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
-OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
+OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
 
 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
 NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
index a58a4d1bc57c95186cf3875a61d17ca0704b5ab7..3dc681cb07ce3bafb1638050352b0e07f0593e82 100644 (file)
@@ -1,3 +1,17 @@
+2014-04-30  Anders Carlsson  <andersca@apple.com>
+
+        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.
+
+        * 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.
+
 2014-04-29  Alex Christensen  <achristensen@webkit.org>
 
         [WinCairo] Switch video from GStreamer to Media Foundation.
index febbc6667aa75a8cf00916afab274e0738b052e5..ad6f08eb092d766cf05c9bbc0a559967bc72fe61 100644 (file)
@@ -33,6 +33,8 @@
                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 */; };
@@ -60,7 +62,7 @@
                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 /* WebKitLegacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */; };
+               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 */; };
                936A2DEA0FD2D08400D312DB /* WebTextCompletionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 936A2DE90FD2D08400D312DB /* WebTextCompletionController.h */; };
                9391F275121B38BD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F273121B38BD00EBF7E8 /* WebFrameNetworkingContext.h */; };
                9391F276121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */; };
-               939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810140824BF01008DF038 /* WebHistoryPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F5B92B820223191D01C1A525 /* WebHistoryPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810150824BF01008DF038 /* WebURLsWithTitles.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E0A76E02B8FEE401C1A525 /* WebURLsWithTitles.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810160824BF01008DF038 /* WebCoreStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = F59EAE3E0253C7EE018635CA /* WebCoreStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810180824BF01008DF038 /* WebIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = F528E3E9031E91AD01CA2ACA /* WebIconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810190824BF01008DF038 /* WebIconDatabasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F528E3EB031E91AD01CA2ACA /* WebIconDatabasePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9398101B0824BF01008DF038 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               9398101B0824BF01008DF038 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398101D0824BF01008DF038 /* WebKitLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AEB17D032C1735008635CE /* WebKitLogging.h */; settings = {ATTRIBUTES = (); }; };
                9398101E0824BF01008DF038 /* WebKitNSStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7082F56F038EADAA00A80180 /* WebKitNSStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398101F0824BF01008DF038 /* WebKitStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = F53444CE02E87CBA018635CA /* WebKitStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398102B0824BF01008DF038 /* WebNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A672B90263866E01000102 /* WebNetscapePluginStream.h */; };
                9398102E0824BF01008DF038 /* WebBasePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF46036652150000E506 /* WebBasePluginPackage.h */; };
                939810310824BF01008DF038 /* WebNetscapePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F7171E0288493C018635CA /* WebNetscapePluginPackage.h */; };
-               939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810370824BF01008DF038 /* WebPluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8467275C0367158500CA2ACA /* WebPluginController.h */; };
                939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F717200288493C018635CA /* WebPluginDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810390824BF01008DF038 /* WebPluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF4B036659440000E506 /* WebPluginPackage.h */; };
-               9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810470824BF01008DF038 /* WebKitPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C283730284676D018635CA /* WebKitPrefix.h */; };
                939810490824BF01008DF038 /* WebClipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 933D659903413FF2008635CE /* WebClipView.h */; };
-               9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398104C0824BF01008DF038 /* WebDataSourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446072020F50ED0ECA1767 /* WebDataSourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398104E0824BF01008DF038 /* WebDefaultContextMenuDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FADD033FC50400CA2ACD /* WebDefaultContextMenuDelegate.h */; settings = {ATTRIBUTES = (); }; };
                9398104F0824BF01008DF038 /* WebDefaultPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FADF033FC50400CA2ACD /* WebDefaultPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               939810500824BF01008DF038 /* WebDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810500824BF01008DF038 /* WebDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810510824BF01008DF038 /* WebDynamicScrollBarsView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606B020F50ED0ECA1767 /* WebDynamicScrollBarsView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810520824BF01008DF038 /* WebFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D81DAB203EB0B2D00A80166 /* WebFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               939810530824BF01008DF038 /* WebFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446074020F50ED0ECA1767 /* WebFrame.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810530824BF01008DF038 /* WebFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446074020F50ED0ECA1767 /* WebFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810540824BF01008DF038 /* WebFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CF0E249021361B00ECA16EA /* WebFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810550824BF01008DF038 /* WebHTMLRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9202B6D4D80ACA2ACA /* WebHTMLRepresentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810560824BF01008DF038 /* WebHTMLRepresentationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A55DC702BAA2E8018635CC /* WebHTMLRepresentationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810570824BF01008DF038 /* WebHTMLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9402B6D4D80ACA2ACA /* WebHTMLView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810580824BF01008DF038 /* WebHTMLViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9602B6D4D80ACA2ACA /* WebHTMLViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FAE5033FC52200CA2ACD /* WebFrameLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               9398105D0824BF01008DF038 /* WebPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606E020F50ED0ECA1767 /* WebPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FAE5033FC52200CA2ACD /* WebFrameLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               9398105D0824BF01008DF038 /* WebPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606E020F50ED0ECA1767 /* WebPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398105E0824BF01008DF038 /* WebPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398105F0824BF01008DF038 /* WebRenderNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F81C3902B67C26018635CA /* WebRenderNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810630824BF01008DF038 /* WebHistoryItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */; };
                939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D36FD5E03F78F9E00A80166 /* WebFormDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810650824BF01008DF038 /* CarbonWindowAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9003F9DBA103CA0DE6 /* CarbonWindowAdapter.h */; };
                939810660824BF01008DF038 /* CarbonWindowContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9203F9DBA103CA0DE6 /* CarbonWindowContentView.h */; };
                939810670824BF01008DF038 /* CarbonWindowFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9403F9DBA103CA0DE6 /* CarbonWindowFrame.h */; };
                939810680824BF01008DF038 /* HIViewAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9A03F9DBA103CA0DE6 /* HIViewAdapter.h */; };
-               939810690824BF01008DF038 /* HIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEEAA03F9DBA103CA0DE6 /* HIWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F79B974804019934036909D2 /* CarbonUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810690824BF01008DF038 /* HIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEEAA03F9DBA103CA0DE6 /* HIWebView.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F79B974804019934036909D2 /* CarbonUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9398106E0824BF01008DF038 /* WebFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B52E04282B5900CA2D3A /* WebFrameView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               9398106E0824BF01008DF038 /* WebFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B52E04282B5900CA2D3A /* WebFrameView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398106F0824BF01008DF038 /* WebFrameViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B53204282BD200CA2D3A /* WebFrameViewInternal.h */; };
-               939810700824BF01008DF038 /* WebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B579042834F700CA2D3A /* WebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810700824BF01008DF038 /* WebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B579042834F700CA2D3A /* WebView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810710824BF01008DF038 /* WebViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B57D0428353A00CA2D3A /* WebViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               939810720824BF01008DF038 /* WebPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810720824BF01008DF038 /* WebPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810730824BF01008DF038 /* WebPolicyDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9C0429392B00CA2D3A /* WebPolicyDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               939810750824BF01008DF038 /* WebUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810750824BF01008DF038 /* WebUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810760824BF01008DF038 /* WebDefaultUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CF0458CA4B00CA2D3A /* WebDefaultUIDelegate.h */; };
-               939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810790824BF01008DF038 /* WebLocalizableStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE18F990472B73200CA289C /* WebLocalizableStrings.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398107A0824BF01008DF038 /* WebKitSystemBits.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE52D4A0473032500CA289C /* WebKitSystemBits.h */; };
                9398107E0824BF01008DF038 /* WebNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6DC39904C62C4E004D0EF6 /* WebNSURLExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810840824BF01008DF038 /* WebNSEventExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BE887BFF056D3A6E009BB3E7 /* WebNSEventExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84723BE3056D719E0044BFEA /* WebKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810870824BF01008DF038 /* WebNSPrintOperationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDD1A5C605C83987008E3150 /* WebNSPrintOperationExtras.h */; };
-               939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311AF105EAB12B0088EDA4 /* WebResourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398108D0824BF01008DF038 /* WebDefaultEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE95BEE605FD0805006E1513 /* WebDefaultEditingDelegate.h */; };
-               939810990824BF01008DF038 /* WebDOMOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               9398109A0824BF01008DF038 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 8373435A0624EE0D00F3B289 /* WebArchive.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               939810990824BF01008DF038 /* WebDOMOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               9398109A0824BF01008DF038 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 8373435A0624EE0D00F3B289 /* WebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9398109B0824BF01008DF038 /* WebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BB06275F640076701E /* WebViewInternal.h */; };
                9398109C0824BF01008DF038 /* WebFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BD06275F710076701E /* WebFrameInternal.h */; };
                9398109D0824BF01008DF038 /* WebDOMOperationsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810A10824BF01008DF038 /* WebHTMLViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93185DB506679F42005D5E7E /* WebHTMLViewInternal.h */; };
                939810A20824BF01008DF038 /* WebNSObjectExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D1FE13067EB10B009CE68A /* WebNSObjectExtras.h */; };
                939810A40824BF01008DF038 /* WebPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E94C3406C0321200A9B09E /* WebPDFView.h */; };
                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 /* WebKitLegacy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitLegacy.cpp; sourceTree = "<group>"; };
-               1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKitLegacy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-               1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitLegacy.xcconfig; 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>"; };
                1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MigrateHeaders.make; path = mac/MigrateHeaders.make; sourceTree = "<group>"; };
                1C7B0C650EB2464D00A28502 /* WebInspectorClientCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebInspectorClientCF.cpp; path = cf/WebCoreSupport/WebInspectorClientCF.cpp; sourceTree = SOURCE_ROOT; };
                1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegatePrivate.h; sourceTree = "<group>"; };
-               1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
+               1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitLegacy.xcconfig; sourceTree = "<group>"; };
                1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
                1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
                1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
                9391F273121B38BD00EBF7E8 /* WebFrameNetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameNetworkingContext.h; sourceTree = "<group>"; };
                9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; };
                939811320824BF01008DF038 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = mac/Info.plist; sourceTree = SOURCE_ROOT; tabWidth = 8; usesTabs = 1; };
-               939811330824BF01008DF038 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               939811330824BF01008DF038 /* WebKitLegacy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKitLegacy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                93AEB17D032C1735008635CE /* WebKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLogging.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93AEB17E032C1735008635CE /* WebKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitLogging.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93C6F14507920B93002449CD /* WebFrameViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameViewPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                034768DFFF38A50411DB9C8B /* Products */ = {
                        isa = PBXGroup;
                        children = (
-                               939811330824BF01008DF038 /* WebKit.framework */,
-                               1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */,
+                               939811330824BF01008DF038 /* WebKitLegacy.framework */,
+                               1AD7451918D0D26C006F3A1E /* WebKit.framework */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                                F5EBC45202134BB601CA1520 /* Plugins */,
                                511F3FC30CECC7E200852565 /* Storage */,
                                F5B36B400281DE87018635CB /* WebCoreSupport */,
-                               1AD7451118D0D23D006F3A1E /* WebKitLegacy */,
+                               1AD7451118D0D23D006F3A1E /* WebKit Framework */,
                                9C7CABBB0190A37C0ECA16EA /* WebView */,
                                1C68F63F095B5F9C00C2984E /* WebInspector */,
                                F7EBEE5903F9DB2203CA0DE6 /* Carbon */,
                        name = Events;
                        sourceTree = "<group>";
                };
-               1AD7451118D0D23D006F3A1E /* WebKitLegacy */ = {
+               1AD7451118D0D23D006F3A1E /* WebKit Framework */ = {
                        isa = PBXGroup;
                        children = (
+                               1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */,
                                1AD7453D18D0D383006F3A1E /* Info.plist */,
-                               1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */,
+                               1AD7451218D0D24C006F3A1E /* WebKit.m */,
+                               1A739034190AE5D4002E3105 /* WebKit.h */,
+                               1A739037190AE674002E3105 /* WebKitPrivate.h */,
                        );
-                       name = WebKitLegacy;
+                       name = "WebKit Framework";
                        path = mac/WebKitLegacy;
                        sourceTree = "<group>";
                };
                                449098B90F8F82DF0076A327 /* FeatureDefines.xcconfig */,
                                FEE7D6910D99B06A005351F6 /* iOS.xcconfig */,
                                1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
-                               1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */,
-                               1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */,
+                               1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */,
+                               1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */,
                        );
                        name = Configurations;
                        path = mac/Configurations;
 /* 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 /* WebKitLegacy */ = {
+               1AD7451818D0D26C006F3A1E /* WebKit */ = {
                        isa = PBXNativeTarget;
-                       buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
+                       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 */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                                1A5B250A18D0DBD300913729 /* PBXTargetDependency */,
                        );
-                       name = WebKitLegacy;
-                       productName = WebKitLegacy;
-                       productReference = 1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */;
+                       name = WebKit;
+                       productName = WebKit;
+                       productReference = 1AD7451918D0D26C006F3A1E /* WebKit.framework */;
                        productType = "com.apple.product-type.framework";
                };
-               9398100A0824BF01008DF038 /* WebKit */ = {
+               9398100A0824BF01008DF038 /* WebKitLegacy */ = {
                        isa = PBXNativeTarget;
-                       buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKit" */;
+                       buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
                        buildPhases = (
                                5D2F7DB70C687A5A00B5B72B /* Update Info.plist with version information */,
                                1C6CB0510AA63EB000D23BFD /* Migrate Headers */,
                                939811270824BF01008DF038 /* Frameworks */,
                                5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */,
                                3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */,
-                               5D88EE6C11407DE800BC3ABC /* Check For Framework Include Consistency */,
-                               A55DEAA516703F9F003DB841 /* Check For Inappropriate Macros in External Headers */,
                                5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
-                       name = WebKit;
+                       name = WebKitLegacy;
                        productInstallPath = /System/Library/Frameworks;
-                       productName = WebKit;
-                       productReference = 939811330824BF01008DF038 /* WebKit.framework */;
+                       productName = WebKitLegacy;
+                       productReference = 939811330824BF01008DF038 /* WebKitLegacy.framework */;
                        productType = "com.apple.product-type.framework";
                };
 /* End PBXNativeTarget section */
                        projectDirPath = "";
                        projectRoot = "";
                        targets = (
-                               1AD7451818D0D26C006F3A1E /* WebKitLegacy */,
-                               9398100A0824BF01008DF038 /* WebKit */,
+                               1AD7451818D0D26C006F3A1E /* WebKit */,
+                               9398100A0824BF01008DF038 /* WebKitLegacy */,
                        );
                };
 /* End PBXProject section */
 /* 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";
+               };
                1A5B250818D0D90C00913729 /* Migrate Headers */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        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    mkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n    make -C mac/WebKitLegacy -f \"MigrateHeadersToLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
+                       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";
+               };
+               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;
                        );
                        name = "Generate Export Files";
                        outputPaths = (
-                               "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp",
-                               "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp",
+                               "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp",
+                               "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\nif [[ \"${PLATFORM_NAME}\" == \"iphoneos\" || \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]]; then\n    cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/ios/WebKit.iOS.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\"\nelse\n    cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/mac/WebKit.mac.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\"\nfi;\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";
+                       shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy\"\n\nif [[ \"${PLATFORM_NAME}\" == \"iphoneos\" || \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]]; then\n    cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/ios/WebKit.iOS.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp\"\nelse\n    cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/mac/WebKit.mac.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp\"\nfi;\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp\"\n";
                };
                1C6CB0510AA63EB000D23BFD /* Migrate Headers */ = {
                        isa = PBXShellScriptBuildPhase;
                        shellPath = /bin/sh;
                        shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\n    touch \"${PROJECT_DIR}/mac/Info.plist\";\nfi;\n";
                };
-               5D88EE6C11407DE800BC3ABC /* 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\n    exit 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";
-               };
                5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        );
                        name = "Symlink WebKitPluginHost in to place";
                        outputPaths = (
-                               "$(CONFIGURATION_BUILD_DIR)/WebKit.framework/WebKitPluginHost.app",
+                               "$(CONFIGURATION_BUILD_DIR)/WebKitLegacy.framework/WebKitPluginHost.app",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n    exit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n    if [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\" ]]; then\n       ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\n    fi\nfi\n";
+                       shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n    exit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n    if [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" ]]; then\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\n    fi\nfi\n";
                };
                939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {
                        isa = PBXShellScriptBuildPhase;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
-                       shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n    exit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
+                       shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n    exit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKitLegacy.framework/Frameworks\"\n";
                };
                A13EE61D185AE82700556064 /* Postprocess Headers */ = {
                        isa = PBXShellScriptBuildPhase;
                        shellPath = /bin/sh;
                        shellScript = "exec \"${SRCROOT}/mac/postprocess-headers.sh\"";
                };
-               A55DEAA516703F9F003DB841 /* 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";
-               };
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               1AD7453C18D0D324006F3A1E /* WebKitLegacy.cpp in Sources */,
+                               1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* Begin PBXTargetDependency section */
                1A5B250A18D0DBD300913729 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = 9398100A0824BF01008DF038 /* WebKit */;
+                       target = 9398100A0824BF01008DF038 /* WebKitLegacy */;
                        targetProxy = 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */;
                };
 /* End PBXTargetDependency section */
 /* Begin XCBuildConfiguration section */
                149C282E08902B0F008A9EFC /* Debug */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
+                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = "$(DEBUG_DEFINES_debug) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                };
                149C282F08902B0F008A9EFC /* Release */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
+                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = "$(DEBUG_DEFINES_$(CURRENT_VARIANT)) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                };
                149C283108902B0F008A9EFC /* Production */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
+                       baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
                        buildSettings = {
                                BUILD_VARIANTS = normal;
                                OTHER_LDFLAGS = (
                };
                1AD7453418D0D26C006F3A1E /* Debug */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
+                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
                        buildSettings = {
                        };
                        name = Debug;
                };
                1AD7453518D0D26C006F3A1E /* Release */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
+                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
                        buildSettings = {
                        };
                        name = Release;
                };
                1AD7453618D0D26C006F3A1E /* Production */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
+                       baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
                        buildSettings = {
                        };
                        name = Production;
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-               149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKit" */ = {
+               149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                149C282E08902B0F008A9EFC /* Debug */,
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
-               1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKitLegacy" */ = {
+               1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                1AD7453418D0D26C006F3A1E /* Debug */,
index 5f3420c64caa2dadd0fb4ef739332564ed233864..b9f8baf068f04ae65eac0d25e8b9185638a6794a 100644 (file)
@@ -1,3 +1,32 @@
+2014-04-30  Anders Carlsson  <andersca@apple.com>
+
+        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.
+
+        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:
+
 2014-04-24  Myles C. Maxfield  <mmaxfield@apple.com>
 
         FontCache::fontCache() never returns nullptr so it can be made to return a reference instead
index c7d2ed8f76a4de5e6e9db9c94be08aba89febf4a..bc4b6695247fdba58965bacc64d0708cf6057488 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebFormDelegate.h>
+#import <WebKitLegacy/WebFormDelegate.h>
 
 @interface WebDefaultFormDelegate : NSObject <WebFormDelegate> {
 }
index 51dc090f07b2b29a9884bc5bd25c8b0f9b1b3ef2..6e735aa975a89e1edbaf094b4e641b490d34331e 100644 (file)
@@ -27,7 +27,7 @@
 
 #import "WebDefaultFrameLoadDelegate.h"
 
-#import <WebKit/WebFrameLoadDelegatePrivate.h>
+#import <WebKitLegacy/WebFrameLoadDelegatePrivate.h>
 #import "WebViewPrivate.h"
 
 @implementation WebDefaultFrameLoadDelegate
index 8b0a47703e2637a7bcc2d4a4d17891119dcdb07d..81548fdb5b16d6c5cfc331decd7cba88e6d5452f 100644 (file)
@@ -27,7 +27,7 @@
 
 #import "WebDefaultResourceLoadDelegate.h"
 
-#import <WebKit/WebResourceLoadDelegate.h>
+#import <WebKitLegacy/WebResourceLoadDelegate.h>
 
 @implementation WebDefaultResourceLoadDelegate
 
index 6236c744a10c529679845cefdbe9e6bb50d087c7..936e4267e01ee5d9654d0a09a6f1e55b2cf1fcd5 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebUIKitDelegate.h>
+#import <WebKitLegacy/WebUIKitDelegate.h>
 
 @interface WebDefaultUIKitDelegate : NSObject {
 }
index a6104e3db9dac0714d6bd2760d6eb72a00ec803a..f31adc2023f54e8153eae255edb019f75f7baa75 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/NSObject.h>
-#import <WebKit/WebViewPrivate.h>
+#import <WebKitLegacy/WebViewPrivate.h>
 
 @interface WebGeolocationProviderIOS : NSObject<WebGeolocationProvider>
 
index 9205115817ab7fefc563f484757e2ab672f583c3..a9adc67fe2ab498d4a29c5ef2a5e009cc7f23512 100644 (file)
@@ -23,4 +23,4 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebNSStringExtrasIOS.h>
+#import <WebKitLegacy/WebNSStringExtrasIOS.h>
index 2a15182c9cffe6e1c4716d71d04b34bfb789ca61..974bd3c7d034b450330c9989c08a4598ca418920 100644 (file)
@@ -26,8 +26,8 @@
 #if TARGET_OS_IPHONE
 
 #import <CoreGraphics/CoreGraphics.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebVisiblePosition.h>
+#import <WebKitLegacy/WebFrame.h>
+#import <WebKitLegacy/WebVisiblePosition.h>
 
 @class DOMRange;
 @class DOMVisiblePosition;
index 1d5ba944989f63e43f4086bf7f9102a2f663fcef..8edb40633c22b742606de483a2f79695949dfb38 100644 (file)
 #import <WebCore/TextDirection.h>
 #import <WebCore/VisiblePosition.h>
 #import <WebCore/VisibleUnits.h>
-#import <WebKit/DOM.h>
-#import <WebKit/DOMRange.h>
-#import <WebKit/DOMUIKitExtensions.h>
-#import <WebKit/WebSelectionRect.h>
-#import <WebKit/WebVisiblePosition.h>
+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/DOMRange.h>
+#import <WebKitLegacy/DOMUIKitExtensions.h>
+#import <WebKitLegacy/WebSelectionRect.h>
+#import <WebKitLegacy/WebVisiblePosition.h>
 #import <unicode/uchar.h>
 
 #import "DOMNodeInternal.h"
index 3733c921d665454b2c507412fc95883c99ea5a33..64bb6534633c3b7e749cd1decf93c014063fde73 100644 (file)
@@ -23,4 +23,4 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebFrameIOS.h>
+#import <WebKitLegacy/WebFrameIOS.h>
index b13558ec3ce41daad094e359fc2f5d3ab621b897..8a8d06bd287c05d4961f4f36ca254d427816ffc5 100644 (file)
@@ -27,7 +27,7 @@
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <Foundation/Foundation.h>
-#import <WebKit/WebFrameIOS.h>
+#import <WebKitLegacy/WebFrameIOS.h>
 
 @interface WebSelectionRect : NSObject <NSCopying> {
     CGRect m_rect;
index 91fb9c353b307c9572f59da38c5a071e3a3a7427..7035d072b9ffb254c3faa0f57864a12b0bed4516 100644 (file)
@@ -24,9 +24,9 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit/DOMUIKitExtensions.h>
+#import <WebKitLegacy/DOMUIKitExtensions.h>
 
-#import <WebKit/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
 
 typedef struct WebObjectInternal WebObjectInternal;
 
index 1357ccbd116dddb66231099e268e39951d934137..602fcd0f276e1611d0436d373a0ea1c1d7d45321 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDocumentPrivate.h>
+#import <WebKitLegacy/WebDocumentPrivate.h>
 
 @interface WebPDFView : WAKView <WebPDFDocumentView, WebPDFDocumentRepresentation> {
     BOOL dataSourceHasBeenSet;
index 30e2c7c1dceb19f8852462e89ba38cb86de1bc58..f649f7d58982abed36e29dac6ebb4f32eb8fbfa8 100644 (file)
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/StringWithDirection.h>
 #import <WebCore/WKGraphics.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebFrameLoadDelegate.h>
-#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebFrameView.h>
-#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebViewPrivate.h>
+#import <WebKitLegacy/WebFrame.h>
+#import <WebKitLegacy/WebFrameLoadDelegate.h>
+#import <WebKitLegacy/WebFramePrivate.h>
+#import <WebKitLegacy/WebFrameView.h>
+#import <WebKitLegacy/WebNSViewExtras.h>
+#import <WebKitLegacy/WebViewPrivate.h>
 #import <wtf/Assertions.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/StdLibExtras.h>
index f0b37670fe17027b67c3c8d7e72a8d1aca0ac9ec..eaf03b30e562448e7fe93b14cdf9b0ef9abd4a18 100644 (file)
@@ -23,4 +23,4 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebPDFViewIOS.h>
+#import <WebKitLegacy/WebPDFViewIOS.h>
index eee30594062f602e4c9a5285061680bbd3918156..e311656e4fe02e2a4a5134ae332b8c6161dcecf5 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDocumentPrivate.h>
+#import <WebKitLegacy/WebDocumentPrivate.h>
 
 #if TARGET_OS_IPHONE
 
index 719f6b3e915194951db86352dd1dd82050cc1bf3..e11fe5f2d3b8d4a1460646eacb40560bcd3b9a80 100644 (file)
 #import <WebCore/HTMLFormElement.h>
 #import <WebCore/MouseEvent.h>
 #import <WebCore/SoftLinking.h>
-#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebJSPDFDoc.h>
-#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebPDFDocumentExtras.h>
-#import <WebKit/WebViewPrivate.h>
+#import <WebKitLegacy/WebDataSourcePrivate.h>
+#import <WebKitLegacy/WebFramePrivate.h>
+#import <WebKitLegacy/WebJSPDFDoc.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
+#import <WebKitLegacy/WebNSViewExtras.h>
+#import <WebKitLegacy/WebPDFDocumentExtras.h>
+#import <WebKitLegacy/WebViewPrivate.h>
 #import <wtf/CurrentTime.h>
 #import <wtf/Vector.h>
 
index 1e9ce208c372430ec21664b428dd1dbdc903b0e4..bfd9c8d46e1f1767183539fc1ac54d1f8351bb31 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #if PLATFORM(IOS)
-#import <WebKit/WebDocumentInternal.h>
+#import <WebKitLegacy/WebDocumentInternal.h>
 
 @class WebDataSource;
 @class WebCoreTextDecoder;
index 2339dfa2dcd8a88e28c561a14b27d9bd0e5b5709..b24fbafca017f722c228438cad356ab33631c3f0 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef WebUIKitDelegate_h
 #define WebUIKitDelegate_h
 
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WKContentObservation.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WKContentObservation.h>
 
 @class DOMNode;
 @class DOMDocumentFragment;
index 6db90529ec2d3e69fa1145f26e1f57946842b774..073ce9bb2f14914328305a6f9eeef8462f437155 100644 (file)
@@ -33,7 +33,7 @@
 
 // These functions are only available for 32-bit.
 
-#include <WebKit/WebKitAvailability.h>
+#include <WebKitLegacy/WebKitAvailability.h>
 
 #ifdef __OBJC__
 #import <ApplicationServices/ApplicationServices.h>
index 31f8ab1b78287a8e75ab07d9e33fe640ffafde85..33677fc6031a07f9b75a61d706f7573bbc26a244 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebKit.h>
+#import <WebKitLegacy/WebKit.h>
 #include <HIToolbox/HIView.h>
 
 @interface HIViewAdapter : NSObject
index 2cb6019457540b77e5be7411a85fb22d5371ffb5..9616ce3dc6474ac97a9d1b2c5109358b8444fa93 100644 (file)
@@ -33,7 +33,7 @@
 
 #include <Carbon/Carbon.h>
 
-#include <WebKit/WebKitAvailability.h>
+#include <WebKitLegacy/WebKitAvailability.h>
 
 #if PRAGMA_ONCE
 #pragma once
index b3d1393f5b0e23cedf518bd8a706a30770223cf3..86d30ec9b53712efab4e5a9c6490e8a5b56e0216 100644 (file)
@@ -1,3 +1,151 @@
+2014-04-30  Anders Carlsson  <andersca@apple.com>
+
+        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.
+
+        * 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.
+
 2014-04-30  David Hyatt  <hyatt@apple.com>
 
         [New Multicolumn] Enable new multi-column mode
index 4174f1b9af993e532936b67dece6f81f261a4b3b..d42f28b0457fc597d262d45ccd380458d421d14e 100644 (file)
 #include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
 
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
-
-EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
-EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
-EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
-EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
-
 FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
 FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
 FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
@@ -49,51 +31,23 @@ FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debu
 FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
 FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
 FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(WEBKIT2_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
+UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
 
 STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
 STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
-OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME));
-OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -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 -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
-
-GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
-HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
-INFOPLIST_FILE = mac/Info.plist;
+INFOPLIST_FILE = mac/WebKitLegacy/Info.plist;
 INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
 INSTALL_PATH_macosx = $(WEBKIT_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_WEBKIT_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 DYLIB_INSTALL_NAME_BASE_iphonesimulator =  $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
-INSTALLHDRS_COPY_PHASE = YES;
-INSTALLHDRS_SCRIPT_PHASE = YES;
-PRODUCT_NAME = WebKit;
-UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
-
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileAsset -lMobileGestalt;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework WebKit2 -sub_umbrella WebKit2 -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
-
-NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
-
-WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION));
-WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
-WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
-WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks;
-WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR)
+DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
 
 WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
 WEBKIT_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos);
@@ -103,6 +57,11 @@ WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_FRAMEWORKS_DIR
 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;
 
+NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
+
 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);
@@ -116,30 +75,25 @@ PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEW
 PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
 PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
+WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION));
+WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
+WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
+WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks;
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR)
+
+INSTALLHDRS_COPY_PHASE = YES;
+INSTALLHDRS_SCRIPT_PHASE = YES;
+PRODUCT_NAME = WebKit;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = -framework WebKitLegacy -sub_umbrella WebKitLegacy
+OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
+OTHER_LDFLAGS_macosx = -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy -framework WebKit2 -sub_umbrella WebKit2
 
 PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
 PRODUCTION_ROOT_iphoneos = $(SDKROOT);
 PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
 PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
-
-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
-WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
-
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-
index be2ed0563f813efa8a78c42ff20978e2f5bd140a..4eb9f0a211c54e5c0f79be6e5b7e9222f8271bf5 100644 (file)
 #include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
 
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
+
+EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
+EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
+EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
+EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
+
 FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
 FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
 FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
 FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debug);
 FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
 FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
+FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
+
+STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
+STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME));
+OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -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 -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
 
-INFOPLIST_FILE = mac/WebKitLegacy/Info.plist;
+GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
+HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
+INFOPLIST_FILE = mac/Info.plist;
 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 = $(WEBKIT_LEGACY_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_WEBKIT_LEGACY_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 DYLIB_INSTALL_NAME_BASE_iphonesimulator =  $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
-
 INSTALLHDRS_COPY_PHASE = YES;
 INSTALLHDRS_SCRIPT_PHASE = YES;
 PRODUCT_NAME = WebKitLegacy;
-
-SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
-SKIP_INSTALL_macosx = YES;
-SKIP_INSTALL_iphoneos = $(SKIP_INSTALL);
-SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
+UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
 
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = -framework WebKit -sub_umbrella WebKit
+OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileAsset -lMobileGestalt;
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
+OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
+
+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+
+WEBKIT_LEGACY_FRAMEWORKS_DIR = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
+WEBKIT_LEGACY_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)/Frameworks;
+
+PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+PRODUCTION_FRAMEWORKS_DIR_macosx = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
 
 PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
 PRODUCTION_ROOT_iphoneos = $(SDKROOT);
 PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
 PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
+
+WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
+WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
+WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
+WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
+WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;
+
index 2172d0e37459c1147f0c8f376c1b39ff5aff3c13..a4ea2711e49c29b91e8c10e13db0bc19923885d0 100644 (file)
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/DOMCore.h>
-#import <WebKit/DOMHTML.h>
-#import <WebKit/DOMRange.h>
+#import <WebKitLegacy/DOMCore.h>
+#import <WebKitLegacy/DOMHTML.h>
+#import <WebKitLegacy/DOMRange.h>
 
 @class WebArchive;
 @class WebFrame;
index 8ba5f2af8eefad157603ccb92521e83b61e3edfb..e4fb7660f9f49e7ad71956103ba3b8518629c5c2 100644 (file)
@@ -53,8 +53,8 @@
 #import <WebCore/ShadowRoot.h>
 #import <WebCore/WheelEvent.h>
 #import <WebCore/markup.h>
-#import <WebKit/DOMExtensions.h>
-#import <WebKit/DOMHTML.h>
+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/DOMHTML.h>
 #import <runtime/JSCJSValue.h>
 #import <runtime/JSLock.h>
 #import <wtf/Assertions.h>
index d9e2806468ec2a3546aedd55c208d26215f98ebb..fca3a9d7b93f12b994d336179ee05affc52b1fc6 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDOMOperations.h>
+#import <WebKitLegacy/WebDOMOperations.h>
 
 @interface DOMDocument (WebDOMDocumentOperationsInternal)
 - (DOMRange *)_documentRange;
index fd889c4de6a1c65508cf2d51e2cca2f629368f4b..7a0676e3bf584be3f5f7ede30eab80ccf1a382f0 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDOMOperations.h>
+#import <WebKitLegacy/WebDOMOperations.h>
 #import <JavaScriptCore/JSBase.h>
 
 #if TARGET_OS_IPHONE
 #import <Foundation/NSGeometry.h>
 #else
 #import <AppKit/NSEvent.h>
-#import <WebKit/DOMWheelEvent.h>
+#import <WebKitLegacy/DOMWheelEvent.h>
 #endif
 
 @interface DOMElement (WebDOMElementOperationsPrivate)
index fa69c9e527b01b83d26726745f64ba9defb95a9b..e0906bce37d9dd9987e47cf8d31847a5c3e0bdad 100644 (file)
@@ -28,7 +28,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <WebKit/WebDefaultUIDelegate.h>
+#import <WebKitLegacy/WebDefaultUIDelegate.h>
 
 @interface WebDefaultUIDelegate (WebContextMenu)
 @end
index 967fedd2a5139e1b6e9f51873c839dd3376c1b46..0265bf0c51a9f1871596555d6907f902370e7957 100644 (file)
@@ -48,8 +48,8 @@
 #import <WebCore/Editor.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
-#import <WebKit/DOM.h>
-#import <WebKit/DOMPrivate.h>
+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/DOMPrivate.h>
 #import <WebKitSystemInterface.h>
 #import <wtf/Assertions.h>
 
index 6e70eccc05543852a955de110dc9f9e1c554ccca..38b67ed75cccbc3241f58d29ceb763805ced9e7e 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDefaultEditingDelegate.h>
+#import <WebKitLegacy/WebDefaultEditingDelegate.h>
 
-#import <WebKit/DOM.h>
-#import <WebKit/WebEditingDelegate.h>
-#import <WebKit/WebEditingDelegatePrivate.h>
-#import <WebKit/WebView.h>
+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/WebEditingDelegate.h>
+#import <WebKitLegacy/WebEditingDelegatePrivate.h>
+#import <WebKitLegacy/WebView.h>
 
 @implementation WebDefaultEditingDelegate
 
index 17062feffc6cf91c5a017e23229159b34a086c12..e7332ffafb902093f0a24e47ef6b904afa98b45b 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebBackForwardList.h>
+#import <WebKitLegacy/WebBackForwardList.h>
 
 namespace WebCore {
-    class BackForwardList;
+class BackForwardList;
 }
 
 WebCore::BackForwardList* core(WebBackForwardList *);
index 6a7b2799d8235891ee8d29c168c672140a6225f3..80626b975b31738abb765b3c4e9b07de6d27ca5b 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WebBackForwardList.h>
+#import <WebKitLegacy/WebBackForwardList.h>
 
 @interface WebBackForwardList (WebBackForwardListPrivate)
 
index 3209cf948747a1c3add53a59cd0612489befe827..e8869be75efb2bf860073313faea0add1b95e454 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebHistoryItem.h>
+#import <WebKitLegacy/WebHistoryItem.h>
 
 #if TARGET_OS_IPHONE
 #import <Foundation/NSCalendarDate.h>
index 4226ef61db0648a3e4543233397a875d26037409..d11e22ebb09fe11f87b4dac9f5811f87e37a35ad 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebHistory.h>
+#import <WebKitLegacy/WebHistory.h>
 
 /*
     @constant WebHistoryItemsDiscardedWhileLoadingNotification Posted from loadFromURL:error:.  
index 84aaaaaee811a2b4223221eaefdfcd6d3a8158b6..30fbc8afc56554a86bceeaa6202a514bd0455e64 100644 (file)
@@ -30,8 +30,8 @@
 
 #import "WebURLsWithTitles.h"
 
-#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/WebKitNSStringExtras.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
+#import <WebKitLegacy/WebKitNSStringExtras.h>
 
 @implementation WebURLsWithTitles
 
index 40db8a9e33ff1b920d8e71192ef84e92a2a17170..b40f8d259932f5c1f6d5059fbb9433ce1b4eaba7 100644 (file)
 
 VPATH = $(WEBCORE_PRIVATE_HEADERS_DIR)
 
-INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit
+INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy
 PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
 PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
 
 .PHONY : all
 all : \
-    $(PUBLIC_HEADERS_DIR)/DOM.h \
-    $(PUBLIC_HEADERS_DIR)/DOMAbstractView.h \
-    $(PUBLIC_HEADERS_DIR)/DOMAttr.h \
-    $(PUBLIC_HEADERS_DIR)/DOMBlob.h \
+    $(PRIVATE_HEADERS_DIR)/DOM.h \
+    $(PRIVATE_HEADERS_DIR)/DOMAbstractView.h \
+    $(PRIVATE_HEADERS_DIR)/DOMAttr.h \
+    $(PRIVATE_HEADERS_DIR)/DOMBlob.h \
     $(INTERNAL_HEADERS_DIR)/DOMBlobInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCDATASection.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSS.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSCharsetRule.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSFontFaceRule.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSImportRule.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSMediaRule.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSPageRule.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSPrimitiveValue.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSRule.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSRuleList.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSStyleDeclaration.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCDATASection.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSS.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSCharsetRule.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSFontFaceRule.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSImportRule.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSMediaRule.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSPageRule.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSPrimitiveValue.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSRule.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSRuleList.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSStyleDeclaration.h \
     $(INTERNAL_HEADERS_DIR)/DOMCSSStyleDeclarationInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSStyleRule.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSStyleSheet.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSUnknownRule.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSValue.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCSSValueList.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCharacterData.h \
-    $(PUBLIC_HEADERS_DIR)/DOMComment.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCore.h \
-    $(PUBLIC_HEADERS_DIR)/DOMCounter.h \
-    $(PUBLIC_HEADERS_DIR)/DOMDocument.h \
-    $(PUBLIC_HEADERS_DIR)/DOMDocumentFragment.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSStyleRule.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSStyleSheet.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSUnknownRule.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSValue.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCSSValueList.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCharacterData.h \
+    $(PRIVATE_HEADERS_DIR)/DOMComment.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCore.h \
+    $(PRIVATE_HEADERS_DIR)/DOMCounter.h \
+    $(PRIVATE_HEADERS_DIR)/DOMDocument.h \
+    $(PRIVATE_HEADERS_DIR)/DOMDocumentFragment.h \
     $(INTERNAL_HEADERS_DIR)/DOMDocumentFragmentInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMDocumentFragmentPrivate.h \
     $(INTERNAL_HEADERS_DIR)/DOMDocumentInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMDocumentPrivate.h \
-    $(PUBLIC_HEADERS_DIR)/DOMDocumentType.h \
-    $(PUBLIC_HEADERS_DIR)/DOMElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMDocumentType.h \
+    $(PRIVATE_HEADERS_DIR)/DOMElement.h \
     $(INTERNAL_HEADERS_DIR)/DOMElementInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMEntity.h \
-    $(PUBLIC_HEADERS_DIR)/DOMEntityReference.h \
-    $(PUBLIC_HEADERS_DIR)/DOMEvent.h \
-    $(PUBLIC_HEADERS_DIR)/DOMEventException.h \
-    $(PUBLIC_HEADERS_DIR)/DOMEventListener.h \
-    $(PUBLIC_HEADERS_DIR)/DOMEventTarget.h \
-    $(PUBLIC_HEADERS_DIR)/DOMEvents.h \
-    $(PUBLIC_HEADERS_DIR)/DOMException.h \
-    $(PUBLIC_HEADERS_DIR)/DOMExtensions.h \
-    $(PUBLIC_HEADERS_DIR)/DOMFile.h \
-    $(PUBLIC_HEADERS_DIR)/DOMFileList.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTML.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLAnchorElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLAppletElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLAreaElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLBRElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLBaseElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLBaseFontElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLBodyElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLButtonElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLCollection.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLDListElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLDirectoryElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLDivElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLDocument.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMEntity.h \
+    $(PRIVATE_HEADERS_DIR)/DOMEntityReference.h \
+    $(PRIVATE_HEADERS_DIR)/DOMEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMEventException.h \
+    $(PRIVATE_HEADERS_DIR)/DOMEventListener.h \
+    $(PRIVATE_HEADERS_DIR)/DOMEventTarget.h \
+    $(PRIVATE_HEADERS_DIR)/DOMEvents.h \
+    $(PRIVATE_HEADERS_DIR)/DOMException.h \
+    $(PRIVATE_HEADERS_DIR)/DOMExtensions.h \
+    $(PRIVATE_HEADERS_DIR)/DOMFile.h \
+    $(PRIVATE_HEADERS_DIR)/DOMFileList.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTML.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLAnchorElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLAppletElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLAreaElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLBRElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLBaseElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLBaseFontElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLBodyElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLButtonElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLCollection.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLDListElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLDirectoryElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLDivElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLDocument.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLElement.h \
     $(INTERNAL_HEADERS_DIR)/DOMHTMLElementInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLEmbedElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLEmbedElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLEmbedElementPrivate.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLFieldSetElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLFontElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLFormElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLFieldSetElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLFontElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLFormElement.h \
     $(INTERNAL_HEADERS_DIR)/DOMHTMLFormElementInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLFrameElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLFrameSetElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLHRElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLHeadElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLHeadingElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLHtmlElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLIFrameElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLImageElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLInputElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLFrameElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLFrameSetElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLHRElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLHeadElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLHeadingElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLHtmlElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLIFrameElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLImageElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLInputElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLInputElementPrivate.h \
     $(INTERNAL_HEADERS_DIR)/DOMHTMLInputElementInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLLIElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLLabelElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLLegendElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLLinkElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLMapElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLMarqueeElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLMenuElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLMetaElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLModElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLOListElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLObjectElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLLIElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLLabelElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLLegendElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLLinkElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLMapElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLMarqueeElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLMenuElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLMetaElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLModElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLOListElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLObjectElement.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLObjectElementPrivate.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLOptGroupElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLOptionElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLOptionsCollection.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLParagraphElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLParamElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLPreElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLQuoteElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLScriptElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLSelectElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLStyleElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLTableCaptionElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLTableCellElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLTableColElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLTableElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLTableRowElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLTableSectionElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLTextAreaElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLOptGroupElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLOptionElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLOptionsCollection.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLParagraphElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLParamElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLPreElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLQuoteElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLScriptElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLSelectElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLStyleElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableCaptionElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableCellElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableColElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableRowElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableSectionElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElement.h \
     $(INTERNAL_HEADERS_DIR)/DOMHTMLTextAreaElementInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLTitleElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMHTMLUListElement.h \
-    $(PUBLIC_HEADERS_DIR)/DOMImplementation.h \
-    $(PUBLIC_HEADERS_DIR)/DOMKeyboardEvent.h \
-    $(PUBLIC_HEADERS_DIR)/DOMMediaList.h \
-    $(PUBLIC_HEADERS_DIR)/DOMMouseEvent.h \
-    $(PUBLIC_HEADERS_DIR)/DOMMutationEvent.h \
-    $(PUBLIC_HEADERS_DIR)/DOMNamedNodeMap.h \
-    $(PUBLIC_HEADERS_DIR)/DOMNode.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLTitleElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMHTMLUListElement.h \
+    $(PRIVATE_HEADERS_DIR)/DOMImplementation.h \
+    $(PRIVATE_HEADERS_DIR)/DOMKeyboardEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMMediaList.h \
+    $(PRIVATE_HEADERS_DIR)/DOMMouseEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMMutationEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMNamedNodeMap.h \
+    $(PRIVATE_HEADERS_DIR)/DOMNode.h \
     $(INTERNAL_HEADERS_DIR)/DOMNodeInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMNodePrivate.h \
-    $(PUBLIC_HEADERS_DIR)/DOMNodeFilter.h \
-    $(PUBLIC_HEADERS_DIR)/DOMNodeIterator.h \
-    $(PUBLIC_HEADERS_DIR)/DOMNodeList.h \
-    $(PUBLIC_HEADERS_DIR)/DOMNotation.h \
-    $(PUBLIC_HEADERS_DIR)/DOMObject.h \
-    $(PUBLIC_HEADERS_DIR)/DOMOverflowEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMNodeFilter.h \
+    $(PRIVATE_HEADERS_DIR)/DOMNodeIterator.h \
+    $(PRIVATE_HEADERS_DIR)/DOMNodeList.h \
+    $(PRIVATE_HEADERS_DIR)/DOMNotation.h \
+    $(PRIVATE_HEADERS_DIR)/DOMObject.h \
+    $(PRIVATE_HEADERS_DIR)/DOMOverflowEvent.h \
     $(PRIVATE_HEADERS_DIR)/DOMPrivate.h \
-    $(PUBLIC_HEADERS_DIR)/DOMProcessingInstruction.h \
-    $(PUBLIC_HEADERS_DIR)/DOMProgressEvent.h \
-    $(PUBLIC_HEADERS_DIR)/DOMRGBColor.h \
-    $(PUBLIC_HEADERS_DIR)/DOMRange.h \
+    $(PRIVATE_HEADERS_DIR)/DOMProcessingInstruction.h \
+    $(PRIVATE_HEADERS_DIR)/DOMProgressEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMRGBColor.h \
+    $(PRIVATE_HEADERS_DIR)/DOMRange.h \
     $(INTERNAL_HEADERS_DIR)/DOMRangeInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMRangeException.h \
-    $(PUBLIC_HEADERS_DIR)/DOMRanges.h \
-    $(PUBLIC_HEADERS_DIR)/DOMRect.h \
-    $(PUBLIC_HEADERS_DIR)/DOMStyleSheet.h \
-    $(PUBLIC_HEADERS_DIR)/DOMStyleSheetList.h \
-    $(PUBLIC_HEADERS_DIR)/DOMStylesheets.h \
-    $(PUBLIC_HEADERS_DIR)/DOMText.h \
-    $(PUBLIC_HEADERS_DIR)/DOMTraversal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMTreeWalker.h \
-    $(PUBLIC_HEADERS_DIR)/DOMUIEvent.h \
-    $(PUBLIC_HEADERS_DIR)/DOMViews.h \
-    $(PUBLIC_HEADERS_DIR)/DOMWheelEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMRangeException.h \
+    $(PRIVATE_HEADERS_DIR)/DOMRanges.h \
+    $(PRIVATE_HEADERS_DIR)/DOMRect.h \
+    $(PRIVATE_HEADERS_DIR)/DOMStyleSheet.h \
+    $(PRIVATE_HEADERS_DIR)/DOMStyleSheetList.h \
+    $(PRIVATE_HEADERS_DIR)/DOMStylesheets.h \
+    $(PRIVATE_HEADERS_DIR)/DOMText.h \
+    $(PRIVATE_HEADERS_DIR)/DOMTraversal.h \
+    $(PRIVATE_HEADERS_DIR)/DOMTreeWalker.h \
+    $(PRIVATE_HEADERS_DIR)/DOMUIEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMViews.h \
+    $(PRIVATE_HEADERS_DIR)/DOMWheelEvent.h \
     $(INTERNAL_HEADERS_DIR)/DOMWheelEventInternal.h \
-    $(PUBLIC_HEADERS_DIR)/DOMXPath.h \
-    $(PUBLIC_HEADERS_DIR)/DOMXPathException.h \
-    $(PUBLIC_HEADERS_DIR)/DOMXPathExpression.h \
-    $(PUBLIC_HEADERS_DIR)/DOMXPathNSResolver.h \
-    $(PUBLIC_HEADERS_DIR)/DOMXPathResult.h \
-    $(PUBLIC_HEADERS_DIR)/WebKitAvailability.h \
-    $(PUBLIC_HEADERS_DIR)/WebScriptObject.h \
-    $(PUBLIC_HEADERS_DIR)/npapi.h \
-    $(PUBLIC_HEADERS_DIR)/npfunctions.h \
-    $(PUBLIC_HEADERS_DIR)/npruntime.h \
-    $(PUBLIC_HEADERS_DIR)/nptypes.h \
+    $(PRIVATE_HEADERS_DIR)/DOMXPath.h \
+    $(PRIVATE_HEADERS_DIR)/DOMXPathException.h \
+    $(PRIVATE_HEADERS_DIR)/DOMXPathExpression.h \
+    $(PRIVATE_HEADERS_DIR)/DOMXPathNSResolver.h \
+    $(PRIVATE_HEADERS_DIR)/DOMXPathResult.h \
+    $(PRIVATE_HEADERS_DIR)/WebKitAvailability.h \
+    $(PRIVATE_HEADERS_DIR)/WebScriptObject.h \
+    $(PRIVATE_HEADERS_DIR)/npapi.h \
+    $(PRIVATE_HEADERS_DIR)/npfunctions.h \
+    $(PRIVATE_HEADERS_DIR)/npruntime.h \
+    $(PRIVATE_HEADERS_DIR)/nptypes.h \
 #
 
 ifneq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
 all : \
-    $(PUBLIC_HEADERS_DIR)/DOMGestureEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h \
     $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElementPrivate.h \
-    $(PUBLIC_HEADERS_DIR)/DOMTouch.h \
-    $(PUBLIC_HEADERS_DIR)/DOMTouchEvent.h \
-    $(PUBLIC_HEADERS_DIR)/DOMTouchList.h \
+    $(PRIVATE_HEADERS_DIR)/DOMTouch.h \
+    $(PRIVATE_HEADERS_DIR)/DOMTouchEvent.h \
+    $(PRIVATE_HEADERS_DIR)/DOMTouchList.h \
     $(PRIVATE_HEADERS_DIR)/DOMUIKitExtensions.h \
     $(PRIVATE_HEADERS_DIR)/KeyEventCodesIOS.h \
     $(PRIVATE_HEADERS_DIR)/MediaPlayerProxy.h \
@@ -230,83 +230,14 @@ $(PRIVATE_HEADERS_DIR)/WAKScrollView.h : WAKScrollView.h MigrateHeaders.make
 
 endif
 
-WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKit/ -e s/DOMDOMImplementation/DOMImplementation/
+WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/
 WEBCORE_HEADER_MIGRATE_CMD = sed $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
 
-ifeq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
-PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*TBD" "$<"; then line=$$(awk "/AVAILABLE.*TBD/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi
-else
-PUBLIC_HEADER_CHECK_CMD =
-endif
-
-$(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
-       $(PUBLIC_HEADER_CHECK_CMD)
-       $(WEBCORE_HEADER_MIGRATE_CMD)
-
 $(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
        $(WEBCORE_HEADER_MIGRATE_CMD)
 
-$(PUBLIC_HEADERS_DIR)/% : % MigrateHeaders.make
-       $(PUBLIC_HEADER_CHECK_CMD)
-       $(WEBCORE_HEADER_MIGRATE_CMD)
-
 $(PRIVATE_HEADERS_DIR)/% : % MigrateHeaders.make
        $(WEBCORE_HEADER_MIGRATE_CMD)
 
 $(INTERNAL_HEADERS_DIR)/% : % MigrateHeaders.make
        $(WEBCORE_HEADER_MIGRATE_CMD)
-
-# Migration of WebKit2 headers to WebKit
-
-WEBKIT2_HEADERS = \
-    WKBackForwardList.h \
-    WKBackForwardListItem.h \
-    WKBackForwardListItemPrivate.h \
-    WKBackForwardListPrivate.h \
-    WKFoundation.h \
-    WKFrameInfo.h \
-    WKHistoryDelegatePrivate.h \
-    WKNavigation.h \
-    WKNavigationAction.h \
-    WKNavigationDelegate.h \
-    WKNavigationResponse.h \
-    WKPreferences.h \
-    WKProcessPool.h \
-    WKProcessPoolPrivate.h \
-    WKScriptMessage.h \
-    WKScriptMessageHandler.h \
-    WKScriptMessagePrivate.h \
-    WKUIDelegate.h \
-    WKUIDelegatePrivate.h \
-    WKUserContentController.h \
-    WKUserContentControllerPrivate.h \
-    WKWebView.h \
-    WKWebViewConfiguration.h \
-    WKWebViewConfigurationPrivate.h \
-    WKWebViewPrivate.h \
-    _WKActivatedElementInfo.h \
-    _WKElementAction.h \
-    _WKFormDelegate.h \
-    _WKFormInputSession.h \
-    _WKProcessPoolConfiguration.h \
-    _WKScriptWorld.h \
-    _WKThumbnailView.h \
-    _WKVisitedLinkProvider.h \
-    _WKVisitedLinkProviderPrivate.h \
-#
-
-WEBKIT2_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/*))))
-WEBKIT2_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/*))))
-
-ifeq ($(PLATFORM_NAME), macosx)
-all : $(WEBKIT2_PUBLIC_HEADERS) $(WEBKIT2_PRIVATE_HEADERS)
-endif
-
-WEBKIT2_HEADER_REPLACE_RULES = -e s/\<WebKit2/\<WebKit/ -e /$\#.*\<WebKit\\/WK.*Ref\\.h\>/d
-WEBKIT2_HEADER_MIGRATE_CMD = sed $(WEBKIT2_HEADER_REPLACE_RULES) $< > $@
-
-$(PUBLIC_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/% MigrateHeaders.make
-       $(WEBKIT2_HEADER_MIGRATE_CMD)
-
-$(PRIVATE_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/% MigrateHeaders.make
-       $(WEBKIT2_HEADER_MIGRATE_CMD)
index 055d75ca3a6a9b432882c8c972168522112e1582..110bcd857a3b495ffa5c3838f5b27856fa37b23d 100644 (file)
@@ -28,7 +28,7 @@
 
 #import <CoreGraphics/CGContext.h>
 #import <Foundation/Foundation.h>
-#import <WebKit/WebFrame.h>
+#import <WebKitLegacy/WebFrame.h>
 
 @class DOMElement;
 
index ebb62dbd1d7f3d0c65afc2e81e73829b6276e945..fb00612670e98587a03fcd0dd05f8964b10c53a9 100644 (file)
@@ -29,7 +29,7 @@
 #import <Foundation/NSURLDownload.h>
 
 #if TARGET_OS_IPHONE
-#import <WebKit/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
 #endif
 
 @class WebDownloadInternal;
index 975aa421cf6ff78d7410a29c7e33885316cf96ba..bb220d2db5dd1bbf9ae93c567fd5e4b90a46a2bd 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDownload.h>
+#import <WebKitLegacy/WebDownload.h>
 
 #import <Foundation/NSURLAuthenticationChallenge.h>
 #import <Foundation/NSURLDownload.h>
@@ -35,7 +35,7 @@
 #import <WebCore/Credential.h>
 #import <WebCore/CredentialStorage.h>
 #import <WebCore/ProtectionSpace.h>
-#import <WebKit/WebPanelAuthenticationHandler.h>
+#import <WebKitLegacy/WebPanelAuthenticationHandler.h>
 #import <wtf/Assertions.h>
 
 #import "WebTypesInternal.h"
index 719bc16f7aaee1b533491736edb02753600200c3..9b2f39585d94a8f5b05d3330acb81237bd0db969 100644 (file)
@@ -26,7 +26,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
  
-#import <WebKit/WebDownload.h>
+#import <WebKitLegacy/WebDownload.h>
 
 #if USE(CFNETWORK)
 #import <CFNetwork/CFURLConnection.h>
index 05b38ec3e67ef6f4d841c3cb6037d3361d15dc41..e2fa77a319bf9a1e881fb52801daab52c6a8a115 100644 (file)
@@ -40,8 +40,8 @@
 #import <WebCore/HitTestResult.h>
 #import <WebCore/Image.h>
 #import <WebCore/WebCoreObjCExtras.h>
-#import <WebKit/DOMCore.h>
-#import <WebKit/DOMExtensions.h>
+#import <WebKitLegacy/DOMCore.h>
+#import <WebKitLegacy/DOMExtensions.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/MainThread.h>
 #import <wtf/RunLoop.h>
index 2ff7d173d45fa816865bfcef60e07deef45f9560..ed56236a18b0377bacd7f3c32fa6898e30f69dc9 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebIconDatabase.h>
+#import <WebKitLegacy/WebIconDatabase.h>
 
 // FIXME: Some of the following is not API and should be moved
 // either inside WebIconDatabase.mm, or to WebIconDatabaseInternal.h.
index b54f844a17b945810e328725c958913c2bc1ba45..989374b8bc4f61d027c1fa263b8dfdeecf83cc19 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/DOM.h>
-#import <WebKit/WebArchive.h>
-#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebDocument.h>
-#import <WebKit/WebDOMOperations.h>
-#import <WebKit/WebDownload.h>
-#import <WebKit/WebEditingDelegate.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebFrameLoadDelegate.h>
-#import <WebKit/WebFrameView.h>
-#import <WebKit/WebHistory.h>
-#import <WebKit/WebHistoryItem.h>
-#import <WebKit/WebKitErrors.h>
-#import <WebKit/WebPlugin.h>
-#import <WebKit/WebPluginContainer.h>
-#import <WebKit/WebPluginViewFactory.h>
-#import <WebKit/WebPolicyDelegate.h>
-#import <WebKit/WebPreferences.h>
-#import <WebKit/WebResource.h>
-#import <WebKit/WebResourceLoadDelegate.h>
-#import <WebKit/WebScriptObject.h>
-#import <WebKit/WebUIDelegate.h>
-#import <WebKit/WebView.h>
+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/WebArchive.h>
+#import <WebKitLegacy/WebBackForwardList.h>
+#import <WebKitLegacy/WebDataSource.h>
+#import <WebKitLegacy/WebDocument.h>
+#import <WebKitLegacy/WebDOMOperations.h>
+#import <WebKitLegacy/WebDownload.h>
+#import <WebKitLegacy/WebEditingDelegate.h>
+#import <WebKitLegacy/WebFrame.h>
+#import <WebKitLegacy/WebFrameLoadDelegate.h>
+#import <WebKitLegacy/WebFrameView.h>
+#import <WebKitLegacy/WebHistory.h>
+#import <WebKitLegacy/WebHistoryItem.h>
+#import <WebKitLegacy/WebKitErrors.h>
+#import <WebKitLegacy/WebPlugin.h>
+#import <WebKitLegacy/WebPluginContainer.h>
+#import <WebKitLegacy/WebPluginViewFactory.h>
+#import <WebKitLegacy/WebPolicyDelegate.h>
+#import <WebKitLegacy/WebPreferences.h>
+#import <WebKitLegacy/WebResource.h>
+#import <WebKitLegacy/WebResourceLoadDelegate.h>
+#import <WebKitLegacy/WebScriptObject.h>
+#import <WebKitLegacy/WebUIDelegate.h>
+#import <WebKitLegacy/WebView.h>
index 3fb2f20fd3745b79913ccd559786838a1929ab7e..a73f51ad80b114233523e13ef7bb120cab75fb2f 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebKitErrors.h>
+#import <WebKitLegacy/WebKitErrors.h>
 
 #import "WebLocalizableStringsInternal.h"
-#import <WebKit/WebKitErrorsPrivate.h>
-#import <WebKit/WebNSURLExtras.h>
+#import <WebKitLegacy/WebKitErrorsPrivate.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
 
 #import <pthread.h>
 
index 8c0c33d5b41a6414a764876994f9a899f5319dbd..203abd6b31e28f6cf8056729b76c3a0b460a6ab1 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebKitErrors.h>
+#import <WebKitLegacy/WebKitErrors.h>
 
 #define WebKitErrorPlugInCancelledConnection 203
 // FIXME: WebKitErrorPlugInWillHandleLoad is used for the cancel we do to prevent loading plugin content twice.  See <rdar://problem/4258008>
index 5c292130f35f79659ecc6c71339e89eceab360a2..cde50e9ce59d19278fb1508f1dc25e5b87ce2166 100644 (file)
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/TextRun.h>
 #import <WebCore/WebCoreNSStringExtras.h>
-#import <WebKit/WebNSFileManagerExtras.h>
-#import <WebKit/WebNSObjectExtras.h>
+#import <WebKitLegacy/WebNSFileManagerExtras.h>
+#import <WebKitLegacy/WebNSObjectExtras.h>
 #import <unicode/uchar.h>
 #import <sys/param.h>
 
 #if PLATFORM(IOS)
 #import <WebCore/WAKViewPrivate.h>
-#import <WebKit/DOM.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebFrameView.h>
-#import <WebKit/WebViewPrivate.h>
+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/WebFrame.h>
+#import <WebKitLegacy/WebFrameView.h>
+#import <WebKitLegacy/WebViewPrivate.h>
 #endif
 
 NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
index 0ae599fda6ce973c5ac7b3254b95d1bc14d66ecf..e47996df729e6840e0a88d39d6f60e0abfbe64ba 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebLocalizableStrings.h>
+#import <WebKitLegacy/WebLocalizableStrings.h>
 
 #import <wtf/Assertions.h>
 #import <wtf/MainThread.h>
index 5e913255b409720bb6b881d28cbac688ca3a94c2..c52f5c5c6d9113f37a8772b2db34df254a48ef0b 100644 (file)
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebNSDataExtras.h>
-#import <WebKit/WebNSDataExtrasPrivate.h>
+#import <WebKitLegacy/WebNSDataExtras.h>
+#import <WebKitLegacy/WebNSDataExtrasPrivate.h>
 
 #import <wtf/Assertions.h>
 
index 8da26d0a697b24570171bc96c12292e7da56fe04..923674a4836027becb610d9c27f7ef4389ad3cbc 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebNSDataExtras.h>
+#import <WebKitLegacy/WebNSDataExtras.h>
 
 #import <wtf/Assertions.h>
 
index f846c10930a86fb8eddad9eadc992e9bc6556695..175d26d6b392fc960d4082ba0257731b28dcac3a 100644 (file)
@@ -28,7 +28,7 @@
 
 #if !PLATFORM(IOS)
 
-#import <WebKit/WebNSEventExtras.h>
+#import <WebKitLegacy/WebNSEventExtras.h>
 
 @implementation NSEvent (WebExtras)
 
index e40fa13abeadf8615faf48de3f201fa758fbeaaf..73368130ec1643db743c8e1a1eaed439e4abe2a1 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebNSFileManagerExtras.h>
+#import <WebKitLegacy/WebNSFileManagerExtras.h>
 
 #import "WebKitNSStringExtras.h"
 #import "WebNSURLExtras.h"
index 200ae5ea30930baeeea0f1da7022febcfe194212..e24c3ef74c12d76cd556cc1f275dc68b0a42977a 100644 (file)
@@ -28,9 +28,9 @@
 
 #if !PLATFORM(IOS)
 
-#import <WebKit/WebNSImageExtras.h>
+#import <WebKitLegacy/WebNSImageExtras.h>
 
-#import <WebKit/WebKitLogging.h>
+#import <WebKitLegacy/WebKitLogging.h>
 
 @implementation NSImage (WebExtras)
 
index 8df9c6d3490ff4c0f54abae3b847ae7d6b03e550..d4499aff4c2018d9a9b1cac88d3f373c60e27b49 100644 (file)
@@ -43,8 +43,8 @@
 #import <WebCore/Image.h>
 #import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/RenderImage.h>
-#import <WebKit/DOMExtensions.h>
-#import <WebKit/DOMPrivate.h>
+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/DOMPrivate.h>
 #import <WebKitSystemInterface.h>
 #import <wtf/Assertions.h>
 #import <wtf/RetainPtr.h>
index c21fcba16d7e83fd9d6f644b4c07d002315abce9..ca2adb146f8194f7b199615dac5a23f3d503147a 100644 (file)
@@ -31,8 +31,8 @@
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
 #else
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
 #endif
 
 #define WebDragImageAlpha 0.75f
index c6f3e10f37195ad0c43539c4b88b97d0de534b1b..20d39d92a6005519ec6b6c33fe109480764fedb3 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebNSViewExtras.h>
+#import <WebKitLegacy/WebNSViewExtras.h>
 
-#import <WebKit/DOMExtensions.h>
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebFrameViewInternal.h>
-#import <WebKit/WebNSImageExtras.h>
-#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/WebView.h>
+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/WebDataSource.h>
+#import <WebKitLegacy/WebFramePrivate.h>
+#import <WebKitLegacy/WebFrameViewInternal.h>
+#import <WebKitLegacy/WebNSImageExtras.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
+#import <WebKitLegacy/WebView.h>
 
 #if !PLATFORM(IOS)
-#import <WebKit/WebNSPasteboardExtras.h>
+#import <WebKitLegacy/WebNSPasteboardExtras.h>
 #endif
 
 #if PLATFORM(IOS)
index 92567117d00a2bc95d1ecd5a99a253b9f1039d04..d69cf0441880a3bbacd3a448a866d66c8c2b3c12 100644 (file)
 
 #if !PLATFORM(IOS)
 
-#import <WebKit/WebAuthenticationPanel.h>
+#import <WebKitLegacy/WebAuthenticationPanel.h>
 
 #import "WebLocalizableStringsInternal.h"
 #import <Foundation/NSURLAuthenticationChallenge.h>
 #import <Foundation/NSURLProtectionSpace.h>
 #import <Foundation/NSURLCredential.h>
-#import <WebKit/WebKitNSStringExtras.h>
-#import <WebKit/WebNSURLExtras.h>
+#import <WebKitLegacy/WebKitNSStringExtras.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
 #import <wtf/Assertions.h>
 
-#import <WebKit/WebNSControlExtras.h>
+#import <WebKitLegacy/WebNSControlExtras.h>
 
 #define WebAuthenticationPanelNibName @"WebAuthenticationPanel"
 
index fe98f61719173d8e1aa6c719fd5b0c74f9fa22eb..39f4327cc18319382d2f5e1d21b74e5480fa9ac8 100644 (file)
 
 #if !PLATFORM(IOS)
 
-#import <WebKit/WebPanelAuthenticationHandler.h>
+#import <WebKitLegacy/WebPanelAuthenticationHandler.h>
 
 #import <Foundation/NSURLAuthenticationChallenge.h>
-#import <WebKit/WebAuthenticationPanel.h>
+#import <WebKitLegacy/WebAuthenticationPanel.h>
 #import <wtf/Assertions.h>
 
 static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
index a338029e313d6aea2c26becfbdc90ede09259fb0..8c194abfa54dd7107040032702dbd4e3413f340e 100644 (file)
@@ -29,7 +29,7 @@
 #define HostedNetscapePluginStream_h
 
 #include <WebCore/NetscapePlugInStreamLoader.h>
-#include <WebKit/npapi.h>
+#include <WebKitLegacy/npapi.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
index 2fe5c4b2a79da100a61ffba87247fc3ec7ea65a8..3b2a5924aef9e6742ff9205902ea60d199a34a6b 100644 (file)
@@ -32,7 +32,7 @@
 #include <JavaScriptCore/VM.h>
 #include <JavaScriptCore/Strong.h>
 #include <WebCore/Timer.h>
-#include <WebKit/npapi.h>
+#include <WebKitLegacy/npapi.h>
 #include <wtf/Deque.h>
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
index 0f332b6fa873b957447586e5d1c0e13b8c5995cb..130cf61f24e63e58ac9e4922935c01289d345950 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
  
-#include <WebKit/WebKitPluginHostTypes.defs>
+#include <WebKitLegacy/WebKitPluginHostTypes.defs>
 
 subsystem WebKitPluginAgent 100;
 
index c802b3d6a53c9b9be3244db41e54b27a7ab489dc..ee555b3c295bb37aa0e2a9ece58575d60d66cb52 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
  
-#include <WebKit/WebKitPluginHostTypes.defs>
+#include <WebKitLegacy/WebKitPluginHostTypes.defs>
 
 subsystem WebKitPluginAgentReply 200;
 
index f1dafe084d8c2f26276acf93e2b8a5b47c03a3e4..26cea5b3a74e9d73fed20b2c79dc481a48e69136 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include <WebKit/WebKitPluginHostTypes.defs>
+#include <WebKitLegacy/WebKitPluginHostTypes.defs>
 
 // FIXME: Come up with a better name.
 subsystem WebKitPluginClient 300;
index 9b1eb37f6d0f1251b7262af39da6adbe7a6c7ea3..fce6f45f5f67e3b47f52cce696d101ad1e0037f4 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include <WebKit/WebKitPluginHostTypes.defs>
+#include <WebKitLegacy/WebKitPluginHostTypes.defs>
 
 subsystem WebKitPluginHost 300;
 
index ee535200897f0a6d8b7a873151b845628577d012..e3b59a2e4cdd7a815038bcef15d6b8335939f4ae 100644 (file)
@@ -26,7 +26,7 @@
 #include <mach/std_types.defs>
 #include <mach/mach_types.defs>
 
-import <WebKit/WebKitPluginHostTypes.h>;
+import <WebKitLegacy/WebKitPluginHostTypes.h>;
 
 type plist_bytes_t = ^array [] of uint8_t;
 type application_name_t = ^array [] of uint8_t;
index b8ddd65253d6c184f20a052c14538a98ca2e130f..d09de423fcab6fa14a9e437fb82b2e3c5f3afa09 100644 (file)
@@ -57,7 +57,7 @@
 #import <WebCore/RenderWidget.h>
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/WebCoreObjCExtras.h>
-#import <WebKit/DOMPrivate.h>
+#import <WebKitLegacy/DOMPrivate.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/Assertions.h>
 #import <wtf/MainThread.h>
index 09920f78d680164a3d46358e3b28d657d4858d4a..504aa32b46ad3b88b819a354c65edbe09189188f 100644 (file)
@@ -30,7 +30,7 @@
 #import <wtf/RetainPtr.h>
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
-#import <WebKit/npfunctions.h>
+#import <WebKitLegacy/npfunctions.h>
 #else
 typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void);
 #endif
index 9ff3d5c36375cd867ec79cd04505a6ba51cded00..bc13dc8016f810efbb0b953a2c3885a7ea403a6b 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebBasePluginPackage.h>
+#import <WebKitLegacy/WebBasePluginPackage.h>
 
 #import <algorithm>
 #import <WebCore/WebCoreObjCExtras.h>
-#import <WebKit/WebKitNSStringExtras.h>
-#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebKit/WebPluginPackage.h>
+#import <WebKitLegacy/WebKitNSStringExtras.h>
+#import <WebKitLegacy/WebNetscapePluginPackage.h>
+#import <WebKitLegacy/WebPluginPackage.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/Assertions.h>
 #import <wtf/MainThread.h>
index 9a8add1b159fc65cb642453097b074bab9774200..e4310c8b866b8400aaeb34036f0abea64b98b645 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef WebNetscapeContainerCheckPrivate_h
 #define WebNetscapeContainerCheckPrivate_h
 
-#include <WebKit/npapi.h>
+#include <WebKitLegacy/npapi.h>
 
 #ifdef __cplusplus
 extern "C" {
index 3a2f03f3ab3a56806c7a176d1ac281fda27e2a40..21fe89dfd43356080531d4284fe5843f05909c85 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef WebNetscapePluginEventHandlerCocoa_h
 #define WebNetscapePluginEventHandlerCocoa_h
 
-#include <WebKit/npapi.h>
+#include <WebKitLegacy/npapi.h>
 #include "WebNetscapePluginEventHandler.h"
 
 class WebNetscapePluginEventHandlerCocoa : public WebNetscapePluginEventHandler {
index b8e442864c5fdf3bc66a6618f4169616b0e819aa..4cc2831613fd69a9668b46d5410f37083d062dae 100644 (file)
@@ -31,7 +31,7 @@
 
 #import <WebCore/Timer.h>
 #import <WebCore/NetscapePlugInStreamLoader.h>
-#import <WebKit/npfunctions.h>
+#import <WebKitLegacy/npfunctions.h>
 #import <wtf/PassRefPtr.h>
 #import <wtf/RefCounted.h>
 #import <wtf/RefPtr.h>
index 8799aaf046eb7fc146af53c76f866f7a72a765bd..d7b9db7641498f1046d3ca8534a6d6163ca9dc5c 100644 (file)
@@ -31,8 +31,8 @@
 #import "WebBaseNetscapePluginView.h"
 
 #import "WebNetscapeContainerCheckPrivate.h"
-#import <WebKit/npfunctions.h>
-#import <WebKit/npapi.h>
+#import <WebKitLegacy/npfunctions.h>
+#import <WebKitLegacy/npapi.h>
 #import <wtf/HashMap.h>
 #import <wtf/HashSet.h>
 #import <wtf/OwnPtr.h>
index 96aa5dbfde5bbe526cce20b5be6ffbc1b038202f..d4f54a14e45cf2051088752e415518391d85da35 100644 (file)
@@ -74,8 +74,8 @@
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreURLResponse.h>
 #import <WebCore/npruntime_impl.h>
-#import <WebKit/DOMPrivate.h>
-#import <WebKit/WebUIDelegate.h>
+#import <WebKitLegacy/DOMPrivate.h>
+#import <WebKitLegacy/WebUIDelegate.h>
 #import <objc/runtime.h>
 #import <runtime/InitializeThreading.h>
 #import <runtime/JSLock.h>
index 80623ae70bf827fc78e335165d5ef55599764ed4..376efc9c8e148e35e84438389d3b8964d24c39b9 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WebKitAvailability.h>
+#import <WebKitLegacy/WebKitAvailability.h>
 
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
index d604725c743154ea2b38fb19863843138b70ebf6..b38b2b024d6bf1a643568de0d6482096a072aed7 100644 (file)
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebBasePluginPackage.h>
-#import <WebKit/WebPluginContainerCheck.h>
+#import <WebKitLegacy/WebBasePluginPackage.h>
+#import <WebKitLegacy/WebPluginContainerCheck.h>
 
 @class WebFrame;
 @class WebHTMLView;
index 3f20867d4f9b51318aace37c894937d7aaa6bd73..178a38d569c02728b0bb3d4970fbd6501f671a96 100644 (file)
@@ -29,7 +29,7 @@
 #import <Foundation/Foundation.h>
 
 #if TARGET_OS_IPHONE
-#import <WebKit/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
 #endif
 
 @class WebBasePluginPackage;
index 98121e095b4b25d9d960146cc53b6f37ada100bb..5547d1004d771ca2039abe384ff51d7d22c63b84 100644 (file)
@@ -28,7 +28,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <WebKit/WebBasePluginPackage.h>
+#import <WebKitLegacy/WebBasePluginPackage.h>
 
 @protocol WebPluginViewFactory;
 
index 6d8aecce6a039f1bde6a96a57f94647966579eea..84ff8e3e5cbfc8ab2b2fa51ce8238aa4dd382230 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebPluginPackage.h>
+#import <WebKitLegacy/WebPluginPackage.h>
 
-#import <WebKit/WebKitLogging.h>
-#import <WebKit/WebKitNSStringExtras.h>
+#import <WebKitLegacy/WebKitLogging.h>
+#import <WebKitLegacy/WebKitNSStringExtras.h>
 
 NSString *WebPlugInBaseURLKey =                 @"WebPlugInBaseURLKey";
 NSString *WebPlugInAttributesKey =              @"WebPlugInAttributesKey";
index c510a8333036cad40be934be84d632c8faab4c8d..41d4de20aaf7c21a74944bd6ed88062973cd5c7e 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WebKitAvailability.h>
+#import <WebKitLegacy/WebKitAvailability.h>
 
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
index 0fc15d2f5d7492b87c70ea623cb161b08901a43d..5a0f2a981fe67d9234586540d3ea0cea4af4a87c 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebPluginViewFactory.h>
+#import <WebKitLegacy/WebPluginViewFactory.h>
 
 typedef enum {
     WebPlugInModeEmbed = 0,
index 5f90616846b70db9cb9508cdfd2ab8556146e30d..fc3d8e876728a312a482763fbc9cc05a648721c6 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
-#import <WebKit/npapi.h>
+#import <WebKitLegacy/npapi.h>
 
 #import "WebNetscapePluginView.h"
 #import "WebKitLogging.h"
index 85bb44ab330c8dd00d5ef045e669858eea1c5e8d..677d2f878ad3f78cb24c7f47c9177a4ba6d45ed1 100644 (file)
@@ -49,7 +49,7 @@ extern NSString *WebDatabaseDidModifyDatabaseNotification;
 extern NSString *WebDatabaseIdentifierKey;
 
 #if TARGET_OS_IPHONE
-#import <WebKit/WebUIKitSupport.h>
+#import <WebKitLegacy/WebUIKitSupport.h>
 
 // Posted when origins have changed.
 extern CFStringRef WebDatabaseOriginsDidChangeNotification;
index fae4df33e0f906383d7b313c7712982e7059a9f9..4cd930cd29fd19f0eed5ffd56a429ee8ebc5d645 100644 (file)
@@ -53,7 +53,7 @@
 #import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/RuntimeApplicationChecks.h>
-#import <WebKit/DOMPrivate.h>
+#import <WebKitLegacy/DOMPrivate.h>
 
 using namespace WebCore;
 
index c11e5010eeac61b71a65abc94c6cc53ab0a8f96c..b7c36abd92a7c4ab0cc550913cf5b8cf3501de9b 100644 (file)
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebScriptObjectPrivate.h>
 #import <WebCore/Widget.h>
-#import <WebKit/DOMElement.h>
-#import <WebKit/DOMHTMLFormElement.h>
+#import <WebKitLegacy/DOMElement.h>
+#import <WebKitLegacy/DOMHTMLFormElement.h>
 #import <WebKitSystemInterface.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/MainThread.h>
index f0005b1c21c62fc4f5a084b99835ea047d89d664..1b15eab233043b586e0629cc542247f3c1536094 100644 (file)
@@ -37,7 +37,7 @@
 #if PLATFORM(IOS)
 #import <CFNetwork/CFHTTPCookiesPriv.h>
 #import <WebCore/WebCoreThread.h>
-#import <WebKit/WebFrameLoadDelegate.h>
+#import <WebKitLegacy/WebFrameLoadDelegate.h>
 #endif
 
 using namespace WebCore;
index d58460ea128fc8d676a4ff88c282dbda5b7d653c..d796332fd0febc2278298efb8c69033b757e7f55 100644 (file)
@@ -40,7 +40,7 @@
 
 #if PLATFORM(IOS)
 #import <WebCore/WAKResponder.h>
-#import <WebKit/WebCoreThreadRun.h>
+#import <WebKitLegacy/WebCoreThreadRun.h>
 #endif
 
 using namespace WebCore;
index 2094aef07da85ea08d5864edf36c45d46cc2d07a..73ce2a3ce1386e686d2fa5cabe93b599e652943a 100644 (file)
@@ -51,7 +51,7 @@
 #import <WebCore/Page.h>
 #import <WebCore/ScriptController.h>
 #import <WebCore/SoftLinking.h>
-#import <WebKit/DOMExtensions.h>
+#import <WebKitLegacy/DOMExtensions.h>
 #import <WebKitSystemInterface.h>
 #import <wtf/text/Base64.h>
 
index b3487b8e164102ed4fc6dbf9bcac585b9a1087b0..92ceadf4066c81f1730d2ed27c3526e5376c17ca 100644 (file)
@@ -32,8 +32,8 @@
 
 #import <wtf/Assertions.h>
 
-#import <WebKit/WebNSControlExtras.h>
-#import <WebKit/WebNSWindowExtras.h>
+#import <WebKitLegacy/WebNSControlExtras.h>
+#import <WebKitLegacy/WebNSWindowExtras.h>
 
 @implementation WebJavaScriptTextInputPanel
 
index 864d991aeafbfded55f8d9556063c57a72d341c6..34b3855e4fcf3836f1a681ed568b13c1ba6c4cec 100644 (file)
@@ -25,7 +25,7 @@
 
 #if !PLATFORM(IOS)
 
-#import <WebKit/WebKeyGenerator.h>
+#import <WebKitLegacy/WebKeyGenerator.h>
 
 #import <WebKitSystemInterface.h>
 #import <wtf/Assertions.h>
index d190e8724c31c7cf9ae557558e56e0fe1bf618fe..cb902b1941776088cb5f89c23aa356b7406e7916 100644 (file)
@@ -28,7 +28,7 @@
 
 // This header contains the WebInspector SPI.
 
-#import <WebKit/WebInspector.h>
+#import <WebKitLegacy/WebInspector.h>
 
 @class WebInspectorFrontend;
 
index 1efc2a2b51d2f9f2de428b533adfd7442ae9bb56..66a8c02551ff65cc8888c80a52ef7cc762b18130 100644 (file)
@@ -28,8 +28,8 @@
 
 #if PLATFORM(IOS)
 #import <QuartzCore/CATiledLayer.h>
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
 #endif
 
 @class WebNodeHighlightView;
index e335b18f62f08631643cd259f34bad3f2687ac95..c7d20bc7ea8819873aa36553cc5a5cb2ebec686a 100644 (file)
@@ -28,8 +28,8 @@
 
 #if PLATFORM(IOS)
 #import <QuartzCore/CAShapeLayer.h>
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
 #endif
 
 @class WebNodeHighlight;
diff --git a/Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make b/Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make
new file mode 100644 (file)
index 0000000..4e5ac1c
--- /dev/null
@@ -0,0 +1,289 @@
+# Copyright (C) 2006, 2007, 2008, 2014 Apple Inc. All rights reserved.
+# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+#
+# 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. 
+# 3.  Neither the name of Apple Inc. ("Apple") nor the names of
+#     its contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission. 
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
+
+# Migration of WebKit Legacy headers to WebKit.
+
+ifeq ($(PLATFORM_NAME), macosx)
+
+PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
+PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
+
+WEBKIT_PUBLIC_HEADERS = \
+    CarbonUtils.h \
+    DOM.h \
+    DOMAbstractView.h \
+    DOMAttr.h \
+    DOMBlob.h \
+    DOMCDATASection.h \
+    DOMCSS.h \
+    DOMCSSCharsetRule.h \
+    DOMCSSFontFaceRule.h \
+    DOMCSSImportRule.h \
+    DOMCSSMediaRule.h \
+    DOMCSSPageRule.h \
+    DOMCSSPrimitiveValue.h \
+    DOMCSSRule.h \
+    DOMCSSRuleList.h \
+    DOMCSSStyleDeclaration.h \
+    DOMCSSStyleRule.h \
+    DOMCSSStyleSheet.h \
+    DOMCSSUnknownRule.h \
+    DOMCSSValue.h \
+    DOMCSSValueList.h \
+    DOMCharacterData.h \
+    DOMComment.h \
+    DOMCore.h \
+    DOMCounter.h \
+    DOMDocument.h \
+    DOMDocumentFragment.h \
+    DOMDocumentType.h \
+    DOMElement.h \
+    DOMEntity.h \
+    DOMEntityReference.h \
+    DOMEvent.h \
+    DOMEventException.h \
+    DOMEventListener.h \
+    DOMEventTarget.h \
+    DOMEvents.h \
+    DOMException.h \
+    DOMExtensions.h \
+    DOMFile.h \
+    DOMFileList.h \
+    DOMHTML.h \
+    DOMHTMLAnchorElement.h \
+    DOMHTMLAppletElement.h \
+    DOMHTMLAreaElement.h \
+    DOMHTMLBRElement.h \
+    DOMHTMLBaseElement.h \
+    DOMHTMLBaseFontElement.h \
+    DOMHTMLBodyElement.h \
+    DOMHTMLButtonElement.h \
+    DOMHTMLCollection.h \
+    DOMHTMLDListElement.h \
+    DOMHTMLDirectoryElement.h \
+    DOMHTMLDivElement.h \
+    DOMHTMLDocument.h \
+    DOMHTMLElement.h \
+    DOMHTMLEmbedElement.h \
+    DOMHTMLFieldSetElement.h \
+    DOMHTMLFontElement.h \
+    DOMHTMLFormElement.h \
+    DOMHTMLFrameElement.h \
+    DOMHTMLFrameSetElement.h \
+    DOMHTMLHRElement.h \
+    DOMHTMLHeadElement.h \
+    DOMHTMLHeadingElement.h \
+    DOMHTMLHtmlElement.h \
+    DOMHTMLIFrameElement.h \
+    DOMHTMLImageElement.h \
+    DOMHTMLInputElement.h \
+    DOMHTMLLIElement.h \
+    DOMHTMLLabelElement.h \
+    DOMHTMLLegendElement.h \
+    DOMHTMLLinkElement.h \
+    DOMHTMLMapElement.h \
+    DOMHTMLMarqueeElement.h \
+    DOMHTMLMenuElement.h \
+    DOMHTMLMetaElement.h \
+    DOMHTMLModElement.h \
+    DOMHTMLOListElement.h \
+    DOMHTMLObjectElement.h \
+    DOMHTMLOptGroupElement.h \
+    DOMHTMLOptionElement.h \
+    DOMHTMLOptionsCollection.h \
+    DOMHTMLParagraphElement.h \
+    DOMHTMLParamElement.h \
+    DOMHTMLPreElement.h \
+    DOMHTMLQuoteElement.h \
+    DOMHTMLScriptElement.h \
+    DOMHTMLSelectElement.h \
+    DOMHTMLStyleElement.h \
+    DOMHTMLTableCaptionElement.h \
+    DOMHTMLTableCellElement.h \
+    DOMHTMLTableColElement.h \
+    DOMHTMLTableElement.h \
+    DOMHTMLTableRowElement.h \
+    DOMHTMLTableSectionElement.h \
+    DOMHTMLTextAreaElement.h \
+    DOMHTMLTitleElement.h \
+    DOMHTMLUListElement.h \
+    DOMImplementation.h \
+    DOMKeyboardEvent.h \
+    DOMMediaList.h \
+    DOMMouseEvent.h \
+    DOMMutationEvent.h \
+    DOMNamedNodeMap.h \
+    DOMNode.h \
+    DOMNodeFilter.h \
+    DOMNodeIterator.h \
+    DOMNodeList.h \
+    DOMNotation.h \
+    DOMObject.h \
+    DOMOverflowEvent.h \
+    DOMProcessingInstruction.h \
+    DOMProgressEvent.h \
+    DOMRGBColor.h \
+    DOMRange.h \
+    DOMRangeException.h \
+    DOMRanges.h \
+    DOMRect.h \
+    DOMStyleSheet.h \
+    DOMStyleSheetList.h \
+    DOMStylesheets.h \
+    DOMText.h \
+    DOMTraversal.h \
+    DOMTreeWalker.h \
+    DOMUIEvent.h \
+    DOMViews.h \
+    DOMWheelEvent.h \
+    DOMXPath.h \
+    DOMXPathException.h \
+    DOMXPathExpression.h \
+    DOMXPathNSResolver.h \
+    DOMXPathResult.h \
+    HIWebView.h \
+    WebArchive.h \
+    WebBackForwardList.h \
+    WebDOMOperations.h \
+    WebDataSource.h \
+    WebDocument.h \
+    WebDownload.h \
+    WebEditingDelegate.h \
+    WebFrame.h \
+    WebFrameLoadDelegate.h \
+    WebFrameView.h \
+    WebHistory.h \
+    WebHistoryItem.h \
+    WebKitAvailability.h \
+    WebKitErrors.h \
+    WebPlugin.h \
+    WebPluginContainer.h \
+    WebPluginViewFactory.h \
+    WebPolicyDelegate.h \
+    WebPreferences.h \
+    WebResource.h \
+    WebResourceLoadDelegate.h \
+    WebScriptObject.h \
+    WebUIDelegate.h \
+    WebView.h \
+    npapi.h \
+    npfunctions.h \
+    npruntime.h \
+    nptypes.h \
+#
+
+WEBKIT_LEGACY_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT_PUBLIC_HEADERS), $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/*))) WebKitLegacy.h)
+
+WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(WEBKIT_PUBLIC_HEADERS) WebKit.h, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/*))))
+
+WEBKIT_LEGACY_HEADER_REPLACE_RULES = -e s/\<WebKitLegacy/\<WebKit/
+WEBKIT_LEGACY_HEADER_MIGRATE_CMD = sed $(WEBKIT_LEGACY_HEADER_REPLACE_RULES) $< > $@
+
+PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*TBD" "$<"; then line=$$(awk "/AVAILABLE.*TBD/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi
+
+$(PUBLIC_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+       $(PUBLIC_HEADER_CHECK_CMD)
+       $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+$(PRIVATE_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+       $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+# Migration of WebKit2 headers to WebKit
+
+WEBKIT2_HEADERS = \
+    WKBackForwardList.h \
+    WKBackForwardListItem.h \
+    WKBackForwardListPrivate.h \
+    WKFoundation.h \
+    WKFrameInfo.h \
+    WKHistoryDelegatePrivate.h \
+    WKNavigation.h \
+    WKNavigationAction.h \
+    WKNavigationDelegate.h \
+    WKNavigationDelegatePrivate.h \
+    WKNavigationResponse.h \
+    WKPreferences.h \
+    WKProcessPool.h \
+    WKProcessPoolPrivate.h \
+    WKScriptMessage.h \
+    WKScriptMessageHandler.h \
+    WKScriptMessagePrivate.h \
+    WKUIDelegate.h \
+    WKUIDelegatePrivate.h \
+    WKUserContentController.h \
+    WKUserContentControllerPrivate.h \
+    WKWebView.h \
+    WKWebViewConfiguration.h \
+    WKWebViewConfigurationPrivate.h \
+    WKWebViewPrivate.h \
+    _WKActivatedElementInfo.h \
+    _WKDownload.h \
+    _WKDownloadDelegate.h \
+    _WKElementAction.h \
+    _WKFormDelegate.h \
+    _WKFormInputSession.h \
+    _WKProcessPoolConfiguration.h \
+    _WKScriptWorld.h \
+    _WKThumbnailView.h \
+    _WKVisitedLinkProvider.h \
+#
+
+WEBKIT2_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/*))))
+WEBKIT2_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/*))))
+
+WEBKIT2_HEADER_REPLACE_RULES = -e s/\<WebKit2/\<WebKit/ -e /$\#.*\<WebKit\\/WK.*Ref\\.h\>/d
+WEBKIT2_HEADER_MIGRATE_CMD = sed $(WEBKIT2_HEADER_REPLACE_RULES) $< > $@
+
+$(PUBLIC_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/% MigrateHeadersFromWebKitLegacy.make
+       $(WEBKIT2_HEADER_MIGRATE_CMD)
+
+$(PRIVATE_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+       $(WEBKIT2_HEADER_MIGRATE_CMD)
+
+all : $(WEBKIT_LEGACY_PUBLIC_HEADERS) $(WEBKIT_LEGACY_PRIVATE_HEADERS) $(WEBKIT2_PUBLIC_HEADERS) $(WEBKIT2_PRIVATE_HEADERS)
+
+$(PUBLIC_HEADERS_DIR)/WebKitLegacy.h : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/WebKit.h MigrateHeadersFromWebKitLegacy.make
+       $(PUBLIC_HEADER_CHECK_CMD)
+       $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+else
+
+PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
+
+WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out WebKit.h, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/*))))
+
+all : $(WEBKIT_LEGACY_PRIVATE_HEADERS) $(PRIVATE_HEADERS_DIR)/WebKitLegacy.h
+
+WEBKIT_HEADER_MIGRATE_CMD = echo "\#import <WebKitLegacy/"`basename $<`">" > $@
+
+$(PRIVATE_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+       $(WEBKIT_HEADER_MIGRATE_CMD)
+
+$(PRIVATE_HEADERS_DIR)/WebKitLegacy.h : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/WebKit.h MigrateHeadersFromWebKitLegacy.make
+       $(WEBKIT_HEADER_MIGRATE_CMD)
+
+endif
diff --git a/Source/WebKit/mac/WebKitLegacy/MigrateHeadersToLegacy.make b/Source/WebKit/mac/WebKitLegacy/MigrateHeadersToLegacy.make
deleted file mode 100644 (file)
index f7c7217..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
-# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
-#
-# 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. 
-# 3.  Neither the name of Apple Inc. ("Apple") nor the names of
-#     its contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission. 
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
-
-PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
-PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
-
-# Migration of WebKit headers to WebKit Legacy
-
-WEBKIT_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/*)))
-WEBKIT_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/*)))
-
-all : $(WEBKIT_PUBLIC_HEADERS) $(WEBKIT_PRIVATE_HEADERS)
-
-WEBKIT_HEADER_MIGRATE_CMD = echo "\#import <WebKit/"`basename $<`">" > $@
-
-$(PUBLIC_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/% MigrateHeadersToLegacy.make
-       $(WEBKIT_HEADER_MIGRATE_CMD)
-
-$(PRIVATE_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/% MigrateHeadersToLegacy.make
-       $(WEBKIT_HEADER_MIGRATE_CMD)
diff --git a/Source/WebKit/mac/WebKitLegacy/WebKit.h b/Source/WebKit/mac/WebKitLegacy/WebKit.h
new file mode 100644 (file)
index 0000000..f92021a
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+// 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>
+#import <WebKit/WKFrameInfo.h>
+#import <WebKit/WKNavigation.h>
+#import <WebKit/WKNavigationAction.h>
+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKNavigationResponse.h>
+#import <WebKit/WKPreferences.h>
+#import <WebKit/WKProcessPool.h>
+#import <WebKit/WKScriptMessage.h>
+#import <WebKit/WKScriptMessageHandler.h>
+#import <WebKit/WKUIDelegate.h>
+#import <WebKit/WKUserContentController.h>
+#import <WebKit/WKWebView.h>
+#import <WebKit/WKWebViewConfiguration.h>
+#endif
+
+#if defined(__has_include) && __has_include(<WebKit/WebKitLegacy.h>)
+#import <WebKit/WebKitLegacy.h>
+#endif
similarity index 88%
rename from Source/WebKit/mac/WebKitLegacy/WebKitLegacy.cpp
rename to Source/WebKit/mac/WebKitLegacy/WebKit.m
index 035adb5de9d73a1401a1dc9718cdbc5aff78104e..1358177dfbda3ed4884d67ca9ba83708dc51ab5c 100644 (file)
@@ -23,4 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// This file is only here so that WebKitLegacy.framework has something to link.
+// FIXME: This is only temporary; WebKit.framework is going to be provided by the WebKit2 project.
+
+// This file is only here so that WebKit.framework has something to link.
diff --git a/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h b/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h
new file mode 100644 (file)
index 0000000..f6b266a
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#import <WebKit/WKBackForwardListPrivate.h>
+#import <WebKit/WKHistoryDelegatePrivate.h>
+#import <WebKit/WKProcessPoolPrivate.h>
+#import <WebKit/WKScriptMessagePrivate.h>
+#import <WebKit/WKUIDelegatePrivate.h>
+#import <WebKit/WKUserContentControllerPrivate.h>
+#import <WebKit/WKWebViewConfigurationPrivate.h>
+#import <WebKit/WKWebViewPrivate.h>
+#import <WebKit/_WKActivatedElementInfo.h>
+#import <WebKit/_WKElementAction.h>
+#import <WebKit/_WKFormDelegate.h>
+#import <WebKit/_WKFormInputSession.h>
+#import <WebKit/_WKProcessPoolConfiguration.h>
+#import <WebKit/_WKScriptWorld.h>
+#import <WebKit/_WKThumbnailView.h>
+#import <WebKit/_WKVisitedLinkProvider.h>
index f6e9cad867421834ef60f803ef896af878f4d8db..d032ee0e0673dd5995ab382022b9f41d5c3c5172 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WebDocument.h>
+#import <WebKitLegacy/WebDocument.h>
 
 @class NSMutableURLRequest;
 @class NSURLConnection;
index bede0aae31d1afad4a120b44d90e4107503136f3..f2a057646372521d06ef02b61c45ac4ca518dd4d 100644 (file)
@@ -58,8 +58,8 @@
 #import <WebCore/SharedBuffer.h>
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreURLResponse.h>
-#import <WebKit/DOMHTML.h>
-#import <WebKit/DOMPrivate.h>
+#import <WebKitLegacy/DOMHTML.h>
+#import <WebKitLegacy/DOMPrivate.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/Assertions.h>
 #import <wtf/MainThread.h>
index e00bbec797145fed3012f6c74ee750ce5ff78a43..a3a75dea8bbdbf7b51dce46d49a308c55be2f95e 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDataSource.h>
+#import <WebKitLegacy/WebDataSource.h>
 
 @protocol WebDataSourcePrivateDelegate
 @required
index fa6d90369019cbc74a52d0ca58b75889763efacc..82a4d92c31c8e8ca27a98c893556ba94339b04f6 100644 (file)
@@ -32,7 +32,7 @@
 #import <JavaScriptCore/JSBase.h>
 
 #if PLATFORM(IOS)
-#import <WebKit/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
 #endif
 
 @class WebView;
index 28e2bbe84f69341d82c4bc41d231f45f8017bb9d..86b6b891f7806674826f0594955020e801c0af37 100644 (file)
@@ -31,8 +31,8 @@
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
 #else
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
 #endif
 
 @class NSError;
index eca07f0cbc88c8a350b61a23cb4cb29c41d0128a..2408b247b67ec2b000fce50105535194831e4da1 100644 (file)
@@ -26,9 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDocumentPrivate.h>
-#import <WebKit/WebHTMLView.h>
-#import <WebKit/WebViewPrivate.h>
+#import <WebKitLegacy/WebDocumentPrivate.h>
+#import <WebKitLegacy/WebHTMLView.h>
+#import <WebKitLegacy/WebViewPrivate.h>
 
 #if PLATFORM(IOS)
 #if !defined(IBAction)
index 7017beacaaca6ba8b13f34b72ecbcd44f9767e6b..2524fc6953e3533e978ec96a59c3a03f8c5fb853 100644 (file)
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDocument.h>
-#import <WebKit/WebHTMLView.h>
+#import <WebKitLegacy/WebDocument.h>
+#import <WebKitLegacy/WebHTMLView.h>
 
 @class DOMDocument;
 @class PDFDocument;
index 2fd050d98c9f20caaf73f2c078c63abe6d9b98c4..1a66b31aa4542076a12a72e6fcd7f8350eb927e3 100644 (file)
@@ -31,7 +31,7 @@
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
 #else
-#import <WebKit/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
 #endif
 
 @class DOMCSSStyleDeclaration;
index f26bad39f4613be608e5cbec1c75386fb23e4f45..1dd1fcc97491843c55fe1195a9d2d76299e62d41 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebEditingDelegate.h>
+#import <WebKitLegacy/WebEditingDelegate.h>
 
 @class DOMHTMLElement;
 
index 9d361a6cc7bc572797ca83da53211e439bc33699..b296e8fc0fb9b564b8f7ea91aed220a0969d80f4 100644 (file)
@@ -28,7 +28,7 @@
 
 #import <Foundation/Foundation.h>
 #import <JavaScriptCore/JSBase.h>
-#import <WebKit/WebKitAvailability.h>
+#import <WebKitLegacy/WebKitAvailability.h>
 
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
index 83090bc0f146ccbebbf66975ca607b2efc9e2238..900851dc571d2aad792a79dd808210e53503ed48 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebFrameLoadDelegate.h>
+#import <WebKitLegacy/WebFrameLoadDelegate.h>
 
 @class WebScriptWorld;
 @class WebSecurityOrigin;
index 8ed5d548f448929027d141603f8142b907105db9..da32133628bd0e3eb571488f60680bb9ee6372e9 100644 (file)
@@ -28,7 +28,7 @@
 
 // This header contains the WebFrame SPI.
 
-#import <WebKit/WebFrame.h>
+#import <WebKitLegacy/WebFrame.h>
 #import <JavaScriptCore/JSBase.h>
 
 #if !TARGET_OS_IPHONE
@@ -39,7 +39,7 @@
 
 #if TARGET_OS_IPHONE
 #include <CoreText/CoreText.h>
-#include <WebKit/WAKAppKitStubs.h>
+#include <WebKitLegacy/WAKAppKitStubs.h>
 #endif
 
 @class DOMDocumentFragment;
index dea58ef9afd29abf90b6cb872d37f04751726658..b9a6dbb53a4f1bc0b5e73f3f85e61e823a2b2240 100644 (file)
@@ -31,8 +31,8 @@
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
 #else
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
 #endif
 
 @class WebDataSource;
index 811b31bf812726152fe32014d0391201135819ea..4d543c91fad7f6a122a78247211ba9d3b2404ba1 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebFrameView.h>
+#import <WebKitLegacy/WebFrameView.h>
 
 @class WebDynamicScrollBarsView;
 @class WebView;
index 8493240448dce9b19874c446815b89d38c1e595b..636630a15e9d2907210132c8023020d11d330f10 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebFrameView.h>
+#import <WebKitLegacy/WebFrameView.h>
 
 @interface WebFrameView (WebPrivate)
 
index 20a602ef0d871094688f178f1295bbbe13814d17..36eb58a963ad5ca54b044324e9a7efd52e919f0b 100644 (file)
@@ -28,7 +28,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <WebKit/WebDocumentPrivate.h>
+#import <WebKitLegacy/WebDocumentPrivate.h>
 
 @class WebHTMLRepresentationPrivate;
 @class NSView;
index fc3a81c5e89e45ff6a2a9bac1bc78c47c7c63c0e..09ddc1d85c33ee9090cc54580c415637245b6d1a 100644 (file)
@@ -59,7 +59,7 @@
 #import <WebCore/Range.h>
 #import <WebCore/RenderElement.h>
 #import <WebCore/TextResourceDecoder.h>
-#import <WebKit/DOMHTMLInputElement.h>
+#import <WebKitLegacy/DOMHTMLInputElement.h>
 #import <yarr/RegularExpression.h>
 #import <wtf/Assertions.h>
 #import <wtf/StdLibExtras.h>
index 5a401cdcd1ad521bc6f0ddc0cf5ab832fbd7f97e..171ebe2a9615b2ba5851903371b2adb6d91736b1 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebHTMLRepresentation.h>
+#import <WebKitLegacy/WebHTMLRepresentation.h>
 
 @protocol WebPluginManualLoader;
 
index 9d60d64dc229ec064dfaac6fe736063718f489d5..e1b53234954cac130032750a5d212fca5739a715 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebDocument.h>
+#import <WebKitLegacy/WebDocument.h>
 
 #if TARGET_OS_IPHONE
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
 #endif
 
 @class WebDataSource;
index 551217f311f4aa78dbce9fd7345f57c59e6904c8..5b8d441a5d8eb1e819f3522dfd35d0d686d813b8 100644 (file)
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebNSAttributedStringExtras.h>
 #import <WebCore/markup.h>
-#import <WebKit/DOM.h>
-#import <WebKit/DOMExtensions.h>
-#import <WebKit/DOMPrivate.h>
+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/DOMPrivate.h>
 #import <WebKitSystemInterface.h>
 #import <dlfcn.h>
 #import <limits>
index 015b600f2615701549329962d085e401be9f047b..c110e5705d6c22f475e1db0f9e2272174356ede8 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebHTMLView.h>
+#import <WebKitLegacy/WebHTMLView.h>
 
 #if !TARGET_OS_IPHONE
 #if !defined(ENABLE_NETSCAPE_PLUGIN_API)
index 4751e827c7b6e40145f9308ebc6552c0d6f5ebbf..1811cf90ad7d715ad046990589ff883542a2e2ac 100644 (file)
@@ -28,7 +28,7 @@
 
 #if !PLATFORM(IOS)
 
-#import <WebKit/WebDocumentInternal.h>
+#import <WebKitLegacy/WebDocumentInternal.h>
 
 @class PDFDocument;
 @class PDFView;
index 886c98ae8db2dc3e549a32f94a97967f9358996a..8ea4caf46aeeed77c823bd2dbff30cb13346f77e 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebPolicyDelegate.h>
+#import <WebKitLegacy/WebPolicyDelegate.h>
 
 @class WebHistoryItem;
 @class WebPolicyDecisionListenerPrivate;
index cb25904e3937271ca8e0d473fdd969166e742bdd..180fc7f78767ba174cc532f93a2f935fdba91a18 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebPreferences.h>
+#import <WebKitLegacy/WebPreferences.h>
 
 #if !TARGET_OS_IPHONE
 #import <Quartz/Quartz.h>
index 60f20c4e570275eb00bfe1da0cc549d4841c473f..ef5894fb0f6774f73251014490efda401b7dc51f 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebResource.h>
+#import <WebKitLegacy/WebResource.h>
 
 @interface WebResource (WebResourcePrivate)
 
index cee1656c275fa30973e6bd7879acd43abd3894d1..f1c984dfb7ffc03a59cc1458be5ff282413fc1c5 100644 (file)
 
 #import <Foundation/Foundation.h>
 #import <Foundation/NSURLRequest.h>
-#import <WebKit/WebKitAvailability.h>
+#import <WebKitLegacy/WebKitAvailability.h>
 
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
 #else
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
 #endif
 
 /*!
index 0a577541c48fb693192f701f68c51e1cb9bb1dc8..9d8038df636d93efc03666af9e2f6eccb3bc7edc 100644 (file)
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebAllowDenyPolicyListener.h>
-#import <WebKit/WebUIDelegate.h>
+#import <WebKitLegacy/WebAllowDenyPolicyListener.h>
+#import <WebKitLegacy/WebUIDelegate.h>
 
 #if !defined(ENABLE_DASHBOARD_SUPPORT)
 #if !TARGET_OS_IPHONE
index 754c7cb863bb2b14f443fdc76cebf585dc0ea6ef..a00a0725e0dabd71f4b05b48d8628d71039ee1a7 100644 (file)
@@ -31,8 +31,8 @@
 #if !TARGET_OS_IPHONE
 #import <AppKit/AppKit.h>
 #else
-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
 #if !defined(IBAction)
 #define IBAction void
 #endif
index ac6bea5d4bf8899a21709dc86e0a1a59c23e2d4a..9a4736f2bb49ac4c88d7bcd079fbb2bd0ed7fc81 100644 (file)
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreView.h>
 #import <WebCore/Widget.h>
-#import <WebKit/DOM.h>
-#import <WebKit/DOMExtensions.h>
-#import <WebKit/DOMPrivate.h>
+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/DOMPrivate.h>
 #import <WebKitSystemInterface.h>
 #import <bindings/ScriptValue.h>
 #import <mach-o/dyld.h>
 #endif // !PLATFORM(IOS)
 
 #if ENABLE(DASHBOARD_SUPPORT)
-#import <WebKit/WebDashboardRegion.h>
+#import <WebKitLegacy/WebDashboardRegion.h>
 #endif
 
 #if ENABLE(DISK_IMAGE_CACHE) && PLATFORM(IOS)
index 99eee89f0daaac3d73378caf1dc87b2cdb235807..c9aea7848dbed966d9d3e794e415bfa0572542e7 100644 (file)
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebKit/WebView.h>
-#import <WebKit/WebFramePrivate.h>
+#import <WebKitLegacy/WebView.h>
+#import <WebKitLegacy/WebFramePrivate.h>
 #import <JavaScriptCore/JSBase.h>
 
 #if TARGET_OS_IPHONE
index fb3ce1b176e0ff3e501371faed6e50f658890075..e38366a2763e6b5a7bdfec22738e666210a84947 100755 (executable)
@@ -25,7 +25,7 @@
 
 mkdir -p "${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}"
 mkdir -p "${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}"
-mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit"
+mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy"
 
 # If we didn't build WebCore, use the production copy of the headers
 if [ ! -d "${WEBCORE_PRIVATE_HEADERS_DIR}" ]; then
index e08587baad82162fc9f8a4c3459a9c8756da1a82..9599ff6633098989f4e225efe68718c7208482ea 100644 (file)
@@ -1,3 +1,18 @@
+2014-04-30  Anders Carlsson  <andersca@apple.com>
+
+        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.
+
+        * 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.
+
 2014-04-30  Simon Fraser  <simon.fraser@apple.com>
 
         [iOS WK2] Add test URL to crash reports for the UI process, clean up project
index ce2321bb385c8aa851173c901d3dd9c90a741a66..0934903ed484e92b6a280b0285a5fe05011fd181 100755 (executable)
@@ -76,7 +76,7 @@ def resolve_include(header, included_header, permitted_types)
 
   # iOS we want to keep the WAK headers private, even if a public header includes them,
   # so we are going to not show warnings for WAK headers.
-  return if framework == "WebKit" and included_header_name =~ /^WAK/
+  return if (framework == "WebKit" or framework == "WebKitLegacy") and included_header_name =~ /^WAK/
 
   header_type = $HEADER_NAMES_TO_TYPE[included_header_name]
 
index 7b34ebc6de087504ebbf596e0a4391df8e0ef3da..24ac215f37b29f8974f4721a38fea5e2d756fc39 100644 (file)
 #import "PlatformUtilities.h"
 #import "Test.h"
 #import <WebCore/FileSystem.h>
-#import <WebKit2/_WKDownload.h>
-#import <WebKit2/_WKDownloadDelegate.h>
-#import <WebKit2/WKNavigationDelegatePrivate.h>
-#import <WebKit2/WKProcessPoolPrivate.h>
-#import <WebKit2/WKWebView.h>
-#import <WebKit2/WKWebViewConfiguration.h>
+#import <WebKit/_WKDownload.h>
+#import <WebKit/_WKDownloadDelegate.h>
+#import <WebKit/WKNavigationDelegatePrivate.h>
+#import <WebKit/WKProcessPoolPrivate.h>
+#import <WebKit/WKWebView.h>
+#import <WebKit/WKWebViewConfiguration.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/WTFString.h>
 
index 7784e7cc75abfbfc9970649c1c68082925fe1c13..29461217e9e98bfe15ed075c5d11f73b2a78a24f 100644 (file)
@@ -25,9 +25,9 @@
 
 #include "config.h"
 
-#import <WebKit2/WKNavigation.h>
-#import <WebKit2/WKNavigationDelegate.h>
-#import <WebKit2/WKWebView.h>
+#import <WebKit/WKNavigation.h>
+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKWebView.h>
 #import <wtf/RetainPtr.h>
 #import "PlatformUtilities.h"
 #import "Test.h"