Changeset 168047 in webkit


Ignore:
Timestamp:
Apr 30, 2014 3:02:19 PM (10 years ago)
Author:
andersca@apple.com
Message:

Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework
https://bugs.webkit.org/show_bug.cgi?id=132399
<rdar://problem/15920046>

Reviewed by Dan Bernstein.

Source/WebCore:
Allow WebKitLegacy to link against WebCore.

  • Configurations/WebCore.xcconfig:

Source/WebKit:

  • WebKit.xcodeproj/project.pbxproj:

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

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

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

Source/WebKit/mac:

  • Carbon/CarbonUtils.h:
  • Carbon/HIViewAdapter.h:
  • Carbon/HIWebView.h:

Import WebKitLegacy headers instead of WebKit headers.

  • Configurations/WebKit.xcconfig:

Move the definitions needed for building WebKitLegacy.framework to WebKitLegacy.xcconfig and
add the relevant definitions needed for re-exporting WebKitLegacy.framework.

  • Configurations/WebKitLegacy.xcconfig:

Add definitions needed for building the "old" WebKit API as WebKitLegacy.framework.

  • DOM/WebDOMOperations.h:
  • DOM/WebDOMOperations.mm:
  • DOM/WebDOMOperationsInternal.h:
  • DOM/WebDOMOperationsPrivate.h:
  • DefaultDelegates/WebDefaultContextMenuDelegate.h:
  • DefaultDelegates/WebDefaultContextMenuDelegate.mm:
  • DefaultDelegates/WebDefaultEditingDelegate.m:
  • History/WebBackForwardListInternal.h:
  • History/WebBackForwardListPrivate.h:
  • History/WebHistoryItemPrivate.h:
  • History/WebHistoryPrivate.h:
  • History/WebURLsWithTitles.m:

Import WebKitLegacy headers instead of WebKit headers.

  • MigrateHeaders.make:

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

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

Import WebKitLegacy headers instead of WebKit headers.

  • WebKitLegacy/MigrateHeadersFromWebKitLegacy.make: Added.

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

  • WebKitLegacy/MigrateHeadersToLegacy.make: Removed.

This is no longer needed.

  • WebKitLegacy/WebKit.h: Added.

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

  • WebKitLegacy/WebKit.m:

This is an empty file so we'll have something to link.

  • WebKitLegacy/WebKitPrivate.h:

New SPI header that imports the private headers of the modern API.

  • WebView/WebDataSource.h:
  • WebView/WebDataSource.mm:
  • WebView/WebDataSourcePrivate.h:
  • WebView/WebDelegateImplementationCaching.h:
  • WebView/WebDocument.h:
  • WebView/WebDocumentInternal.h:
  • WebView/WebDocumentPrivate.h:
  • WebView/WebEditingDelegate.h:
  • WebView/WebEditingDelegatePrivate.h:
  • WebView/WebFrameLoadDelegate.h:
  • WebView/WebFrameLoadDelegatePrivate.h:
  • WebView/WebFramePrivate.h:
  • WebView/WebFrameView.h:
  • WebView/WebFrameViewInternal.h:
  • WebView/WebFrameViewPrivate.h:
  • WebView/WebHTMLRepresentation.h:
  • WebView/WebHTMLRepresentation.mm:
  • WebView/WebHTMLRepresentationPrivate.h:
  • WebView/WebHTMLView.h:
  • WebView/WebHTMLView.mm:
  • WebView/WebHTMLViewPrivate.h:
  • WebView/WebPDFView.h:
  • WebView/WebPolicyDelegatePrivate.h:
  • WebView/WebPreferencesPrivate.h:
  • WebView/WebResourcePrivate.h:
  • WebView/WebUIDelegate.h:
  • WebView/WebUIDelegatePrivate.h:
  • WebView/WebView.h:
  • WebView/WebView.mm:
  • WebView/WebViewPrivate.h:

Import WebKitLegacy headers instead of WebKit headers.

  • migrate-headers.sh:

Derived sources are put in DerivedSources/WebKitLegacy now.

Tools:

  • Scripts/check-for-webkit-framework-include-consistency:

Allos WAK headers in WebKitLegacy as well as WebKit.

  • TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm:

Update header imports.

Location:
trunk
Files:
1 added
1 deleted
132 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r168043 r168047  
     12014-04-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework
     4        https://bugs.webkit.org/show_bug.cgi?id=132399
     5        <rdar://problem/15920046>
     6
     7        Reviewed by Dan Bernstein.
     8
     9        Allow WebKitLegacy to link against WebCore.
     10
     11        * Configurations/WebCore.xcconfig:
     12
    1132014-04-30  David Hyatt  <hyatt@apple.com>
    214
  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r166965 r168047  
    7474OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_iphonesimulator) -framework IOSurface;
    7575OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
    76 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;
     76OTHER_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;
    7777
    7878NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
  • trunk/Source/WebKit/ChangeLog

    r167971 r168047  
     12014-04-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework
     4        https://bugs.webkit.org/show_bug.cgi?id=132399
     5        <rdar://problem/15920046>
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * WebKit.xcodeproj/project.pbxproj:
     10        Add a new build target that builds the legacy WebKit API in WebKitLegacy.framework. This framework
     11        is then re-exported by WebKit.framework, and its headers are copied to WebKit.framework. All the WebKitLegacy
     12        headers are made private, and the MigrateHeadersFromWebKitLegacy.make Makefile will copy all the headers specified
     13        in WEBKIT_PUBLIC_HEADERS to WebKit/Headers.
     14
    1152014-04-29  Alex Christensen  <achristensen@webkit.org>
    216
  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r166691 r168047  
    3434                1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */; };
    3535                1A6A208E1886154600E50F5F /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */; };
     36                1A739036190AE622002E3105 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739034190AE5D4002E3105 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
     37                1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739037190AE674002E3105 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    3638                1A74A28E0F4F75400082E228 /* WebTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */; };
    3739                1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
     
    6163                1AB1DAC118BC0232004B6A9F /* WebViewGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */; };
    6264                1AB1DAC218BC0232004B6A9F /* WebViewGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */; };
    63                 1AD7453C18D0D324006F3A1E /* WebKitLegacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */; };
     65                1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKit.m */; };
    6466                1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */; };
    6567                1AEA66D50DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */; };
     
    164166                9391F275121B38BD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F273121B38BD00EBF7E8 /* WebFrameNetworkingContext.h */; };
    165167                9391F276121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */; };
    166                 939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
    167                 939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Public, ); }; };
    168                 939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
     168                939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Private, ); }; };
     169                939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Private, ); }; };
     170                939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
    169171                939810140824BF01008DF038 /* WebHistoryPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F5B92B820223191D01C1A525 /* WebHistoryPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    170172                939810150824BF01008DF038 /* WebURLsWithTitles.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E0A76E02B8FEE401C1A525 /* WebURLsWithTitles.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    172174                939810180824BF01008DF038 /* WebIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = F528E3E9031E91AD01CA2ACA /* WebIconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
    173175                939810190824BF01008DF038 /* WebIconDatabasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F528E3EB031E91AD01CA2ACA /* WebIconDatabasePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    174                 9398101B0824BF01008DF038 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
    175                 9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
     176                9398101B0824BF01008DF038 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
     177                9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */; settings = {ATTRIBUTES = (Private, ); }; };
    176178                9398101D0824BF01008DF038 /* WebKitLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AEB17D032C1735008635CE /* WebKitLogging.h */; settings = {ATTRIBUTES = (); }; };
    177179                9398101E0824BF01008DF038 /* WebKitNSStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7082F56F038EADAA00A80180 /* WebKitNSStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    189191                9398102E0824BF01008DF038 /* WebBasePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF46036652150000E506 /* WebBasePluginPackage.h */; };
    190192                939810310824BF01008DF038 /* WebNetscapePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F7171E0288493C018635CA /* WebNetscapePluginPackage.h */; };
    191                 939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
    192                 939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (Public, ); }; };
     193                939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (Private, ); }; };
     194                939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (Private, ); }; };
    193195                939810370824BF01008DF038 /* WebPluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8467275C0367158500CA2ACA /* WebPluginController.h */; };
    194196                939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F717200288493C018635CA /* WebPluginDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
    195197                939810390824BF01008DF038 /* WebPluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF4B036659440000E506 /* WebPluginPackage.h */; };
    196                 9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
     198                9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
    197199                939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */; settings = {ATTRIBUTES = (Private, ); }; };
    198200                939810470824BF01008DF038 /* WebKitPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C283730284676D018635CA /* WebKitPrefix.h */; };
    199201                939810490824BF01008DF038 /* WebClipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 933D659903413FF2008635CE /* WebClipView.h */; };
    200                 9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
     202                9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
    201203                9398104C0824BF01008DF038 /* WebDataSourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446072020F50ED0ECA1767 /* WebDataSourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    202204                9398104E0824BF01008DF038 /* WebDefaultContextMenuDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FADD033FC50400CA2ACD /* WebDefaultContextMenuDelegate.h */; settings = {ATTRIBUTES = (); }; };
    203205                9398104F0824BF01008DF038 /* WebDefaultPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FADF033FC50400CA2ACD /* WebDefaultPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    204                 939810500824BF01008DF038 /* WebDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */; settings = {ATTRIBUTES = (Public, ); }; };
     206                939810500824BF01008DF038 /* WebDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
    205207                939810510824BF01008DF038 /* WebDynamicScrollBarsView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606B020F50ED0ECA1767 /* WebDynamicScrollBarsView.h */; settings = {ATTRIBUTES = (Private, ); }; };
    206208                939810520824BF01008DF038 /* WebFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D81DAB203EB0B2D00A80166 /* WebFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    207                 939810530824BF01008DF038 /* WebFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446074020F50ED0ECA1767 /* WebFrame.h */; settings = {ATTRIBUTES = (Public, ); }; };
     209                939810530824BF01008DF038 /* WebFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446074020F50ED0ECA1767 /* WebFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
    208210                939810540824BF01008DF038 /* WebFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CF0E249021361B00ECA16EA /* WebFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    209211                939810550824BF01008DF038 /* WebHTMLRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9202B6D4D80ACA2ACA /* WebHTMLRepresentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    211213                939810570824BF01008DF038 /* WebHTMLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9402B6D4D80ACA2ACA /* WebHTMLView.h */; settings = {ATTRIBUTES = (Private, ); }; };
    212214                939810580824BF01008DF038 /* WebHTMLViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9602B6D4D80ACA2ACA /* WebHTMLViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    213                 9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FAE5033FC52200CA2ACD /* WebFrameLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
    214                 9398105D0824BF01008DF038 /* WebPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606E020F50ED0ECA1767 /* WebPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
     215                9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FAE5033FC52200CA2ACD /* WebFrameLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     216                9398105D0824BF01008DF038 /* WebPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606E020F50ED0ECA1767 /* WebPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
    215217                9398105E0824BF01008DF038 /* WebPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    216218                9398105F0824BF01008DF038 /* WebRenderNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F81C3902B67C26018635CA /* WebRenderNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
    217                 939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
     219                939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    218220                939810630824BF01008DF038 /* WebHistoryItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */; };
    219221                939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D36FD5E03F78F9E00A80166 /* WebFormDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    222224                939810670824BF01008DF038 /* CarbonWindowFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9403F9DBA103CA0DE6 /* CarbonWindowFrame.h */; };
    223225                939810680824BF01008DF038 /* HIViewAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9A03F9DBA103CA0DE6 /* HIViewAdapter.h */; };
    224                 939810690824BF01008DF038 /* HIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEEAA03F9DBA103CA0DE6 /* HIWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
    225                 9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F79B974804019934036909D2 /* CarbonUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
     226                939810690824BF01008DF038 /* HIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEEAA03F9DBA103CA0DE6 /* HIWebView.h */; settings = {ATTRIBUTES = (Private, ); }; };
     227                9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F79B974804019934036909D2 /* CarbonUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
    226228                9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    227                 9398106E0824BF01008DF038 /* WebFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B52E04282B5900CA2D3A /* WebFrameView.h */; settings = {ATTRIBUTES = (Public, ); }; };
     229                9398106E0824BF01008DF038 /* WebFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B52E04282B5900CA2D3A /* WebFrameView.h */; settings = {ATTRIBUTES = (Private, ); }; };
    228230                9398106F0824BF01008DF038 /* WebFrameViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B53204282BD200CA2D3A /* WebFrameViewInternal.h */; };
    229                 939810700824BF01008DF038 /* WebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B579042834F700CA2D3A /* WebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
     231                939810700824BF01008DF038 /* WebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B579042834F700CA2D3A /* WebView.h */; settings = {ATTRIBUTES = (Private, ); }; };
    230232                939810710824BF01008DF038 /* WebViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B57D0428353A00CA2D3A /* WebViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    231                 939810720824BF01008DF038 /* WebPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
     233                939810720824BF01008DF038 /* WebPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    232234                939810730824BF01008DF038 /* WebPolicyDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9C0429392B00CA2D3A /* WebPolicyDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    233                 939810750824BF01008DF038 /* WebUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
     235                939810750824BF01008DF038 /* WebUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    234236                939810760824BF01008DF038 /* WebDefaultUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CF0458CA4B00CA2D3A /* WebDefaultUIDelegate.h */; };
    235                 939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (Public, ); }; };
     237                939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (Private, ); }; };
    236238                939810790824BF01008DF038 /* WebLocalizableStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE18F990472B73200CA289C /* WebLocalizableStrings.h */; settings = {ATTRIBUTES = (Private, ); }; };
    237239                9398107A0824BF01008DF038 /* WebKitSystemBits.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE52D4A0473032500CA289C /* WebKitSystemBits.h */; };
     
    244246                939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84723BE3056D719E0044BFEA /* WebKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    245247                939810870824BF01008DF038 /* WebNSPrintOperationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDD1A5C605C83987008E3150 /* WebNSPrintOperationExtras.h */; };
    246                 939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Public, ); }; };
     248                939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
    247249                939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311AF105EAB12B0088EDA4 /* WebResourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    248250                9398108D0824BF01008DF038 /* WebDefaultEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE95BEE605FD0805006E1513 /* WebDefaultEditingDelegate.h */; };
    249                 939810990824BF01008DF038 /* WebDOMOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */; settings = {ATTRIBUTES = (Public, ); }; };
    250                 9398109A0824BF01008DF038 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 8373435A0624EE0D00F3B289 /* WebArchive.h */; settings = {ATTRIBUTES = (Public, ); }; };
     251                939810990824BF01008DF038 /* WebDOMOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */; settings = {ATTRIBUTES = (Private, ); }; };
     252                9398109A0824BF01008DF038 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 8373435A0624EE0D00F3B289 /* WebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; };
    251253                9398109B0824BF01008DF038 /* WebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BB06275F640076701E /* WebViewInternal.h */; };
    252254                9398109C0824BF01008DF038 /* WebFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BD06275F710076701E /* WebFrameInternal.h */; };
    253255                9398109D0824BF01008DF038 /* WebDOMOperationsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    254                 9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
     256                9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    255257                939810A10824BF01008DF038 /* WebHTMLViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93185DB506679F42005D5E7E /* WebHTMLViewInternal.h */; };
    256258                939810A20824BF01008DF038 /* WebNSObjectExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D1FE13067EB10B009CE68A /* WebNSObjectExtras.h */; };
     
    477479                14D8252D0AF955090004F057 /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = "<group>"; };
    478480                14D8252E0AF955090004F057 /* WebChromeClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebChromeClient.mm; sourceTree = "<group>"; };
     481                1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MigrateHeadersFromWebKitLegacy.make; sourceTree = "<group>"; };
    479482                1A2DBE9D0F251E3A0036F8A6 /* ProxyInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyInstance.h; sourceTree = "<group>"; };
    480483                1A2DBE9E0F251E3A0036F8A6 /* ProxyInstance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProxyInstance.mm; sourceTree = "<group>"; };
     
    489492                1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProgressTrackerClient.mm; sourceTree = "<group>"; };
    490493                1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProgressTrackerClient.h; sourceTree = "<group>"; };
     494                1A739034190AE5D4002E3105 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
     495                1A739037190AE674002E3105 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
    491496                1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTextInputWindowController.h; sourceTree = "<group>"; };
    492497                1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
     
    513518                1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewGroup.mm; sourceTree = "<group>"; };
    514519                1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewGroup.h; sourceTree = "<group>"; };
    515                 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitLegacy.cpp; sourceTree = "<group>"; };
    516                 1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKitLegacy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    517                 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitLegacy.xcconfig; sourceTree = "<group>"; };
     520                1AD7451218D0D24C006F3A1E /* WebKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; };
     521                1AD7451918D0D26C006F3A1E /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
     522                1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
    518523                1AD7453D18D0D383006F3A1E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    519524                1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; };
     
    532537                1C7B0C650EB2464D00A28502 /* WebInspectorClientCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebInspectorClientCF.cpp; path = cf/WebCoreSupport/WebInspectorClientCF.cpp; sourceTree = SOURCE_ROOT; };
    533538                1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegatePrivate.h; sourceTree = "<group>"; };
    534                 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
     539                1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitLegacy.xcconfig; sourceTree = "<group>"; };
    535540                1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
    536541                1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
     
    715720                9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; };
    716721                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; };
    717                 939811330824BF01008DF038 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
     722                939811330824BF01008DF038 /* WebKitLegacy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKitLegacy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    718723                93AEB17D032C1735008635CE /* WebKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLogging.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    719724                93AEB17E032C1735008635CE /* WebKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitLogging.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     
    945950                        isa = PBXGroup;
    946951                        children = (
    947                                 939811330824BF01008DF038 /* WebKit.framework */,
    948                                 1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */,
     952                                939811330824BF01008DF038 /* WebKitLegacy.framework */,
     953                                1AD7451918D0D26C006F3A1E /* WebKit.framework */,
    949954                        );
    950955                        name = Products;
     
    969974                                511F3FC30CECC7E200852565 /* Storage */,
    970975                                F5B36B400281DE87018635CB /* WebCoreSupport */,
    971                                 1AD7451118D0D23D006F3A1E /* WebKitLegacy */,
     976                                1AD7451118D0D23D006F3A1E /* WebKit Framework */,
    972977                                9C7CABBB0190A37C0ECA16EA /* WebView */,
    973978                                1C68F63F095B5F9C00C2984E /* WebInspector */,
     
    10511056                        sourceTree = "<group>";
    10521057                };
    1053                 1AD7451118D0D23D006F3A1E /* WebKitLegacy */ = {
    1054                         isa = PBXGroup;
    1055                         children = (
     1058                1AD7451118D0D23D006F3A1E /* WebKit Framework */ = {
     1059                        isa = PBXGroup;
     1060                        children = (
     1061                                1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */,
    10561062                                1AD7453D18D0D383006F3A1E /* Info.plist */,
    1057                                 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */,
    1058                         );
    1059                         name = WebKitLegacy;
     1063                                1AD7451218D0D24C006F3A1E /* WebKit.m */,
     1064                                1A739034190AE5D4002E3105 /* WebKit.h */,
     1065                                1A739037190AE674002E3105 /* WebKitPrivate.h */,
     1066                        );
     1067                        name = "WebKit Framework";
    10601068                        path = mac/WebKitLegacy;
    10611069                        sourceTree = "<group>";
     
    10901098                                FEE7D6910D99B06A005351F6 /* iOS.xcconfig */,
    10911099                                1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
    1092                                 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */,
    1093                                 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */,
     1100                                1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */,
     1101                                1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */,
    10941102                        );
    10951103                        name = Configurations;
     
    16961704
    16971705/* Begin PBXHeadersBuildPhase section */
     1706                1A739035190AE603002E3105 /* Headers */ = {
     1707                        isa = PBXHeadersBuildPhase;
     1708                        buildActionMask = 2147483647;
     1709                        files = (
     1710                                1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */,
     1711                                1A739036190AE622002E3105 /* WebKit.h in Headers */,
     1712                        );
     1713                        runOnlyForDeploymentPostprocessing = 0;
     1714                };
    16981715                9398100D0824BF01008DF038 /* Headers */ = {
    16991716                        isa = PBXHeadersBuildPhase;
     
    19591976
    19601977/* Begin PBXNativeTarget section */
    1961                 1AD7451818D0D26C006F3A1E /* WebKitLegacy */ = {
     1978                1AD7451818D0D26C006F3A1E /* WebKit */ = {
    19621979                        isa = PBXNativeTarget;
    1963                         buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
     1980                        buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */;
    19641981                        buildPhases = (
     1982                                1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */,
    19651983                                1A5B250818D0D90C00913729 /* Migrate Headers */,
     1984                                1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */,
     1985                                1A739035190AE603002E3105 /* Headers */,
    19661986                                1AD7451418D0D26C006F3A1E /* Sources */,
    19671987                                1AD7451518D0D26C006F3A1E /* Frameworks */,
     1988                                1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */,
     1989                                1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */,
    19681990                        );
    19691991                        buildRules = (
     
    19721994                                1A5B250A18D0DBD300913729 /* PBXTargetDependency */,
    19731995                        );
    1974                         name = WebKitLegacy;
    1975                         productName = WebKitLegacy;
    1976                         productReference = 1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */;
     1996                        name = WebKit;
     1997                        productName = WebKit;
     1998                        productReference = 1AD7451918D0D26C006F3A1E /* WebKit.framework */;
    19771999                        productType = "com.apple.product-type.framework";
    19782000                };
    1979                 9398100A0824BF01008DF038 /* WebKit */ = {
     2001                9398100A0824BF01008DF038 /* WebKitLegacy */ = {
    19802002                        isa = PBXNativeTarget;
    1981                         buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKit" */;
     2003                        buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
    19822004                        buildPhases = (
    19832005                                5D2F7DB70C687A5A00B5B72B /* Update Info.plist with version information */,
     
    19922014                                5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */,
    19932015                                3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */,
    1994                                 5D88EE6C11407DE800BC3ABC /* Check For Framework Include Consistency */,
    1995                                 A55DEAA516703F9F003DB841 /* Check For Inappropriate Macros in External Headers */,
    19962016                                5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */,
    19972017                        );
     
    20002020                        dependencies = (
    20012021                        );
    2002                         name = WebKit;
     2022                        name = WebKitLegacy;
    20032023                        productInstallPath = /System/Library/Frameworks;
    2004                         productName = WebKit;
    2005                         productReference = 939811330824BF01008DF038 /* WebKit.framework */;
     2024                        productName = WebKitLegacy;
     2025                        productReference = 939811330824BF01008DF038 /* WebKitLegacy.framework */;
    20062026                        productType = "com.apple.product-type.framework";
    20072027                };
     
    20322052                        projectRoot = "";
    20332053                        targets = (
    2034                                 1AD7451818D0D26C006F3A1E /* WebKitLegacy */,
    2035                                 9398100A0824BF01008DF038 /* WebKit */,
     2054                                1AD7451818D0D26C006F3A1E /* WebKit */,
     2055                                9398100A0824BF01008DF038 /* WebKitLegacy */,
    20362056                        );
    20372057                };
     
    20542074
    20552075/* Begin PBXShellScriptBuildPhase section */
     2076                1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */ = {
     2077                        isa = PBXShellScriptBuildPhase;
     2078                        buildActionMask = 2147483647;
     2079                        files = (
     2080                        );
     2081                        inputPaths = (
     2082                                "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
     2083                        );
     2084                        name = "Check For Inappropriate Macros in External Headers";
     2085                        outputPaths = (
     2086                        );
     2087                        runOnlyForDeploymentPostprocessing = 0;
     2088                        shellPath = /bin/sh;
     2089                        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";
     2090                };
     2091                1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */ = {
     2092                        isa = PBXShellScriptBuildPhase;
     2093                        buildActionMask = 2147483647;
     2094                        files = (
     2095                        );
     2096                        inputPaths = (
     2097                                "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
     2098                        );
     2099                        name = "Check For Framework Include Consistency";
     2100                        outputPaths = (
     2101                        );
     2102                        runOnlyForDeploymentPostprocessing = 0;
     2103                        shellPath = /bin/sh;
     2104                        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";
     2105                };
    20562106                1A5B250818D0D90C00913729 /* Migrate Headers */ = {
    20572107                        isa = PBXShellScriptBuildPhase;
     
    20662116                        runOnlyForDeploymentPostprocessing = 0;
    20672117                        shellPath = /bin/sh;
    2068                         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";
     2118                        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";
     2119                };
     2120                1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */ = {
     2121                        isa = PBXShellScriptBuildPhase;
     2122                        buildActionMask = 2147483647;
     2123                        files = (
     2124                        );
     2125                        inputPaths = (
     2126                                "$(PROJECT_DIR)/mac/Configurations/Version.xcconfig",
     2127                        );
     2128                        name = "Update Info.plist with version information";
     2129                        outputPaths = (
     2130                                "$(PROJECT_DIR)/mac/WebKitLegacy/Info.plist",
     2131                        );
     2132                        runOnlyForDeploymentPostprocessing = 0;
     2133                        shellPath = /bin/sh;
     2134                        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";
     2135                };
     2136                1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */ = {
     2137                        isa = PBXShellScriptBuildPhase;
     2138                        buildActionMask = 8;
     2139                        files = (
     2140                        );
     2141                        inputPaths = (
     2142                                WebKit.xcodeproj,
     2143                        );
     2144                        name = "Make Frameworks Symbolic Link";
     2145                        outputPaths = (
     2146                                "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp",
     2147                        );
     2148                        runOnlyForDeploymentPostprocessing = 1;
     2149                        shellPath = /bin/sh;
     2150                        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";
    20692151                };
    20702152                1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
     
    20802162                        name = "Generate Export Files";
    20812163                        outputPaths = (
    2082                                 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp",
    2083                                 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp",
     2164                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp",
     2165                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp",
    20842166                        );
    20852167                        runOnlyForDeploymentPostprocessing = 0;
    20862168                        shellPath = /bin/sh;
    2087                         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";
     2169                        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";
    20882170                };
    20892171                1C6CB0510AA63EB000D23BFD /* Migrate Headers */ = {
     
    21482230                        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";
    21492231                };
    2150                 5D88EE6C11407DE800BC3ABC /* Check For Framework Include Consistency */ = {
    2151                         isa = PBXShellScriptBuildPhase;
    2152                         buildActionMask = 2147483647;
    2153                         files = (
    2154                         );
    2155                         inputPaths = (
    2156                                 "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
    2157                         );
    2158                         name = "Check For Framework Include Consistency";
    2159                         outputPaths = (
    2160                         );
    2161                         runOnlyForDeploymentPostprocessing = 0;
    2162                         shellPath = /bin/sh;
    2163                         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";
    2164                 };
    21652232                5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */ = {
    21662233                        isa = PBXShellScriptBuildPhase;
     
    21722239                        name = "Symlink WebKitPluginHost in to place";
    21732240                        outputPaths = (
    2174                                 "$(CONFIGURATION_BUILD_DIR)/WebKit.framework/WebKitPluginHost.app",
     2241                                "$(CONFIGURATION_BUILD_DIR)/WebKitLegacy.framework/WebKitPluginHost.app",
    21752242                        );
    21762243                        runOnlyForDeploymentPostprocessing = 0;
    21772244                        shellPath = /bin/sh;
    2178                         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";
     2245                        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";
    21792246                };
    21802247                939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {
     
    21922259                        runOnlyForDeploymentPostprocessing = 1;
    21932260                        shellPath = /bin/sh;
    2194                         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";
     2261                        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";
    21952262                };
    21962263                A13EE61D185AE82700556064 /* Postprocess Headers */ = {
     
    22072274                        shellPath = /bin/sh;
    22082275                        shellScript = "exec \"${SRCROOT}/mac/postprocess-headers.sh\"";
    2209                 };
    2210                 A55DEAA516703F9F003DB841 /* Check For Inappropriate Macros in External Headers */ = {
    2211                         isa = PBXShellScriptBuildPhase;
    2212                         buildActionMask = 2147483647;
    2213                         files = (
    2214                         );
    2215                         inputPaths = (
    2216                                 "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
    2217                         );
    2218                         name = "Check For Inappropriate Macros in External Headers";
    2219                         outputPaths = (
    2220                         );
    2221                         runOnlyForDeploymentPostprocessing = 0;
    2222                         shellPath = /bin/sh;
    2223                         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";
    22242276                };
    22252277/* End PBXShellScriptBuildPhase section */
     
    22302282                        buildActionMask = 2147483647;
    22312283                        files = (
    2232                                 1AD7453C18D0D324006F3A1E /* WebKitLegacy.cpp in Sources */,
     2284                                1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */,
    22332285                        );
    22342286                        runOnlyForDeploymentPostprocessing = 0;
     
    24242476                1A5B250A18D0DBD300913729 /* PBXTargetDependency */ = {
    24252477                        isa = PBXTargetDependency;
    2426                         target = 9398100A0824BF01008DF038 /* WebKit */;
     2478                        target = 9398100A0824BF01008DF038 /* WebKitLegacy */;
    24272479                        targetProxy = 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */;
    24282480                };
     
    24532505                149C282E08902B0F008A9EFC /* Debug */ = {
    24542506                        isa = XCBuildConfiguration;
    2455                         baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
     2507                        baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
    24562508                        buildSettings = {
    24572509                                DEBUG_DEFINES = "$(DEBUG_DEFINES_debug) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
     
    24662518                149C282F08902B0F008A9EFC /* Release */ = {
    24672519                        isa = XCBuildConfiguration;
    2468                         baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
     2520                        baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
    24692521                        buildSettings = {
    24702522                                DEBUG_DEFINES = "$(DEBUG_DEFINES_$(CURRENT_VARIANT)) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
     
    24792531                149C283108902B0F008A9EFC /* Production */ = {
    24802532                        isa = XCBuildConfiguration;
    2481                         baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
     2533                        baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
    24822534                        buildSettings = {
    24832535                                BUILD_VARIANTS = normal;
     
    25162568                1AD7453418D0D26C006F3A1E /* Debug */ = {
    25172569                        isa = XCBuildConfiguration;
    2518                         baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
     2570                        baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
    25192571                        buildSettings = {
    25202572                        };
     
    25232575                1AD7453518D0D26C006F3A1E /* Release */ = {
    25242576                        isa = XCBuildConfiguration;
    2525                         baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
     2577                        baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
    25262578                        buildSettings = {
    25272579                        };
     
    25302582                1AD7453618D0D26C006F3A1E /* Production */ = {
    25312583                        isa = XCBuildConfiguration;
    2532                         baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
     2584                        baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
    25332585                        buildSettings = {
    25342586                        };
     
    25382590
    25392591/* Begin XCConfigurationList section */
    2540                 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKit" */ = {
     2592                149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */ = {
    25412593                        isa = XCConfigurationList;
    25422594                        buildConfigurations = (
     
    25582610                        defaultConfigurationName = Production;
    25592611                };
    2560                 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKitLegacy" */ = {
     2612                1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */ = {
    25612613                        isa = XCConfigurationList;
    25622614                        buildConfigurations = (
  • trunk/Source/WebKit/ios/ChangeLog

    r167768 r168047  
     12014-04-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework
     4        https://bugs.webkit.org/show_bug.cgi?id=132399
     5        <rdar://problem/15920046>
     6
     7        Reviewed by Dan Bernstein.
     8
     9        Import WebKitLegacy headers instead of WebKit headers.
     10       
     11        * DefaultDelegates/WebDefaultFormDelegate.h:
     12        * DefaultDelegates/WebDefaultFrameLoadDelegate.m:
     13        * DefaultDelegates/WebDefaultResourceLoadDelegate.m:
     14        * DefaultDelegates/WebDefaultUIKitDelegate.h:
     15        * Misc/WebGeolocationProviderIOS.h:
     16        * Misc/WebNSStringExtrasIPhone.h:
     17        * WebCoreSupport/WebFrameIOS.h:
     18        * WebCoreSupport/WebFrameIOS.mm:
     19        * WebCoreSupport/WebFrameIPhone.h:
     20        * WebCoreSupport/WebSelectionRect.h:
     21        * WebCoreSupport/WebVisiblePosition.h:
     22        * WebView/WebPDFViewIOS.h:
     23        * WebView/WebPDFViewIOS.mm:
     24        * WebView/WebPDFViewIPhone.h:
     25        * WebView/WebPDFViewPlaceholder.h:
     26        * WebView/WebPDFViewPlaceholder.mm:
     27        * WebView/WebPlainWhiteView.h:
     28        * WebView/WebUIKitDelegate.h:
     29
    1302014-04-24  Myles C. Maxfield  <mmaxfield@apple.com>
    231
  • trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultFormDelegate.h

    r158327 r168047  
    2424 */
    2525
    26 #import <WebKit/WebFormDelegate.h>
     26#import <WebKitLegacy/WebFormDelegate.h>
    2727
    2828@interface WebDefaultFormDelegate : NSObject <WebFormDelegate> {
  • trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultFrameLoadDelegate.m

    r158327 r168047  
    2828#import "WebDefaultFrameLoadDelegate.h"
    2929
    30 #import <WebKit/WebFrameLoadDelegatePrivate.h>
     30#import <WebKitLegacy/WebFrameLoadDelegatePrivate.h>
    3131#import "WebViewPrivate.h"
    3232
  • trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m

    r158327 r168047  
    2828#import "WebDefaultResourceLoadDelegate.h"
    2929
    30 #import <WebKit/WebResourceLoadDelegate.h>
     30#import <WebKitLegacy/WebResourceLoadDelegate.h>
    3131
    3232@implementation WebDefaultResourceLoadDelegate
  • trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.h

    r158327 r168047  
    2424 */
    2525
    26 #import <WebKit/WebUIKitDelegate.h>
     26#import <WebKitLegacy/WebUIKitDelegate.h>
    2727
    2828@interface WebDefaultUIKitDelegate : NSObject {
  • trunk/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.h

    r158327 r168047  
    2525
    2626#import <Foundation/NSObject.h>
    27 #import <WebKit/WebViewPrivate.h>
     27#import <WebKitLegacy/WebViewPrivate.h>
    2828
    2929@interface WebGeolocationProviderIOS : NSObject<WebGeolocationProvider>
  • trunk/Source/WebKit/ios/Misc/WebNSStringExtrasIPhone.h

    r158327 r168047  
    2424 */
    2525
    26 #import <WebKit/WebNSStringExtrasIOS.h>
     26#import <WebKitLegacy/WebNSStringExtrasIOS.h>
  • trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h

    r166409 r168047  
    2727
    2828#import <CoreGraphics/CoreGraphics.h>
    29 #import <WebKit/WebFrame.h>
    30 #import <WebKit/WebVisiblePosition.h>
     29#import <WebKitLegacy/WebFrame.h>
     30#import <WebKitLegacy/WebVisiblePosition.h>
    3131
    3232@class DOMRange;
  • trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm

    r166409 r168047  
    4848#import <WebCore/VisiblePosition.h>
    4949#import <WebCore/VisibleUnits.h>
    50 #import <WebKit/DOM.h>
    51 #import <WebKit/DOMRange.h>
    52 #import <WebKit/DOMUIKitExtensions.h>
    53 #import <WebKit/WebSelectionRect.h>
    54 #import <WebKit/WebVisiblePosition.h>
     50#import <WebKitLegacy/DOM.h>
     51#import <WebKitLegacy/DOMRange.h>
     52#import <WebKitLegacy/DOMUIKitExtensions.h>
     53#import <WebKitLegacy/WebSelectionRect.h>
     54#import <WebKitLegacy/WebVisiblePosition.h>
    5555#import <unicode/uchar.h>
    5656
  • trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIPhone.h

    r158327 r168047  
    2424 */
    2525
    26 #import <WebKit/WebFrameIOS.h>
     26#import <WebKitLegacy/WebFrameIOS.h>
  • trunk/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h

    r162024 r168047  
    2828#import <CoreGraphics/CoreGraphics.h>
    2929#import <Foundation/Foundation.h>
    30 #import <WebKit/WebFrameIOS.h>
     30#import <WebKitLegacy/WebFrameIOS.h>
    3131
    3232@interface WebSelectionRect : NSObject <NSCopying> {
  • trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.h

    r158327 r168047  
    2525
    2626#import <Foundation/Foundation.h>
    27 #import <WebKit/DOMUIKitExtensions.h>
     27#import <WebKitLegacy/DOMUIKitExtensions.h>
    2828
    29 #import <WebKit/WAKAppKitStubs.h>
     29#import <WebKitLegacy/WAKAppKitStubs.h>
    3030
    3131typedef struct WebObjectInternal WebObjectInternal;
  • trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.h

    r158327 r168047  
    2424 */
    2525
    26 #import <WebKit/WebDocumentPrivate.h>
     26#import <WebKitLegacy/WebDocumentPrivate.h>
    2727
    2828@interface WebPDFView : WAKView <WebPDFDocumentView, WebPDFDocumentRepresentation> {
  • trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm

    r161106 r168047  
    4444#import <WebCore/StringWithDirection.h>
    4545#import <WebCore/WKGraphics.h>
    46 #import <WebKit/WebFrame.h>
    47 #import <WebKit/WebFrameLoadDelegate.h>
    48 #import <WebKit/WebFramePrivate.h>
    49 #import <WebKit/WebFrameView.h>
    50 #import <WebKit/WebNSViewExtras.h>
    51 #import <WebKit/WebViewPrivate.h>
     46#import <WebKitLegacy/WebFrame.h>
     47#import <WebKitLegacy/WebFrameLoadDelegate.h>
     48#import <WebKitLegacy/WebFramePrivate.h>
     49#import <WebKitLegacy/WebFrameView.h>
     50#import <WebKitLegacy/WebNSViewExtras.h>
     51#import <WebKitLegacy/WebViewPrivate.h>
    5252#import <wtf/Assertions.h>
    5353#import <wtf/RetainPtr.h>
  • trunk/Source/WebKit/ios/WebView/WebPDFViewIPhone.h

    r158327 r168047  
    2424 */
    2525
    26 #import <WebKit/WebPDFViewIOS.h>
     26#import <WebKitLegacy/WebPDFViewIOS.h>
  • trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.h

    r165896 r168047  
    2424 */
    2525
    26 #import <WebKit/WebDocumentPrivate.h>
     26#import <WebKitLegacy/WebDocumentPrivate.h>
    2727
    2828#if TARGET_OS_IPHONE
  • trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm

    r166965 r168047  
    4444#import <WebCore/MouseEvent.h>
    4545#import <WebCore/SoftLinking.h>
    46 #import <WebKit/WebDataSourcePrivate.h>
    47 #import <WebKit/WebFramePrivate.h>
    48 #import <WebKit/WebJSPDFDoc.h>
    49 #import <WebKit/WebNSURLExtras.h>
    50 #import <WebKit/WebNSViewExtras.h>
    51 #import <WebKit/WebPDFDocumentExtras.h>
    52 #import <WebKit/WebViewPrivate.h>
     46#import <WebKitLegacy/WebDataSourcePrivate.h>
     47#import <WebKitLegacy/WebFramePrivate.h>
     48#import <WebKitLegacy/WebJSPDFDoc.h>
     49#import <WebKitLegacy/WebNSURLExtras.h>
     50#import <WebKitLegacy/WebNSViewExtras.h>
     51#import <WebKitLegacy/WebPDFDocumentExtras.h>
     52#import <WebKitLegacy/WebViewPrivate.h>
    5353#import <wtf/CurrentTime.h>
    5454#import <wtf/Vector.h>
  • trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.h

    r165676 r168047  
    2828
    2929#if PLATFORM(IOS)
    30 #import <WebKit/WebDocumentInternal.h>
     30#import <WebKitLegacy/WebDocumentInternal.h>
    3131
    3232@class WebDataSource;
  • trunk/Source/WebKit/ios/WebView/WebUIKitDelegate.h

    r166409 r168047  
    2727#define WebUIKitDelegate_h
    2828
    29 #import <WebKit/WAKAppKitStubs.h>
    30 #import <WebKit/WKContentObservation.h>
     29#import <WebKitLegacy/WAKAppKitStubs.h>
     30#import <WebKitLegacy/WKContentObservation.h>
    3131
    3232@class DOMNode;
  • trunk/Source/WebKit/mac/Carbon/CarbonUtils.h

    r165676 r168047  
    3434// These functions are only available for 32-bit.
    3535
    36 #include <WebKit/WebKitAvailability.h>
     36#include <WebKitLegacy/WebKitAvailability.h>
    3737
    3838#ifdef __OBJC__
  • trunk/Source/WebKit/mac/Carbon/HIViewAdapter.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebKit.h>
     29#import <WebKitLegacy/WebKit.h>
    3030#include <HIToolbox/HIView.h>
    3131
  • trunk/Source/WebKit/mac/Carbon/HIWebView.h

    r165676 r168047  
    3434#include <Carbon/Carbon.h>
    3535
    36 #include <WebKit/WebKitAvailability.h>
     36#include <WebKitLegacy/WebKitAvailability.h>
    3737
    3838#if PRAGMA_ONCE
  • trunk/Source/WebKit/mac/ChangeLog

    r168046 r168047  
     12014-04-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework
     4        https://bugs.webkit.org/show_bug.cgi?id=132399
     5        <rdar://problem/15920046>
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Carbon/CarbonUtils.h:
     10        * Carbon/HIViewAdapter.h:
     11        * Carbon/HIWebView.h:
     12        Import WebKitLegacy headers instead of WebKit headers.
     13
     14        * Configurations/WebKit.xcconfig:
     15        Move the definitions needed for building WebKitLegacy.framework to WebKitLegacy.xcconfig and
     16        add the relevant definitions needed for re-exporting WebKitLegacy.framework.
     17
     18        * Configurations/WebKitLegacy.xcconfig:
     19        Add definitions needed for building the "old" WebKit API as WebKitLegacy.framework.
     20
     21        * DOM/WebDOMOperations.h:
     22        * DOM/WebDOMOperations.mm:
     23        * DOM/WebDOMOperationsInternal.h:
     24        * DOM/WebDOMOperationsPrivate.h:
     25        * DefaultDelegates/WebDefaultContextMenuDelegate.h:
     26        * DefaultDelegates/WebDefaultContextMenuDelegate.mm:
     27        * DefaultDelegates/WebDefaultEditingDelegate.m:
     28        * History/WebBackForwardListInternal.h:
     29        * History/WebBackForwardListPrivate.h:
     30        * History/WebHistoryItemPrivate.h:
     31        * History/WebHistoryPrivate.h:
     32        * History/WebURLsWithTitles.m:
     33        Import WebKitLegacy headers instead of WebKit headers.
     34
     35        * MigrateHeaders.make:
     36        Update header paths now that all WebKitLegacy headers are private.
     37        Remove migration of WebKit2 headers, that is done by MigrateHeadersFromWebKitLegacy.make now.
     38       
     39        * Misc/WebCoreStatistics.h:
     40        * Misc/WebDownload.h:
     41        * Misc/WebDownload.mm:
     42        * Misc/WebDownloadInternal.h:
     43        * Misc/WebElementDictionary.mm:
     44        * Misc/WebIconDatabasePrivate.h:
     45        * Misc/WebKit.h:
     46        * Misc/WebKitErrors.m:
     47        * Misc/WebKitErrorsPrivate.h:
     48        * Misc/WebKitNSStringExtras.mm:
     49        * Misc/WebLocalizableStrings.mm:
     50        * Misc/WebNSDataExtras.m:
     51        * Misc/WebNSDictionaryExtras.m:
     52        * Misc/WebNSEventExtras.m:
     53        * Misc/WebNSFileManagerExtras.mm:
     54        * Misc/WebNSImageExtras.m:
     55        * Misc/WebNSPasteboardExtras.mm:
     56        * Misc/WebNSViewExtras.h:
     57        * Misc/WebNSViewExtras.m:
     58        * Panels/WebAuthenticationPanel.m:
     59        * Panels/WebPanelAuthenticationHandler.m:
     60        * Plugins/Hosted/HostedNetscapePluginStream.h:
     61        * Plugins/Hosted/NetscapePluginInstanceProxy.h:
     62        * Plugins/Hosted/WebKitPluginAgent.defs:
     63        * Plugins/Hosted/WebKitPluginAgentReply.defs:
     64        * Plugins/Hosted/WebKitPluginClient.defs:
     65        * Plugins/Hosted/WebKitPluginHost.defs:
     66        * Plugins/Hosted/WebKitPluginHostTypes.defs:
     67        * Plugins/WebBaseNetscapePluginView.mm:
     68        * Plugins/WebBasePluginPackage.h:
     69        * Plugins/WebBasePluginPackage.mm:
     70        * Plugins/WebNetscapeContainerCheckPrivate.h:
     71        * Plugins/WebNetscapePluginEventHandlerCocoa.h:
     72        * Plugins/WebNetscapePluginStream.h:
     73        * Plugins/WebNetscapePluginView.h:
     74        * Plugins/WebNetscapePluginView.mm:
     75        * Plugins/WebPlugin.h:
     76        * Plugins/WebPluginController.h:
     77        * Plugins/WebPluginDatabase.h:
     78        * Plugins/WebPluginPackage.h:
     79        * Plugins/WebPluginPackage.mm:
     80        * Plugins/WebPluginViewFactory.h:
     81        * Plugins/WebPluginViewFactoryPrivate.h:
     82        * Plugins/npapi.mm:
     83        * Storage/WebDatabaseManagerPrivate.h:
     84        * WebCoreSupport/WebContextMenuClient.mm:
     85        * WebCoreSupport/WebFrameLoaderClient.mm:
     86        * WebCoreSupport/WebFrameNetworkingContext.mm:
     87        * WebCoreSupport/WebGeolocationClient.mm:
     88        * WebCoreSupport/WebInspectorClient.mm:
     89        * WebCoreSupport/WebJavaScriptTextInputPanel.m:
     90        * WebCoreSupport/WebKeyGenerator.mm:
     91        * WebInspector/WebInspectorPrivate.h:
     92        * WebInspector/WebNodeHighlight.h:
     93        * WebInspector/WebNodeHighlightView.h:
     94        Import WebKitLegacy headers instead of WebKit headers.
     95       
     96        * WebKitLegacy/MigrateHeadersFromWebKitLegacy.make: Added.
     97        New makefile that handles copying WebKitLegacy headers to the WebKit framework, rewriting WebKitLegacy
     98        imports to WebKit imports. (On iOS the WebKit headers just forward to the relevant WebKitLegacy headers).
     99        On OS X, this also handles copying WebKit2 headers to the WebKit framework, rewriting WebKit2 imports to WebKit imports
     100        and getting rid of C SPI imports.
     101       
     102        * WebKitLegacy/MigrateHeadersToLegacy.make: Removed.
     103        This is no longer needed.
     104       
     105        * WebKitLegacy/WebKit.h: Added.
     106        New umbrella header that imports the modern API if available, as well as the legacy API (using WebKit/WebKitLegacy.h).
     107
     108        * WebKitLegacy/WebKit.m:
     109        This is an empty file so we'll have something to link.
     110
     111        * WebKitLegacy/WebKitPrivate.h:
     112        New SPI header that imports the private headers of the modern API.
     113
     114        * WebView/WebDataSource.h:
     115        * WebView/WebDataSource.mm:
     116        * WebView/WebDataSourcePrivate.h:
     117        * WebView/WebDelegateImplementationCaching.h:
     118        * WebView/WebDocument.h:
     119        * WebView/WebDocumentInternal.h:
     120        * WebView/WebDocumentPrivate.h:
     121        * WebView/WebEditingDelegate.h:
     122        * WebView/WebEditingDelegatePrivate.h:
     123        * WebView/WebFrameLoadDelegate.h:
     124        * WebView/WebFrameLoadDelegatePrivate.h:
     125        * WebView/WebFramePrivate.h:
     126        * WebView/WebFrameView.h:
     127        * WebView/WebFrameViewInternal.h:
     128        * WebView/WebFrameViewPrivate.h:
     129        * WebView/WebHTMLRepresentation.h:
     130        * WebView/WebHTMLRepresentation.mm:
     131        * WebView/WebHTMLRepresentationPrivate.h:
     132        * WebView/WebHTMLView.h:
     133        * WebView/WebHTMLView.mm:
     134        * WebView/WebHTMLViewPrivate.h:
     135        * WebView/WebPDFView.h:
     136        * WebView/WebPolicyDelegatePrivate.h:
     137        * WebView/WebPreferencesPrivate.h:
     138        * WebView/WebResourcePrivate.h:
     139        * WebView/WebUIDelegate.h:
     140        * WebView/WebUIDelegatePrivate.h:
     141        * WebView/WebView.h:
     142        * WebView/WebView.mm:
     143        * WebView/WebViewPrivate.h:
     144        Import WebKitLegacy headers instead of WebKit headers.
     145
     146        * migrate-headers.sh:
     147        Derived sources are put in DerivedSources/WebKitLegacy now.
     148
    11492014-04-30  David Hyatt  <hyatt@apple.com>
    2150
  • trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig

    r166691 r168047  
    2525#include "Version.xcconfig"
    2626
    27 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
    28 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.*;
    29 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
    30 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;
    31 
    32 EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
    33 EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    34 EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    35 EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    36 EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    37 EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    38 EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
    39 EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    40 EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    41 EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
    42 EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    43 EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
    44 
    4527FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
    4628FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
     
    5032FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
    5133FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(WEBKIT2_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
     34UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
    5235
    5336STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
    5437STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    5538
    56 OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME));
    57 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;
    58 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    59 
    60 GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
    61 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
    62 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);
    63 INFOPLIST_FILE = mac/Info.plist;
     39INFOPLIST_FILE = mac/WebKitLegacy/Info.plist;
    6440INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
    65 INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     41INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks;
    6642INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
    6743INSTALL_PATH_macosx = $(WEBKIT_FRAMEWORKS_DIR);
    6844INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
    6945INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
     46
    7047DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
     48DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks;
     49DYLIB_INSTALL_NAME_BASE_iphonesimulator =  $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
    7150DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
    72 DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    73 DYLIB_INSTALL_NAME_BASE_iphonesimulator =  $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
    74 INSTALLHDRS_COPY_PHASE = YES;
    75 INSTALLHDRS_SCRIPT_PHASE = YES;
    76 PRODUCT_NAME = WebKit;
    77 UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
    78 
    79 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
    80 OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileAsset -lMobileGestalt;
    81 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
    82 OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework WebKit2 -sub_umbrella WebKit2 -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
    83 
    84 NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    85 NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
    86 NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
    87 NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
    88 
    89 WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION));
    90 WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
    91 WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
    92 WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
    93 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO);
    94 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks;
    95 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR);
    96 WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR)
    9751
    9852WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
     
    10357WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
    10458WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
     59
     60NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
     61NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
     62NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
     63NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
    10564
    10665NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
     
    11776PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    11877
     78WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION));
     79WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
     80WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
     81WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
     82WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO);
     83WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks;
     84WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR);
     85WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR)
     86
     87INSTALLHDRS_COPY_PHASE = YES;
     88INSTALLHDRS_SCRIPT_PHASE = YES;
     89PRODUCT_NAME = WebKit;
     90
     91OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
     92OTHER_LDFLAGS_iphoneos = -framework WebKitLegacy -sub_umbrella WebKitLegacy
     93OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
     94OTHER_LDFLAGS_macosx = -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy -framework WebKit2 -sub_umbrella WebKit2
    11995
    12096PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
     
    12298PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
    12399PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
    124 
    125 WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
    126 WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
    127 WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
    128 WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
    129 WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
    130 WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
    131 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
    132 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
    133 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
    134 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
    135 WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
    136 
    137 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
    138 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    139 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
    140 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
    141 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));
    142 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
    143 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;
    144 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;
    145 
  • trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig

    r165503 r168047  
    2525#include "Version.xcconfig"
    2626
     27EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
     28EXCLUDED_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.*;
     29EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
     30EXCLUDED_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;
     31
     32EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
     33EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
     34EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
     35EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
     36EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
     37EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
     38EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
     39EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
     40EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
     41EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
     42EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
     43EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
     44
    2745FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
    2846FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
     
    3149FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
    3250FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
     51FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
    3352
    34 INFOPLIST_FILE = mac/WebKitLegacy/Info.plist;
     53STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
     54STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
     55
     56OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME));
     57OTHER_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;
     58OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
     59
     60GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
     61GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
     62HEADER_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);
     63INFOPLIST_FILE = mac/Info.plist;
    3564INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
    3665INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    3766INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
     67INSTALL_PATH_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
    3868INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
    3969INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
    40 
    4170DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
     71DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
    4272DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    4373DYLIB_INSTALL_NAME_BASE_iphonesimulator =  $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
    44 
    4574INSTALLHDRS_COPY_PHASE = YES;
    4675INSTALLHDRS_SCRIPT_PHASE = YES;
    4776PRODUCT_NAME = WebKitLegacy;
    48 
    49 SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
    50 SKIP_INSTALL_macosx = YES;
    51 SKIP_INSTALL_iphoneos = $(SKIP_INSTALL);
    52 SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
     77UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
    5378
    5479OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
    55 OTHER_LDFLAGS_iphoneos = -framework WebKit -sub_umbrella WebKit
     80OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileAsset -lMobileGestalt;
    5681OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
     82OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
     83
     84NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
     85NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
     86NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
     87NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
     88
     89WEBKIT_LEGACY_FRAMEWORKS_DIR = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
     90WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos);
     91WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos);
     92WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
     93WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
     94WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
     95WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
     96
     97NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
     98NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     99NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
     100NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
     101
     102PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
     103PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
     104PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
     105PRODUCTION_FRAMEWORKS_DIR_macosx = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
     106PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
     107PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
     108PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    57109
    58110PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
     
    60112PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
    61113PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
     114
     115WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
     116WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
     117WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
     118WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
     119WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
     120WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
     121WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
     122WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
     123WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
     124WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
     125WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
     126
     127WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
     128WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
     129WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
     130WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
     131WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));
     132WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
     133WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;
     134WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;
     135
  • trunk/Source/WebKit/mac/DOM/WebDOMOperations.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/DOMCore.h>
    30 #import <WebKit/DOMHTML.h>
    31 #import <WebKit/DOMRange.h>
     29#import <WebKitLegacy/DOMCore.h>
     30#import <WebKitLegacy/DOMHTML.h>
     31#import <WebKitLegacy/DOMRange.h>
    3232
    3333@class WebArchive;
  • trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm

    r165676 r168047  
    5454#import <WebCore/WheelEvent.h>
    5555#import <WebCore/markup.h>
    56 #import <WebKit/DOMExtensions.h>
    57 #import <WebKit/DOMHTML.h>
     56#import <WebKitLegacy/DOMExtensions.h>
     57#import <WebKitLegacy/DOMHTML.h>
    5858#import <runtime/JSCJSValue.h>
    5959#import <runtime/JSLock.h>
  • trunk/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebDOMOperations.h>
     29#import <WebKitLegacy/WebDOMOperations.h>
    3030
    3131@interface DOMDocument (WebDOMDocumentOperationsInternal)
  • trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebDOMOperations.h>
     29#import <WebKitLegacy/WebDOMOperations.h>
    3030#import <JavaScriptCore/JSBase.h>
    3131
     
    3434#else
    3535#import <AppKit/NSEvent.h>
    36 #import <WebKit/DOMWheelEvent.h>
     36#import <WebKitLegacy/DOMWheelEvent.h>
    3737#endif
    3838
  • trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.h

    r165676 r168047  
    2929#import <Foundation/Foundation.h>
    3030
    31 #import <WebKit/WebDefaultUIDelegate.h>
     31#import <WebKitLegacy/WebDefaultUIDelegate.h>
    3232
    3333@interface WebDefaultUIDelegate (WebContextMenu)
  • trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm

    r165676 r168047  
    4949#import <WebCore/Frame.h>
    5050#import <WebCore/FrameLoader.h>
    51 #import <WebKit/DOM.h>
    52 #import <WebKit/DOMPrivate.h>
     51#import <WebKitLegacy/DOM.h>
     52#import <WebKitLegacy/DOMPrivate.h>
    5353#import <WebKitSystemInterface.h>
    5454#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebDefaultEditingDelegate.h>
     29#import <WebKitLegacy/WebDefaultEditingDelegate.h>
    3030
    31 #import <WebKit/DOM.h>
    32 #import <WebKit/WebEditingDelegate.h>
    33 #import <WebKit/WebEditingDelegatePrivate.h>
    34 #import <WebKit/WebView.h>
     31#import <WebKitLegacy/DOM.h>
     32#import <WebKitLegacy/WebEditingDelegate.h>
     33#import <WebKitLegacy/WebEditingDelegatePrivate.h>
     34#import <WebKitLegacy/WebView.h>
    3535
    3636@implementation WebDefaultEditingDelegate
  • trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h

    r168041 r168047  
    2727 */
    2828
    29 #import <WebKit/WebBackForwardList.h>
     29#import <WebKitLegacy/WebBackForwardList.h>
    3030
    3131namespace WebCore {
    32     class BackForwardList;
     32class BackForwardList;
    3333}
    3434
  • trunk/Source/WebKit/mac/History/WebBackForwardListPrivate.h

    r165676 r168047  
    2828
    2929#import <Foundation/Foundation.h>
    30 #import <WebKit/WebBackForwardList.h>
     30#import <WebKitLegacy/WebBackForwardList.h>
    3131
    3232@interface WebBackForwardList (WebBackForwardListPrivate)
  • trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebHistoryItem.h>
     29#import <WebKitLegacy/WebHistoryItem.h>
    3030
    3131#if TARGET_OS_IPHONE
  • trunk/Source/WebKit/mac/History/WebHistoryPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebHistory.h>
     29#import <WebKitLegacy/WebHistory.h>
    3030
    3131/*
  • trunk/Source/WebKit/mac/History/WebURLsWithTitles.m

    r165676 r168047  
    3131#import "WebURLsWithTitles.h"
    3232
    33 #import <WebKit/WebNSURLExtras.h>
    34 #import <WebKit/WebKitNSStringExtras.h>
     33#import <WebKitLegacy/WebNSURLExtras.h>
     34#import <WebKitLegacy/WebKitNSStringExtras.h>
    3535
    3636@implementation WebURLsWithTitles
  • trunk/Source/WebKit/mac/MigrateHeaders.make

    r167730 r168047  
    2828VPATH = $(WEBCORE_PRIVATE_HEADERS_DIR)
    2929
    30 INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit
     30INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy
    3131PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
    3232PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
     
    3434.PHONY : all
    3535all : \
    36     $(PUBLIC_HEADERS_DIR)/DOM.h \
    37     $(PUBLIC_HEADERS_DIR)/DOMAbstractView.h \
    38     $(PUBLIC_HEADERS_DIR)/DOMAttr.h \
    39     $(PUBLIC_HEADERS_DIR)/DOMBlob.h \
     36    $(PRIVATE_HEADERS_DIR)/DOM.h \
     37    $(PRIVATE_HEADERS_DIR)/DOMAbstractView.h \
     38    $(PRIVATE_HEADERS_DIR)/DOMAttr.h \
     39    $(PRIVATE_HEADERS_DIR)/DOMBlob.h \
    4040    $(INTERNAL_HEADERS_DIR)/DOMBlobInternal.h \
    41     $(PUBLIC_HEADERS_DIR)/DOMCDATASection.h \
    42     $(PUBLIC_HEADERS_DIR)/DOMCSS.h \
    43     $(PUBLIC_HEADERS_DIR)/DOMCSSCharsetRule.h \
    44     $(PUBLIC_HEADERS_DIR)/DOMCSSFontFaceRule.h \
    45     $(PUBLIC_HEADERS_DIR)/DOMCSSImportRule.h \
    46     $(PUBLIC_HEADERS_DIR)/DOMCSSMediaRule.h \
    47     $(PUBLIC_HEADERS_DIR)/DOMCSSPageRule.h \
    48     $(PUBLIC_HEADERS_DIR)/DOMCSSPrimitiveValue.h \
    49     $(PUBLIC_HEADERS_DIR)/DOMCSSRule.h \
    50     $(PUBLIC_HEADERS_DIR)/DOMCSSRuleList.h \
    51     $(PUBLIC_HEADERS_DIR)/DOMCSSStyleDeclaration.h \
     41    $(PRIVATE_HEADERS_DIR)/DOMCDATASection.h \
     42    $(PRIVATE_HEADERS_DIR)/DOMCSS.h \
     43    $(PRIVATE_HEADERS_DIR)/DOMCSSCharsetRule.h \
     44    $(PRIVATE_HEADERS_DIR)/DOMCSSFontFaceRule.h \
     45    $(PRIVATE_HEADERS_DIR)/DOMCSSImportRule.h \
     46    $(PRIVATE_HEADERS_DIR)/DOMCSSMediaRule.h \
     47    $(PRIVATE_HEADERS_DIR)/DOMCSSPageRule.h \
     48    $(PRIVATE_HEADERS_DIR)/DOMCSSPrimitiveValue.h \
     49    $(PRIVATE_HEADERS_DIR)/DOMCSSRule.h \
     50    $(PRIVATE_HEADERS_DIR)/DOMCSSRuleList.h \
     51    $(PRIVATE_HEADERS_DIR)/DOMCSSStyleDeclaration.h \
    5252    $(INTERNAL_HEADERS_DIR)/DOMCSSStyleDeclarationInternal.h \
    53     $(PUBLIC_HEADERS_DIR)/DOMCSSStyleRule.h \
    54     $(PUBLIC_HEADERS_DIR)/DOMCSSStyleSheet.h \
    55     $(PUBLIC_HEADERS_DIR)/DOMCSSUnknownRule.h \
    56     $(PUBLIC_HEADERS_DIR)/DOMCSSValue.h \
    57     $(PUBLIC_HEADERS_DIR)/DOMCSSValueList.h \
    58     $(PUBLIC_HEADERS_DIR)/DOMCharacterData.h \
    59     $(PUBLIC_HEADERS_DIR)/DOMComment.h \
    60     $(PUBLIC_HEADERS_DIR)/DOMCore.h \
    61     $(PUBLIC_HEADERS_DIR)/DOMCounter.h \
    62     $(PUBLIC_HEADERS_DIR)/DOMDocument.h \
    63     $(PUBLIC_HEADERS_DIR)/DOMDocumentFragment.h \
     53    $(PRIVATE_HEADERS_DIR)/DOMCSSStyleRule.h \
     54    $(PRIVATE_HEADERS_DIR)/DOMCSSStyleSheet.h \
     55    $(PRIVATE_HEADERS_DIR)/DOMCSSUnknownRule.h \
     56    $(PRIVATE_HEADERS_DIR)/DOMCSSValue.h \
     57    $(PRIVATE_HEADERS_DIR)/DOMCSSValueList.h \
     58    $(PRIVATE_HEADERS_DIR)/DOMCharacterData.h \
     59    $(PRIVATE_HEADERS_DIR)/DOMComment.h \
     60    $(PRIVATE_HEADERS_DIR)/DOMCore.h \
     61    $(PRIVATE_HEADERS_DIR)/DOMCounter.h \
     62    $(PRIVATE_HEADERS_DIR)/DOMDocument.h \
     63    $(PRIVATE_HEADERS_DIR)/DOMDocumentFragment.h \
    6464    $(INTERNAL_HEADERS_DIR)/DOMDocumentFragmentInternal.h \
    6565    $(PRIVATE_HEADERS_DIR)/DOMDocumentFragmentPrivate.h \
    6666    $(INTERNAL_HEADERS_DIR)/DOMDocumentInternal.h \
    6767    $(PRIVATE_HEADERS_DIR)/DOMDocumentPrivate.h \
    68     $(PUBLIC_HEADERS_DIR)/DOMDocumentType.h \
    69     $(PUBLIC_HEADERS_DIR)/DOMElement.h \
     68    $(PRIVATE_HEADERS_DIR)/DOMDocumentType.h \
     69    $(PRIVATE_HEADERS_DIR)/DOMElement.h \
    7070    $(INTERNAL_HEADERS_DIR)/DOMElementInternal.h \
    71     $(PUBLIC_HEADERS_DIR)/DOMEntity.h \
    72     $(PUBLIC_HEADERS_DIR)/DOMEntityReference.h \
    73     $(PUBLIC_HEADERS_DIR)/DOMEvent.h \
    74     $(PUBLIC_HEADERS_DIR)/DOMEventException.h \
    75     $(PUBLIC_HEADERS_DIR)/DOMEventListener.h \
    76     $(PUBLIC_HEADERS_DIR)/DOMEventTarget.h \
    77     $(PUBLIC_HEADERS_DIR)/DOMEvents.h \
    78     $(PUBLIC_HEADERS_DIR)/DOMException.h \
    79     $(PUBLIC_HEADERS_DIR)/DOMExtensions.h \
    80     $(PUBLIC_HEADERS_DIR)/DOMFile.h \
    81     $(PUBLIC_HEADERS_DIR)/DOMFileList.h \
    82     $(PUBLIC_HEADERS_DIR)/DOMHTML.h \
    83     $(PUBLIC_HEADERS_DIR)/DOMHTMLAnchorElement.h \
    84     $(PUBLIC_HEADERS_DIR)/DOMHTMLAppletElement.h \
    85     $(PUBLIC_HEADERS_DIR)/DOMHTMLAreaElement.h \
    86     $(PUBLIC_HEADERS_DIR)/DOMHTMLBRElement.h \
    87     $(PUBLIC_HEADERS_DIR)/DOMHTMLBaseElement.h \
    88     $(PUBLIC_HEADERS_DIR)/DOMHTMLBaseFontElement.h \
    89     $(PUBLIC_HEADERS_DIR)/DOMHTMLBodyElement.h \
    90     $(PUBLIC_HEADERS_DIR)/DOMHTMLButtonElement.h \
    91     $(PUBLIC_HEADERS_DIR)/DOMHTMLCollection.h \
    92     $(PUBLIC_HEADERS_DIR)/DOMHTMLDListElement.h \
    93     $(PUBLIC_HEADERS_DIR)/DOMHTMLDirectoryElement.h \
    94     $(PUBLIC_HEADERS_DIR)/DOMHTMLDivElement.h \
    95     $(PUBLIC_HEADERS_DIR)/DOMHTMLDocument.h \
    96     $(PUBLIC_HEADERS_DIR)/DOMHTMLElement.h \
     71    $(PRIVATE_HEADERS_DIR)/DOMEntity.h \
     72    $(PRIVATE_HEADERS_DIR)/DOMEntityReference.h \
     73    $(PRIVATE_HEADERS_DIR)/DOMEvent.h \
     74    $(PRIVATE_HEADERS_DIR)/DOMEventException.h \
     75    $(PRIVATE_HEADERS_DIR)/DOMEventListener.h \
     76    $(PRIVATE_HEADERS_DIR)/DOMEventTarget.h \
     77    $(PRIVATE_HEADERS_DIR)/DOMEvents.h \
     78    $(PRIVATE_HEADERS_DIR)/DOMException.h \
     79    $(PRIVATE_HEADERS_DIR)/DOMExtensions.h \
     80    $(PRIVATE_HEADERS_DIR)/DOMFile.h \
     81    $(PRIVATE_HEADERS_DIR)/DOMFileList.h \
     82    $(PRIVATE_HEADERS_DIR)/DOMHTML.h \
     83    $(PRIVATE_HEADERS_DIR)/DOMHTMLAnchorElement.h \
     84    $(PRIVATE_HEADERS_DIR)/DOMHTMLAppletElement.h \
     85    $(PRIVATE_HEADERS_DIR)/DOMHTMLAreaElement.h \
     86    $(PRIVATE_HEADERS_DIR)/DOMHTMLBRElement.h \
     87    $(PRIVATE_HEADERS_DIR)/DOMHTMLBaseElement.h \
     88    $(PRIVATE_HEADERS_DIR)/DOMHTMLBaseFontElement.h \
     89    $(PRIVATE_HEADERS_DIR)/DOMHTMLBodyElement.h \
     90    $(PRIVATE_HEADERS_DIR)/DOMHTMLButtonElement.h \
     91    $(PRIVATE_HEADERS_DIR)/DOMHTMLCollection.h \
     92    $(PRIVATE_HEADERS_DIR)/DOMHTMLDListElement.h \
     93    $(PRIVATE_HEADERS_DIR)/DOMHTMLDirectoryElement.h \
     94    $(PRIVATE_HEADERS_DIR)/DOMHTMLDivElement.h \
     95    $(PRIVATE_HEADERS_DIR)/DOMHTMLDocument.h \
     96    $(PRIVATE_HEADERS_DIR)/DOMHTMLElement.h \
    9797    $(INTERNAL_HEADERS_DIR)/DOMHTMLElementInternal.h \
    98     $(PUBLIC_HEADERS_DIR)/DOMHTMLEmbedElement.h \
     98    $(PRIVATE_HEADERS_DIR)/DOMHTMLEmbedElement.h \
    9999    $(PRIVATE_HEADERS_DIR)/DOMHTMLEmbedElementPrivate.h \
    100     $(PUBLIC_HEADERS_DIR)/DOMHTMLFieldSetElement.h \
    101     $(PUBLIC_HEADERS_DIR)/DOMHTMLFontElement.h \
    102     $(PUBLIC_HEADERS_DIR)/DOMHTMLFormElement.h \
     100    $(PRIVATE_HEADERS_DIR)/DOMHTMLFieldSetElement.h \
     101    $(PRIVATE_HEADERS_DIR)/DOMHTMLFontElement.h \
     102    $(PRIVATE_HEADERS_DIR)/DOMHTMLFormElement.h \
    103103    $(INTERNAL_HEADERS_DIR)/DOMHTMLFormElementInternal.h \
    104     $(PUBLIC_HEADERS_DIR)/DOMHTMLFrameElement.h \
    105     $(PUBLIC_HEADERS_DIR)/DOMHTMLFrameSetElement.h \
    106     $(PUBLIC_HEADERS_DIR)/DOMHTMLHRElement.h \
    107     $(PUBLIC_HEADERS_DIR)/DOMHTMLHeadElement.h \
    108     $(PUBLIC_HEADERS_DIR)/DOMHTMLHeadingElement.h \
    109     $(PUBLIC_HEADERS_DIR)/DOMHTMLHtmlElement.h \
    110     $(PUBLIC_HEADERS_DIR)/DOMHTMLIFrameElement.h \
    111     $(PUBLIC_HEADERS_DIR)/DOMHTMLImageElement.h \
    112     $(PUBLIC_HEADERS_DIR)/DOMHTMLInputElement.h \
     104    $(PRIVATE_HEADERS_DIR)/DOMHTMLFrameElement.h \
     105    $(PRIVATE_HEADERS_DIR)/DOMHTMLFrameSetElement.h \
     106    $(PRIVATE_HEADERS_DIR)/DOMHTMLHRElement.h \
     107    $(PRIVATE_HEADERS_DIR)/DOMHTMLHeadElement.h \
     108    $(PRIVATE_HEADERS_DIR)/DOMHTMLHeadingElement.h \
     109    $(PRIVATE_HEADERS_DIR)/DOMHTMLHtmlElement.h \
     110    $(PRIVATE_HEADERS_DIR)/DOMHTMLIFrameElement.h \
     111    $(PRIVATE_HEADERS_DIR)/DOMHTMLImageElement.h \
     112    $(PRIVATE_HEADERS_DIR)/DOMHTMLInputElement.h \
    113113    $(PRIVATE_HEADERS_DIR)/DOMHTMLInputElementPrivate.h \
    114114    $(INTERNAL_HEADERS_DIR)/DOMHTMLInputElementInternal.h \
    115     $(PUBLIC_HEADERS_DIR)/DOMHTMLLIElement.h \
    116     $(PUBLIC_HEADERS_DIR)/DOMHTMLLabelElement.h \
    117     $(PUBLIC_HEADERS_DIR)/DOMHTMLLegendElement.h \
    118     $(PUBLIC_HEADERS_DIR)/DOMHTMLLinkElement.h \
    119     $(PUBLIC_HEADERS_DIR)/DOMHTMLMapElement.h \
    120     $(PUBLIC_HEADERS_DIR)/DOMHTMLMarqueeElement.h \
    121     $(PUBLIC_HEADERS_DIR)/DOMHTMLMenuElement.h \
    122     $(PUBLIC_HEADERS_DIR)/DOMHTMLMetaElement.h \
    123     $(PUBLIC_HEADERS_DIR)/DOMHTMLModElement.h \
    124     $(PUBLIC_HEADERS_DIR)/DOMHTMLOListElement.h \
    125     $(PUBLIC_HEADERS_DIR)/DOMHTMLObjectElement.h \
     115    $(PRIVATE_HEADERS_DIR)/DOMHTMLLIElement.h \
     116    $(PRIVATE_HEADERS_DIR)/DOMHTMLLabelElement.h \
     117    $(PRIVATE_HEADERS_DIR)/DOMHTMLLegendElement.h \
     118    $(PRIVATE_HEADERS_DIR)/DOMHTMLLinkElement.h \
     119    $(PRIVATE_HEADERS_DIR)/DOMHTMLMapElement.h \
     120    $(PRIVATE_HEADERS_DIR)/DOMHTMLMarqueeElement.h \
     121    $(PRIVATE_HEADERS_DIR)/DOMHTMLMenuElement.h \
     122    $(PRIVATE_HEADERS_DIR)/DOMHTMLMetaElement.h \
     123    $(PRIVATE_HEADERS_DIR)/DOMHTMLModElement.h \
     124    $(PRIVATE_HEADERS_DIR)/DOMHTMLOListElement.h \
     125    $(PRIVATE_HEADERS_DIR)/DOMHTMLObjectElement.h \
    126126    $(PRIVATE_HEADERS_DIR)/DOMHTMLObjectElementPrivate.h \
    127     $(PUBLIC_HEADERS_DIR)/DOMHTMLOptGroupElement.h \
    128     $(PUBLIC_HEADERS_DIR)/DOMHTMLOptionElement.h \
    129     $(PUBLIC_HEADERS_DIR)/DOMHTMLOptionsCollection.h \
    130     $(PUBLIC_HEADERS_DIR)/DOMHTMLParagraphElement.h \
    131     $(PUBLIC_HEADERS_DIR)/DOMHTMLParamElement.h \
    132     $(PUBLIC_HEADERS_DIR)/DOMHTMLPreElement.h \
    133     $(PUBLIC_HEADERS_DIR)/DOMHTMLQuoteElement.h \
    134     $(PUBLIC_HEADERS_DIR)/DOMHTMLScriptElement.h \
    135     $(PUBLIC_HEADERS_DIR)/DOMHTMLSelectElement.h \
    136     $(PUBLIC_HEADERS_DIR)/DOMHTMLStyleElement.h \
    137     $(PUBLIC_HEADERS_DIR)/DOMHTMLTableCaptionElement.h \
    138     $(PUBLIC_HEADERS_DIR)/DOMHTMLTableCellElement.h \
    139     $(PUBLIC_HEADERS_DIR)/DOMHTMLTableColElement.h \
    140     $(PUBLIC_HEADERS_DIR)/DOMHTMLTableElement.h \
    141     $(PUBLIC_HEADERS_DIR)/DOMHTMLTableRowElement.h \
    142     $(PUBLIC_HEADERS_DIR)/DOMHTMLTableSectionElement.h \
    143     $(PUBLIC_HEADERS_DIR)/DOMHTMLTextAreaElement.h \
     127    $(PRIVATE_HEADERS_DIR)/DOMHTMLOptGroupElement.h \
     128    $(PRIVATE_HEADERS_DIR)/DOMHTMLOptionElement.h \
     129    $(PRIVATE_HEADERS_DIR)/DOMHTMLOptionsCollection.h \
     130    $(PRIVATE_HEADERS_DIR)/DOMHTMLParagraphElement.h \
     131    $(PRIVATE_HEADERS_DIR)/DOMHTMLParamElement.h \
     132    $(PRIVATE_HEADERS_DIR)/DOMHTMLPreElement.h \
     133    $(PRIVATE_HEADERS_DIR)/DOMHTMLQuoteElement.h \
     134    $(PRIVATE_HEADERS_DIR)/DOMHTMLScriptElement.h \
     135    $(PRIVATE_HEADERS_DIR)/DOMHTMLSelectElement.h \
     136    $(PRIVATE_HEADERS_DIR)/DOMHTMLStyleElement.h \
     137    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableCaptionElement.h \
     138    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableCellElement.h \
     139    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableColElement.h \
     140    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableElement.h \
     141    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableRowElement.h \
     142    $(PRIVATE_HEADERS_DIR)/DOMHTMLTableSectionElement.h \
     143    $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElement.h \
    144144    $(INTERNAL_HEADERS_DIR)/DOMHTMLTextAreaElementInternal.h \
    145     $(PUBLIC_HEADERS_DIR)/DOMHTMLTitleElement.h \
    146     $(PUBLIC_HEADERS_DIR)/DOMHTMLUListElement.h \
    147     $(PUBLIC_HEADERS_DIR)/DOMImplementation.h \
    148     $(PUBLIC_HEADERS_DIR)/DOMKeyboardEvent.h \
    149     $(PUBLIC_HEADERS_DIR)/DOMMediaList.h \
    150     $(PUBLIC_HEADERS_DIR)/DOMMouseEvent.h \
    151     $(PUBLIC_HEADERS_DIR)/DOMMutationEvent.h \
    152     $(PUBLIC_HEADERS_DIR)/DOMNamedNodeMap.h \
    153     $(PUBLIC_HEADERS_DIR)/DOMNode.h \
     145    $(PRIVATE_HEADERS_DIR)/DOMHTMLTitleElement.h \
     146    $(PRIVATE_HEADERS_DIR)/DOMHTMLUListElement.h \
     147    $(PRIVATE_HEADERS_DIR)/DOMImplementation.h \
     148    $(PRIVATE_HEADERS_DIR)/DOMKeyboardEvent.h \
     149    $(PRIVATE_HEADERS_DIR)/DOMMediaList.h \
     150    $(PRIVATE_HEADERS_DIR)/DOMMouseEvent.h \
     151    $(PRIVATE_HEADERS_DIR)/DOMMutationEvent.h \
     152    $(PRIVATE_HEADERS_DIR)/DOMNamedNodeMap.h \
     153    $(PRIVATE_HEADERS_DIR)/DOMNode.h \
    154154    $(INTERNAL_HEADERS_DIR)/DOMNodeInternal.h \
    155155    $(PRIVATE_HEADERS_DIR)/DOMNodePrivate.h \
    156     $(PUBLIC_HEADERS_DIR)/DOMNodeFilter.h \
    157     $(PUBLIC_HEADERS_DIR)/DOMNodeIterator.h \
    158     $(PUBLIC_HEADERS_DIR)/DOMNodeList.h \
    159     $(PUBLIC_HEADERS_DIR)/DOMNotation.h \
    160     $(PUBLIC_HEADERS_DIR)/DOMObject.h \
    161     $(PUBLIC_HEADERS_DIR)/DOMOverflowEvent.h \
     156    $(PRIVATE_HEADERS_DIR)/DOMNodeFilter.h \
     157    $(PRIVATE_HEADERS_DIR)/DOMNodeIterator.h \
     158    $(PRIVATE_HEADERS_DIR)/DOMNodeList.h \
     159    $(PRIVATE_HEADERS_DIR)/DOMNotation.h \
     160    $(PRIVATE_HEADERS_DIR)/DOMObject.h \
     161    $(PRIVATE_HEADERS_DIR)/DOMOverflowEvent.h \
    162162    $(PRIVATE_HEADERS_DIR)/DOMPrivate.h \
    163     $(PUBLIC_HEADERS_DIR)/DOMProcessingInstruction.h \
    164     $(PUBLIC_HEADERS_DIR)/DOMProgressEvent.h \
    165     $(PUBLIC_HEADERS_DIR)/DOMRGBColor.h \
    166     $(PUBLIC_HEADERS_DIR)/DOMRange.h \
     163    $(PRIVATE_HEADERS_DIR)/DOMProcessingInstruction.h \
     164    $(PRIVATE_HEADERS_DIR)/DOMProgressEvent.h \
     165    $(PRIVATE_HEADERS_DIR)/DOMRGBColor.h \
     166    $(PRIVATE_HEADERS_DIR)/DOMRange.h \
    167167    $(INTERNAL_HEADERS_DIR)/DOMRangeInternal.h \
    168     $(PUBLIC_HEADERS_DIR)/DOMRangeException.h \
    169     $(PUBLIC_HEADERS_DIR)/DOMRanges.h \
    170     $(PUBLIC_HEADERS_DIR)/DOMRect.h \
    171     $(PUBLIC_HEADERS_DIR)/DOMStyleSheet.h \
    172     $(PUBLIC_HEADERS_DIR)/DOMStyleSheetList.h \
    173     $(PUBLIC_HEADERS_DIR)/DOMStylesheets.h \
    174     $(PUBLIC_HEADERS_DIR)/DOMText.h \
    175     $(PUBLIC_HEADERS_DIR)/DOMTraversal.h \
    176     $(PUBLIC_HEADERS_DIR)/DOMTreeWalker.h \
    177     $(PUBLIC_HEADERS_DIR)/DOMUIEvent.h \
    178     $(PUBLIC_HEADERS_DIR)/DOMViews.h \
    179     $(PUBLIC_HEADERS_DIR)/DOMWheelEvent.h \
     168    $(PRIVATE_HEADERS_DIR)/DOMRangeException.h \
     169    $(PRIVATE_HEADERS_DIR)/DOMRanges.h \
     170    $(PRIVATE_HEADERS_DIR)/DOMRect.h \
     171    $(PRIVATE_HEADERS_DIR)/DOMStyleSheet.h \
     172    $(PRIVATE_HEADERS_DIR)/DOMStyleSheetList.h \
     173    $(PRIVATE_HEADERS_DIR)/DOMStylesheets.h \
     174    $(PRIVATE_HEADERS_DIR)/DOMText.h \
     175    $(PRIVATE_HEADERS_DIR)/DOMTraversal.h \
     176    $(PRIVATE_HEADERS_DIR)/DOMTreeWalker.h \
     177    $(PRIVATE_HEADERS_DIR)/DOMUIEvent.h \
     178    $(PRIVATE_HEADERS_DIR)/DOMViews.h \
     179    $(PRIVATE_HEADERS_DIR)/DOMWheelEvent.h \
    180180    $(INTERNAL_HEADERS_DIR)/DOMWheelEventInternal.h \
    181     $(PUBLIC_HEADERS_DIR)/DOMXPath.h \
    182     $(PUBLIC_HEADERS_DIR)/DOMXPathException.h \
    183     $(PUBLIC_HEADERS_DIR)/DOMXPathExpression.h \
    184     $(PUBLIC_HEADERS_DIR)/DOMXPathNSResolver.h \
    185     $(PUBLIC_HEADERS_DIR)/DOMXPathResult.h \
    186     $(PUBLIC_HEADERS_DIR)/WebKitAvailability.h \
    187     $(PUBLIC_HEADERS_DIR)/WebScriptObject.h \
    188     $(PUBLIC_HEADERS_DIR)/npapi.h \
    189     $(PUBLIC_HEADERS_DIR)/npfunctions.h \
    190     $(PUBLIC_HEADERS_DIR)/npruntime.h \
    191     $(PUBLIC_HEADERS_DIR)/nptypes.h \
     181    $(PRIVATE_HEADERS_DIR)/DOMXPath.h \
     182    $(PRIVATE_HEADERS_DIR)/DOMXPathException.h \
     183    $(PRIVATE_HEADERS_DIR)/DOMXPathExpression.h \
     184    $(PRIVATE_HEADERS_DIR)/DOMXPathNSResolver.h \
     185    $(PRIVATE_HEADERS_DIR)/DOMXPathResult.h \
     186    $(PRIVATE_HEADERS_DIR)/WebKitAvailability.h \
     187    $(PRIVATE_HEADERS_DIR)/WebScriptObject.h \
     188    $(PRIVATE_HEADERS_DIR)/npapi.h \
     189    $(PRIVATE_HEADERS_DIR)/npfunctions.h \
     190    $(PRIVATE_HEADERS_DIR)/npruntime.h \
     191    $(PRIVATE_HEADERS_DIR)/nptypes.h \
    192192#
    193193
    194194ifneq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
    195195all : \
    196     $(PUBLIC_HEADERS_DIR)/DOMGestureEvent.h \
     196    $(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h \
    197197    $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElementPrivate.h \
    198     $(PUBLIC_HEADERS_DIR)/DOMTouch.h \
    199     $(PUBLIC_HEADERS_DIR)/DOMTouchEvent.h \
    200     $(PUBLIC_HEADERS_DIR)/DOMTouchList.h \
     198    $(PRIVATE_HEADERS_DIR)/DOMTouch.h \
     199    $(PRIVATE_HEADERS_DIR)/DOMTouchEvent.h \
     200    $(PRIVATE_HEADERS_DIR)/DOMTouchList.h \
    201201    $(PRIVATE_HEADERS_DIR)/DOMUIKitExtensions.h \
    202202    $(PRIVATE_HEADERS_DIR)/KeyEventCodesIOS.h \
     
    231231endif
    232232
    233 WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKit/ -e s/DOMDOMImplementation/DOMImplementation/
     233WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/
    234234WEBCORE_HEADER_MIGRATE_CMD = sed $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
    235 
    236 ifeq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
    237 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
    238 else
    239 PUBLIC_HEADER_CHECK_CMD =
    240 endif
    241 
    242 $(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
    243         $(PUBLIC_HEADER_CHECK_CMD)
    244         $(WEBCORE_HEADER_MIGRATE_CMD)
    245235
    246236$(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
    247237        $(WEBCORE_HEADER_MIGRATE_CMD)
    248238
    249 $(PUBLIC_HEADERS_DIR)/% : % MigrateHeaders.make
    250         $(PUBLIC_HEADER_CHECK_CMD)
    251         $(WEBCORE_HEADER_MIGRATE_CMD)
    252 
    253239$(PRIVATE_HEADERS_DIR)/% : % MigrateHeaders.make
    254240        $(WEBCORE_HEADER_MIGRATE_CMD)
     
    256242$(INTERNAL_HEADERS_DIR)/% : % MigrateHeaders.make
    257243        $(WEBCORE_HEADER_MIGRATE_CMD)
    258 
    259 # Migration of WebKit2 headers to WebKit
    260 
    261 WEBKIT2_HEADERS = \
    262     WKBackForwardList.h \
    263     WKBackForwardListItem.h \
    264     WKBackForwardListItemPrivate.h \
    265     WKBackForwardListPrivate.h \
    266     WKFoundation.h \
    267     WKFrameInfo.h \
    268     WKHistoryDelegatePrivate.h \
    269     WKNavigation.h \
    270     WKNavigationAction.h \
    271     WKNavigationDelegate.h \
    272     WKNavigationResponse.h \
    273     WKPreferences.h \
    274     WKProcessPool.h \
    275     WKProcessPoolPrivate.h \
    276     WKScriptMessage.h \
    277     WKScriptMessageHandler.h \
    278     WKScriptMessagePrivate.h \
    279     WKUIDelegate.h \
    280     WKUIDelegatePrivate.h \
    281     WKUserContentController.h \
    282     WKUserContentControllerPrivate.h \
    283     WKWebView.h \
    284     WKWebViewConfiguration.h \
    285     WKWebViewConfigurationPrivate.h \
    286     WKWebViewPrivate.h \
    287     _WKActivatedElementInfo.h \
    288     _WKElementAction.h \
    289     _WKFormDelegate.h \
    290     _WKFormInputSession.h \
    291     _WKProcessPoolConfiguration.h \
    292     _WKScriptWorld.h \
    293     _WKThumbnailView.h \
    294     _WKVisitedLinkProvider.h \
    295     _WKVisitedLinkProviderPrivate.h \
    296 #
    297 
    298 WEBKIT2_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/*))))
    299 WEBKIT2_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/*))))
    300 
    301 ifeq ($(PLATFORM_NAME), macosx)
    302 all : $(WEBKIT2_PUBLIC_HEADERS) $(WEBKIT2_PRIVATE_HEADERS)
    303 endif
    304 
    305 WEBKIT2_HEADER_REPLACE_RULES = -e s/\<WebKit2/\<WebKit/ -e /$\#.*\<WebKit\\/WK.*Ref\\.h\>/d
    306 WEBKIT2_HEADER_MIGRATE_CMD = sed $(WEBKIT2_HEADER_REPLACE_RULES) $< > $@
    307 
    308 $(PUBLIC_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/% MigrateHeaders.make
    309         $(WEBKIT2_HEADER_MIGRATE_CMD)
    310 
    311 $(PRIVATE_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/% MigrateHeaders.make
    312         $(WEBKIT2_HEADER_MIGRATE_CMD)
  • trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h

    r165676 r168047  
    2929#import <CoreGraphics/CGContext.h>
    3030#import <Foundation/Foundation.h>
    31 #import <WebKit/WebFrame.h>
     31#import <WebKitLegacy/WebFrame.h>
    3232
    3333@class DOMElement;
  • trunk/Source/WebKit/mac/Misc/WebDownload.h

    r165676 r168047  
    3030
    3131#if TARGET_OS_IPHONE
    32 #import <WebKit/WAKAppKitStubs.h>
     32#import <WebKitLegacy/WAKAppKitStubs.h>
    3333#endif
    3434
  • trunk/Source/WebKit/mac/Misc/WebDownload.mm

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebDownload.h>
     29#import <WebKitLegacy/WebDownload.h>
    3030
    3131#import <Foundation/NSURLAuthenticationChallenge.h>
     
    3636#import <WebCore/CredentialStorage.h>
    3737#import <WebCore/ProtectionSpace.h>
    38 #import <WebKit/WebPanelAuthenticationHandler.h>
     38#import <WebKitLegacy/WebPanelAuthenticationHandler.h>
    3939#import <wtf/Assertions.h>
    4040
  • trunk/Source/WebKit/mac/Misc/WebDownloadInternal.h

    r165676 r168047  
    2727*/
    2828 
    29 #import <WebKit/WebDownload.h>
     29#import <WebKitLegacy/WebDownload.h>
    3030
    3131#if USE(CFNETWORK)
  • trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm

    r166378 r168047  
    4141#import <WebCore/Image.h>
    4242#import <WebCore/WebCoreObjCExtras.h>
    43 #import <WebKit/DOMCore.h>
    44 #import <WebKit/DOMExtensions.h>
     43#import <WebKitLegacy/DOMCore.h>
     44#import <WebKitLegacy/DOMExtensions.h>
    4545#import <runtime/InitializeThreading.h>
    4646#import <wtf/MainThread.h>
  • trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebIconDatabase.h>
     29#import <WebKitLegacy/WebIconDatabase.h>
    3030
    3131// FIXME: Some of the following is not API and should be moved
  • trunk/Source/WebKit/mac/Misc/WebKit.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/DOM.h>
    30 #import <WebKit/WebArchive.h>
    31 #import <WebKit/WebBackForwardList.h>
    32 #import <WebKit/WebDataSource.h>
    33 #import <WebKit/WebDocument.h>
    34 #import <WebKit/WebDOMOperations.h>
    35 #import <WebKit/WebDownload.h>
    36 #import <WebKit/WebEditingDelegate.h>
    37 #import <WebKit/WebFrame.h>
    38 #import <WebKit/WebFrameLoadDelegate.h>
    39 #import <WebKit/WebFrameView.h>
    40 #import <WebKit/WebHistory.h>
    41 #import <WebKit/WebHistoryItem.h>
    42 #import <WebKit/WebKitErrors.h>
    43 #import <WebKit/WebPlugin.h>
    44 #import <WebKit/WebPluginContainer.h>
    45 #import <WebKit/WebPluginViewFactory.h>
    46 #import <WebKit/WebPolicyDelegate.h>
    47 #import <WebKit/WebPreferences.h>
    48 #import <WebKit/WebResource.h>
    49 #import <WebKit/WebResourceLoadDelegate.h>
    50 #import <WebKit/WebScriptObject.h>
    51 #import <WebKit/WebUIDelegate.h>
    52 #import <WebKit/WebView.h>
     29#import <WebKitLegacy/DOM.h>
     30#import <WebKitLegacy/WebArchive.h>
     31#import <WebKitLegacy/WebBackForwardList.h>
     32#import <WebKitLegacy/WebDataSource.h>
     33#import <WebKitLegacy/WebDocument.h>
     34#import <WebKitLegacy/WebDOMOperations.h>
     35#import <WebKitLegacy/WebDownload.h>
     36#import <WebKitLegacy/WebEditingDelegate.h>
     37#import <WebKitLegacy/WebFrame.h>
     38#import <WebKitLegacy/WebFrameLoadDelegate.h>
     39#import <WebKitLegacy/WebFrameView.h>
     40#import <WebKitLegacy/WebHistory.h>
     41#import <WebKitLegacy/WebHistoryItem.h>
     42#import <WebKitLegacy/WebKitErrors.h>
     43#import <WebKitLegacy/WebPlugin.h>
     44#import <WebKitLegacy/WebPluginContainer.h>
     45#import <WebKitLegacy/WebPluginViewFactory.h>
     46#import <WebKitLegacy/WebPolicyDelegate.h>
     47#import <WebKitLegacy/WebPreferences.h>
     48#import <WebKitLegacy/WebResource.h>
     49#import <WebKitLegacy/WebResourceLoadDelegate.h>
     50#import <WebKitLegacy/WebScriptObject.h>
     51#import <WebKitLegacy/WebUIDelegate.h>
     52#import <WebKitLegacy/WebView.h>
  • trunk/Source/WebKit/mac/Misc/WebKitErrors.m

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebKitErrors.h>
     29#import <WebKitLegacy/WebKitErrors.h>
    3030
    3131#import "WebLocalizableStringsInternal.h"
    32 #import <WebKit/WebKitErrorsPrivate.h>
    33 #import <WebKit/WebNSURLExtras.h>
     32#import <WebKitLegacy/WebKitErrorsPrivate.h>
     33#import <WebKitLegacy/WebNSURLExtras.h>
    3434
    3535#import <pthread.h>
  • trunk/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebKitErrors.h>
     29#import <WebKitLegacy/WebKitErrors.h>
    3030
    3131#define WebKitErrorPlugInCancelledConnection 203
  • trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm

    r165676 r168047  
    3434#import <WebCore/TextRun.h>
    3535#import <WebCore/WebCoreNSStringExtras.h>
    36 #import <WebKit/WebNSFileManagerExtras.h>
    37 #import <WebKit/WebNSObjectExtras.h>
     36#import <WebKitLegacy/WebNSFileManagerExtras.h>
     37#import <WebKitLegacy/WebNSObjectExtras.h>
    3838#import <unicode/uchar.h>
    3939#import <sys/param.h>
     
    4141#if PLATFORM(IOS)
    4242#import <WebCore/WAKViewPrivate.h>
    43 #import <WebKit/DOM.h>
    44 #import <WebKit/WebFrame.h>
    45 #import <WebKit/WebFrameView.h>
    46 #import <WebKit/WebViewPrivate.h>
     43#import <WebKitLegacy/DOM.h>
     44#import <WebKitLegacy/WebFrame.h>
     45#import <WebKitLegacy/WebFrameView.h>
     46#import <WebKitLegacy/WebViewPrivate.h>
    4747#endif
    4848
  • trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebLocalizableStrings.h>
     29#import <WebKitLegacy/WebLocalizableStrings.h>
    3030
    3131#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebNSDataExtras.h>
    30 #import <WebKit/WebNSDataExtrasPrivate.h>
     29#import <WebKitLegacy/WebNSDataExtras.h>
     30#import <WebKitLegacy/WebNSDataExtrasPrivate.h>
    3131
    3232#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/Misc/WebNSDictionaryExtras.m

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebNSDataExtras.h>
     29#import <WebKitLegacy/WebNSDataExtras.h>
    3030
    3131#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m

    r165676 r168047  
    2929#if !PLATFORM(IOS)
    3030
    31 #import <WebKit/WebNSEventExtras.h>
     31#import <WebKitLegacy/WebNSEventExtras.h>
    3232
    3333@implementation NSEvent (WebExtras)
  • trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebNSFileManagerExtras.h>
     29#import <WebKitLegacy/WebNSFileManagerExtras.h>
    3030
    3131#import "WebKitNSStringExtras.h"
  • trunk/Source/WebKit/mac/Misc/WebNSImageExtras.m

    r165676 r168047  
    2929#if !PLATFORM(IOS)
    3030
    31 #import <WebKit/WebNSImageExtras.h>
     31#import <WebKitLegacy/WebNSImageExtras.h>
    3232
    33 #import <WebKit/WebKitLogging.h>
     33#import <WebKitLegacy/WebKitLogging.h>
    3434
    3535@implementation NSImage (WebExtras)
  • trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm

    r165676 r168047  
    4444#import <WebCore/MIMETypeRegistry.h>
    4545#import <WebCore/RenderImage.h>
    46 #import <WebKit/DOMExtensions.h>
    47 #import <WebKit/DOMPrivate.h>
     46#import <WebKitLegacy/DOMExtensions.h>
     47#import <WebKitLegacy/DOMPrivate.h>
    4848#import <WebKitSystemInterface.h>
    4949#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h

    r165676 r168047  
    3232#import <AppKit/AppKit.h>
    3333#else
    34 #import <WebKit/WAKAppKitStubs.h>
    35 #import <WebKit/WAKView.h>
     34#import <WebKitLegacy/WAKAppKitStubs.h>
     35#import <WebKitLegacy/WAKView.h>
    3636#endif
    3737
  • trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebNSViewExtras.h>
    30 
    31 #import <WebKit/DOMExtensions.h>
    32 #import <WebKit/WebDataSource.h>
    33 #import <WebKit/WebFramePrivate.h>
    34 #import <WebKit/WebFrameViewInternal.h>
    35 #import <WebKit/WebNSImageExtras.h>
    36 #import <WebKit/WebNSURLExtras.h>
    37 #import <WebKit/WebView.h>
     29#import <WebKitLegacy/WebNSViewExtras.h>
     30
     31#import <WebKitLegacy/DOMExtensions.h>
     32#import <WebKitLegacy/WebDataSource.h>
     33#import <WebKitLegacy/WebFramePrivate.h>
     34#import <WebKitLegacy/WebFrameViewInternal.h>
     35#import <WebKitLegacy/WebNSImageExtras.h>
     36#import <WebKitLegacy/WebNSURLExtras.h>
     37#import <WebKitLegacy/WebView.h>
    3838
    3939#if !PLATFORM(IOS)
    40 #import <WebKit/WebNSPasteboardExtras.h>
     40#import <WebKitLegacy/WebNSPasteboardExtras.h>
    4141#endif
    4242
  • trunk/Source/WebKit/mac/Panels/WebAuthenticationPanel.m

    r165676 r168047  
    2929#if !PLATFORM(IOS)
    3030
    31 #import <WebKit/WebAuthenticationPanel.h>
     31#import <WebKitLegacy/WebAuthenticationPanel.h>
    3232
    3333#import "WebLocalizableStringsInternal.h"
     
    3535#import <Foundation/NSURLProtectionSpace.h>
    3636#import <Foundation/NSURLCredential.h>
    37 #import <WebKit/WebKitNSStringExtras.h>
    38 #import <WebKit/WebNSURLExtras.h>
     37#import <WebKitLegacy/WebKitNSStringExtras.h>
     38#import <WebKitLegacy/WebNSURLExtras.h>
    3939#import <wtf/Assertions.h>
    4040
    41 #import <WebKit/WebNSControlExtras.h>
     41#import <WebKitLegacy/WebNSControlExtras.h>
    4242
    4343#define WebAuthenticationPanelNibName @"WebAuthenticationPanel"
  • trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.m

    r165676 r168047  
    2929#if !PLATFORM(IOS)
    3030
    31 #import <WebKit/WebPanelAuthenticationHandler.h>
     31#import <WebKitLegacy/WebPanelAuthenticationHandler.h>
    3232
    3333#import <Foundation/NSURLAuthenticationChallenge.h>
    34 #import <WebKit/WebAuthenticationPanel.h>
     34#import <WebKitLegacy/WebAuthenticationPanel.h>
    3535#import <wtf/Assertions.h>
    3636
  • trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.h

    r128234 r168047  
    3030
    3131#include <WebCore/NetscapePlugInStreamLoader.h>
    32 #include <WebKit/npapi.h>
     32#include <WebKitLegacy/npapi.h>
    3333#include <wtf/PassRefPtr.h>
    3434#include <wtf/RefCounted.h>
  • trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h

    r161309 r168047  
    3333#include <JavaScriptCore/Strong.h>
    3434#include <WebCore/Timer.h>
    35 #include <WebKit/npapi.h>
     35#include <WebKitLegacy/npapi.h>
    3636#include <wtf/Deque.h>
    3737#include <wtf/Forward.h>
  • trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgent.defs

    r45678 r168047  
    2424 */
    2525 
    26 #include <WebKit/WebKitPluginHostTypes.defs>
     26#include <WebKitLegacy/WebKitPluginHostTypes.defs>
    2727
    2828subsystem WebKitPluginAgent 100;
  • trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgentReply.defs

    r45678 r168047  
    2424 */
    2525 
    26 #include <WebKit/WebKitPluginHostTypes.defs>
     26#include <WebKitLegacy/WebKitPluginHostTypes.defs>
    2727
    2828subsystem WebKitPluginAgentReply 200;
  • trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs

    r154078 r168047  
    2424 */
    2525
    26 #include <WebKit/WebKitPluginHostTypes.defs>
     26#include <WebKitLegacy/WebKitPluginHostTypes.defs>
    2727
    2828// FIXME: Come up with a better name.
  • trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs

    r154078 r168047  
    2424 */
    2525
    26 #include <WebKit/WebKitPluginHostTypes.defs>
     26#include <WebKitLegacy/WebKitPluginHostTypes.defs>
    2727
    2828subsystem WebKitPluginHost 300;
  • trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHostTypes.defs

    r45678 r168047  
    2727#include <mach/mach_types.defs>
    2828
    29 import <WebKit/WebKitPluginHostTypes.h>;
     29import <WebKitLegacy/WebKitPluginHostTypes.h>;
    3030
    3131type plist_bytes_t = ^array [] of uint8_t;
  • trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

    r166378 r168047  
    5858#import <WebCore/SecurityOrigin.h>
    5959#import <WebCore/WebCoreObjCExtras.h>
    60 #import <WebKit/DOMPrivate.h>
     60#import <WebKitLegacy/DOMPrivate.h>
    6161#import <runtime/InitializeThreading.h>
    6262#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.h

    r165676 r168047  
    3131
    3232#if ENABLE(NETSCAPE_PLUGIN_API)
    33 #import <WebKit/npfunctions.h>
     33#import <WebKitLegacy/npfunctions.h>
    3434#else
    3535typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void);
  • trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm

    r166378 r168047  
    2727 */
    2828
    29 #import <WebKit/WebBasePluginPackage.h>
     29#import <WebKitLegacy/WebBasePluginPackage.h>
    3030
    3131#import <algorithm>
    3232#import <WebCore/WebCoreObjCExtras.h>
    33 #import <WebKit/WebKitNSStringExtras.h>
    34 #import <WebKit/WebNetscapePluginPackage.h>
    35 #import <WebKit/WebPluginPackage.h>
     33#import <WebKitLegacy/WebKitNSStringExtras.h>
     34#import <WebKitLegacy/WebNetscapePluginPackage.h>
     35#import <WebKitLegacy/WebPluginPackage.h>
    3636#import <runtime/InitializeThreading.h>
    3737#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h

    r165676 r168047  
    3030#define WebNetscapeContainerCheckPrivate_h
    3131
    32 #include <WebKit/npapi.h>
     32#include <WebKitLegacy/npapi.h>
    3333
    3434#ifdef __cplusplus
  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.h

    r95901 r168047  
    2929#define WebNetscapePluginEventHandlerCocoa_h
    3030
    31 #include <WebKit/npapi.h>
     31#include <WebKitLegacy/npapi.h>
    3232#include "WebNetscapePluginEventHandler.h"
    3333
  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h

    r165676 r168047  
    3232#import <WebCore/Timer.h>
    3333#import <WebCore/NetscapePlugInStreamLoader.h>
    34 #import <WebKit/npfunctions.h>
     34#import <WebKitLegacy/npfunctions.h>
    3535#import <wtf/PassRefPtr.h>
    3636#import <wtf/RefCounted.h>
  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.h

    r165676 r168047  
    3232
    3333#import "WebNetscapeContainerCheckPrivate.h"
    34 #import <WebKit/npfunctions.h>
    35 #import <WebKit/npapi.h>
     34#import <WebKitLegacy/npfunctions.h>
     35#import <WebKitLegacy/npapi.h>
    3636#import <wtf/HashMap.h>
    3737#import <wtf/HashSet.h>
  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm

    r166378 r168047  
    7575#import <WebCore/WebCoreURLResponse.h>
    7676#import <WebCore/npruntime_impl.h>
    77 #import <WebKit/DOMPrivate.h>
    78 #import <WebKit/WebUIDelegate.h>
     77#import <WebKitLegacy/DOMPrivate.h>
     78#import <WebKitLegacy/WebUIDelegate.h>
    7979#import <objc/runtime.h>
    8080#import <runtime/InitializeThreading.h>
  • trunk/Source/WebKit/mac/Plugins/WebPlugin.h

    r165676 r168047  
    2828
    2929#import <Foundation/Foundation.h>
    30 #import <WebKit/WebKitAvailability.h>
     30#import <WebKitLegacy/WebKitAvailability.h>
    3131
    3232#if !TARGET_OS_IPHONE
  • trunk/Source/WebKit/mac/Plugins/WebPluginController.h

    r165979 r168047  
    2727 */
    2828
    29 #import <WebKit/WebBasePluginPackage.h>
    30 #import <WebKit/WebPluginContainerCheck.h>
     29#import <WebKitLegacy/WebBasePluginPackage.h>
     30#import <WebKitLegacy/WebPluginContainerCheck.h>
    3131
    3232@class WebFrame;
  • trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.h

    r165676 r168047  
    3030
    3131#if TARGET_OS_IPHONE
    32 #import <WebKit/WAKAppKitStubs.h>
     32#import <WebKitLegacy/WAKAppKitStubs.h>
    3333#endif
    3434
  • trunk/Source/WebKit/mac/Plugins/WebPluginPackage.h

    r165676 r168047  
    2929#import <Foundation/Foundation.h>
    3030
    31 #import <WebKit/WebBasePluginPackage.h>
     31#import <WebKitLegacy/WebBasePluginPackage.h>
    3232
    3333@protocol WebPluginViewFactory;
  • trunk/Source/WebKit/mac/Plugins/WebPluginPackage.mm

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebPluginPackage.h>
     29#import <WebKitLegacy/WebPluginPackage.h>
    3030
    31 #import <WebKit/WebKitLogging.h>
    32 #import <WebKit/WebKitNSStringExtras.h>
     31#import <WebKitLegacy/WebKitLogging.h>
     32#import <WebKitLegacy/WebKitNSStringExtras.h>
    3333
    3434NSString *WebPlugInBaseURLKey =                 @"WebPlugInBaseURLKey";
  • trunk/Source/WebKit/mac/Plugins/WebPluginViewFactory.h

    r165676 r168047  
    2828
    2929#import <Foundation/Foundation.h>
    30 #import <WebKit/WebKitAvailability.h>
     30#import <WebKitLegacy/WebKitAvailability.h>
    3131
    3232#if !TARGET_OS_IPHONE
  • trunk/Source/WebKit/mac/Plugins/WebPluginViewFactoryPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebPluginViewFactory.h>
     29#import <WebKitLegacy/WebPluginViewFactory.h>
    3030
    3131typedef enum {
  • trunk/Source/WebKit/mac/Plugins/npapi.mm

    r165676 r168047  
    2828
    2929#if ENABLE(NETSCAPE_PLUGIN_API)
    30 #import <WebKit/npapi.h>
     30#import <WebKitLegacy/npapi.h>
    3131
    3232#import "WebNetscapePluginView.h"
  • trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h

    r165676 r168047  
    5050
    5151#if TARGET_OS_IPHONE
    52 #import <WebKit/WebUIKitSupport.h>
     52#import <WebKitLegacy/WebUIKitSupport.h>
    5353
    5454// Posted when origins have changed.
  • trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm

    r167786 r168047  
    5454#import <WebCore/FrameView.h>
    5555#import <WebCore/RuntimeApplicationChecks.h>
    56 #import <WebKit/DOMPrivate.h>
     56#import <WebKitLegacy/DOMPrivate.h>
    5757
    5858using namespace WebCore;
  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r168041 r168047  
    122122#import <WebCore/WebScriptObjectPrivate.h>
    123123#import <WebCore/Widget.h>
    124 #import <WebKit/DOMElement.h>
    125 #import <WebKit/DOMHTMLFormElement.h>
     124#import <WebKitLegacy/DOMElement.h>
     125#import <WebKitLegacy/DOMHTMLFormElement.h>
    126126#import <WebKitSystemInterface.h>
    127127#import <runtime/InitializeThreading.h>
  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm

    r166928 r168047  
    3838#import <CFNetwork/CFHTTPCookiesPriv.h>
    3939#import <WebCore/WebCoreThread.h>
    40 #import <WebKit/WebFrameLoadDelegate.h>
     40#import <WebKitLegacy/WebFrameLoadDelegate.h>
    4141#endif
    4242
  • trunk/Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm

    r161185 r168047  
    4141#if PLATFORM(IOS)
    4242#import <WebCore/WAKResponder.h>
    43 #import <WebKit/WebCoreThreadRun.h>
     43#import <WebKitLegacy/WebCoreThreadRun.h>
    4444#endif
    4545
  • trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm

    r166257 r168047  
    5252#import <WebCore/ScriptController.h>
    5353#import <WebCore/SoftLinking.h>
    54 #import <WebKit/DOMExtensions.h>
     54#import <WebKitLegacy/DOMExtensions.h>
    5555#import <WebKitSystemInterface.h>
    5656#import <wtf/text/Base64.h>
  • trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m

    r165676 r168047  
    3333#import <wtf/Assertions.h>
    3434
    35 #import <WebKit/WebNSControlExtras.h>
    36 #import <WebKit/WebNSWindowExtras.h>
     35#import <WebKitLegacy/WebNSControlExtras.h>
     36#import <WebKitLegacy/WebNSWindowExtras.h>
    3737
    3838@implementation WebJavaScriptTextInputPanel
  • trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm

    r161185 r168047  
    2626#if !PLATFORM(IOS)
    2727
    28 #import <WebKit/WebKeyGenerator.h>
     28#import <WebKitLegacy/WebKeyGenerator.h>
    2929
    3030#import <WebKitSystemInterface.h>
  • trunk/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h

    r165676 r168047  
    2929// This header contains the WebInspector SPI.
    3030
    31 #import <WebKit/WebInspector.h>
     31#import <WebKitLegacy/WebInspector.h>
    3232
    3333@class WebInspectorFrontend;
  • trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.h

    r165676 r168047  
    2929#if PLATFORM(IOS)
    3030#import <QuartzCore/CATiledLayer.h>
    31 #import <WebKit/WAKAppKitStubs.h>
    32 #import <WebKit/WAKView.h>
     31#import <WebKitLegacy/WAKAppKitStubs.h>
     32#import <WebKitLegacy/WAKView.h>
    3333#endif
    3434
  • trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.h

    r165676 r168047  
    2929#if PLATFORM(IOS)
    3030#import <QuartzCore/CAShapeLayer.h>
    31 #import <WebKit/WAKAppKitStubs.h>
    32 #import <WebKit/WAKView.h>
     31#import <WebKitLegacy/WAKAppKitStubs.h>
     32#import <WebKitLegacy/WAKView.h>
    3333#endif
    3434
  • trunk/Source/WebKit/mac/WebKitLegacy/WebKit.h

    r168046 r168047  
    2424 */
    2525
    26 // This file is only here so that WebKitLegacy.framework has something to link.
     26// FIXME: Remove this __has_include check once the WebKit framework lives in the right place.
     27#if defined(__has_include) && __has_include(<WebKit/WKWebView.h>)
     28#import <WebKit/WKBackForwardList.h>
     29#import <WebKit/WKBackForwardListItem.h>
     30#import <WebKit/WKFoundation.h>
     31#import <WebKit/WKFrameInfo.h>
     32#import <WebKit/WKNavigation.h>
     33#import <WebKit/WKNavigationAction.h>
     34#import <WebKit/WKNavigationDelegate.h>
     35#import <WebKit/WKNavigationResponse.h>
     36#import <WebKit/WKPreferences.h>
     37#import <WebKit/WKProcessPool.h>
     38#import <WebKit/WKScriptMessage.h>
     39#import <WebKit/WKScriptMessageHandler.h>
     40#import <WebKit/WKUIDelegate.h>
     41#import <WebKit/WKUserContentController.h>
     42#import <WebKit/WKWebView.h>
     43#import <WebKit/WKWebViewConfiguration.h>
     44#endif
     45
     46#if defined(__has_include) && __has_include(<WebKit/WebKitLegacy.h>)
     47#import <WebKit/WebKitLegacy.h>
     48#endif
  • trunk/Source/WebKit/mac/WebKitLegacy/WebKit.m

    r168046 r168047  
    2424 */
    2525
    26 // This file is only here so that WebKitLegacy.framework has something to link.
     26// FIXME: This is only temporary; WebKit.framework is going to be provided by the WebKit2 project.
     27
     28// This file is only here so that WebKit.framework has something to link.
  • trunk/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h

    r168046 r168047  
    2424 */
    2525
    26 // This file is only here so that WebKitLegacy.framework has something to link.
     26#import <WebKit/WKBackForwardListPrivate.h>
     27#import <WebKit/WKHistoryDelegatePrivate.h>
     28#import <WebKit/WKProcessPoolPrivate.h>
     29#import <WebKit/WKScriptMessagePrivate.h>
     30#import <WebKit/WKUIDelegatePrivate.h>
     31#import <WebKit/WKUserContentControllerPrivate.h>
     32#import <WebKit/WKWebViewConfigurationPrivate.h>
     33#import <WebKit/WKWebViewPrivate.h>
     34#import <WebKit/_WKActivatedElementInfo.h>
     35#import <WebKit/_WKElementAction.h>
     36#import <WebKit/_WKFormDelegate.h>
     37#import <WebKit/_WKFormInputSession.h>
     38#import <WebKit/_WKProcessPoolConfiguration.h>
     39#import <WebKit/_WKScriptWorld.h>
     40#import <WebKit/_WKThumbnailView.h>
     41#import <WebKit/_WKVisitedLinkProvider.h>
  • trunk/Source/WebKit/mac/WebView/WebDataSource.h

    r165676 r168047  
    2828
    2929#import <Foundation/Foundation.h>
    30 #import <WebKit/WebDocument.h>
     30#import <WebKitLegacy/WebDocument.h>
    3131
    3232@class NSMutableURLRequest;
  • trunk/Source/WebKit/mac/WebView/WebDataSource.mm

    r166378 r168047  
    5959#import <WebCore/WebCoreObjCExtras.h>
    6060#import <WebCore/WebCoreURLResponse.h>
    61 #import <WebKit/DOMHTML.h>
    62 #import <WebKit/DOMPrivate.h>
     61#import <WebKitLegacy/DOMHTML.h>
     62#import <WebKitLegacy/DOMPrivate.h>
    6363#import <runtime/InitializeThreading.h>
    6464#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/WebView/WebDataSourcePrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebDataSource.h>
     29#import <WebKitLegacy/WebDataSource.h>
    3030
    3131@protocol WebDataSourcePrivateDelegate
  • trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h

    r165676 r168047  
    3333
    3434#if PLATFORM(IOS)
    35 #import <WebKit/WAKAppKitStubs.h>
     35#import <WebKitLegacy/WAKAppKitStubs.h>
    3636#endif
    3737
  • trunk/Source/WebKit/mac/WebView/WebDocument.h

    r165676 r168047  
    3232#import <AppKit/AppKit.h>
    3333#else
    34 #import <WebKit/WAKAppKitStubs.h>
    35 #import <WebKit/WAKView.h>
     34#import <WebKitLegacy/WAKAppKitStubs.h>
     35#import <WebKitLegacy/WAKView.h>
    3636#endif
    3737
  • trunk/Source/WebKit/mac/WebView/WebDocumentInternal.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebDocumentPrivate.h>
    30 #import <WebKit/WebHTMLView.h>
    31 #import <WebKit/WebViewPrivate.h>
     29#import <WebKitLegacy/WebDocumentPrivate.h>
     30#import <WebKitLegacy/WebHTMLView.h>
     31#import <WebKitLegacy/WebViewPrivate.h>
    3232
    3333#if PLATFORM(IOS)
  • trunk/Source/WebKit/mac/WebView/WebDocumentPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebDocument.h>
    30 #import <WebKit/WebHTMLView.h>
     29#import <WebKitLegacy/WebDocument.h>
     30#import <WebKitLegacy/WebHTMLView.h>
    3131
    3232@class DOMDocument;
  • trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h

    r165676 r168047  
    3232#import <AppKit/AppKit.h>
    3333#else
    34 #import <WebKit/WAKAppKitStubs.h>
     34#import <WebKitLegacy/WAKAppKitStubs.h>
    3535#endif
    3636
  • trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebEditingDelegate.h>
     29#import <WebKitLegacy/WebEditingDelegate.h>
    3030
    3131@class DOMHTMLElement;
  • trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h

    r165676 r168047  
    2929#import <Foundation/Foundation.h>
    3030#import <JavaScriptCore/JSBase.h>
    31 #import <WebKit/WebKitAvailability.h>
     31#import <WebKitLegacy/WebKitAvailability.h>
    3232
    3333#if !TARGET_OS_IPHONE
  • trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegatePrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebFrameLoadDelegate.h>
     29#import <WebKitLegacy/WebFrameLoadDelegate.h>
    3030
    3131@class WebScriptWorld;
  • trunk/Source/WebKit/mac/WebView/WebFramePrivate.h

    r165870 r168047  
    2929// This header contains the WebFrame SPI.
    3030
    31 #import <WebKit/WebFrame.h>
     31#import <WebKitLegacy/WebFrame.h>
    3232#import <JavaScriptCore/JSBase.h>
    3333
     
    4040#if TARGET_OS_IPHONE
    4141#include <CoreText/CoreText.h>
    42 #include <WebKit/WAKAppKitStubs.h>
     42#include <WebKitLegacy/WAKAppKitStubs.h>
    4343#endif
    4444
  • trunk/Source/WebKit/mac/WebView/WebFrameView.h

    r165676 r168047  
    3232#import <AppKit/AppKit.h>
    3333#else
    34 #import <WebKit/WAKAppKitStubs.h>
    35 #import <WebKit/WAKView.h>
     34#import <WebKitLegacy/WAKAppKitStubs.h>
     35#import <WebKitLegacy/WAKView.h>
    3636#endif
    3737
  • trunk/Source/WebKit/mac/WebView/WebFrameViewInternal.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebFrameView.h>
     29#import <WebKitLegacy/WebFrameView.h>
    3030
    3131@class WebDynamicScrollBarsView;
  • trunk/Source/WebKit/mac/WebView/WebFrameViewPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebFrameView.h>
     29#import <WebKitLegacy/WebFrameView.h>
    3030
    3131@interface WebFrameView (WebPrivate)
  • trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h

    r165676 r168047  
    2929#import <Foundation/Foundation.h>
    3030
    31 #import <WebKit/WebDocumentPrivate.h>
     31#import <WebKitLegacy/WebDocumentPrivate.h>
    3232
    3333@class WebHTMLRepresentationPrivate;
  • trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm

    r167594 r168047  
    6060#import <WebCore/RenderElement.h>
    6161#import <WebCore/TextResourceDecoder.h>
    62 #import <WebKit/DOMHTMLInputElement.h>
     62#import <WebKitLegacy/DOMHTMLInputElement.h>
    6363#import <yarr/RegularExpression.h>
    6464#import <wtf/Assertions.h>
  • trunk/Source/WebKit/mac/WebView/WebHTMLRepresentationPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebHTMLRepresentation.h>
     29#import <WebKitLegacy/WebHTMLRepresentation.h>
    3030
    3131@protocol WebPluginManualLoader;
  • trunk/Source/WebKit/mac/WebView/WebHTMLView.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebDocument.h>
     29#import <WebKitLegacy/WebDocument.h>
    3030
    3131#if TARGET_OS_IPHONE
    32 #import <WebKit/WAKAppKitStubs.h>
    33 #import <WebKit/WAKView.h>
     32#import <WebKitLegacy/WAKAppKitStubs.h>
     33#import <WebKitLegacy/WAKView.h>
    3434#endif
    3535
  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r168029 r168047  
    117117#import <WebCore/WebNSAttributedStringExtras.h>
    118118#import <WebCore/markup.h>
    119 #import <WebKit/DOM.h>
    120 #import <WebKit/DOMExtensions.h>
    121 #import <WebKit/DOMPrivate.h>
     119#import <WebKitLegacy/DOM.h>
     120#import <WebKitLegacy/DOMExtensions.h>
     121#import <WebKitLegacy/DOMPrivate.h>
    122122#import <WebKitSystemInterface.h>
    123123#import <dlfcn.h>
  • trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebHTMLView.h>
     29#import <WebKitLegacy/WebHTMLView.h>
    3030
    3131#if !TARGET_OS_IPHONE
  • trunk/Source/WebKit/mac/WebView/WebPDFView.h

    r165676 r168047  
    2929#if !PLATFORM(IOS)
    3030
    31 #import <WebKit/WebDocumentInternal.h>
     31#import <WebKitLegacy/WebDocumentInternal.h>
    3232
    3333@class PDFDocument;
  • trunk/Source/WebKit/mac/WebView/WebPolicyDelegatePrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebPolicyDelegate.h>
     29#import <WebKitLegacy/WebPolicyDelegate.h>
    3030
    3131@class WebHistoryItem;
  • trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

    r166665 r168047  
    2727 */
    2828
    29 #import <WebKit/WebPreferences.h>
     29#import <WebKitLegacy/WebPreferences.h>
    3030
    3131#if !TARGET_OS_IPHONE
  • trunk/Source/WebKit/mac/WebView/WebResourcePrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebResource.h>
     29#import <WebKitLegacy/WebResource.h>
    3030
    3131@interface WebResource (WebResourcePrivate)
  • trunk/Source/WebKit/mac/WebView/WebUIDelegate.h

    r165676 r168047  
    2929#import <Foundation/Foundation.h>
    3030#import <Foundation/NSURLRequest.h>
    31 #import <WebKit/WebKitAvailability.h>
     31#import <WebKitLegacy/WebKitAvailability.h>
    3232
    3333#if !TARGET_OS_IPHONE
    3434#import <AppKit/AppKit.h>
    3535#else
    36 #import <WebKit/WAKAppKitStubs.h>
    37 #import <WebKit/WAKView.h>
     36#import <WebKitLegacy/WAKAppKitStubs.h>
     37#import <WebKitLegacy/WAKView.h>
    3838#endif
    3939
  • trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h

    r165676 r168047  
    2727 */
    2828
    29 #import <WebKit/WebAllowDenyPolicyListener.h>
    30 #import <WebKit/WebUIDelegate.h>
     29#import <WebKitLegacy/WebAllowDenyPolicyListener.h>
     30#import <WebKitLegacy/WebUIDelegate.h>
    3131
    3232#if !defined(ENABLE_DASHBOARD_SUPPORT)
  • trunk/Source/WebKit/mac/WebView/WebView.h

    r165676 r168047  
    3232#import <AppKit/AppKit.h>
    3333#else
    34 #import <WebKit/WAKAppKitStubs.h>
    35 #import <WebKit/WAKView.h>
     34#import <WebKitLegacy/WAKAppKitStubs.h>
     35#import <WebKitLegacy/WAKView.h>
    3636#if !defined(IBAction)
    3737#define IBAction void
  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r168041 r168047  
    176176#import <WebCore/WebCoreView.h>
    177177#import <WebCore/Widget.h>
    178 #import <WebKit/DOM.h>
    179 #import <WebKit/DOMExtensions.h>
    180 #import <WebKit/DOMPrivate.h>
     178#import <WebKitLegacy/DOM.h>
     179#import <WebKitLegacy/DOMExtensions.h>
     180#import <WebKitLegacy/DOMPrivate.h>
    181181#import <WebKitSystemInterface.h>
    182182#import <bindings/ScriptValue.h>
     
    251251
    252252#if ENABLE(DASHBOARD_SUPPORT)
    253 #import <WebKit/WebDashboardRegion.h>
     253#import <WebKitLegacy/WebDashboardRegion.h>
    254254#endif
    255255
  • trunk/Source/WebKit/mac/WebView/WebViewPrivate.h

    r166257 r168047  
    2727 */
    2828
    29 #import <WebKit/WebView.h>
    30 #import <WebKit/WebFramePrivate.h>
     29#import <WebKitLegacy/WebView.h>
     30#import <WebKitLegacy/WebFramePrivate.h>
    3131#import <JavaScriptCore/JSBase.h>
    3232
  • trunk/Source/WebKit/mac/migrate-headers.sh

    r165298 r168047  
    2626mkdir -p "${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}"
    2727mkdir -p "${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}"
    28 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit"
     28mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy"
    2929
    3030# If we didn't build WebCore, use the production copy of the headers
  • trunk/Tools/ChangeLog

    r168045 r168047  
     12014-04-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework
     4        https://bugs.webkit.org/show_bug.cgi?id=132399
     5        <rdar://problem/15920046>
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Scripts/check-for-webkit-framework-include-consistency:
     10        Allos WAK headers in WebKitLegacy as well as WebKit.
     11
     12        * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
     13        * TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm:
     14        Update header imports.
     15
    1162014-04-30  Simon Fraser  <simon.fraser@apple.com>
    217
  • trunk/Tools/Scripts/check-for-webkit-framework-include-consistency

    r161638 r168047  
    7777  # iOS we want to keep the WAK headers private, even if a public header includes them,
    7878  # so we are going to not show warnings for WAK headers.
    79   return if framework == "WebKit" and included_header_name =~ /^WAK/
     79  return if (framework == "WebKit" or framework == "WebKitLegacy") and included_header_name =~ /^WAK/
    8080
    8181  header_type = $HEADER_NAMES_TO_TYPE[included_header_name]
  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm

    r167479 r168047  
    3232#import "Test.h"
    3333#import <WebCore/FileSystem.h>
    34 #import <WebKit2/_WKDownload.h>
    35 #import <WebKit2/_WKDownloadDelegate.h>
    36 #import <WebKit2/WKNavigationDelegatePrivate.h>
    37 #import <WebKit2/WKProcessPoolPrivate.h>
    38 #import <WebKit2/WKWebView.h>
    39 #import <WebKit2/WKWebViewConfiguration.h>
     34#import <WebKit/_WKDownload.h>
     35#import <WebKit/_WKDownloadDelegate.h>
     36#import <WebKit/WKNavigationDelegatePrivate.h>
     37#import <WebKit/WKProcessPoolPrivate.h>
     38#import <WebKit/WKWebView.h>
     39#import <WebKit/WKWebViewConfiguration.h>
    4040#import <wtf/RetainPtr.h>
    4141#import <wtf/text/WTFString.h>
  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm

    r167627 r168047  
    2626#include "config.h"
    2727
    28 #import <WebKit2/WKNavigation.h>
    29 #import <WebKit2/WKNavigationDelegate.h>
    30 #import <WebKit2/WKWebView.h>
     28#import <WebKit/WKNavigation.h>
     29#import <WebKit/WKNavigationDelegate.h>
     30#import <WebKit/WKWebView.h>
    3131#import <wtf/RetainPtr.h>
    3232#import "PlatformUtilities.h"
Note: See TracChangeset for help on using the changeset viewer.