<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168158] tags/Safari-538.33.1</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168158">168158</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 00:24:28 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-merged <a href="http://trac.webkit.org/projects/webkit/changeset/168047">r168047</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538331SourceWebCoreChangeLog">tags/Safari-538.33.1/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari538331SourceWebCoreConfigurationsWebCorexcconfig">tags/Safari-538.33.1/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#tagsSafari538331SourceWebKitChangeLog">tags/Safari-538.33.1/Source/WebKit/ChangeLog</a></li>
<li><a href="#tagsSafari538331SourceWebKitWebKitxcodeprojprojectpbxproj">tags/Safari-538.33.1/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosChangeLog">tags/Safari-538.33.1/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosDefaultDelegatesWebDefaultFormDelegateh">tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultFormDelegate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosDefaultDelegatesWebDefaultFrameLoadDelegatem">tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultFrameLoadDelegate.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosDefaultDelegatesWebDefaultResourceLoadDelegatem">tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosDefaultDelegatesWebDefaultUIKitDelegateh">tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosMiscWebGeolocationProviderIOSh">tags/Safari-538.33.1/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosMiscWebNSStringExtrasIPhoneh">tags/Safari-538.33.1/Source/WebKit/ios/Misc/WebNSStringExtrasIPhone.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebCoreSupportWebFrameIOSh">tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebCoreSupportWebFrameIOSmm">tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebCoreSupportWebFrameIPhoneh">tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIPhone.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebCoreSupportWebSelectionRecth">tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebCoreSupportWebVisiblePositionh">tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebViewWebPDFViewIOSh">tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIOS.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebViewWebPDFViewIOSmm">tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIOS.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebViewWebPDFViewIPhoneh">tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIPhone.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebViewWebPDFViewPlaceholderh">tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebViewWebPDFViewPlaceholdermm">tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebViewWebPlainWhiteViewh">tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPlainWhiteView.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitiosWebViewWebUIKitDelegateh">tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebUIKitDelegate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacCarbonCarbonUtilsh">tags/Safari-538.33.1/Source/WebKit/mac/Carbon/CarbonUtils.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacCarbonHIViewAdapterh">tags/Safari-538.33.1/Source/WebKit/mac/Carbon/HIViewAdapter.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacCarbonHIWebViewh">tags/Safari-538.33.1/Source/WebKit/mac/Carbon/HIWebView.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacChangeLog">tags/Safari-538.33.1/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacConfigurationsWebKitxcconfig">tags/Safari-538.33.1/Source/WebKit/mac/Configurations/WebKit.xcconfig</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacConfigurationsWebKitLegacyxcconfig">tags/Safari-538.33.1/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacDOMWebDOMOperationsh">tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperations.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacDOMWebDOMOperationsmm">tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperations.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacDOMWebDOMOperationsInternalh">tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacDOMWebDOMOperationsPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacDefaultDelegatesWebDefaultContextMenuDelegateh">tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacDefaultDelegatesWebDefaultContextMenuDelegatemm">tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacDefaultDelegatesWebDefaultEditingDelegatem">tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacHistoryWebBackForwardListInternalh">tags/Safari-538.33.1/Source/WebKit/mac/History/WebBackForwardListInternal.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacHistoryWebBackForwardListPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/History/WebBackForwardListPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacHistoryWebHistoryItemPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/History/WebHistoryItemPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacHistoryWebHistoryPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/History/WebHistoryPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacHistoryWebURLsWithTitlesm">tags/Safari-538.33.1/Source/WebKit/mac/History/WebURLsWithTitles.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMigrateHeadersmake">tags/Safari-538.33.1/Source/WebKit/mac/MigrateHeaders.make</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebCoreStatisticsh">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebCoreStatistics.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebDownloadh">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownload.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebDownloadmm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownload.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebDownloadInternalh">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownloadInternal.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebElementDictionarymm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebElementDictionary.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebIconDatabasePrivateh">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebKith">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKit.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebKitErrorsm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitErrors.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebKitErrorsPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebKitNSStringExtrasmm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebLocalizableStringsmm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebLocalizableStrings.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebNSDataExtrasm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSDataExtras.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebNSDictionaryExtrasm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSDictionaryExtras.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebNSEventExtrasm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSEventExtras.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebNSFileManagerExtrasmm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebNSImageExtrasm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSImageExtras.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebNSPasteboardExtrasmm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebNSViewExtrash">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSViewExtras.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacMiscWebNSViewExtrasm">tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSViewExtras.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPanelsWebAuthenticationPanelm">tags/Safari-538.33.1/Source/WebKit/mac/Panels/WebAuthenticationPanel.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPanelsWebPanelAuthenticationHandlerm">tags/Safari-538.33.1/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsHostedHostedNetscapePluginStreamh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsHostedNetscapePluginInstanceProxyh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginAgentdefs">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgent.defs</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginAgentReplydefs">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgentReply.defs</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginClientdefs">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginHostdefs">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginHostTypesdefs">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHostTypes.defs</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebBaseNetscapePluginViewmm">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebBasePluginPackageh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBasePluginPackage.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebBasePluginPackagemm">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebNetscapeContainerCheckPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebNetscapePluginEventHandlerCocoah">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebNetscapePluginStreamh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebNetscapePluginViewh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginView.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebNetscapePluginViewmm">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebPluginh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPlugin.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebPluginControllerh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginController.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebPluginDatabaseh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginDatabase.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebPluginPackageh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginPackage.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebPluginPackagemm">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginPackage.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebPluginViewFactoryh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginViewFactory.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsWebPluginViewFactoryPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginViewFactoryPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacPluginsnpapimm">tags/Safari-538.33.1/Source/WebKit/mac/Plugins/npapi.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacStorageWebDatabaseManagerPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebCoreSupportWebContextMenuClientmm">tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebCoreSupportWebFrameNetworkingContextmm">tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebCoreSupportWebGeolocationClientmm">tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebCoreSupportWebInspectorClientmm">tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebCoreSupportWebJavaScriptTextInputPanelm">tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebCoreSupportWebKeyGeneratormm">tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebInspectorWebInspectorPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebInspectorWebNodeHighlighth">tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebNodeHighlight.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebInspectorWebNodeHighlightViewh">tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebNodeHighlightView.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebDataSourceh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSource.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebDataSourcemm">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebDataSourcePrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSourcePrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebDelegateImplementationCachingh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebDocumenth">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocument.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebDocumentInternalh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocumentInternal.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebDocumentPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocumentPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebEditingDelegateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebEditingDelegate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebEditingDelegatePrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebFrameLoadDelegateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebFrameLoadDelegatePrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameLoadDelegatePrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebFramePrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFramePrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebFrameViewh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameView.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebFrameViewInternalh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameViewInternal.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebFrameViewPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameViewPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebHTMLRepresentationh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentation.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebHTMLRepresentationmm">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebHTMLRepresentationPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentationPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebHTMLViewh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLView.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebHTMLViewmm">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebHTMLViewPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebPDFViewh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPDFView.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebPolicyDelegatePrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPolicyDelegatePrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebPreferencesPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebResourcePrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebResourcePrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebUIDelegateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebUIDelegate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebUIDelegatePrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebViewh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebView.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebViewmm">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebViewWebViewPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacmigrateheaderssh">tags/Safari-538.33.1/Source/WebKit/mac/migrate-headers.sh</a></li>
<li><a href="#tagsSafari538331ToolsChangeLog">tags/Safari-538.33.1/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari538331ToolsScriptscheckforwebkitframeworkincludeconsistency">tags/Safari-538.33.1/Tools/Scripts/check-for-webkit-framework-include-consistency</a></li>
<li><a href="#tagsSafari538331ToolsTestWebKitAPITestsWebKit2CocoaDownloadmm">tags/Safari-538.33.1/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm</a></li>
<li><a href="#tagsSafari538331ToolsTestWebKitAPITestsWebKit2CocoaNavigationmm">tags/Safari-538.33.1/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari538331SourceWebKitmacWebKitLegacyMigrateHeadersFromWebKitLegacymake">tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebKitLegacyWebKith">tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKit.h</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebKitLegacyWebKitm">tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKit.m</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebKitLegacyWebKitPrivateh">tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#tagsSafari538331SourceWebKitmacWebKitLegacyMigrateHeadersToLegacymake">tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/MigrateHeadersToLegacy.make</a></li>
<li><a href="#tagsSafari538331SourceWebKitmacWebKitLegacyWebKitLegacycpp">tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKitLegacy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538331SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebCore/ChangeLog (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebCore/ChangeLog 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebCore/ChangeLog 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-05-02 Babak Shafiei <bshafiei@apple.com>
+
+ Re-merge r168047
+
</ins><span class="cx"> 2014-05-01 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168113
</span></span></pre></div>
<a id="tagsSafari538331SourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebCore/Configurations/WebCore.xcconfig (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebCore/Configurations/WebCore.xcconfig 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebCore/Configurations/WebCore.xcconfig 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
</span><span class="cx"> OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_iphonesimulator) -framework IOSurface;
</span><span class="cx"> OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
</span><del>-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;
</del><ins>+OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
</ins><span class="cx">
</span><span class="cx"> NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
</span><span class="cx"> NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ChangeLog (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ChangeLog 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ChangeLog 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-05-02 Babak Shafiei <bshafiei@apple.com>
+
+ Re-merge r168047
+
</ins><span class="cx"> 2014-05-01 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r168047
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/WebKit.xcodeproj/project.pbxproj (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> 1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */; };
</span><span class="cx"> 1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */; };
</span><span class="cx"> 1A6A208E1886154600E50F5F /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */; };
</span><ins>+ 1A739036190AE622002E3105 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739034190AE5D4002E3105 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739037190AE674002E3105 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1A74A28E0F4F75400082E228 /* WebTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */; };
</span><span class="cx"> 1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
</span><span class="cx"> 1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
</span><span class="lines">@@ -60,7 +62,7 @@
</span><span class="cx"> 1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */; };
</span><span class="cx"> 1AB1DAC118BC0232004B6A9F /* WebViewGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */; };
</span><span class="cx"> 1AB1DAC218BC0232004B6A9F /* WebViewGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */; };
</span><del>- 1AD7453C18D0D324006F3A1E /* WebKitLegacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */; };
</del><ins>+ 1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKit.m */; };
</ins><span class="cx"> 1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */; };
</span><span class="cx"> 1AEA66D50DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */; };
</span><span class="cx"> 1AEA66D80DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D60DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h */; };
</span><span class="lines">@@ -163,16 +165,16 @@
</span><span class="cx"> 936A2DEA0FD2D08400D312DB /* WebTextCompletionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 936A2DE90FD2D08400D312DB /* WebTextCompletionController.h */; };
</span><span class="cx"> 9391F275121B38BD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F273121B38BD00EBF7E8 /* WebFrameNetworkingContext.h */; };
</span><span class="cx"> 9391F276121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */; };
</span><del>- 939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810140824BF01008DF038 /* WebHistoryPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F5B92B820223191D01C1A525 /* WebHistoryPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810150824BF01008DF038 /* WebURLsWithTitles.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E0A76E02B8FEE401C1A525 /* WebURLsWithTitles.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810160824BF01008DF038 /* WebCoreStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = F59EAE3E0253C7EE018635CA /* WebCoreStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810180824BF01008DF038 /* WebIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = F528E3E9031E91AD01CA2ACA /* WebIconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810190824BF01008DF038 /* WebIconDatabasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F528E3EB031E91AD01CA2ACA /* WebIconDatabasePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 9398101B0824BF01008DF038 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 9398101B0824BF01008DF038 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 9398101D0824BF01008DF038 /* WebKitLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AEB17D032C1735008635CE /* WebKitLogging.h */; settings = {ATTRIBUTES = (); }; };
</span><span class="cx"> 9398101E0824BF01008DF038 /* WebKitNSStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7082F56F038EADAA00A80180 /* WebKitNSStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9398101F0824BF01008DF038 /* WebKitStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = F53444CE02E87CBA018635CA /* WebKitStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -188,51 +190,51 @@
</span><span class="cx"> 9398102B0824BF01008DF038 /* WebNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A672B90263866E01000102 /* WebNetscapePluginStream.h */; };
</span><span class="cx"> 9398102E0824BF01008DF038 /* WebBasePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF46036652150000E506 /* WebBasePluginPackage.h */; };
</span><span class="cx"> 939810310824BF01008DF038 /* WebNetscapePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F7171E0288493C018635CA /* WebNetscapePluginPackage.h */; };
</span><del>- 939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810370824BF01008DF038 /* WebPluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8467275C0367158500CA2ACA /* WebPluginController.h */; };
</span><span class="cx"> 939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F717200288493C018635CA /* WebPluginDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810390824BF01008DF038 /* WebPluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF4B036659440000E506 /* WebPluginPackage.h */; };
</span><del>- 9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810470824BF01008DF038 /* WebKitPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C283730284676D018635CA /* WebKitPrefix.h */; };
</span><span class="cx"> 939810490824BF01008DF038 /* WebClipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 933D659903413FF2008635CE /* WebClipView.h */; };
</span><del>- 9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 9398104C0824BF01008DF038 /* WebDataSourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446072020F50ED0ECA1767 /* WebDataSourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9398104E0824BF01008DF038 /* WebDefaultContextMenuDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FADD033FC50400CA2ACD /* WebDefaultContextMenuDelegate.h */; settings = {ATTRIBUTES = (); }; };
</span><span class="cx"> 9398104F0824BF01008DF038 /* WebDefaultPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FADF033FC50400CA2ACD /* WebDefaultPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 939810500824BF01008DF038 /* WebDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810500824BF01008DF038 /* WebDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810510824BF01008DF038 /* WebDynamicScrollBarsView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606B020F50ED0ECA1767 /* WebDynamicScrollBarsView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810520824BF01008DF038 /* WebFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D81DAB203EB0B2D00A80166 /* WebFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 939810530824BF01008DF038 /* WebFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446074020F50ED0ECA1767 /* WebFrame.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810530824BF01008DF038 /* WebFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446074020F50ED0ECA1767 /* WebFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810540824BF01008DF038 /* WebFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CF0E249021361B00ECA16EA /* WebFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810550824BF01008DF038 /* WebHTMLRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9202B6D4D80ACA2ACA /* WebHTMLRepresentation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810560824BF01008DF038 /* WebHTMLRepresentationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A55DC702BAA2E8018635CC /* WebHTMLRepresentationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810570824BF01008DF038 /* WebHTMLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9402B6D4D80ACA2ACA /* WebHTMLView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810580824BF01008DF038 /* WebHTMLViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9602B6D4D80ACA2ACA /* WebHTMLViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FAE5033FC52200CA2ACD /* WebFrameLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 9398105D0824BF01008DF038 /* WebPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606E020F50ED0ECA1767 /* WebPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FAE5033FC52200CA2ACD /* WebFrameLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9398105D0824BF01008DF038 /* WebPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606E020F50ED0ECA1767 /* WebPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 9398105E0824BF01008DF038 /* WebPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9398105F0824BF01008DF038 /* WebRenderNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F81C3902B67C26018635CA /* WebRenderNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810630824BF01008DF038 /* WebHistoryItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */; };
</span><span class="cx"> 939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D36FD5E03F78F9E00A80166 /* WebFormDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810650824BF01008DF038 /* CarbonWindowAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9003F9DBA103CA0DE6 /* CarbonWindowAdapter.h */; };
</span><span class="cx"> 939810660824BF01008DF038 /* CarbonWindowContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9203F9DBA103CA0DE6 /* CarbonWindowContentView.h */; };
</span><span class="cx"> 939810670824BF01008DF038 /* CarbonWindowFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9403F9DBA103CA0DE6 /* CarbonWindowFrame.h */; };
</span><span class="cx"> 939810680824BF01008DF038 /* HIViewAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9A03F9DBA103CA0DE6 /* HIViewAdapter.h */; };
</span><del>- 939810690824BF01008DF038 /* HIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEEAA03F9DBA103CA0DE6 /* HIWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F79B974804019934036909D2 /* CarbonUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810690824BF01008DF038 /* HIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEEAA03F9DBA103CA0DE6 /* HIWebView.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F79B974804019934036909D2 /* CarbonUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 9398106E0824BF01008DF038 /* WebFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B52E04282B5900CA2D3A /* WebFrameView.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 9398106E0824BF01008DF038 /* WebFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B52E04282B5900CA2D3A /* WebFrameView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 9398106F0824BF01008DF038 /* WebFrameViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B53204282BD200CA2D3A /* WebFrameViewInternal.h */; };
</span><del>- 939810700824BF01008DF038 /* WebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B579042834F700CA2D3A /* WebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810700824BF01008DF038 /* WebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B579042834F700CA2D3A /* WebView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810710824BF01008DF038 /* WebViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B57D0428353A00CA2D3A /* WebViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 939810720824BF01008DF038 /* WebPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810720824BF01008DF038 /* WebPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810730824BF01008DF038 /* WebPolicyDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9C0429392B00CA2D3A /* WebPolicyDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 939810750824BF01008DF038 /* WebUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810750824BF01008DF038 /* WebUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810760824BF01008DF038 /* WebDefaultUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CF0458CA4B00CA2D3A /* WebDefaultUIDelegate.h */; };
</span><del>- 939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810790824BF01008DF038 /* WebLocalizableStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE18F990472B73200CA289C /* WebLocalizableStrings.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9398107A0824BF01008DF038 /* WebKitSystemBits.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE52D4A0473032500CA289C /* WebKitSystemBits.h */; };
</span><span class="cx"> 9398107E0824BF01008DF038 /* WebNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6DC39904C62C4E004D0EF6 /* WebNSURLExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -243,15 +245,15 @@
</span><span class="cx"> 939810840824BF01008DF038 /* WebNSEventExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BE887BFF056D3A6E009BB3E7 /* WebNSEventExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84723BE3056D719E0044BFEA /* WebKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810870824BF01008DF038 /* WebNSPrintOperationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDD1A5C605C83987008E3150 /* WebNSPrintOperationExtras.h */; };
</span><del>- 939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311AF105EAB12B0088EDA4 /* WebResourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9398108D0824BF01008DF038 /* WebDefaultEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE95BEE605FD0805006E1513 /* WebDefaultEditingDelegate.h */; };
</span><del>- 939810990824BF01008DF038 /* WebDOMOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 9398109A0824BF01008DF038 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 8373435A0624EE0D00F3B289 /* WebArchive.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 939810990824BF01008DF038 /* WebDOMOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 9398109A0824BF01008DF038 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 8373435A0624EE0D00F3B289 /* WebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 9398109B0824BF01008DF038 /* WebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BB06275F640076701E /* WebViewInternal.h */; };
</span><span class="cx"> 9398109C0824BF01008DF038 /* WebFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BD06275F710076701E /* WebFrameInternal.h */; };
</span><span class="cx"> 9398109D0824BF01008DF038 /* WebDOMOperationsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 939810A10824BF01008DF038 /* WebHTMLViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93185DB506679F42005D5E7E /* WebHTMLViewInternal.h */; };
</span><span class="cx"> 939810A20824BF01008DF038 /* WebNSObjectExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D1FE13067EB10B009CE68A /* WebNSObjectExtras.h */; };
</span><span class="cx"> 939810A40824BF01008DF038 /* WebPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E94C3406C0321200A9B09E /* WebPDFView.h */; };
</span><span class="lines">@@ -476,6 +478,7 @@
</span><span class="cx"> 0F30985E11ECFE4500F559DF /* WebRenderLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebRenderLayer.mm; sourceTree = "<group>"; };
</span><span class="cx"> 14D8252D0AF955090004F057 /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 14D8252E0AF955090004F057 /* WebChromeClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebChromeClient.mm; sourceTree = "<group>"; };
</span><ins>+ 1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MigrateHeadersFromWebKitLegacy.make; sourceTree = "<group>"; };
</ins><span class="cx"> 1A2DBE9D0F251E3A0036F8A6 /* ProxyInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyInstance.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A2DBE9E0F251E3A0036F8A6 /* ProxyInstance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProxyInstance.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A4DF5200EC8C74D006BD4B4 /* WebNetscapePluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginView.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -488,6 +491,8 @@
</span><span class="cx"> 1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryPropertyList.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProgressTrackerClient.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProgressTrackerClient.h; sourceTree = "<group>"; };
</span><ins>+ 1A739034190AE5D4002E3105 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
+ 1A739037190AE674002E3105 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTextInputWindowController.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
</span><span class="cx"> 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -512,9 +517,9 @@
</span><span class="cx"> 1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHostedNetscapePluginView.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewGroup.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewGroup.h; sourceTree = "<group>"; };
</span><del>- 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitLegacy.cpp; sourceTree = "<group>"; };
- 1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKitLegacy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitLegacy.xcconfig; sourceTree = "<group>"; };
</del><ins>+ 1AD7451218D0D24C006F3A1E /* WebKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; };
+ 1AD7451918D0D26C006F3A1E /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> 1AD7453D18D0D383006F3A1E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><span class="cx"> 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapePluginEventHandler.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -531,7 +536,7 @@
</span><span class="cx"> 1C6CB03E0AA6391D00D23BFD /* MigrateHeaders.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MigrateHeaders.make; path = mac/MigrateHeaders.make; sourceTree = "<group>"; };
</span><span class="cx"> 1C7B0C650EB2464D00A28502 /* WebInspectorClientCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebInspectorClientCF.cpp; path = cf/WebCoreSupport/WebInspectorClientCF.cpp; sourceTree = SOURCE_ROOT; };
</span><span class="cx"> 1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegatePrivate.h; sourceTree = "<group>"; };
</span><del>- 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
</del><ins>+ 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitLegacy.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> 1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -714,7 +719,7 @@
</span><span class="cx"> 9391F273121B38BD00EBF7E8 /* WebFrameNetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameNetworkingContext.h; sourceTree = "<group>"; };
</span><span class="cx"> 9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; };
</span><span class="cx"> 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; };
</span><del>- 939811330824BF01008DF038 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</del><ins>+ 939811330824BF01008DF038 /* WebKitLegacy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKitLegacy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</ins><span class="cx"> 93AEB17D032C1735008635CE /* WebKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLogging.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 93AEB17E032C1735008635CE /* WebKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitLogging.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 93C6F14507920B93002449CD /* WebFrameViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameViewPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="lines">@@ -944,8 +949,8 @@
</span><span class="cx"> 034768DFFF38A50411DB9C8B /* Products */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 939811330824BF01008DF038 /* WebKit.framework */,
- 1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */,
</del><ins>+ 939811330824BF01008DF038 /* WebKitLegacy.framework */,
+ 1AD7451918D0D26C006F3A1E /* WebKit.framework */,
</ins><span class="cx"> );
</span><span class="cx"> name = Products;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -968,7 +973,7 @@
</span><span class="cx"> F5EBC45202134BB601CA1520 /* Plugins */,
</span><span class="cx"> 511F3FC30CECC7E200852565 /* Storage */,
</span><span class="cx"> F5B36B400281DE87018635CB /* WebCoreSupport */,
</span><del>- 1AD7451118D0D23D006F3A1E /* WebKitLegacy */,
</del><ins>+ 1AD7451118D0D23D006F3A1E /* WebKit Framework */,
</ins><span class="cx"> 9C7CABBB0190A37C0ECA16EA /* WebView */,
</span><span class="cx"> 1C68F63F095B5F9C00C2984E /* WebInspector */,
</span><span class="cx"> F7EBEE5903F9DB2203CA0DE6 /* Carbon */,
</span><span class="lines">@@ -1050,13 +1055,16 @@
</span><span class="cx"> name = Events;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 1AD7451118D0D23D006F3A1E /* WebKitLegacy */ = {
</del><ins>+ 1AD7451118D0D23D006F3A1E /* WebKit Framework */ = {
</ins><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */,
</ins><span class="cx"> 1AD7453D18D0D383006F3A1E /* Info.plist */,
</span><del>- 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */,
</del><ins>+ 1AD7451218D0D24C006F3A1E /* WebKit.m */,
+ 1A739034190AE5D4002E3105 /* WebKit.h */,
+ 1A739037190AE674002E3105 /* WebKitPrivate.h */,
</ins><span class="cx"> );
</span><del>- name = WebKitLegacy;
</del><ins>+ name = "WebKit Framework";
</ins><span class="cx"> path = mac/WebKitLegacy;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><span class="lines">@@ -1089,8 +1097,8 @@
</span><span class="cx"> 449098B90F8F82DF0076A327 /* FeatureDefines.xcconfig */,
</span><span class="cx"> FEE7D6910D99B06A005351F6 /* iOS.xcconfig */,
</span><span class="cx"> 1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
</span><del>- 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */,
- 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */,
</del><ins>+ 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */,
+ 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */,
</ins><span class="cx"> );
</span><span class="cx"> name = Configurations;
</span><span class="cx"> path = mac/Configurations;
</span><span class="lines">@@ -1695,6 +1703,15 @@
</span><span class="cx"> /* End PBXGroup section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXHeadersBuildPhase section */
</span><ins>+ 1A739035190AE603002E3105 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */,
+ 1A739036190AE622002E3105 /* WebKit.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> 9398100D0824BF01008DF038 /* Headers */ = {
</span><span class="cx"> isa = PBXHeadersBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -1958,27 +1975,32 @@
</span><span class="cx"> /* End PBXHeadersBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXNativeTarget section */
</span><del>- 1AD7451818D0D26C006F3A1E /* WebKitLegacy */ = {
</del><ins>+ 1AD7451818D0D26C006F3A1E /* WebKit */ = {
</ins><span class="cx"> isa = PBXNativeTarget;
</span><del>- buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
</del><ins>+ buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */;
</ins><span class="cx"> buildPhases = (
</span><ins>+ 1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */,
</ins><span class="cx"> 1A5B250818D0D90C00913729 /* Migrate Headers */,
</span><ins>+ 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */,
+ 1A739035190AE603002E3105 /* Headers */,
</ins><span class="cx"> 1AD7451418D0D26C006F3A1E /* Sources */,
</span><span class="cx"> 1AD7451518D0D26C006F3A1E /* Frameworks */,
</span><ins>+ 1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */,
+ 1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */,
</ins><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><span class="cx"> 1A5B250A18D0DBD300913729 /* PBXTargetDependency */,
</span><span class="cx"> );
</span><del>- name = WebKitLegacy;
- productName = WebKitLegacy;
- productReference = 1AD7451918D0D26C006F3A1E /* WebKitLegacy.framework */;
</del><ins>+ name = WebKit;
+ productName = WebKit;
+ productReference = 1AD7451918D0D26C006F3A1E /* WebKit.framework */;
</ins><span class="cx"> productType = "com.apple.product-type.framework";
</span><span class="cx"> };
</span><del>- 9398100A0824BF01008DF038 /* WebKit */ = {
</del><ins>+ 9398100A0824BF01008DF038 /* WebKitLegacy */ = {
</ins><span class="cx"> isa = PBXNativeTarget;
</span><del>- buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKit" */;
</del><ins>+ buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
</ins><span class="cx"> buildPhases = (
</span><span class="cx"> 5D2F7DB70C687A5A00B5B72B /* Update Info.plist with version information */,
</span><span class="cx"> 1C6CB0510AA63EB000D23BFD /* Migrate Headers */,
</span><span class="lines">@@ -1991,18 +2013,16 @@
</span><span class="cx"> 939811270824BF01008DF038 /* Frameworks */,
</span><span class="cx"> 5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */,
</span><span class="cx"> 3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */,
</span><del>- 5D88EE6C11407DE800BC3ABC /* Check For Framework Include Consistency */,
- A55DEAA516703F9F003DB841 /* Check For Inappropriate Macros in External Headers */,
</del><span class="cx"> 5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */,
</span><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><span class="cx"> );
</span><del>- name = WebKit;
</del><ins>+ name = WebKitLegacy;
</ins><span class="cx"> productInstallPath = /System/Library/Frameworks;
</span><del>- productName = WebKit;
- productReference = 939811330824BF01008DF038 /* WebKit.framework */;
</del><ins>+ productName = WebKitLegacy;
+ productReference = 939811330824BF01008DF038 /* WebKitLegacy.framework */;
</ins><span class="cx"> productType = "com.apple.product-type.framework";
</span><span class="cx"> };
</span><span class="cx"> /* End PBXNativeTarget section */
</span><span class="lines">@@ -2031,8 +2051,8 @@
</span><span class="cx"> projectDirPath = "";
</span><span class="cx"> projectRoot = "";
</span><span class="cx"> targets = (
</span><del>- 1AD7451818D0D26C006F3A1E /* WebKitLegacy */,
- 9398100A0824BF01008DF038 /* WebKit */,
</del><ins>+ 1AD7451818D0D26C006F3A1E /* WebKit */,
+ 9398100A0824BF01008DF038 /* WebKitLegacy */,
</ins><span class="cx"> );
</span><span class="cx"> };
</span><span class="cx"> /* End PBXProject section */
</span><span class="lines">@@ -2053,6 +2073,36 @@
</span><span class="cx"> /* End PBXResourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXShellScriptBuildPhase section */
</span><ins>+ 1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
+ );
+ name = "Check For Inappropriate Macros in External Headers";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders || exit $?\nfi";
+ };
+ 1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
+ );
+ name = "Check For Framework Include Consistency";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\nexit 0;\nfi\n\n# FIXME: Once WebKit is provided by WebKit2.xcodeproj, this should be re-enabled.\nif [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nif [ -f ../../Tools/Scripts/check-for-webkit-framework-include-consistency ]; then\n../../Tools/Scripts/check-for-webkit-framework-include-consistency || exit $?\nfi\n";
+ };
</ins><span class="cx"> 1A5B250818D0D90C00913729 /* Migrate Headers */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -2065,8 +2115,40 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- 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";
</del><ins>+ 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";
</ins><span class="cx"> };
</span><ins>+ 1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(PROJECT_DIR)/mac/Configurations/Version.xcconfig",
+ );
+ name = "Update Info.plist with version information";
+ outputPaths = (
+ "$(PROJECT_DIR)/mac/WebKitLegacy/Info.plist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/WebKitLegacy/Info.plist\";\nfi;\n";
+ };
+ 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 8;
+ files = (
+ );
+ inputPaths = (
+ WebKit.xcodeproj,
+ );
+ name = "Make Frameworks Symbolic Link";
+ outputPaths = (
+ "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp",
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
+ };
</ins><span class="cx"> 1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -2079,12 +2161,12 @@
</span><span class="cx"> );
</span><span class="cx"> name = "Generate Export Files";
</span><span class="cx"> outputPaths = (
</span><del>- "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp",
- "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp",
+ "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp",
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- 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";
</del><ins>+ 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";
</ins><span class="cx"> };
</span><span class="cx"> 1C6CB0510AA63EB000D23BFD /* Migrate Headers */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -2147,21 +2229,6 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> 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";
</span><span class="cx"> };
</span><del>- 5D88EE6C11407DE800BC3ABC /* Check For Framework Include Consistency */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
- );
- name = "Check For Framework Include Consistency";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-webkit-framework-include-consistency ]; then\n ../../Tools/Scripts/check-for-webkit-framework-include-consistency || exit $?\nfi\n";
- };
</del><span class="cx"> 5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -2171,11 +2238,11 @@
</span><span class="cx"> );
</span><span class="cx"> name = "Symlink WebKitPluginHost in to place";
</span><span class="cx"> outputPaths = (
</span><del>- "$(CONFIGURATION_BUILD_DIR)/WebKit.framework/WebKitPluginHost.app",
</del><ins>+ "$(CONFIGURATION_BUILD_DIR)/WebKitLegacy.framework/WebKitPluginHost.app",
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- 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";
</del><ins>+ 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";
</ins><span class="cx"> };
</span><span class="cx"> 939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -2191,7 +2258,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 1;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- 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";
</del><ins>+ 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";
</ins><span class="cx"> };
</span><span class="cx"> A13EE61D185AE82700556064 /* Postprocess Headers */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -2207,21 +2274,6 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> shellScript = "exec \"${SRCROOT}/mac/postprocess-headers.sh\"";
</span><span class="cx"> };
</span><del>- A55DEAA516703F9F003DB841 /* Check For Inappropriate Macros in External Headers */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
- );
- name = "Check For Inappropriate Macros in External Headers";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders || exit $?\nfi";
- };
</del><span class="cx"> /* End PBXShellScriptBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXSourcesBuildPhase section */
</span><span class="lines">@@ -2229,7 +2281,7 @@
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 1AD7453C18D0D324006F3A1E /* WebKitLegacy.cpp in Sources */,
</del><ins>+ 1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -2423,7 +2475,7 @@
</span><span class="cx"> /* Begin PBXTargetDependency section */
</span><span class="cx"> 1A5B250A18D0DBD300913729 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><del>- target = 9398100A0824BF01008DF038 /* WebKit */;
</del><ins>+ target = 9398100A0824BF01008DF038 /* WebKitLegacy */;
</ins><span class="cx"> targetProxy = 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><span class="cx"> /* End PBXTargetDependency section */
</span><span class="lines">@@ -2452,7 +2504,7 @@
</span><span class="cx"> /* Begin XCBuildConfiguration section */
</span><span class="cx"> 149C282E08902B0F008A9EFC /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
</del><ins>+ baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> DEBUG_DEFINES = "$(DEBUG_DEFINES_debug) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
</span><span class="cx"> INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
</span><span class="lines">@@ -2465,7 +2517,7 @@
</span><span class="cx"> };
</span><span class="cx"> 149C282F08902B0F008A9EFC /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
</del><ins>+ baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> DEBUG_DEFINES = "$(DEBUG_DEFINES_$(CURRENT_VARIANT)) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
</span><span class="cx"> INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
</span><span class="lines">@@ -2478,7 +2530,7 @@
</span><span class="cx"> };
</span><span class="cx"> 149C283108902B0F008A9EFC /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
</del><ins>+ baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> BUILD_VARIANTS = normal;
</span><span class="cx"> OTHER_LDFLAGS = (
</span><span class="lines">@@ -2515,21 +2567,21 @@
</span><span class="cx"> };
</span><span class="cx"> 1AD7453418D0D26C006F3A1E /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
</del><ins>+ baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><span class="cx"> 1AD7453518D0D26C006F3A1E /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
</del><ins>+ baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="cx"> };
</span><span class="cx"> 1AD7453618D0D26C006F3A1E /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKitLegacy.xcconfig */;
</del><ins>+ baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="lines">@@ -2537,7 +2589,7 @@
</span><span class="cx"> /* End XCBuildConfiguration section */
</span><span class="cx">
</span><span class="cx"> /* Begin XCConfigurationList section */
</span><del>- 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKit" */ = {
</del><ins>+ 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */ = {
</ins><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><span class="cx"> 149C282E08902B0F008A9EFC /* Debug */,
</span><span class="lines">@@ -2557,7 +2609,7 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKitLegacy" */ = {
</del><ins>+ 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */ = {
</ins><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><span class="cx"> 1AD7453418D0D26C006F3A1E /* Debug */,
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/ChangeLog (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/ChangeLog 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/ChangeLog 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-05-02 Babak Shafiei <bshafiei@apple.com>
+
+ Re-merge r168047
+
</ins><span class="cx"> 2014-05-01 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r168047
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosDefaultDelegatesWebDefaultFormDelegateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultFormDelegate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultFormDelegate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultFormDelegate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebFormDelegate.h>
</del><ins>+#import <WebKitLegacy/WebFormDelegate.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebDefaultFormDelegate : NSObject <WebFormDelegate> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosDefaultDelegatesWebDefaultFrameLoadDelegatem"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultFrameLoadDelegate.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultFrameLoadDelegate.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultFrameLoadDelegate.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDefaultFrameLoadDelegate.h"
</span><span class="cx">
</span><del>-#import <WebKit/WebFrameLoadDelegatePrivate.h>
</del><ins>+#import <WebKitLegacy/WebFrameLoadDelegatePrivate.h>
</ins><span class="cx"> #import "WebViewPrivate.h"
</span><span class="cx">
</span><span class="cx"> @implementation WebDefaultFrameLoadDelegate
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosDefaultDelegatesWebDefaultResourceLoadDelegatem"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDefaultResourceLoadDelegate.h"
</span><span class="cx">
</span><del>-#import <WebKit/WebResourceLoadDelegate.h>
</del><ins>+#import <WebKitLegacy/WebResourceLoadDelegate.h>
</ins><span class="cx">
</span><span class="cx"> @implementation WebDefaultResourceLoadDelegate
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosDefaultDelegatesWebDefaultUIKitDelegateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebUIKitDelegate.h>
</del><ins>+#import <WebKitLegacy/WebUIKitDelegate.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebDefaultUIKitDelegate : NSObject {
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosMiscWebGeolocationProviderIOSh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/NSObject.h>
</span><del>-#import <WebKit/WebViewPrivate.h>
</del><ins>+#import <WebKitLegacy/WebViewPrivate.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebGeolocationProviderIOS : NSObject<WebGeolocationProvider>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosMiscWebNSStringExtrasIPhoneh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/Misc/WebNSStringExtrasIPhone.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/Misc/WebNSStringExtrasIPhone.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/Misc/WebNSStringExtrasIPhone.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,4 +23,4 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebNSStringExtrasIOS.h>
</del><ins>+#import <WebKitLegacy/WebNSStringExtrasIOS.h>
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebCoreSupportWebFrameIOSh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx">
</span><span class="cx"> #import <CoreGraphics/CoreGraphics.h>
</span><del>-#import <WebKit/WebFrame.h>
-#import <WebKit/WebVisiblePosition.h>
</del><ins>+#import <WebKitLegacy/WebFrame.h>
+#import <WebKitLegacy/WebVisiblePosition.h>
</ins><span class="cx">
</span><span class="cx"> @class DOMRange;
</span><span class="cx"> @class DOMVisiblePosition;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebCoreSupportWebFrameIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -47,11 +47,11 @@
</span><span class="cx"> #import <WebCore/TextDirection.h>
</span><span class="cx"> #import <WebCore/VisiblePosition.h>
</span><span class="cx"> #import <WebCore/VisibleUnits.h>
</span><del>-#import <WebKit/DOM.h>
-#import <WebKit/DOMRange.h>
-#import <WebKit/DOMUIKitExtensions.h>
-#import <WebKit/WebSelectionRect.h>
-#import <WebKit/WebVisiblePosition.h>
</del><ins>+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/DOMRange.h>
+#import <WebKitLegacy/DOMUIKitExtensions.h>
+#import <WebKitLegacy/WebSelectionRect.h>
+#import <WebKitLegacy/WebVisiblePosition.h>
</ins><span class="cx"> #import <unicode/uchar.h>
</span><span class="cx">
</span><span class="cx"> #import "DOMNodeInternal.h"
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebCoreSupportWebFrameIPhoneh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIPhone.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIPhone.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebFrameIPhone.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,4 +23,4 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebFrameIOS.h>
</del><ins>+#import <WebKitLegacy/WebFrameIOS.h>
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebCoreSupportWebSelectionRecth"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #import <CoreGraphics/CoreGraphics.h>
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit/WebFrameIOS.h>
</del><ins>+#import <WebKitLegacy/WebFrameIOS.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebSelectionRect : NSObject <NSCopying> {
</span><span class="cx"> CGRect m_rect;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebCoreSupportWebVisiblePositionh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit/DOMUIKitExtensions.h>
</del><ins>+#import <WebKitLegacy/DOMUIKitExtensions.h>
</ins><span class="cx">
</span><del>-#import <WebKit/WAKAppKitStubs.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct WebObjectInternal WebObjectInternal;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebViewWebPDFViewIOSh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIOS.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIOS.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIOS.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDocumentPrivate.h>
</del><ins>+#import <WebKitLegacy/WebDocumentPrivate.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebPDFView : WAKView <WebPDFDocumentView, WebPDFDocumentRepresentation> {
</span><span class="cx"> BOOL dataSourceHasBeenSet;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebViewWebPDFViewIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIOS.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIOS.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIOS.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/StringWithDirection.h>
</span><span class="cx"> #import <WebCore/WKGraphics.h>
</span><del>-#import <WebKit/WebFrame.h>
-#import <WebKit/WebFrameLoadDelegate.h>
-#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebFrameView.h>
-#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebViewPrivate.h>
</del><ins>+#import <WebKitLegacy/WebFrame.h>
+#import <WebKitLegacy/WebFrameLoadDelegate.h>
+#import <WebKitLegacy/WebFramePrivate.h>
+#import <WebKitLegacy/WebFrameView.h>
+#import <WebKitLegacy/WebNSViewExtras.h>
+#import <WebKitLegacy/WebViewPrivate.h>
</ins><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebViewWebPDFViewIPhoneh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIPhone.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIPhone.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewIPhone.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,4 +23,4 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebPDFViewIOS.h>
</del><ins>+#import <WebKitLegacy/WebPDFViewIOS.h>
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebViewWebPDFViewPlaceholderh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDocumentPrivate.h>
</del><ins>+#import <WebKitLegacy/WebDocumentPrivate.h>
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebViewWebPDFViewPlaceholdermm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx"> #import <WebCore/HTMLFormElement.h>
</span><span class="cx"> #import <WebCore/MouseEvent.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><del>-#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebJSPDFDoc.h>
-#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebPDFDocumentExtras.h>
-#import <WebKit/WebViewPrivate.h>
</del><ins>+#import <WebKitLegacy/WebDataSourcePrivate.h>
+#import <WebKitLegacy/WebFramePrivate.h>
+#import <WebKitLegacy/WebJSPDFDoc.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
+#import <WebKitLegacy/WebNSViewExtras.h>
+#import <WebKitLegacy/WebPDFDocumentExtras.h>
+#import <WebKitLegacy/WebViewPrivate.h>
</ins><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebViewWebPlainWhiteViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPlainWhiteView.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPlainWhiteView.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebPlainWhiteView.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import <WebKit/WebDocumentInternal.h>
</del><ins>+#import <WebKitLegacy/WebDocumentInternal.h>
</ins><span class="cx">
</span><span class="cx"> @class WebDataSource;
</span><span class="cx"> @class WebCoreTextDecoder;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitiosWebViewWebUIKitDelegateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebUIKitDelegate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebUIKitDelegate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/ios/WebView/WebUIKitDelegate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WebUIKitDelegate_h
</span><span class="cx"> #define WebUIKitDelegate_h
</span><span class="cx">
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WKContentObservation.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WKContentObservation.h>
</ins><span class="cx">
</span><span class="cx"> @class DOMNode;
</span><span class="cx"> @class DOMDocumentFragment;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacCarbonCarbonUtilsh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Carbon/CarbonUtils.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Carbon/CarbonUtils.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Carbon/CarbonUtils.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> // These functions are only available for 32-bit.
</span><span class="cx">
</span><del>-#include <WebKit/WebKitAvailability.h>
</del><ins>+#include <WebKitLegacy/WebKitAvailability.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import <ApplicationServices/ApplicationServices.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacCarbonHIViewAdapterh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Carbon/HIViewAdapter.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Carbon/HIViewAdapter.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Carbon/HIViewAdapter.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebKit.h>
</del><ins>+#import <WebKitLegacy/WebKit.h>
</ins><span class="cx"> #include <HIToolbox/HIView.h>
</span><span class="cx">
</span><span class="cx"> @interface HIViewAdapter : NSObject
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacCarbonHIWebViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Carbon/HIWebView.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Carbon/HIWebView.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Carbon/HIWebView.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <Carbon/Carbon.h>
</span><span class="cx">
</span><del>-#include <WebKit/WebKitAvailability.h>
</del><ins>+#include <WebKitLegacy/WebKitAvailability.h>
</ins><span class="cx">
</span><span class="cx"> #if PRAGMA_ONCE
</span><span class="cx"> #pragma once
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/ChangeLog (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/ChangeLog 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/ChangeLog 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-05-02 Babak Shafiei <bshafiei@apple.com>
+
+ Re-merge r168047
+
</ins><span class="cx"> 2014-05-01 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r168047
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Configurations/WebKit.xcconfig (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -24,24 +24,6 @@
</span><span class="cx"> #include "FeatureDefines.xcconfig"
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
-
-EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
-EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
-EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
-EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
-EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;
-
</del><span class="cx"> FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="lines">@@ -49,52 +31,24 @@
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(WEBKIT2_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
</span><ins>+UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
</ins><span class="cx">
</span><span class="cx"> STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
</span><span class="cx"> STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME));
-OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
-
-GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
-HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
-INFOPLIST_FILE = mac/Info.plist;
</del><ins>+INFOPLIST_FILE = mac/WebKitLegacy/Info.plist;
</ins><span class="cx"> INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
</span><del>-INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks;
</ins><span class="cx"> INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
</span><span class="cx"> INSTALL_PATH_macosx = $(WEBKIT_FRAMEWORKS_DIR);
</span><span class="cx"> INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
</span><span class="cx"> INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
</span><ins>+
</ins><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
</span><del>-DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks;
</ins><span class="cx"> DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
</span><del>-INSTALLHDRS_COPY_PHASE = YES;
-INSTALLHDRS_SCRIPT_PHASE = YES;
-PRODUCT_NAME = WebKit;
-UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
</del><ins>+DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileAsset -lMobileGestalt;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework WebKit2 -sub_umbrella WebKit2 -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
-
-NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
-
-WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION));
-WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
-WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
-WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks;
-WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR)
-
</del><span class="cx"> WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
</span><span class="cx"> WEBKIT_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos);
</span><span class="cx"> WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT_FRAMEWORKS_DIR_iphoneos);
</span><span class="lines">@@ -103,6 +57,11 @@
</span><span class="cx"> WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
</span><span class="cx"> WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><ins>+NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
+
</ins><span class="cx"> NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
</span><span class="cx"> NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
</span><span class="lines">@@ -116,30 +75,25 @@
</span><span class="cx"> PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
</span><span class="cx"> PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><ins>+WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION));
+WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
+WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering);
+WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks;
+WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR)
</ins><span class="cx">
</span><ins>+INSTALLHDRS_COPY_PHASE = YES;
+INSTALLHDRS_SCRIPT_PHASE = YES;
+PRODUCT_NAME = WebKit;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = -framework WebKitLegacy -sub_umbrella WebKitLegacy
+OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
+OTHER_LDFLAGS_macosx = -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy -framework WebKit2 -sub_umbrella WebKit2
+
</ins><span class="cx"> PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
</span><span class="cx"> PRODUCTION_ROOT_iphoneos = $(SDKROOT);
</span><span class="cx"> PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
</span><span class="cx"> PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
</span><del>-
-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
-WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
-
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-
</del></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacConfigurationsWebKitLegacyxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -24,38 +24,112 @@
</span><span class="cx"> #include "FeatureDefines.xcconfig"
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><ins>+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
+
+EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
+EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
+EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
+EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
+
</ins><span class="cx"> FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debug);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
</span><ins>+FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
</ins><span class="cx">
</span><del>-INFOPLIST_FILE = mac/WebKitLegacy/Info.plist;
</del><ins>+STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
+STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME));
+OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
+
+GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
+HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
+INFOPLIST_FILE = mac/Info.plist;
</ins><span class="cx"> INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
</span><span class="cx"> INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
</span><ins>+INSTALL_PATH_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
</ins><span class="cx"> INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
</span><span class="cx"> INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
</span><del>-
</del><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
</span><ins>+DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
</ins><span class="cx"> DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
</span><del>-
</del><span class="cx"> INSTALLHDRS_COPY_PHASE = YES;
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx"> PRODUCT_NAME = WebKitLegacy;
</span><ins>+UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
</ins><span class="cx">
</span><del>-SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
-SKIP_INSTALL_macosx = YES;
-SKIP_INSTALL_iphoneos = $(SKIP_INSTALL);
-SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
-
</del><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
</span><del>-OTHER_LDFLAGS_iphoneos = -framework WebKit -sub_umbrella WebKit
</del><ins>+OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileAsset -lMobileGestalt;
</ins><span class="cx"> OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
</span><ins>+OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
</ins><span class="cx">
</span><ins>+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+
+WEBKIT_LEGACY_FRAMEWORKS_DIR = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
+
+PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+PRODUCTION_FRAMEWORKS_DIR_macosx = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
</ins><span class="cx"> PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
</span><span class="cx"> PRODUCTION_ROOT_iphoneos = $(SDKROOT);
</span><span class="cx"> PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
</span><span class="cx"> PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
</span><ins>+
+WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
+WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
+WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
+WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
+WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;
+
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacDOMWebDOMOperationsh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperations.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperations.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperations.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/DOMCore.h>
-#import <WebKit/DOMHTML.h>
-#import <WebKit/DOMRange.h>
</del><ins>+#import <WebKitLegacy/DOMCore.h>
+#import <WebKitLegacy/DOMHTML.h>
+#import <WebKitLegacy/DOMRange.h>
</ins><span class="cx">
</span><span class="cx"> @class WebArchive;
</span><span class="cx"> @class WebFrame;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacDOMWebDOMOperationsmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperations.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperations.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperations.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> #import <WebCore/ShadowRoot.h>
</span><span class="cx"> #import <WebCore/WheelEvent.h>
</span><span class="cx"> #import <WebCore/markup.h>
</span><del>-#import <WebKit/DOMExtensions.h>
-#import <WebKit/DOMHTML.h>
</del><ins>+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/DOMHTML.h>
</ins><span class="cx"> #import <runtime/JSCJSValue.h>
</span><span class="cx"> #import <runtime/JSLock.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacDOMWebDOMOperationsInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDOMOperations.h>
</del><ins>+#import <WebKitLegacy/WebDOMOperations.h>
</ins><span class="cx">
</span><span class="cx"> @interface DOMDocument (WebDOMDocumentOperationsInternal)
</span><span class="cx"> - (DOMRange *)_documentRange;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacDOMWebDOMOperationsPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,14 +26,14 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDOMOperations.h>
</del><ins>+#import <WebKitLegacy/WebDOMOperations.h>
</ins><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #import <Foundation/NSGeometry.h>
</span><span class="cx"> #else
</span><span class="cx"> #import <AppKit/NSEvent.h>
</span><del>-#import <WebKit/DOMWheelEvent.h>
</del><ins>+#import <WebKitLegacy/DOMWheelEvent.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface DOMElement (WebDOMElementOperationsPrivate)
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacDefaultDelegatesWebDefaultContextMenuDelegateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebKit/WebDefaultUIDelegate.h>
</del><ins>+#import <WebKitLegacy/WebDefaultUIDelegate.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebDefaultUIDelegate (WebContextMenu)
</span><span class="cx"> @end
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacDefaultDelegatesWebDefaultContextMenuDelegatemm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -48,8 +48,8 @@
</span><span class="cx"> #import <WebCore/Editor.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameLoader.h>
</span><del>-#import <WebKit/DOM.h>
-#import <WebKit/DOMPrivate.h>
</del><ins>+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/DOMPrivate.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacDefaultDelegatesWebDefaultEditingDelegatem"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDefaultEditingDelegate.h>
</del><ins>+#import <WebKitLegacy/WebDefaultEditingDelegate.h>
</ins><span class="cx">
</span><del>-#import <WebKit/DOM.h>
-#import <WebKit/WebEditingDelegate.h>
-#import <WebKit/WebEditingDelegatePrivate.h>
-#import <WebKit/WebView.h>
</del><ins>+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/WebEditingDelegate.h>
+#import <WebKitLegacy/WebEditingDelegatePrivate.h>
+#import <WebKitLegacy/WebView.h>
</ins><span class="cx">
</span><span class="cx"> @implementation WebDefaultEditingDelegate
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacHistoryWebBackForwardListInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/History/WebBackForwardListInternal.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/History/WebBackForwardListInternal.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/History/WebBackForwardListInternal.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebBackForwardList.h>
</del><ins>+#import <WebKitLegacy/WebBackForwardList.h>
</ins><span class="cx"> #import <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>- class BackForwardList;
</del><ins>+class BackForwardList;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::BackForwardList* core(WebBackForwardList *);
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacHistoryWebBackForwardListPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/History/WebBackForwardListPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/History/WebBackForwardListPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/History/WebBackForwardListPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit/WebBackForwardList.h>
</del><ins>+#import <WebKitLegacy/WebBackForwardList.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebBackForwardList (WebBackForwardListPrivate)
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacHistoryWebHistoryItemPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/History/WebHistoryItemPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebHistoryItem.h>
</del><ins>+#import <WebKitLegacy/WebHistoryItem.h>
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #import <Foundation/NSCalendarDate.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacHistoryWebHistoryPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/History/WebHistoryPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/History/WebHistoryPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/History/WebHistoryPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebHistory.h>
</del><ins>+#import <WebKitLegacy/WebHistory.h>
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> @constant WebHistoryItemsDiscardedWhileLoadingNotification Posted from loadFromURL:error:.
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacHistoryWebURLsWithTitlesm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/History/WebURLsWithTitles.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/History/WebURLsWithTitles.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/History/WebURLsWithTitles.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> #import "WebURLsWithTitles.h"
</span><span class="cx">
</span><del>-#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/WebKitNSStringExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSURLExtras.h>
+#import <WebKitLegacy/WebKitNSStringExtras.h>
</ins><span class="cx">
</span><span class="cx"> @implementation WebURLsWithTitles
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/MigrateHeaders.make (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/MigrateHeaders.make 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/MigrateHeaders.make 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,177 +27,177 @@
</span><span class="cx">
</span><span class="cx"> VPATH = $(WEBCORE_PRIVATE_HEADERS_DIR)
</span><span class="cx">
</span><del>-INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit
</del><ins>+INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy
</ins><span class="cx"> PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
</span><span class="cx"> PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
</span><span class="cx">
</span><span class="cx"> .PHONY : all
</span><span class="cx"> all : \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOM.h \
- $(PUBLIC_HEADERS_DIR)/DOMAbstractView.h \
- $(PUBLIC_HEADERS_DIR)/DOMAttr.h \
- $(PUBLIC_HEADERS_DIR)/DOMBlob.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOM.h \
+ $(PRIVATE_HEADERS_DIR)/DOMAbstractView.h \
+ $(PRIVATE_HEADERS_DIR)/DOMAttr.h \
+ $(PRIVATE_HEADERS_DIR)/DOMBlob.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMBlobInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMCDATASection.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSS.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSCharsetRule.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSFontFaceRule.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSImportRule.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSMediaRule.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSPageRule.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSPrimitiveValue.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSRule.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSRuleList.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSStyleDeclaration.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMCDATASection.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSS.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSCharsetRule.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSFontFaceRule.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSImportRule.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSMediaRule.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSPageRule.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSPrimitiveValue.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSRule.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSRuleList.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSStyleDeclaration.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMCSSStyleDeclarationInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMCSSStyleRule.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSStyleSheet.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSUnknownRule.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSValue.h \
- $(PUBLIC_HEADERS_DIR)/DOMCSSValueList.h \
- $(PUBLIC_HEADERS_DIR)/DOMCharacterData.h \
- $(PUBLIC_HEADERS_DIR)/DOMComment.h \
- $(PUBLIC_HEADERS_DIR)/DOMCore.h \
- $(PUBLIC_HEADERS_DIR)/DOMCounter.h \
- $(PUBLIC_HEADERS_DIR)/DOMDocument.h \
- $(PUBLIC_HEADERS_DIR)/DOMDocumentFragment.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMCSSStyleRule.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSStyleSheet.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSUnknownRule.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSValue.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCSSValueList.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCharacterData.h \
+ $(PRIVATE_HEADERS_DIR)/DOMComment.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCore.h \
+ $(PRIVATE_HEADERS_DIR)/DOMCounter.h \
+ $(PRIVATE_HEADERS_DIR)/DOMDocument.h \
+ $(PRIVATE_HEADERS_DIR)/DOMDocumentFragment.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMDocumentFragmentInternal.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMDocumentFragmentPrivate.h \
</span><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMDocumentInternal.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMDocumentPrivate.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMDocumentType.h \
- $(PUBLIC_HEADERS_DIR)/DOMElement.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMDocumentType.h \
+ $(PRIVATE_HEADERS_DIR)/DOMElement.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMElementInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMEntity.h \
- $(PUBLIC_HEADERS_DIR)/DOMEntityReference.h \
- $(PUBLIC_HEADERS_DIR)/DOMEvent.h \
- $(PUBLIC_HEADERS_DIR)/DOMEventException.h \
- $(PUBLIC_HEADERS_DIR)/DOMEventListener.h \
- $(PUBLIC_HEADERS_DIR)/DOMEventTarget.h \
- $(PUBLIC_HEADERS_DIR)/DOMEvents.h \
- $(PUBLIC_HEADERS_DIR)/DOMException.h \
- $(PUBLIC_HEADERS_DIR)/DOMExtensions.h \
- $(PUBLIC_HEADERS_DIR)/DOMFile.h \
- $(PUBLIC_HEADERS_DIR)/DOMFileList.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTML.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLAnchorElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLAppletElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLAreaElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLBRElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLBaseElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLBaseFontElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLBodyElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLButtonElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLCollection.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLDListElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLDirectoryElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLDivElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLDocument.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLElement.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMEntity.h \
+ $(PRIVATE_HEADERS_DIR)/DOMEntityReference.h \
+ $(PRIVATE_HEADERS_DIR)/DOMEvent.h \
+ $(PRIVATE_HEADERS_DIR)/DOMEventException.h \
+ $(PRIVATE_HEADERS_DIR)/DOMEventListener.h \
+ $(PRIVATE_HEADERS_DIR)/DOMEventTarget.h \
+ $(PRIVATE_HEADERS_DIR)/DOMEvents.h \
+ $(PRIVATE_HEADERS_DIR)/DOMException.h \
+ $(PRIVATE_HEADERS_DIR)/DOMExtensions.h \
+ $(PRIVATE_HEADERS_DIR)/DOMFile.h \
+ $(PRIVATE_HEADERS_DIR)/DOMFileList.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTML.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLAnchorElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLAppletElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLAreaElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLBRElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLBaseElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLBaseFontElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLBodyElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLButtonElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLCollection.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLDListElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLDirectoryElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLDivElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLDocument.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLElement.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMHTMLElementInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMHTMLEmbedElement.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMHTMLEmbedElement.h \
</ins><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMHTMLEmbedElementPrivate.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMHTMLFieldSetElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLFontElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLFormElement.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMHTMLFieldSetElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLFontElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLFormElement.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMHTMLFormElementInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMHTMLFrameElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLFrameSetElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLHRElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLHeadElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLHeadingElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLHtmlElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLIFrameElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLImageElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLInputElement.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMHTMLFrameElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLFrameSetElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLHRElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLHeadElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLHeadingElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLHtmlElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLIFrameElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLImageElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLInputElement.h \
</ins><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMHTMLInputElementPrivate.h \
</span><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMHTMLInputElementInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMHTMLLIElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLLabelElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLLegendElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLLinkElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLMapElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLMarqueeElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLMenuElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLMetaElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLModElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLOListElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLObjectElement.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMHTMLLIElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLLabelElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLLegendElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLLinkElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLMapElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLMarqueeElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLMenuElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLMetaElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLModElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLOListElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLObjectElement.h \
</ins><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMHTMLObjectElementPrivate.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMHTMLOptGroupElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLOptionElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLOptionsCollection.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLParagraphElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLParamElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLPreElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLQuoteElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLScriptElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLSelectElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLStyleElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLTableCaptionElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLTableCellElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLTableColElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLTableElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLTableRowElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLTableSectionElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLTextAreaElement.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMHTMLOptGroupElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLOptionElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLOptionsCollection.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLParagraphElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLParamElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLPreElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLQuoteElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLScriptElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLSelectElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLStyleElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLTableCaptionElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLTableCellElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLTableColElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLTableElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLTableRowElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLTableSectionElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElement.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMHTMLTextAreaElementInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMHTMLTitleElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMHTMLUListElement.h \
- $(PUBLIC_HEADERS_DIR)/DOMImplementation.h \
- $(PUBLIC_HEADERS_DIR)/DOMKeyboardEvent.h \
- $(PUBLIC_HEADERS_DIR)/DOMMediaList.h \
- $(PUBLIC_HEADERS_DIR)/DOMMouseEvent.h \
- $(PUBLIC_HEADERS_DIR)/DOMMutationEvent.h \
- $(PUBLIC_HEADERS_DIR)/DOMNamedNodeMap.h \
- $(PUBLIC_HEADERS_DIR)/DOMNode.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMHTMLTitleElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMHTMLUListElement.h \
+ $(PRIVATE_HEADERS_DIR)/DOMImplementation.h \
+ $(PRIVATE_HEADERS_DIR)/DOMKeyboardEvent.h \
+ $(PRIVATE_HEADERS_DIR)/DOMMediaList.h \
+ $(PRIVATE_HEADERS_DIR)/DOMMouseEvent.h \
+ $(PRIVATE_HEADERS_DIR)/DOMMutationEvent.h \
+ $(PRIVATE_HEADERS_DIR)/DOMNamedNodeMap.h \
+ $(PRIVATE_HEADERS_DIR)/DOMNode.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMNodeInternal.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMNodePrivate.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMNodeFilter.h \
- $(PUBLIC_HEADERS_DIR)/DOMNodeIterator.h \
- $(PUBLIC_HEADERS_DIR)/DOMNodeList.h \
- $(PUBLIC_HEADERS_DIR)/DOMNotation.h \
- $(PUBLIC_HEADERS_DIR)/DOMObject.h \
- $(PUBLIC_HEADERS_DIR)/DOMOverflowEvent.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMNodeFilter.h \
+ $(PRIVATE_HEADERS_DIR)/DOMNodeIterator.h \
+ $(PRIVATE_HEADERS_DIR)/DOMNodeList.h \
+ $(PRIVATE_HEADERS_DIR)/DOMNotation.h \
+ $(PRIVATE_HEADERS_DIR)/DOMObject.h \
+ $(PRIVATE_HEADERS_DIR)/DOMOverflowEvent.h \
</ins><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMPrivate.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMProcessingInstruction.h \
- $(PUBLIC_HEADERS_DIR)/DOMProgressEvent.h \
- $(PUBLIC_HEADERS_DIR)/DOMRGBColor.h \
- $(PUBLIC_HEADERS_DIR)/DOMRange.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMProcessingInstruction.h \
+ $(PRIVATE_HEADERS_DIR)/DOMProgressEvent.h \
+ $(PRIVATE_HEADERS_DIR)/DOMRGBColor.h \
+ $(PRIVATE_HEADERS_DIR)/DOMRange.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMRangeInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMRangeException.h \
- $(PUBLIC_HEADERS_DIR)/DOMRanges.h \
- $(PUBLIC_HEADERS_DIR)/DOMRect.h \
- $(PUBLIC_HEADERS_DIR)/DOMStyleSheet.h \
- $(PUBLIC_HEADERS_DIR)/DOMStyleSheetList.h \
- $(PUBLIC_HEADERS_DIR)/DOMStylesheets.h \
- $(PUBLIC_HEADERS_DIR)/DOMText.h \
- $(PUBLIC_HEADERS_DIR)/DOMTraversal.h \
- $(PUBLIC_HEADERS_DIR)/DOMTreeWalker.h \
- $(PUBLIC_HEADERS_DIR)/DOMUIEvent.h \
- $(PUBLIC_HEADERS_DIR)/DOMViews.h \
- $(PUBLIC_HEADERS_DIR)/DOMWheelEvent.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMRangeException.h \
+ $(PRIVATE_HEADERS_DIR)/DOMRanges.h \
+ $(PRIVATE_HEADERS_DIR)/DOMRect.h \
+ $(PRIVATE_HEADERS_DIR)/DOMStyleSheet.h \
+ $(PRIVATE_HEADERS_DIR)/DOMStyleSheetList.h \
+ $(PRIVATE_HEADERS_DIR)/DOMStylesheets.h \
+ $(PRIVATE_HEADERS_DIR)/DOMText.h \
+ $(PRIVATE_HEADERS_DIR)/DOMTraversal.h \
+ $(PRIVATE_HEADERS_DIR)/DOMTreeWalker.h \
+ $(PRIVATE_HEADERS_DIR)/DOMUIEvent.h \
+ $(PRIVATE_HEADERS_DIR)/DOMViews.h \
+ $(PRIVATE_HEADERS_DIR)/DOMWheelEvent.h \
</ins><span class="cx"> $(INTERNAL_HEADERS_DIR)/DOMWheelEventInternal.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMXPath.h \
- $(PUBLIC_HEADERS_DIR)/DOMXPathException.h \
- $(PUBLIC_HEADERS_DIR)/DOMXPathExpression.h \
- $(PUBLIC_HEADERS_DIR)/DOMXPathNSResolver.h \
- $(PUBLIC_HEADERS_DIR)/DOMXPathResult.h \
- $(PUBLIC_HEADERS_DIR)/WebKitAvailability.h \
- $(PUBLIC_HEADERS_DIR)/WebScriptObject.h \
- $(PUBLIC_HEADERS_DIR)/npapi.h \
- $(PUBLIC_HEADERS_DIR)/npfunctions.h \
- $(PUBLIC_HEADERS_DIR)/npruntime.h \
- $(PUBLIC_HEADERS_DIR)/nptypes.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMXPath.h \
+ $(PRIVATE_HEADERS_DIR)/DOMXPathException.h \
+ $(PRIVATE_HEADERS_DIR)/DOMXPathExpression.h \
+ $(PRIVATE_HEADERS_DIR)/DOMXPathNSResolver.h \
+ $(PRIVATE_HEADERS_DIR)/DOMXPathResult.h \
+ $(PRIVATE_HEADERS_DIR)/WebKitAvailability.h \
+ $(PRIVATE_HEADERS_DIR)/WebScriptObject.h \
+ $(PRIVATE_HEADERS_DIR)/npapi.h \
+ $(PRIVATE_HEADERS_DIR)/npfunctions.h \
+ $(PRIVATE_HEADERS_DIR)/npruntime.h \
+ $(PRIVATE_HEADERS_DIR)/nptypes.h \
</ins><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> ifneq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
</span><span class="cx"> all : \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMGestureEvent.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h \
</ins><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElementPrivate.h \
</span><del>- $(PUBLIC_HEADERS_DIR)/DOMTouch.h \
- $(PUBLIC_HEADERS_DIR)/DOMTouchEvent.h \
- $(PUBLIC_HEADERS_DIR)/DOMTouchList.h \
</del><ins>+ $(PRIVATE_HEADERS_DIR)/DOMTouch.h \
+ $(PRIVATE_HEADERS_DIR)/DOMTouchEvent.h \
+ $(PRIVATE_HEADERS_DIR)/DOMTouchList.h \
</ins><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOMUIKitExtensions.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/KeyEventCodesIOS.h \
</span><span class="cx"> $(PRIVATE_HEADERS_DIR)/MediaPlayerProxy.h \
</span><span class="lines">@@ -230,83 +230,14 @@
</span><span class="cx">
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKit/ -e s/DOMDOMImplementation/DOMImplementation/
</del><ins>+WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/
</ins><span class="cx"> WEBCORE_HEADER_MIGRATE_CMD = sed $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
</span><span class="cx">
</span><del>-ifeq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
-PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*TBD" "$<"; then line=$$(awk "/AVAILABLE.*TBD/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi
-else
-PUBLIC_HEADER_CHECK_CMD =
-endif
-
-$(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
- $(PUBLIC_HEADER_CHECK_CMD)
- $(WEBCORE_HEADER_MIGRATE_CMD)
-
</del><span class="cx"> $(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
</span><span class="cx"> $(WEBCORE_HEADER_MIGRATE_CMD)
</span><span class="cx">
</span><del>-$(PUBLIC_HEADERS_DIR)/% : % MigrateHeaders.make
- $(PUBLIC_HEADER_CHECK_CMD)
- $(WEBCORE_HEADER_MIGRATE_CMD)
-
</del><span class="cx"> $(PRIVATE_HEADERS_DIR)/% : % MigrateHeaders.make
</span><span class="cx"> $(WEBCORE_HEADER_MIGRATE_CMD)
</span><span class="cx">
</span><span class="cx"> $(INTERNAL_HEADERS_DIR)/% : % MigrateHeaders.make
</span><span class="cx"> $(WEBCORE_HEADER_MIGRATE_CMD)
</span><del>-
-# Migration of WebKit2 headers to WebKit
-
-WEBKIT2_HEADERS = \
- WKBackForwardList.h \
- WKBackForwardListItem.h \
- WKBackForwardListItemPrivate.h \
- WKBackForwardListPrivate.h \
- WKFoundation.h \
- WKFrameInfo.h \
- WKHistoryDelegatePrivate.h \
- WKNavigation.h \
- WKNavigationAction.h \
- WKNavigationDelegate.h \
- WKNavigationResponse.h \
- WKPreferences.h \
- WKProcessPool.h \
- WKProcessPoolPrivate.h \
- WKScriptMessage.h \
- WKScriptMessageHandler.h \
- WKScriptMessagePrivate.h \
- WKUIDelegate.h \
- WKUIDelegatePrivate.h \
- WKUserContentController.h \
- WKUserContentControllerPrivate.h \
- WKWebView.h \
- WKWebViewConfiguration.h \
- WKWebViewConfigurationPrivate.h \
- WKWebViewPrivate.h \
- _WKActivatedElementInfo.h \
- _WKElementAction.h \
- _WKFormDelegate.h \
- _WKFormInputSession.h \
- _WKProcessPoolConfiguration.h \
- _WKScriptWorld.h \
- _WKThumbnailView.h \
- _WKVisitedLinkProvider.h \
- _WKVisitedLinkProviderPrivate.h \
-#
-
-WEBKIT2_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/*))))
-WEBKIT2_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/*))))
-
-ifeq ($(PLATFORM_NAME), macosx)
-all : $(WEBKIT2_PUBLIC_HEADERS) $(WEBKIT2_PRIVATE_HEADERS)
-endif
-
-WEBKIT2_HEADER_REPLACE_RULES = -e s/\<WebKit2/\<WebKit/ -e /$\#.*\<WebKit\\/WK.*Ref\\.h\>/d
-WEBKIT2_HEADER_MIGRATE_CMD = sed $(WEBKIT2_HEADER_REPLACE_RULES) $< > $@
-
-$(PUBLIC_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/% MigrateHeaders.make
- $(WEBKIT2_HEADER_MIGRATE_CMD)
-
-$(PRIVATE_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/% MigrateHeaders.make
- $(WEBKIT2_HEADER_MIGRATE_CMD)
</del></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebCoreStatisticsh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebCoreStatistics.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebCoreStatistics.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebCoreStatistics.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <CoreGraphics/CGContext.h>
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit/WebFrame.h>
</del><ins>+#import <WebKitLegacy/WebFrame.h>
</ins><span class="cx">
</span><span class="cx"> @class DOMElement;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebDownloadh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownload.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownload.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownload.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #import <Foundation/NSURLDownload.h>
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><del>-#import <WebKit/WAKAppKitStubs.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebDownloadInternal;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebDownloadmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownload.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownload.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownload.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDownload.h>
</del><ins>+#import <WebKitLegacy/WebDownload.h>
</ins><span class="cx">
</span><span class="cx"> #import <Foundation/NSURLAuthenticationChallenge.h>
</span><span class="cx"> #import <Foundation/NSURLDownload.h>
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #import <WebCore/Credential.h>
</span><span class="cx"> #import <WebCore/CredentialStorage.h>
</span><span class="cx"> #import <WebCore/ProtectionSpace.h>
</span><del>-#import <WebKit/WebPanelAuthenticationHandler.h>
</del><ins>+#import <WebKitLegacy/WebPanelAuthenticationHandler.h>
</ins><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><span class="cx"> #import "WebTypesInternal.h"
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebDownloadInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownloadInternal.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownloadInternal.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebDownloadInternal.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDownload.h>
</del><ins>+#import <WebKitLegacy/WebDownload.h>
</ins><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #import <CFNetwork/CFURLConnection.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebElementDictionarymm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebElementDictionary.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebElementDictionary.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> #import <WebCore/HitTestResult.h>
</span><span class="cx"> #import <WebCore/Image.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><del>-#import <WebKit/DOMCore.h>
-#import <WebKit/DOMExtensions.h>
</del><ins>+#import <WebKitLegacy/DOMCore.h>
+#import <WebKitLegacy/DOMExtensions.h>
</ins><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/RunLoop.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebIconDatabasePrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebIconDatabase.h>
</del><ins>+#import <WebKitLegacy/WebIconDatabase.h>
</ins><span class="cx">
</span><span class="cx"> // FIXME: Some of the following is not API and should be moved
</span><span class="cx"> // either inside WebIconDatabase.mm, or to WebIconDatabaseInternal.h.
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebKith"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKit.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKit.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKit.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,27 +26,27 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/DOM.h>
-#import <WebKit/WebArchive.h>
-#import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebDocument.h>
-#import <WebKit/WebDOMOperations.h>
-#import <WebKit/WebDownload.h>
-#import <WebKit/WebEditingDelegate.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebFrameLoadDelegate.h>
-#import <WebKit/WebFrameView.h>
-#import <WebKit/WebHistory.h>
-#import <WebKit/WebHistoryItem.h>
-#import <WebKit/WebKitErrors.h>
-#import <WebKit/WebPlugin.h>
-#import <WebKit/WebPluginContainer.h>
-#import <WebKit/WebPluginViewFactory.h>
-#import <WebKit/WebPolicyDelegate.h>
-#import <WebKit/WebPreferences.h>
-#import <WebKit/WebResource.h>
-#import <WebKit/WebResourceLoadDelegate.h>
-#import <WebKit/WebScriptObject.h>
-#import <WebKit/WebUIDelegate.h>
-#import <WebKit/WebView.h>
</del><ins>+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/WebArchive.h>
+#import <WebKitLegacy/WebBackForwardList.h>
+#import <WebKitLegacy/WebDataSource.h>
+#import <WebKitLegacy/WebDocument.h>
+#import <WebKitLegacy/WebDOMOperations.h>
+#import <WebKitLegacy/WebDownload.h>
+#import <WebKitLegacy/WebEditingDelegate.h>
+#import <WebKitLegacy/WebFrame.h>
+#import <WebKitLegacy/WebFrameLoadDelegate.h>
+#import <WebKitLegacy/WebFrameView.h>
+#import <WebKitLegacy/WebHistory.h>
+#import <WebKitLegacy/WebHistoryItem.h>
+#import <WebKitLegacy/WebKitErrors.h>
+#import <WebKitLegacy/WebPlugin.h>
+#import <WebKitLegacy/WebPluginContainer.h>
+#import <WebKitLegacy/WebPluginViewFactory.h>
+#import <WebKitLegacy/WebPolicyDelegate.h>
+#import <WebKitLegacy/WebPreferences.h>
+#import <WebKitLegacy/WebResource.h>
+#import <WebKitLegacy/WebResourceLoadDelegate.h>
+#import <WebKitLegacy/WebScriptObject.h>
+#import <WebKitLegacy/WebUIDelegate.h>
+#import <WebKitLegacy/WebView.h>
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebKitErrorsm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitErrors.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitErrors.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitErrors.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebKitErrors.h>
</del><ins>+#import <WebKitLegacy/WebKitErrors.h>
</ins><span class="cx">
</span><span class="cx"> #import "WebLocalizableStringsInternal.h"
</span><del>-#import <WebKit/WebKitErrorsPrivate.h>
-#import <WebKit/WebNSURLExtras.h>
</del><ins>+#import <WebKitLegacy/WebKitErrorsPrivate.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
</ins><span class="cx">
</span><span class="cx"> #import <pthread.h>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebKitErrorsPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebKitErrors.h>
</del><ins>+#import <WebKitLegacy/WebKitErrors.h>
</ins><span class="cx">
</span><span class="cx"> #define WebKitErrorPlugInCancelledConnection 203
</span><span class="cx"> // FIXME: WebKitErrorPlugInWillHandleLoad is used for the cancel we do to prevent loading plugin content twice. See <rdar://problem/4258008>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebKitNSStringExtrasmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -33,17 +33,17 @@
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/TextRun.h>
</span><span class="cx"> #import <WebCore/WebCoreNSStringExtras.h>
</span><del>-#import <WebKit/WebNSFileManagerExtras.h>
-#import <WebKit/WebNSObjectExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSFileManagerExtras.h>
+#import <WebKitLegacy/WebNSObjectExtras.h>
</ins><span class="cx"> #import <unicode/uchar.h>
</span><span class="cx"> #import <sys/param.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <WebCore/WAKViewPrivate.h>
</span><del>-#import <WebKit/DOM.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebFrameView.h>
-#import <WebKit/WebViewPrivate.h>
</del><ins>+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/WebFrame.h>
+#import <WebKitLegacy/WebFrameView.h>
+#import <WebKitLegacy/WebViewPrivate.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebLocalizableStringsmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebLocalizableStrings.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebLocalizableStrings.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebLocalizableStrings.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebLocalizableStrings.h>
</del><ins>+#import <WebKitLegacy/WebLocalizableStrings.h>
</ins><span class="cx">
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebNSDataExtrasm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSDataExtras.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSDataExtras.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSDataExtras.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebNSDataExtras.h>
-#import <WebKit/WebNSDataExtrasPrivate.h>
</del><ins>+#import <WebKitLegacy/WebNSDataExtras.h>
+#import <WebKitLegacy/WebNSDataExtrasPrivate.h>
</ins><span class="cx">
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebNSDictionaryExtrasm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSDictionaryExtras.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSDictionaryExtras.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSDictionaryExtras.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebNSDataExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSDataExtras.h>
</ins><span class="cx">
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebNSEventExtrasm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSEventExtras.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSEventExtras.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSEventExtras.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <WebKit/WebNSEventExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSEventExtras.h>
</ins><span class="cx">
</span><span class="cx"> @implementation NSEvent (WebExtras)
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebNSFileManagerExtrasmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebNSFileManagerExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSFileManagerExtras.h>
</ins><span class="cx">
</span><span class="cx"> #import "WebKitNSStringExtras.h"
</span><span class="cx"> #import "WebNSURLExtras.h"
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebNSImageExtrasm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSImageExtras.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSImageExtras.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSImageExtras.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <WebKit/WebNSImageExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSImageExtras.h>
</ins><span class="cx">
</span><del>-#import <WebKit/WebKitLogging.h>
</del><ins>+#import <WebKitLegacy/WebKitLogging.h>
</ins><span class="cx">
</span><span class="cx"> @implementation NSImage (WebExtras)
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebNSPasteboardExtrasmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> #import <WebCore/Image.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/RenderImage.h>
</span><del>-#import <WebKit/DOMExtensions.h>
-#import <WebKit/DOMPrivate.h>
</del><ins>+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/DOMPrivate.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebNSViewExtrash"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSViewExtras.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSViewExtras.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSViewExtras.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #define WebDragImageAlpha 0.75f
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacMiscWebNSViewExtrasm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSViewExtras.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSViewExtras.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Misc/WebNSViewExtras.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,18 +26,18 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebNSViewExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSViewExtras.h>
</ins><span class="cx">
</span><del>-#import <WebKit/DOMExtensions.h>
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebFrameViewInternal.h>
-#import <WebKit/WebNSImageExtras.h>
-#import <WebKit/WebNSURLExtras.h>
-#import <WebKit/WebView.h>
</del><ins>+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/WebDataSource.h>
+#import <WebKitLegacy/WebFramePrivate.h>
+#import <WebKitLegacy/WebFrameViewInternal.h>
+#import <WebKitLegacy/WebNSImageExtras.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
+#import <WebKitLegacy/WebView.h>
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#import <WebKit/WebNSPasteboardExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSPasteboardExtras.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPanelsWebAuthenticationPanelm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Panels/WebAuthenticationPanel.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Panels/WebAuthenticationPanel.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Panels/WebAuthenticationPanel.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,17 +28,17 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <WebKit/WebAuthenticationPanel.h>
</del><ins>+#import <WebKitLegacy/WebAuthenticationPanel.h>
</ins><span class="cx">
</span><span class="cx"> #import "WebLocalizableStringsInternal.h"
</span><span class="cx"> #import <Foundation/NSURLAuthenticationChallenge.h>
</span><span class="cx"> #import <Foundation/NSURLProtectionSpace.h>
</span><span class="cx"> #import <Foundation/NSURLCredential.h>
</span><del>-#import <WebKit/WebKitNSStringExtras.h>
-#import <WebKit/WebNSURLExtras.h>
</del><ins>+#import <WebKitLegacy/WebKitNSStringExtras.h>
+#import <WebKitLegacy/WebNSURLExtras.h>
</ins><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><del>-#import <WebKit/WebNSControlExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSControlExtras.h>
</ins><span class="cx">
</span><span class="cx"> #define WebAuthenticationPanelNibName @"WebAuthenticationPanel"
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPanelsWebPanelAuthenticationHandlerm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <WebKit/WebPanelAuthenticationHandler.h>
</del><ins>+#import <WebKitLegacy/WebPanelAuthenticationHandler.h>
</ins><span class="cx">
</span><span class="cx"> #import <Foundation/NSURLAuthenticationChallenge.h>
</span><del>-#import <WebKit/WebAuthenticationPanel.h>
</del><ins>+#import <WebKitLegacy/WebAuthenticationPanel.h>
</ins><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><span class="cx"> static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsHostedHostedNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #define HostedNetscapePluginStream_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/NetscapePlugInStreamLoader.h>
</span><del>-#include <WebKit/npapi.h>
</del><ins>+#include <WebKitLegacy/npapi.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsHostedNetscapePluginInstanceProxyh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <JavaScriptCore/VM.h>
</span><span class="cx"> #include <JavaScriptCore/Strong.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><del>-#include <WebKit/npapi.h>
</del><ins>+#include <WebKitLegacy/npapi.h>
</ins><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginAgentdefs"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgent.defs (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgent.defs 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgent.defs 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include <WebKit/WebKitPluginHostTypes.defs>
</del><ins>+#include <WebKitLegacy/WebKitPluginHostTypes.defs>
</ins><span class="cx">
</span><span class="cx"> subsystem WebKitPluginAgent 100;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginAgentReplydefs"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgentReply.defs (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgentReply.defs 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgentReply.defs 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include <WebKit/WebKitPluginHostTypes.defs>
</del><ins>+#include <WebKitLegacy/WebKitPluginHostTypes.defs>
</ins><span class="cx">
</span><span class="cx"> subsystem WebKitPluginAgentReply 200;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginClientdefs"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include <WebKit/WebKitPluginHostTypes.defs>
</del><ins>+#include <WebKitLegacy/WebKitPluginHostTypes.defs>
</ins><span class="cx">
</span><span class="cx"> // FIXME: Come up with a better name.
</span><span class="cx"> subsystem WebKitPluginClient 300;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginHostdefs"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include <WebKit/WebKitPluginHostTypes.defs>
</del><ins>+#include <WebKitLegacy/WebKitPluginHostTypes.defs>
</ins><span class="cx">
</span><span class="cx"> subsystem WebKitPluginHost 300;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsHostedWebKitPluginHostTypesdefs"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHostTypes.defs (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHostTypes.defs 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHostTypes.defs 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include <mach/std_types.defs>
</span><span class="cx"> #include <mach/mach_types.defs>
</span><span class="cx">
</span><del>-import <WebKit/WebKitPluginHostTypes.h>;
</del><ins>+import <WebKitLegacy/WebKitPluginHostTypes.h>;
</ins><span class="cx">
</span><span class="cx"> type plist_bytes_t = ^array [] of uint8_t;
</span><span class="cx"> type application_name_t = ^array [] of uint8_t;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebBaseNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> #import <WebCore/RenderWidget.h>
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><del>-#import <WebKit/DOMPrivate.h>
</del><ins>+#import <WebKitLegacy/DOMPrivate.h>
</ins><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebBasePluginPackageh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBasePluginPackage.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBasePluginPackage.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBasePluginPackage.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>-#import <WebKit/npfunctions.h>
</del><ins>+#import <WebKitLegacy/npfunctions.h>
</ins><span class="cx"> #else
</span><span class="cx"> typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebBasePluginPackagemm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebBasePluginPackage.h>
</del><ins>+#import <WebKitLegacy/WebBasePluginPackage.h>
</ins><span class="cx">
</span><span class="cx"> #import <algorithm>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><del>-#import <WebKit/WebKitNSStringExtras.h>
-#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebKit/WebPluginPackage.h>
</del><ins>+#import <WebKitLegacy/WebKitNSStringExtras.h>
+#import <WebKitLegacy/WebNetscapePluginPackage.h>
+#import <WebKitLegacy/WebPluginPackage.h>
</ins><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebNetscapeContainerCheckPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #ifndef WebNetscapeContainerCheckPrivate_h
</span><span class="cx"> #define WebNetscapeContainerCheckPrivate_h
</span><span class="cx">
</span><del>-#include <WebKit/npapi.h>
</del><ins>+#include <WebKitLegacy/npapi.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebNetscapePluginEventHandlerCocoah"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #ifndef WebNetscapePluginEventHandlerCocoa_h
</span><span class="cx"> #define WebNetscapePluginEventHandlerCocoa_h
</span><span class="cx">
</span><del>-#include <WebKit/npapi.h>
</del><ins>+#include <WebKitLegacy/npapi.h>
</ins><span class="cx"> #include "WebNetscapePluginEventHandler.h"
</span><span class="cx">
</span><span class="cx"> class WebNetscapePluginEventHandlerCocoa : public WebNetscapePluginEventHandler {
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebCore/Timer.h>
</span><span class="cx"> #import <WebCore/NetscapePlugInStreamLoader.h>
</span><del>-#import <WebKit/npfunctions.h>
</del><ins>+#import <WebKitLegacy/npfunctions.h>
</ins><span class="cx"> #import <wtf/PassRefPtr.h>
</span><span class="cx"> #import <wtf/RefCounted.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebNetscapePluginViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginView.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginView.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginView.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #import "WebBaseNetscapePluginView.h"
</span><span class="cx">
</span><span class="cx"> #import "WebNetscapeContainerCheckPrivate.h"
</span><del>-#import <WebKit/npfunctions.h>
-#import <WebKit/npapi.h>
</del><ins>+#import <WebKitLegacy/npfunctions.h>
+#import <WebKitLegacy/npapi.h>
</ins><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><span class="cx"> #import <wtf/OwnPtr.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebNetscapePluginViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -74,8 +74,8 @@
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebCoreURLResponse.h>
</span><span class="cx"> #import <WebCore/npruntime_impl.h>
</span><del>-#import <WebKit/DOMPrivate.h>
-#import <WebKit/WebUIDelegate.h>
</del><ins>+#import <WebKitLegacy/DOMPrivate.h>
+#import <WebKitLegacy/WebUIDelegate.h>
</ins><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <runtime/JSLock.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebPluginh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPlugin.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPlugin.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPlugin.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit/WebKitAvailability.h>
</del><ins>+#import <WebKitLegacy/WebKitAvailability.h>
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebPluginControllerh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginController.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginController.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginController.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebBasePluginPackage.h>
-#import <WebKit/WebPluginContainerCheck.h>
</del><ins>+#import <WebKitLegacy/WebBasePluginPackage.h>
+#import <WebKitLegacy/WebPluginContainerCheck.h>
</ins><span class="cx">
</span><span class="cx"> @class WebFrame;
</span><span class="cx"> @class WebHTMLView;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebPluginDatabaseh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginDatabase.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginDatabase.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginDatabase.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><del>-#import <WebKit/WAKAppKitStubs.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebBasePluginPackage;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebPluginPackageh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginPackage.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginPackage.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginPackage.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebKit/WebBasePluginPackage.h>
</del><ins>+#import <WebKitLegacy/WebBasePluginPackage.h>
</ins><span class="cx">
</span><span class="cx"> @protocol WebPluginViewFactory;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebPluginPackagemm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginPackage.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginPackage.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginPackage.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebPluginPackage.h>
</del><ins>+#import <WebKitLegacy/WebPluginPackage.h>
</ins><span class="cx">
</span><del>-#import <WebKit/WebKitLogging.h>
-#import <WebKit/WebKitNSStringExtras.h>
</del><ins>+#import <WebKitLegacy/WebKitLogging.h>
+#import <WebKitLegacy/WebKitNSStringExtras.h>
</ins><span class="cx">
</span><span class="cx"> NSString *WebPlugInBaseURLKey = @"WebPlugInBaseURLKey";
</span><span class="cx"> NSString *WebPlugInAttributesKey = @"WebPlugInAttributesKey";
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebPluginViewFactoryh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginViewFactory.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginViewFactory.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginViewFactory.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit/WebKitAvailability.h>
</del><ins>+#import <WebKitLegacy/WebKitAvailability.h>
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsWebPluginViewFactoryPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginViewFactoryPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginViewFactoryPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/WebPluginViewFactoryPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebPluginViewFactory.h>
</del><ins>+#import <WebKitLegacy/WebPluginViewFactory.h>
</ins><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> WebPlugInModeEmbed = 0,
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacPluginsnpapimm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Plugins/npapi.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Plugins/npapi.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Plugins/npapi.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>-#import <WebKit/npapi.h>
</del><ins>+#import <WebKitLegacy/npapi.h>
</ins><span class="cx">
</span><span class="cx"> #import "WebNetscapePluginView.h"
</span><span class="cx"> #import "WebKitLogging.h"
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacStorageWebDatabaseManagerPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> extern NSString *WebDatabaseIdentifierKey;
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><del>-#import <WebKit/WebUIKitSupport.h>
</del><ins>+#import <WebKitLegacy/WebUIKitSupport.h>
</ins><span class="cx">
</span><span class="cx"> // Posted when origins have changed.
</span><span class="cx"> extern CFStringRef WebDatabaseOriginsDidChangeNotification;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><del>-#import <WebKit/DOMPrivate.h>
</del><ins>+#import <WebKitLegacy/DOMPrivate.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -121,8 +121,8 @@
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebScriptObjectPrivate.h>
</span><span class="cx"> #import <WebCore/Widget.h>
</span><del>-#import <WebKit/DOMElement.h>
-#import <WebKit/DOMHTMLFormElement.h>
</del><ins>+#import <WebKitLegacy/DOMElement.h>
+#import <WebKitLegacy/DOMHTMLFormElement.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebCoreSupportWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <CFNetwork/CFHTTPCookiesPriv.h>
</span><span class="cx"> #import <WebCore/WebCoreThread.h>
</span><del>-#import <WebKit/WebFrameLoadDelegate.h>
</del><ins>+#import <WebKitLegacy/WebFrameLoadDelegate.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebCoreSupportWebGeolocationClientmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <WebCore/WAKResponder.h>
</span><del>-#import <WebKit/WebCoreThreadRun.h>
</del><ins>+#import <WebKitLegacy/WebCoreThreadRun.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/ScriptController.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><del>-#import <WebKit/DOMExtensions.h>
</del><ins>+#import <WebKitLegacy/DOMExtensions.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/text/Base64.h>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebCoreSupportWebJavaScriptTextInputPanelm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx">
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><del>-#import <WebKit/WebNSControlExtras.h>
-#import <WebKit/WebNSWindowExtras.h>
</del><ins>+#import <WebKitLegacy/WebNSControlExtras.h>
+#import <WebKitLegacy/WebNSWindowExtras.h>
</ins><span class="cx">
</span><span class="cx"> @implementation WebJavaScriptTextInputPanel
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebCoreSupportWebKeyGeneratormm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <WebKit/WebKeyGenerator.h>
</del><ins>+#import <WebKitLegacy/WebKeyGenerator.h>
</ins><span class="cx">
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebInspectorWebInspectorPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> // This header contains the WebInspector SPI.
</span><span class="cx">
</span><del>-#import <WebKit/WebInspector.h>
</del><ins>+#import <WebKitLegacy/WebInspector.h>
</ins><span class="cx">
</span><span class="cx"> @class WebInspectorFrontend;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebInspectorWebNodeHighlighth"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebNodeHighlight.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebNodeHighlight.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebNodeHighlight.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <QuartzCore/CATiledLayer.h>
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebNodeHighlightView;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebInspectorWebNodeHighlightViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebNodeHighlightView.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebNodeHighlightView.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebInspector/WebNodeHighlightView.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import <QuartzCore/CAShapeLayer.h>
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebNodeHighlight;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebKitLegacyMigrateHeadersFromWebKitLegacymakefromrev168047trunkSourceWebKitmacWebKitLegacyMigrateHeadersFromWebKitLegacymake"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make (from rev 168047, trunk/Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make) (0 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make (rev 0)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -0,0 +1,289 @@
</span><ins>+# Copyright (C) 2006, 2007, 2008, 2014 Apple Inc. All rights reserved.
+# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of Apple Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Migration of WebKit Legacy headers to WebKit.
+
+ifeq ($(PLATFORM_NAME), macosx)
+
+PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
+PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
+
+WEBKIT_PUBLIC_HEADERS = \
+ CarbonUtils.h \
+ DOM.h \
+ DOMAbstractView.h \
+ DOMAttr.h \
+ DOMBlob.h \
+ DOMCDATASection.h \
+ DOMCSS.h \
+ DOMCSSCharsetRule.h \
+ DOMCSSFontFaceRule.h \
+ DOMCSSImportRule.h \
+ DOMCSSMediaRule.h \
+ DOMCSSPageRule.h \
+ DOMCSSPrimitiveValue.h \
+ DOMCSSRule.h \
+ DOMCSSRuleList.h \
+ DOMCSSStyleDeclaration.h \
+ DOMCSSStyleRule.h \
+ DOMCSSStyleSheet.h \
+ DOMCSSUnknownRule.h \
+ DOMCSSValue.h \
+ DOMCSSValueList.h \
+ DOMCharacterData.h \
+ DOMComment.h \
+ DOMCore.h \
+ DOMCounter.h \
+ DOMDocument.h \
+ DOMDocumentFragment.h \
+ DOMDocumentType.h \
+ DOMElement.h \
+ DOMEntity.h \
+ DOMEntityReference.h \
+ DOMEvent.h \
+ DOMEventException.h \
+ DOMEventListener.h \
+ DOMEventTarget.h \
+ DOMEvents.h \
+ DOMException.h \
+ DOMExtensions.h \
+ DOMFile.h \
+ DOMFileList.h \
+ DOMHTML.h \
+ DOMHTMLAnchorElement.h \
+ DOMHTMLAppletElement.h \
+ DOMHTMLAreaElement.h \
+ DOMHTMLBRElement.h \
+ DOMHTMLBaseElement.h \
+ DOMHTMLBaseFontElement.h \
+ DOMHTMLBodyElement.h \
+ DOMHTMLButtonElement.h \
+ DOMHTMLCollection.h \
+ DOMHTMLDListElement.h \
+ DOMHTMLDirectoryElement.h \
+ DOMHTMLDivElement.h \
+ DOMHTMLDocument.h \
+ DOMHTMLElement.h \
+ DOMHTMLEmbedElement.h \
+ DOMHTMLFieldSetElement.h \
+ DOMHTMLFontElement.h \
+ DOMHTMLFormElement.h \
+ DOMHTMLFrameElement.h \
+ DOMHTMLFrameSetElement.h \
+ DOMHTMLHRElement.h \
+ DOMHTMLHeadElement.h \
+ DOMHTMLHeadingElement.h \
+ DOMHTMLHtmlElement.h \
+ DOMHTMLIFrameElement.h \
+ DOMHTMLImageElement.h \
+ DOMHTMLInputElement.h \
+ DOMHTMLLIElement.h \
+ DOMHTMLLabelElement.h \
+ DOMHTMLLegendElement.h \
+ DOMHTMLLinkElement.h \
+ DOMHTMLMapElement.h \
+ DOMHTMLMarqueeElement.h \
+ DOMHTMLMenuElement.h \
+ DOMHTMLMetaElement.h \
+ DOMHTMLModElement.h \
+ DOMHTMLOListElement.h \
+ DOMHTMLObjectElement.h \
+ DOMHTMLOptGroupElement.h \
+ DOMHTMLOptionElement.h \
+ DOMHTMLOptionsCollection.h \
+ DOMHTMLParagraphElement.h \
+ DOMHTMLParamElement.h \
+ DOMHTMLPreElement.h \
+ DOMHTMLQuoteElement.h \
+ DOMHTMLScriptElement.h \
+ DOMHTMLSelectElement.h \
+ DOMHTMLStyleElement.h \
+ DOMHTMLTableCaptionElement.h \
+ DOMHTMLTableCellElement.h \
+ DOMHTMLTableColElement.h \
+ DOMHTMLTableElement.h \
+ DOMHTMLTableRowElement.h \
+ DOMHTMLTableSectionElement.h \
+ DOMHTMLTextAreaElement.h \
+ DOMHTMLTitleElement.h \
+ DOMHTMLUListElement.h \
+ DOMImplementation.h \
+ DOMKeyboardEvent.h \
+ DOMMediaList.h \
+ DOMMouseEvent.h \
+ DOMMutationEvent.h \
+ DOMNamedNodeMap.h \
+ DOMNode.h \
+ DOMNodeFilter.h \
+ DOMNodeIterator.h \
+ DOMNodeList.h \
+ DOMNotation.h \
+ DOMObject.h \
+ DOMOverflowEvent.h \
+ DOMProcessingInstruction.h \
+ DOMProgressEvent.h \
+ DOMRGBColor.h \
+ DOMRange.h \
+ DOMRangeException.h \
+ DOMRanges.h \
+ DOMRect.h \
+ DOMStyleSheet.h \
+ DOMStyleSheetList.h \
+ DOMStylesheets.h \
+ DOMText.h \
+ DOMTraversal.h \
+ DOMTreeWalker.h \
+ DOMUIEvent.h \
+ DOMViews.h \
+ DOMWheelEvent.h \
+ DOMXPath.h \
+ DOMXPathException.h \
+ DOMXPathExpression.h \
+ DOMXPathNSResolver.h \
+ DOMXPathResult.h \
+ HIWebView.h \
+ WebArchive.h \
+ WebBackForwardList.h \
+ WebDOMOperations.h \
+ WebDataSource.h \
+ WebDocument.h \
+ WebDownload.h \
+ WebEditingDelegate.h \
+ WebFrame.h \
+ WebFrameLoadDelegate.h \
+ WebFrameView.h \
+ WebHistory.h \
+ WebHistoryItem.h \
+ WebKitAvailability.h \
+ WebKitErrors.h \
+ WebPlugin.h \
+ WebPluginContainer.h \
+ WebPluginViewFactory.h \
+ WebPolicyDelegate.h \
+ WebPreferences.h \
+ WebResource.h \
+ WebResourceLoadDelegate.h \
+ WebScriptObject.h \
+ WebUIDelegate.h \
+ WebView.h \
+ npapi.h \
+ npfunctions.h \
+ npruntime.h \
+ nptypes.h \
+#
+
+WEBKIT_LEGACY_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT_PUBLIC_HEADERS), $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/*))) WebKitLegacy.h)
+
+WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(WEBKIT_PUBLIC_HEADERS) WebKit.h, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/*))))
+
+WEBKIT_LEGACY_HEADER_REPLACE_RULES = -e s/\<WebKitLegacy/\<WebKit/
+WEBKIT_LEGACY_HEADER_MIGRATE_CMD = sed $(WEBKIT_LEGACY_HEADER_REPLACE_RULES) $< > $@
+
+PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*TBD" "$<"; then line=$$(awk "/AVAILABLE.*TBD/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi
+
+$(PUBLIC_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+ $(PUBLIC_HEADER_CHECK_CMD)
+ $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+$(PRIVATE_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+# Migration of WebKit2 headers to WebKit
+
+WEBKIT2_HEADERS = \
+ WKBackForwardList.h \
+ WKBackForwardListItem.h \
+ WKBackForwardListPrivate.h \
+ WKFoundation.h \
+ WKFrameInfo.h \
+ WKHistoryDelegatePrivate.h \
+ WKNavigation.h \
+ WKNavigationAction.h \
+ WKNavigationDelegate.h \
+ WKNavigationDelegatePrivate.h \
+ WKNavigationResponse.h \
+ WKPreferences.h \
+ WKProcessPool.h \
+ WKProcessPoolPrivate.h \
+ WKScriptMessage.h \
+ WKScriptMessageHandler.h \
+ WKScriptMessagePrivate.h \
+ WKUIDelegate.h \
+ WKUIDelegatePrivate.h \
+ WKUserContentController.h \
+ WKUserContentControllerPrivate.h \
+ WKWebView.h \
+ WKWebViewConfiguration.h \
+ WKWebViewConfigurationPrivate.h \
+ WKWebViewPrivate.h \
+ _WKActivatedElementInfo.h \
+ _WKDownload.h \
+ _WKDownloadDelegate.h \
+ _WKElementAction.h \
+ _WKFormDelegate.h \
+ _WKFormInputSession.h \
+ _WKProcessPoolConfiguration.h \
+ _WKScriptWorld.h \
+ _WKThumbnailView.h \
+ _WKVisitedLinkProvider.h \
+#
+
+WEBKIT2_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/*))))
+WEBKIT2_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/*))))
+
+WEBKIT2_HEADER_REPLACE_RULES = -e s/\<WebKit2/\<WebKit/ -e /$\#.*\<WebKit\\/WK.*Ref\\.h\>/d
+WEBKIT2_HEADER_MIGRATE_CMD = sed $(WEBKIT2_HEADER_REPLACE_RULES) $< > $@
+
+$(PUBLIC_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/% MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT2_HEADER_MIGRATE_CMD)
+
+$(PRIVATE_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT2_HEADER_MIGRATE_CMD)
+
+all : $(WEBKIT_LEGACY_PUBLIC_HEADERS) $(WEBKIT_LEGACY_PRIVATE_HEADERS) $(WEBKIT2_PUBLIC_HEADERS) $(WEBKIT2_PRIVATE_HEADERS)
+
+$(PUBLIC_HEADERS_DIR)/WebKitLegacy.h : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/WebKit.h MigrateHeadersFromWebKitLegacy.make
+ $(PUBLIC_HEADER_CHECK_CMD)
+ $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+else
+
+PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
+
+WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out WebKit.h, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/*))))
+
+all : $(WEBKIT_LEGACY_PRIVATE_HEADERS) $(PRIVATE_HEADERS_DIR)/WebKitLegacy.h
+
+WEBKIT_HEADER_MIGRATE_CMD = echo "\#import <WebKitLegacy/"`basename $<`">" > $@
+
+$(PRIVATE_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT_HEADER_MIGRATE_CMD)
+
+$(PRIVATE_HEADERS_DIR)/WebKitLegacy.h : $(BUILT_PRODUCTS_DIR)/WebKitLegacy.framework/PrivateHeaders/WebKit.h MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT_HEADER_MIGRATE_CMD)
+
+endif
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebKitLegacyMigrateHeadersToLegacymake"></a>
<div class="delfile"><h4>Deleted: tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/MigrateHeadersToLegacy.make (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/MigrateHeadersToLegacy.make 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/MigrateHeadersToLegacy.make 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-# Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
-# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
-PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
-
-# Migration of WebKit headers to WebKit Legacy
-
-WEBKIT_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/*)))
-WEBKIT_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/*)))
-
-all : $(WEBKIT_PUBLIC_HEADERS) $(WEBKIT_PRIVATE_HEADERS)
-
-WEBKIT_HEADER_MIGRATE_CMD = echo "\#import <WebKit/"`basename $<`">" > $@
-
-$(PUBLIC_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/% MigrateHeadersToLegacy.make
- $(WEBKIT_HEADER_MIGRATE_CMD)
-
-$(PRIVATE_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/% MigrateHeadersToLegacy.make
- $(WEBKIT_HEADER_MIGRATE_CMD)
</del></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebKitLegacyWebKithfromrev168047trunkSourceWebKitmacWebKitLegacyWebKith"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKit.h (from rev 168047, trunk/Source/WebKit/mac/WebKitLegacy/WebKit.h) (0 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKit.h (rev 0)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKit.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// FIXME: Remove this __has_include check once the WebKit framework lives in the right place.
+#if defined(__has_include) && __has_include(<WebKit/WKWebView.h>)
+#import <WebKit/WKBackForwardList.h>
+#import <WebKit/WKBackForwardListItem.h>
+#import <WebKit/WKFoundation.h>
+#import <WebKit/WKFrameInfo.h>
+#import <WebKit/WKNavigation.h>
+#import <WebKit/WKNavigationAction.h>
+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKNavigationResponse.h>
+#import <WebKit/WKPreferences.h>
+#import <WebKit/WKProcessPool.h>
+#import <WebKit/WKScriptMessage.h>
+#import <WebKit/WKScriptMessageHandler.h>
+#import <WebKit/WKUIDelegate.h>
+#import <WebKit/WKUserContentController.h>
+#import <WebKit/WKWebView.h>
+#import <WebKit/WKWebViewConfiguration.h>
+#endif
+
+#if defined(__has_include) && __has_include(<WebKit/WebKitLegacy.h>)
+#import <WebKit/WebKitLegacy.h>
+#endif
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebKitLegacyWebKitmfromrev168047trunkSourceWebKitmacWebKitLegacyWebKitm"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKit.m (from rev 168047, trunk/Source/WebKit/mac/WebKitLegacy/WebKit.m) (0 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKit.m (rev 0)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKit.m 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// FIXME: This is only temporary; WebKit.framework is going to be provided by the WebKit2 project.
+
+// This file is only here so that WebKit.framework has something to link.
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebKitLegacyWebKitLegacycpp"></a>
<div class="delfile"><h4>Deleted: tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKitLegacy.cpp (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKitLegacy.cpp 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKitLegacy.cpp 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// This file is only here so that WebKitLegacy.framework has something to link.
</del></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebKitLegacyWebKitPrivatehfromrev168047trunkSourceWebKitmacWebKitLegacyWebKitPrivateh"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h (from rev 168047, trunk/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h) (0 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h (rev 0)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKBackForwardListPrivate.h>
+#import <WebKit/WKHistoryDelegatePrivate.h>
+#import <WebKit/WKProcessPoolPrivate.h>
+#import <WebKit/WKScriptMessagePrivate.h>
+#import <WebKit/WKUIDelegatePrivate.h>
+#import <WebKit/WKUserContentControllerPrivate.h>
+#import <WebKit/WKWebViewConfigurationPrivate.h>
+#import <WebKit/WKWebViewPrivate.h>
+#import <WebKit/_WKActivatedElementInfo.h>
+#import <WebKit/_WKElementAction.h>
+#import <WebKit/_WKFormDelegate.h>
+#import <WebKit/_WKFormInputSession.h>
+#import <WebKit/_WKProcessPoolConfiguration.h>
+#import <WebKit/_WKScriptWorld.h>
+#import <WebKit/_WKThumbnailView.h>
+#import <WebKit/_WKVisitedLinkProvider.h>
</ins></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebDataSourceh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSource.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSource.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSource.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit/WebDocument.h>
</del><ins>+#import <WebKitLegacy/WebDocument.h>
</ins><span class="cx">
</span><span class="cx"> @class NSMutableURLRequest;
</span><span class="cx"> @class NSURLConnection;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSource.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSource.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSource.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebCoreURLResponse.h>
</span><del>-#import <WebKit/DOMHTML.h>
-#import <WebKit/DOMPrivate.h>
</del><ins>+#import <WebKitLegacy/DOMHTML.h>
+#import <WebKitLegacy/DOMPrivate.h>
</ins><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebDataSourcePrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSourcePrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSourcePrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDataSourcePrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDataSource.h>
</del><ins>+#import <WebKitLegacy/WebDataSource.h>
</ins><span class="cx">
</span><span class="cx"> @protocol WebDataSourcePrivateDelegate
</span><span class="cx"> @required
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebDelegateImplementationCachingh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import <WebKit/WAKAppKitStubs.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebView;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebDocumenth"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocument.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocument.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocument.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class NSError;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebDocumentInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocumentInternal.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocumentInternal.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocumentInternal.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDocumentPrivate.h>
-#import <WebKit/WebHTMLView.h>
-#import <WebKit/WebViewPrivate.h>
</del><ins>+#import <WebKitLegacy/WebDocumentPrivate.h>
+#import <WebKitLegacy/WebHTMLView.h>
+#import <WebKitLegacy/WebViewPrivate.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #if !defined(IBAction)
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebDocumentPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocumentPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocumentPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebDocumentPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDocument.h>
-#import <WebKit/WebHTMLView.h>
</del><ins>+#import <WebKitLegacy/WebDocument.h>
+#import <WebKitLegacy/WebHTMLView.h>
</ins><span class="cx">
</span><span class="cx"> @class DOMDocument;
</span><span class="cx"> @class PDFDocument;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebEditingDelegateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebEditingDelegate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebEditingDelegate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebEditingDelegate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><del>-#import <WebKit/WAKAppKitStubs.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class DOMCSSStyleDeclaration;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebEditingDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebEditingDelegate.h>
</del><ins>+#import <WebKitLegacy/WebEditingDelegate.h>
</ins><span class="cx">
</span><span class="cx"> @class DOMHTMLElement;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebFrameLoadDelegateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><del>-#import <WebKit/WebKitAvailability.h>
</del><ins>+#import <WebKitLegacy/WebKitAvailability.h>
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebFrameLoadDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameLoadDelegatePrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameLoadDelegatePrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameLoadDelegatePrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebFrameLoadDelegate.h>
</del><ins>+#import <WebKitLegacy/WebFrameLoadDelegate.h>
</ins><span class="cx">
</span><span class="cx"> @class WebScriptWorld;
</span><span class="cx"> @class WebSecurityOrigin;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebFramePrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFramePrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFramePrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFramePrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> // This header contains the WebFrame SPI.
</span><span class="cx">
</span><del>-#import <WebKit/WebFrame.h>
</del><ins>+#import <WebKitLegacy/WebFrame.h>
</ins><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #include <CoreText/CoreText.h>
</span><del>-#include <WebKit/WAKAppKitStubs.h>
</del><ins>+#include <WebKitLegacy/WAKAppKitStubs.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class DOMDocumentFragment;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebFrameViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameView.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameView.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameView.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebDataSource;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebFrameViewInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameViewInternal.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameViewInternal.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameViewInternal.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebFrameView.h>
</del><ins>+#import <WebKitLegacy/WebFrameView.h>
</ins><span class="cx">
</span><span class="cx"> @class WebDynamicScrollBarsView;
</span><span class="cx"> @class WebView;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebFrameViewPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameViewPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameViewPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebFrameViewPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebFrameView.h>
</del><ins>+#import <WebKitLegacy/WebFrameView.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebFrameView (WebPrivate)
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebHTMLRepresentationh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentation.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentation.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentation.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-#import <WebKit/WebDocumentPrivate.h>
</del><ins>+#import <WebKitLegacy/WebDocumentPrivate.h>
</ins><span class="cx">
</span><span class="cx"> @class WebHTMLRepresentationPrivate;
</span><span class="cx"> @class NSView;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebHTMLRepresentationmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> #import <WebCore/Range.h>
</span><span class="cx"> #import <WebCore/RenderElement.h>
</span><span class="cx"> #import <WebCore/TextResourceDecoder.h>
</span><del>-#import <WebKit/DOMHTMLInputElement.h>
</del><ins>+#import <WebKitLegacy/DOMHTMLInputElement.h>
</ins><span class="cx"> #import <yarr/RegularExpression.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebHTMLRepresentationPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentationPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentationPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLRepresentationPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebHTMLRepresentation.h>
</del><ins>+#import <WebKitLegacy/WebHTMLRepresentation.h>
</ins><span class="cx">
</span><span class="cx"> @protocol WebPluginManualLoader;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebHTMLViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLView.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLView.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLView.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebDocument.h>
</del><ins>+#import <WebKitLegacy/WebDocument.h>
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebDataSource;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLView.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -116,9 +116,9 @@
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebNSAttributedStringExtras.h>
</span><span class="cx"> #import <WebCore/markup.h>
</span><del>-#import <WebKit/DOM.h>
-#import <WebKit/DOMExtensions.h>
-#import <WebKit/DOMPrivate.h>
</del><ins>+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/DOMPrivate.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <dlfcn.h>
</span><span class="cx"> #import <limits>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebHTMLViewPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebHTMLView.h>
</del><ins>+#import <WebKitLegacy/WebHTMLView.h>
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #if !defined(ENABLE_NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebPDFViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPDFView.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPDFView.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPDFView.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <WebKit/WebDocumentInternal.h>
</del><ins>+#import <WebKitLegacy/WebDocumentInternal.h>
</ins><span class="cx">
</span><span class="cx"> @class PDFDocument;
</span><span class="cx"> @class PDFView;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebPolicyDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPolicyDelegatePrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPolicyDelegatePrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPolicyDelegatePrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebPolicyDelegate.h>
</del><ins>+#import <WebKitLegacy/WebPolicyDelegate.h>
</ins><span class="cx">
</span><span class="cx"> @class WebHistoryItem;
</span><span class="cx"> @class WebPolicyDecisionListenerPrivate;
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebPreferences.h>
</del><ins>+#import <WebKitLegacy/WebPreferences.h>
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <Quartz/Quartz.h>
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebResourcePrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebResourcePrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebResourcePrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebResourcePrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebResource.h>
</del><ins>+#import <WebKitLegacy/WebResource.h>
</ins><span class="cx">
</span><span class="cx"> @interface WebResource (WebResourcePrivate)
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebUIDelegateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebUIDelegate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebUIDelegate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebUIDelegate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -28,13 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <Foundation/NSURLRequest.h>
</span><del>-#import <WebKit/WebKitAvailability.h>
</del><ins>+#import <WebKitLegacy/WebKitAvailability.h>
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebAllowDenyPolicyListener.h>
-#import <WebKit/WebUIDelegate.h>
</del><ins>+#import <WebKitLegacy/WebAllowDenyPolicyListener.h>
+#import <WebKitLegacy/WebUIDelegate.h>
</ins><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_DASHBOARD_SUPPORT)
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebViewh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebView.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebView.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebView.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><del>-#import <WebKit/WAKAppKitStubs.h>
-#import <WebKit/WAKView.h>
</del><ins>+#import <WebKitLegacy/WAKAppKitStubs.h>
+#import <WebKitLegacy/WAKView.h>
</ins><span class="cx"> #if !defined(IBAction)
</span><span class="cx"> #define IBAction void
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebView.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebView.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebView.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -175,9 +175,9 @@
</span><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebCoreView.h>
</span><span class="cx"> #import <WebCore/Widget.h>
</span><del>-#import <WebKit/DOM.h>
-#import <WebKit/DOMExtensions.h>
-#import <WebKit/DOMPrivate.h>
</del><ins>+#import <WebKitLegacy/DOM.h>
+#import <WebKitLegacy/DOMExtensions.h>
+#import <WebKitLegacy/DOMPrivate.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <bindings/ScriptValue.h>
</span><span class="cx"> #import <mach-o/dyld.h>
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><del>-#import <WebKit/WebDashboardRegion.h>
</del><ins>+#import <WebKitLegacy/WebDashboardRegion.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE) && PLATFORM(IOS)
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebViewPrivate.h (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit/WebView.h>
-#import <WebKit/WebFramePrivate.h>
</del><ins>+#import <WebKitLegacy/WebView.h>
+#import <WebKitLegacy/WebFramePrivate.h>
</ins><span class="cx"> #import <JavaScriptCore/JSBase.h>
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span></span></pre></div>
<a id="tagsSafari538331SourceWebKitmacmigrateheaderssh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Source/WebKit/mac/migrate-headers.sh (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Source/WebKit/mac/migrate-headers.sh 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Source/WebKit/mac/migrate-headers.sh 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> mkdir -p "${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}"
</span><span class="cx"> mkdir -p "${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}"
</span><del>-mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit"
</del><ins>+mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy"
</ins><span class="cx">
</span><span class="cx"> # If we didn't build WebCore, use the production copy of the headers
</span><span class="cx"> if [ ! -d "${WEBCORE_PRIVATE_HEADERS_DIR}" ]; then
</span></span></pre></div>
<a id="tagsSafari538331ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Tools/ChangeLog (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Tools/ChangeLog 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Tools/ChangeLog 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-05-02 Babak Shafiei <bshafiei@apple.com>
+
+ Re-merge r168047
+
</ins><span class="cx"> 2014-05-01 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r168047
</span></span></pre></div>
<a id="tagsSafari538331ToolsScriptscheckforwebkitframeworkincludeconsistency"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Tools/Scripts/check-for-webkit-framework-include-consistency (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Tools/Scripts/check-for-webkit-framework-include-consistency 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Tools/Scripts/check-for-webkit-framework-include-consistency 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> # iOS we want to keep the WAK headers private, even if a public header includes them,
</span><span class="cx"> # so we are going to not show warnings for WAK headers.
</span><del>- return if framework == "WebKit" and included_header_name =~ /^WAK/
</del><ins>+ return if (framework == "WebKit" or framework == "WebKitLegacy") and included_header_name =~ /^WAK/
</ins><span class="cx">
</span><span class="cx"> header_type = $HEADER_NAMES_TO_TYPE[included_header_name]
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331ToolsTestWebKitAPITestsWebKit2CocoaDownloadmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -31,12 +31,12 @@
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx"> #import "Test.h"
</span><span class="cx"> #import <WebCore/FileSystem.h>
</span><del>-#import <WebKit2/_WKDownload.h>
-#import <WebKit2/_WKDownloadDelegate.h>
-#import <WebKit2/WKNavigationDelegatePrivate.h>
-#import <WebKit2/WKProcessPoolPrivate.h>
-#import <WebKit2/WKWebView.h>
-#import <WebKit2/WKWebViewConfiguration.h>
</del><ins>+#import <WebKit/_WKDownload.h>
+#import <WebKit/_WKDownloadDelegate.h>
+#import <WebKit/WKNavigationDelegatePrivate.h>
+#import <WebKit/WKProcessPoolPrivate.h>
+#import <WebKit/WKWebView.h>
+#import <WebKit/WKWebViewConfiguration.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari538331ToolsTestWebKitAPITestsWebKit2CocoaNavigationmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.33.1/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm (168157 => 168158)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.33.1/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2014-05-02 06:23:31 UTC (rev 168157)
+++ tags/Safari-538.33.1/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2014-05-02 07:24:28 UTC (rev 168158)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#import <WebKit2/WKNavigation.h>
-#import <WebKit2/WKNavigationDelegate.h>
-#import <WebKit2/WKWebView.h>
</del><ins>+#import <WebKit/WKNavigation.h>
+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKWebView.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx"> #import "Test.h"
</span></span></pre>
</div>
</div>
</body>
</html>