<!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>[168730] branches/safari-538.34-branch</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/168730">168730</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-13 14:04:14 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168541">r168541</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53834branchChangeLog">branches/safari-538.34-branch/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceMakefile">branches/safari-538.34-branch/Source/Makefile</a></li>
<li><a href="#branchessafari53834branchSourceWebKitChangeLog">branches/safari-538.34-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceWebKitWebKitxcodeprojprojectpbxproj">branches/safari-538.34-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2ChangeLog">branches/safari-538.34-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2ConfigurationsBaseLegacyProcessxcconfig">branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2ConfigurationsBaseTargetxcconfig">branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseTarget.xcconfig</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2ConfigurationsBaseXPCServicexcconfig">branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseXPCService.xcconfig</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2ConfigurationsWebKit2xcconfig">branches/safari-538.34-branch/Source/WebKit2/Configurations/WebKit2.xcconfig</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoOSXplist">branches/safari-538.34-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2PluginProcessEntryPointmacXPCServicePluginService3264Infoplist">branches/safari-538.34-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoaWKBrowsingContextHandleh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKBrowsingContextHandle.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoaWKRenderingProgressEventsh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoa_WKFrameHandleh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoa_WKNSFileManagerExtrash">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKNSFileManagerExtras.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoa_WKRemoteObjectInterfaceh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoa_WKRemoteObjectRegistryh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKArrayh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKArray.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKBaseh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKCertificateInfoh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKCertificateInfo.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKConnectionRefh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKConnectionRef.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKContextMenuItemh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKContextMenuItem.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKDatah">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKData.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKDictionaryh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKDictionary.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKErrorh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKError.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKEventh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKEvent.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKGeometryh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKGeometry.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKImageh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKImage.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKMutableArrayh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKMutableArray.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKMutableDictionaryh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKMutableDictionary.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKNumberh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKNumber.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKPluginInformationh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKPluginInformation.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKRenderLayerh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKRenderLayer.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKRenderObjecth">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKRenderObject.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKSecurityOriginh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKSerializedScriptValueh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSerializedScriptValue.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKSerializedScriptValuePrivateh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKStringh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKString.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKStringPrivateh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKStringPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKTypeh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKType.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKURLh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURL.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKURLRequesth">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURLRequest.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKURLResponseh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURLResponse.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcWKUserContentURLPatternh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIccfWKErrorCFh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKErrorCF.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIccfWKStringCFh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKStringCF.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIccfWKURLCFh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKURLCF.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIccgWKImageCGh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcmacWKCertificateInfoMach">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcmacWKObjCTypeWrapperRefh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcmacWKURLRequestNSh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcmacWKURLResponseNSh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcmacWKWebArchiveh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKWebArchive.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPIcmacWKWebArchiveResourceh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainDevelopmentmm">branches/safari-538.34-branch/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainmm">branches/safari-538.34-branch/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKApplicationCacheManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKAuthenticationChallengeh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKAuthenticationChallenge.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKAuthenticationDecisionListenerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKAuthenticationDecisionListener.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKBackForwardListItemRefh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKBackForwardListItemRef.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKBackForwardListRefh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKContexth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKContextConnectionClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKContextDownloadClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKContextHistoryClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKContextInjectedBundleClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKContextPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKCookieManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKCookieManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKCredentialh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKCredential.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKDatabaseManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKDownloadh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKDownload.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKFormSubmissionListenerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKFrameh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFrame.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKFramePolicyListenerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFramePolicyListener.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKGeolocationManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKGeolocationPermissionRequesth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationPermissionRequest.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKGeolocationPositionh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationPosition.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKHitTestResulth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKHitTestResult.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKIconDatabaseh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKInspectorh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKInspector.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKKeyValueStorageManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKMediaCacheManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKNavigationDataRefh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKNotificationh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotification.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKNotificationManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKNotificationPermissionRequesth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKNotificationProviderh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKOpenPanelParametersh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKOpenPanelResultListenerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOpenPanelResultListener.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKOriginDataManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPageh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPage.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPageContextMenuClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPageFindClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPageFindMatchesClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPageFormClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPageGrouph">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageGroup.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPageLoaderClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPagePolicyClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPagePrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPageUIClienth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPluginSiteDataManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPreferencesRefh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKProtectionSpaceh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKProtectionSpace.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKProtectionSpaceTypesh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKProtectionSpaceTypes.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKResourceCacheManagerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWKSessionRefh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKSessionRef.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICWebKit2_Ch">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WebKit2_C.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICcgWKIconDatabaseCGh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICmacWKContextPrivateMach">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICmacWKInspectorPrivateMach">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICmacWKPagePrivateMach">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBackForwardListh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBackForwardListItemh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBackForwardListPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextGrouph">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextGroupPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroupPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextHistoryDelegateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextHistoryDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextLoadDelegateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextLoadDelegatePrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextPolicyDelegateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKConnectionh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKFrameInfoh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKHistoryDelegatePrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationActionh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationActionPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationDatah">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationDelegateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationDelegatePrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationResponseh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKPreferencesh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKProcessGrouph">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKProcessGroupPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroupPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKProcessPoolh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKScriptMessageh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKScriptMessageHandlerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKScriptMessagePrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKTypeRefWrapperh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKTypeRefWrapper.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKUIDelegateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKUserContentControllerh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKUserContentControllerPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKViewh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKView.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKViewPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWebViewh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWindowFeaturesh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWindowFeatures.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoaWebKit2h">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WebKit2.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKActivatedElementInfoh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKDownloadh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKDownloadDelegateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKElementActionh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKErrorRecoveryAttemptingh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKFindDelegateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFindDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKFormDelegateh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKFormInputSessionh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKScriptWorldh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKThumbnailViewh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKVisitedLinkProviderh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessAPIcppWKRetainPtrh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessCocoaWKReloadFrameErrorRecoveryAttempterh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessCocoaWKWebViewContentProviderh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessCocoaWKWebViewContentProviderRegistryh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProviderRegistry.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">branches/safari-538.34-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">branches/safari-538.34-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessiosWKActionSheetAssistanth">branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessiosWKGeolocationProviderIOSh">branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessiosWKGeolocationProviderIOSmm">branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2UIProcessmacWebContextMacmm">branches/safari-538.34-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebKit2xcodeprojprojectpbxproj">branches/safari-538.34-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSXplist">branches/safari-538.34-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessBundleParametersh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFormDelegatePrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFrameh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInHitTestResulth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInLoadDelegateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInNodeHandleh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGrouph">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInScriptWorldh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleBackForwardListh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleBackForwardListItemh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleDOMWindowExtensionh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFrameh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFramePrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResulth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInitializeh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNavigationActionh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNodeHandleh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNodeHandlePrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageBannerh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageContextMenuClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageDiagnosticLoggingClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageEditorClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageFormClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageFullScreenClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageGrouph">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageLoaderClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlayh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePolicyClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageResourceLoadClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageUIClienth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleRangeHandleh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleRangeHandlePrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleScriptWorldh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMach">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMDocumenth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMDocument.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMElementh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMElement.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMNodeh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMNodePrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMRangeh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMRangePrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMTexth">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMTextIteratorh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerPrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInPrivateh">branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInPrivate.h</a></li>
<li><a href="#branchessafari53834branchToolsChangeLog">branches/safari-538.34-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari53834branchToolsScriptscheckforinappropriatefilesinframework">branches/safari-538.34-branch/Tools/Scripts/check-for-inappropriate-files-in-framework</a></li>
<li><a href="#branchessafari53834branchToolsScriptscheckforwebkitframeworkincludeconsistency">branches/safari-538.34-branch/Tools/Scripts/check-for-webkit-framework-include-consistency</a></li>
<li><a href="#branchessafari53834branchWebKitxcworkspacexcshareddataxcschemesAllSourcetargetWebProcessxcscheme">branches/safari-538.34-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme</a></li>
<li><a href="#branchessafari53834branchWebKitxcworkspacexcshareddataxcschemesAllSourcexcscheme">branches/safari-538.34-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53834branchSourceWebKit2ConfigurationsWebKitxcconfig">branches/safari-538.34-branch/Source/WebKit2/Configurations/WebKit.xcconfig</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoaWebKith">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKit.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoaWebKitm">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKit.m</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2SharedAPICocoaWebKitPrivateh">branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2macInfoWebKit2plist">branches/safari-538.34-branch/Source/WebKit2/mac/Info-WebKit2.plist</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2macMigrateHeadersFromWebKitLegacymake">branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2macMigrateHeadersToWebKit2make">branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersToWebKit2.make</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2macWKPreferencesh">branches/safari-538.34-branch/Source/WebKit2/mac/WKPreferences.h</a></li>
<li><a href="#branchessafari53834branchSourceWebKit2macWebKit2m">branches/safari-538.34-branch/Source/WebKit2/mac/WebKit2.m</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>branches/safari-538.34-branch/Source/WebKit/mac/WebKitLegacy/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53834branchChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/ChangeLog (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/ChangeLog 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/ChangeLog 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-13 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168541
+
+ 2014-05-09 Anders Carlsson <andersca@apple.com>
+
+ Rename WebKit2.framework to WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132743
+ <rdar://problem/15920046>
+
+ Reviewed by Dan Bernstein.
+
+ * Source/Makefile:
+ Build WebKit.xcodeproj before WebKit2.xcodeproj.
+
+ * WebKit.xcworkspace/xcshareddata/xcschemes/:
+ Ditto.
+
</ins><span class="cx"> 2014-05-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r168304.
</span></span></pre></div>
<a id="branchessafari53834branchSourceMakefile"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/Makefile (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/Makefile 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/Makefile 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit2 WebKit
</del><ins>+MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
</ins><span class="cx">
</span><span class="cx"> ifneq (,$(findstring iphoneos,$(SDKROOT)))
</span><span class="cx"> MODULES = bmalloc WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit/ChangeLog (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit/ChangeLog 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit/ChangeLog 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-13 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168541
+
+ 2014-05-09 Anders Carlsson <andersca@apple.com>
+
+ Rename WebKit2.framework to WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132743
+ <rdar://problem/15920046>
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj:
+ Remove the WebKit framework, it lives inside WebKit2 now.
+
</ins><span class="cx"> 2014-05-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Put the symlink in the right place.
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -33,8 +33,6 @@
</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><del>- 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, ); }; };
</del><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">@@ -62,7 +60,6 @@
</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 /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKit.m */; };
</del><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">@@ -453,16 +450,6 @@
</span><span class="cx"> F834AAD80E64B1C700E2737C /* WebTextIterator.mm in Sources */ = {isa = PBXBuildFile; fileRef = F834AAD60E64B1C700E2737C /* WebTextIterator.mm */; };
</span><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><del>-/* Begin PBXContainerItemProxy section */
- 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 9398100A0824BF01008DF038;
- remoteInfo = WebKit;
- };
-/* End PBXContainerItemProxy section */
-
</del><span class="cx"> /* Begin PBXFileReference section */
</span><span class="cx"> 065AD5A10B0C32C7005A2B1D /* WebContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebContextMenuClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 065AD5A20B0C32C7005A2B1D /* WebContextMenuClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMenuClient.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -478,7 +465,6 @@
</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><del>- 1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MigrateHeadersFromWebKitLegacy.make; sourceTree = "<group>"; };
</del><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">@@ -491,8 +477,6 @@
</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><del>- 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>"; };
</del><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">@@ -517,10 +501,7 @@
</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 /* 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; };
</del><span class="cx"> 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
</span><del>- 1AD7453D18D0D383006F3A1E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</del><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="cx"> 1AEA66D60DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandlerCarbon.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -924,13 +905,6 @@
</span><span class="cx"> /* End PBXFileReference section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFrameworksBuildPhase section */
</span><del>- 1AD7451518D0D26C006F3A1E /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> 939811270824BF01008DF038 /* Frameworks */ = {
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -950,7 +924,6 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> 939811330824BF01008DF038 /* WebKitLegacy.framework */,
</span><del>- 1AD7451918D0D26C006F3A1E /* WebKit.framework */,
</del><span class="cx"> );
</span><span class="cx"> name = Products;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -973,7 +946,6 @@
</span><span class="cx"> F5EBC45202134BB601CA1520 /* Plugins */,
</span><span class="cx"> 511F3FC30CECC7E200852565 /* Storage */,
</span><span class="cx"> F5B36B400281DE87018635CB /* WebCoreSupport */,
</span><del>- 1AD7451118D0D23D006F3A1E /* WebKit Framework */,
</del><span class="cx"> 9C7CABBB0190A37C0ECA16EA /* WebView */,
</span><span class="cx"> 1C68F63F095B5F9C00C2984E /* WebInspector */,
</span><span class="cx"> F7EBEE5903F9DB2203CA0DE6 /* Carbon */,
</span><span class="lines">@@ -1055,19 +1027,6 @@
</span><span class="cx"> name = Events;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 1AD7451118D0D23D006F3A1E /* WebKit Framework */ = {
- isa = PBXGroup;
- children = (
- 1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */,
- 1AD7453D18D0D383006F3A1E /* Info.plist */,
- 1AD7451218D0D24C006F3A1E /* WebKit.m */,
- 1A739034190AE5D4002E3105 /* WebKit.h */,
- 1A739037190AE674002E3105 /* WebKitPrivate.h */,
- );
- name = "WebKit Framework";
- path = mac/WebKitLegacy;
- sourceTree = "<group>";
- };
</del><span class="cx"> 1C68F63F095B5F9C00C2984E /* WebInspector */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -1703,15 +1662,6 @@
</span><span class="cx"> /* End PBXGroup section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXHeadersBuildPhase section */
</span><del>- 1A739035190AE603002E3105 /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */,
- 1A739036190AE622002E3105 /* WebKit.h in Headers */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> 9398100D0824BF01008DF038 /* Headers */ = {
</span><span class="cx"> isa = PBXHeadersBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -1975,30 +1925,6 @@
</span><span class="cx"> /* End PBXHeadersBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXNativeTarget section */
</span><del>- 1AD7451818D0D26C006F3A1E /* WebKit */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */;
- buildPhases = (
- 1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */,
- 1A5B250818D0D90C00913729 /* Migrate Headers */,
- 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */,
- 1A739035190AE603002E3105 /* Headers */,
- 1AD7451418D0D26C006F3A1E /* Sources */,
- 1AD7451518D0D26C006F3A1E /* Frameworks */,
- 1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */,
- 1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */,
- 1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */,
- );
- buildRules = (
- );
- dependencies = (
- 1A5B250A18D0DBD300913729 /* PBXTargetDependency */,
- );
- name = WebKit;
- productName = WebKit;
- productReference = 1AD7451918D0D26C006F3A1E /* WebKit.framework */;
- productType = "com.apple.product-type.framework";
- };
</del><span class="cx"> 9398100A0824BF01008DF038 /* WebKitLegacy */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */;
</span><span class="lines">@@ -2052,7 +1978,6 @@
</span><span class="cx"> projectDirPath = "";
</span><span class="cx"> projectRoot = "";
</span><span class="cx"> targets = (
</span><del>- 1AD7451818D0D26C006F3A1E /* WebKit */,
</del><span class="cx"> 9398100A0824BF01008DF038 /* WebKitLegacy */,
</span><span class="cx"> );
</span><span class="cx"> };
</span><span class="lines">@@ -2074,36 +1999,6 @@
</span><span class="cx"> /* End PBXResourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXShellScriptBuildPhase section */
</span><del>- 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";
- };
</del><span class="cx"> 1A3193D5191856E500E1CF89 /* Symlink WebKitPluginHost */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -2119,66 +2014,6 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n # FIXME: This should be removed once faulty links have been removed on the bots.\n if [[ -L \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" ]]; then\n rm \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n fi\n\n if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n else\n ln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n fi\nfi\n";
</span><span class="cx"> };
</span><del>- 1A5B250818D0D90C00913729 /* Migrate Headers */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Migrate Headers";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n if [[ ${PLATFORM_NAME} == \"macosx\" ]]; then\n mkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n fi\n mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n make -C mac/WebKitLegacy -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
- };
- 1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(PROJECT_DIR)/mac/Configurations/Version.xcconfig",
- );
- name = "Update Info.plist with version information";
- outputPaths = (
- "$(PROJECT_DIR)/mac/WebKitLegacy/Info.plist",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/WebKitLegacy/Info.plist\";\nfi;\n";
- };
- 1AC9317F19130A87006EA8BC /* Add Symlink in /System/Library/PrivateFrameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
- files = (
- );
- inputPaths = (
- );
- name = "Add Symlink in /System/Library/PrivateFrameworks";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n if [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\n fi\n if [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\n echo \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework already exists and is a directory.\"\n exit 1\n fi\n # If the symlink already exists, remove it and create the new one in its place.\n ln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nfi";
- };
- 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
- files = (
- );
- inputPaths = (
- WebKit.xcodeproj,
- );
- name = "Make Frameworks Symbolic Link";
- outputPaths = (
- "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp",
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
- };
</del><span class="cx"> 1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -2292,14 +2127,6 @@
</span><span class="cx"> /* End PBXShellScriptBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXSourcesBuildPhase section */
</span><del>- 1AD7451418D0D26C006F3A1E /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> 939810BB0824BF01008DF038 /* Sources */ = {
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -2487,14 +2314,6 @@
</span><span class="cx"> };
</span><span class="cx"> /* End PBXSourcesBuildPhase section */
</span><span class="cx">
</span><del>-/* Begin PBXTargetDependency section */
- 1A5B250A18D0DBD300913729 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 9398100A0824BF01008DF038 /* WebKitLegacy */;
- targetProxy = 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
</del><span class="cx"> /* Begin PBXVariantGroup section */
</span><span class="cx"> 5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */ = {
</span><span class="cx"> isa = PBXVariantGroup;
</span><span class="lines">@@ -2580,27 +2399,6 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><del>- 1AD7453418D0D26C006F3A1E /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
- buildSettings = {
- };
- name = Debug;
- };
- 1AD7453518D0D26C006F3A1E /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
- buildSettings = {
- };
- name = Release;
- };
- 1AD7453618D0D26C006F3A1E /* Production */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */;
- buildSettings = {
- };
- name = Production;
- };
</del><span class="cx"> /* End XCBuildConfiguration section */
</span><span class="cx">
</span><span class="cx"> /* Begin XCConfigurationList section */
</span><span class="lines">@@ -2624,16 +2422,6 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 1AD7453418D0D26C006F3A1E /* Debug */,
- 1AD7453518D0D26C006F3A1E /* Release */,
- 1AD7453618D0D26C006F3A1E /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
</del><span class="cx"> /* End XCConfigurationList section */
</span><span class="cx"> };
</span><span class="cx"> rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -1,3 +1,103 @@
</span><ins>+2014-05-13 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168541
+
+ 2014-05-09 Anders Carlsson <andersca@apple.com>
+
+ Rename WebKit2.framework to WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132743
+ <rdar://problem/15920046>
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/BaseLegacyProcess.xcconfig:
+ Change INSTALL_PATH to WebKit.framework.
+
+ * Configurations/BaseTarget.xcconfig:
+ Change WEBKIT2_FRAMEWORKS_DIR to WEBKIT_FRAMEWORKS_DIR and add WEBKIT_LEGACY_PRIVATE_HEADERS_DIR.
+
+ * Configurations/BaseXPCService.xcconfig:
+ Change WebKit2.framework to WebKit.framework.
+
+ * Configurations/WebKit.xcconfig: Copied from Source/WebKit2/Configurations/WebKit2.xcconfig.
+ New configuration file for WebKit.framework. Re-export WebKitLegacy.framework.
+
+ * Configurations/WebKit2.xcconfig:
+ New configuration file for the WebKit2 shim framework. Re-export WebKit.framework.
+
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:
+ Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
+ Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+
+ * Shared/API/Cocoa/WKBrowsingContextHandle.h:
+ * Shared/API/Cocoa/WKRenderingProgressEvents.h:
+ Update header imports.
+
+ * Shared/API/Cocoa/WebKit.h: Renamed from Source/WebKit/mac/WebKitLegacy/WebKit.h.
+ New umbrella header. Imports the modern WebKit API as well as the legacy API.
+
+ * Shared/API/Cocoa/WebKit.m: Renamed from Source/WebKit/mac/WebKitLegacy/WebKit.m.
+ Export install name symbols on iOS.
+
+ * Shared/API/Cocoa/WebKitPrivate.h: Renamed from Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h.
+ New umbrella SPI header. Imports the modern WebKit SPI.
+
+ * Many headers:
+ Change WebKit2 includes to WebKit includes.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+ (WebKit::XPCServiceEventHandler):
+ Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
+ (WebKit::XPCServiceEventHandler):
+ Change bundle identifier from com.apple.WebKit2 to com.apple.WebKit.
+
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ Stop including WKPreferencesRef.h, we have a WebKit2 header that handles this workaround for us now.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::addDYLDEnvironmentAdditions):
+ (WebKit::connectToService):
+ (WebKit::createProcess):
+ (WebKit::ProcessLauncher::launchProcess):
+ Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::createPropertyListFile):
+ Change bundle identifiers from com.apple.WebKit2 to com.apple.WebKit.
+
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultDiskCacheDirectory):
+ Change bundle identifier from com.apple.WebKit2 to com.apple.WebKit.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Copy the python message scripts to the WebKit2 framework.
+ Rename WebKit2.framework to WebKit.framework everywhere.
+ Add a new WebKit2 target that builds the shim WebKit2 framework.
+ Move the build script phase that migrates WebKitLegacy headers to WebKit.
+ Add a new build script phase that adds forwarding headers from WebKit2 to WebKit.
+
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
+ Update DYLD_INSERT_LIBRARIES to refer to WebKit.framework.
+
+ * mac/MigrateHeadersFromWebKitLegacy.make: Renamed from Source/WebKit/mac/WebKitLegacy/MigrateHeadersFromWebKitLegacy.make.
+ Move the makefile that migrates WebKitLegacy headers here. On OS X, it copies the header contents and on iOS it creates forarding headers.
+
+ * mac/MigrateHeadersToWebKit2.make:
+ New makefile that creates forwarding headers for the WebKit2 shim framework.
+
+ * mac/WKPreferences.h: Added.
+ Add WebKit2/WKPreferences.h header that imports WebKit2/WKPreferencesref.h.
+
+ * mac/WebKit2.m:
+ Skeleton for the WebKit2 shim framework.
+
+ * mac/Info-WebKit2.plist: Added.
+ New Info.plist file for the WebKit2 shim framework.
+
</ins><span class="cx"> 2014-04-17 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168565
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2ConfigurationsBaseLegacyProcessxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><span class="cx"> GCC_ENABLE_OBJC_GC = NO;
</span><del>-INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
</del><ins>+INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework;
</ins><span class="cx">
</span><span class="cx"> APP_ICON = $(APP_ICON_$(CONFIGURATION));
</span><span class="cx"> APP_ICON_Debug = WebKit.icns;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2ConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseTarget.xcconfig (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseTarget.xcconfig 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseTarget.xcconfig 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,21 +26,21 @@
</span><span class="cx">
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
</span><span class="cx"> GCC_PREFIX_HEADER = WebKit2Prefix.h;
</span><del>-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit2
</del><ins>+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit
</ins><span class="cx"> HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
</span><span class="cx">
</span><span class="cx"> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="cx">
</span><del>-NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+NORMAL_WEBKIT_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
</ins><span class="cx">
</span><del>-WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
</del><ins>+WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+WEBKIT_FRAMEWORKS_DIR_macosx = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+WEBKIT_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(PLATFORM_NAME));
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR_iphoneos = $(UMBRELLA_FRAMEWORKS_DIR_iphoneos_$(CONFIGURATION));
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
</span><span class="cx">
</span><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
</span><ins>+WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.framework/PrivateHeaders;
</ins><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH));
</span><span class="cx"> OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2ConfigurationsBaseXPCServicexcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseXPCService.xcconfig (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(WK_XPC_SERVICE_VARIANT));
</span><span class="cx">
</span><span class="cx"> INSTALL_PATH_ACTUAL_Normal = $(INSTALL_PATH_ACTUAL_Normal_$(PLATFORM_NAME));
</span><del>-INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
-INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/XPCServices;
</del><ins>+INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
+INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
</ins><span class="cx"> INSTALL_PATH_ACTUAL_Normal_iphonesimulator = $(INSTALL_PATH_ACTUAL_Normal_iphoneos);
</span><span class="cx">
</span><span class="cx"> INSTALL_PATH_ACTUAL_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2ConfigurationsWebKitxcconfigfromrev168541trunkSourceWebKit2ConfigurationsWebKitxcconfig"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/Configurations/WebKit.xcconfig (from rev 168541, trunk/Source/WebKit2/Configurations/WebKit.xcconfig) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Configurations/WebKit.xcconfig (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/Configurations/WebKit.xcconfig 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+// Copyright (C) 2010, 2013, 2014 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "BaseTarget.xcconfig"
+
+PRODUCT_NAME = WebKit;
+INFOPLIST_FILE = Info.plist;
+
+INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+
+FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
+FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileAsset -framework MobileCoreServices -lMobileGestalt -lassertion_extension;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
+
+// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
+UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
+
+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
+OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.DatabaseProcess.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+
+INSTALLHDRS_SCRIPT_PHASE = YES;
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2ConfigurationsWebKit2xcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Configurations/WebKit2.xcconfig (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -21,29 +21,39 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#include "BaseTarget.xcconfig"
</del><ins>+#include "Version.xcconfig"
</ins><span class="cx">
</span><span class="cx"> PRODUCT_NAME = WebKit2;
</span><del>-INFOPLIST_FILE = Info.plist;
</del><ins>+INFOPLIST_FILE = mac/Info-WebKit2.plist;
</ins><span class="cx">
</span><del>-INSTALL_PATH_ACTUAL = $(WEBKIT2_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
</del><ins>+OTHER_LDFLAGS = $(inherited) -framework WebKit -sub_umbrella WebKit;
</ins><span class="cx">
</span><del>-FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileAsset -framework MobileCoreServices -framework WebKit -lMobileGestalt -lassertion_extension;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
</del><ins>+INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
+INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
+INSTALL_PATH_macosx = $(WEBKIT2_FRAMEWORKS_DIR);
+INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
+INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
</ins><span class="cx">
</span><del>-// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
-UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
</del><ins>+DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
+DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
</ins><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
</del><ins>+NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT2_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.DatabaseProcess.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</del><ins>+WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos);
+WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT2_FRAMEWORKS_DIR_iphoneos);
+WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</ins><span class="cx">
</span><del>-INSTALLHDRS_SCRIPT_PHASE = YES;
</del><ins>+NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceInfoOSXplist"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> <key>EnvironmentVariables</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>DYLD_INSERT_LIBRARIES</key>
</span><del>- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
</del><ins>+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2PluginProcessEntryPointmacXPCServicePluginService3264Infoplist"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> <key>EnvironmentVariables</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>DYLD_INSERT_LIBRARIES</key>
</span><del>- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
</del><ins>+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPICocoaWKBrowsingContextHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKBrowsingContextHandle.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKBrowsingContextHandle.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKBrowsingContextHandle.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPICocoaWKRenderingProgressEventsh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPICocoaWebKithfromrev168541trunkSourceWebKit2SharedAPICocoaWebKith"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKit.h (from rev 168541, trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.h) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKit.h (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKit.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -0,0 +1,42 @@
</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/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>
+#import <WebKit/WebKitLegacy.h>
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPICocoaWebKitmfromrev168541trunkSourceWebKit2SharedAPICocoaWebKitm"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKit.m (from rev 168541, trunk/Source/WebKit2/Shared/API/Cocoa/WebKit.m) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKit.m (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKit.m 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -0,0 +1,42 @@
</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 "config.h"
+
+#if PLATFORM(IOS)
+
+#define DEFINE_INSTALL_NAME(major, minor) \
+ extern __attribute__((visibility ("default"))) const char install_name_ ##major## _ ##minor __asm("$ld$install_name$os" #major "." #minor "$/System/Library/PrivateFrameworks/WebKit.framework/WebKit"); \
+ const char install_name_ ##major## _ ##minor = 0;
+
+DEFINE_INSTALL_NAME(4, 3);
+DEFINE_INSTALL_NAME(5, 0);
+DEFINE_INSTALL_NAME(5, 1);
+DEFINE_INSTALL_NAME(6, 0);
+DEFINE_INSTALL_NAME(6, 1);
+DEFINE_INSTALL_NAME(7, 0);
+DEFINE_INSTALL_NAME(7, 1);
+
+#endif
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPICocoaWebKitPrivatehfromrev168541trunkSourceWebKit2SharedAPICocoaWebKitPrivateh"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h (from rev 168541, trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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="branchessafari53834branchSourceWebKit2SharedAPICocoa_WKFrameHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKFrameHandle.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPICocoa_WKNSFileManagerExtrash"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKNSFileManagerExtras.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKNSFileManagerExtras.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKNSFileManagerExtras.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPICocoa_WKRemoteObjectInterfaceh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectInterface.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPICocoa_WKRemoteObjectRegistryh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKArrayh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKArray.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKArray.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKArray.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKArray_h
</span><span class="cx"> #define WKArray_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #include <stddef.h>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKBase.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKBase.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKBase.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,23 +27,23 @@
</span><span class="cx"> #ifndef WKBase_h
</span><span class="cx"> #define WKBase_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKDeclarationSpecifiers.h>
</del><ins>+#include <WebKit/WKDeclarationSpecifiers.h>
</ins><span class="cx"> #include <stdint.h>
</span><span class="cx">
</span><span class="cx"> #if defined(BUILDING_GTK__)
</span><del>-#include <WebKit2/WKBaseGtk.h>
</del><ins>+#include <WebKit/WKBaseGtk.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if defined(WTF_USE_SOUP)
</span><del>-#include <WebKit2/WKBaseSoup.h>
</del><ins>+#include <WebKit/WKBaseSoup.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if defined(BUILDING_EFL__)
</span><del>-#include <WebKit2/WKBaseEfl.h>
</del><ins>+#include <WebKit/WKBaseEfl.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if defined(__APPLE__)
</span><del>-#include <WebKit2/WKBaseMac.h>
</del><ins>+#include <WebKit/WKBaseMac.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* WebKit2 shared types */
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKCertificateInfoh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKCertificateInfo.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKCertificateInfo.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKCertificateInfo.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKCertificateInfo_h
</span><span class="cx"> #define WKCertificateInfo_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKConnectionRefh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKConnectionRef.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKConnectionRef.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKConnectionRef.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKConnectionRef_h
</span><span class="cx"> #define WKConnectionRef_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKContextMenuItemh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKContextMenuItem.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKContextMenuItem.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKContextMenuItem.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKContextMenuItem_h
</span><span class="cx"> #define WKContextMenuItem_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContextMenuItemTypes.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKContextMenuItemTypes.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKData.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKData.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKData.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKData_h
</span><span class="cx"> #define WKData_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #include <stddef.h>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKDictionaryh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKDictionary.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKDictionary.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKDictionary.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKDictionary_h
</span><span class="cx"> #define WKDictionary_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #include <stddef.h>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKErrorh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKError.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKError.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKError.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKError_h
</span><span class="cx"> #define WKError_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKEventh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKEvent.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKEvent.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKEvent.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKEvent_h
</span><span class="cx"> #define WKEvent_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKGeometryh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKGeometry.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKGeometry.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKGeometry.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKGeometry_h
</span><span class="cx"> #define WKGeometry_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKImage.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKImage.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKImage.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKImage_h
</span><span class="cx"> #define WKImage_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKMutableArrayh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKMutableArray.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKMutableArray.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKMutableArray.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKMutableArray_h
</span><span class="cx"> #define WKMutableArray_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx"> #include <stddef.h>
</span><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKMutableDictionaryh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKMutableDictionary.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKMutableDictionary.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKMutableDictionary.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKMutableDictionary_h
</span><span class="cx"> #define WKMutableDictionary_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKNumberh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKNumber.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKNumber.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKNumber.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKNumber_h
</span><span class="cx"> #define WKNumber_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKPluginInformationh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKPluginInformation.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKPluginInformation.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKPluginInformation.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKPluginInformation_h
</span><span class="cx"> #define WKPluginInformation_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKRenderLayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKRenderLayer.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKRenderLayer.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKRenderLayer.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #define WKRenderLayer_h
</span><span class="cx">
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKRenderObjecth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKRenderObject.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKRenderObject.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKRenderObject.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKRenderObject_h
</span><span class="cx"> #define WKRenderObject_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKSecurityOriginh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSecurityOrigin.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKSecurityOrigin_h
</span><span class="cx"> #define WKSecurityOrigin_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKSerializedScriptValueh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSerializedScriptValue.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSerializedScriptValue.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSerializedScriptValue.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKSerializedScriptValue_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKSerializedScriptValuePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKSerializedScriptValuePrivate_h
</span><span class="cx"> #define WKSerializedScriptValuePrivate_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKStringh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKString.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKString.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKString.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKString_h
</span><span class="cx"> #define WKString_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx"> #include <stddef.h>
</span><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKStringPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKStringPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKStringPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKStringPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKStringPrivate_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKTypeh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKType.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKType.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKType.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKType_h
</span><span class="cx"> #define WKType_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKURLh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURL.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURL.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURL.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKURL_h
</span><span class="cx"> #define WKURL_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKURLRequesth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURLRequest.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURLRequest.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURLRequest.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKURLRequest_h
</span><span class="cx"> #define WKURLRequest_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKURLResponseh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURLResponse.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURLResponse.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKURLResponse.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKURLResponse_h
</span><span class="cx"> #define WKURLResponse_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcWKUserContentURLPatternh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKUserContentURLPattern_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIccfWKErrorCFh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKErrorCF.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKErrorCF.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKErrorCF.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKErrorCF_h
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIccfWKStringCFh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKStringCF.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKStringCF.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKStringCF.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKStringCF_h
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIccfWKURLCFh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKURLCF.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKURLCF.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cf/WKURLCF.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKURLCF_h
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIccgWKImageCGh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/cg/WKImageCG.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #define WKImageCG_h
</span><span class="cx">
</span><span class="cx"> #include <CoreGraphics/CGImage.h>
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKImage.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKImage.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcmacWKCertificateInfoMach"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKCertificateInfoMac_h
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcmacWKObjCTypeWrapperRefh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKObjCTypeWrapperRef_h
</span><span class="cx">
</span><span class="cx"> #include <Foundation/Foundation.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcmacWKURLRequestNSh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKURLRequestNS_h
</span><span class="cx">
</span><span class="cx"> #include <Foundation/Foundation.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcmacWKURLResponseNSh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKURLResponseNS_h
</span><span class="cx">
</span><span class="cx"> #include <Foundation/Foundation.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcmacWKWebArchiveh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKWebArchive.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKWebArchive.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKWebArchive.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKWebArchive_h
</span><span class="cx"> #define WKWebArchive_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #include <stddef.h>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedAPIcmacWKWebArchiveResourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKWebArchiveResource_h
</span><span class="cx"> #define WKWebArchiveResource_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #include <stddef.h>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainDevelopmentmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -126,13 +126,13 @@
</span><span class="cx"> exit(EXIT_FAILURE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CFBundleRef webKit2Bundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit2"));
</del><ins>+ CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
</ins><span class="cx"> CFStringRef entryPointFunctionName = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
</span><span class="cx">
</span><span class="cx"> typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t);
</span><del>- InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKit2Bundle, entryPointFunctionName));
</del><ins>+ InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
</ins><span class="cx"> if (!initializerFunctionPtr) {
</span><del>- NSLog(@"Unable to find entry point in WebKit2.framework with name: %@", (NSString *)entryPointFunctionName);
</del><ins>+ NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (NSString *)entryPointFunctionName);
</ins><span class="cx"> exit(EXIT_FAILURE);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceMainmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> assert(type == XPC_TYPE_DICTIONARY);
</span><span class="cx">
</span><span class="cx"> if (!strcmp(xpc_dictionary_get_string(event, "message-name"), "bootstrap")) {
</span><del>- CFBundleRef webKit2Bundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit2"));
</del><ins>+ CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
</ins><span class="cx"> CFStringRef entryPointFunctionName = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), CFSTR("WebKitEntryPoint"));
</span><span class="cx">
</span><span class="cx"> typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t);
</span><del>- InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKit2Bundle, entryPointFunctionName));
</del><ins>+ InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
</ins><span class="cx"> if (!initializerFunctionPtr) {
</span><span class="cx"> NSLog(@"Unable to find entry point in WebKit2.framework with name: %@", (NSString *)entryPointFunctionName);
</span><span class="cx"> exit(EXIT_FAILURE);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKApplicationCacheManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKApplicationCacheManager_h
</span><span class="cx"> #define WKApplicationCacheManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKAuthenticationChallengeh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKAuthenticationChallenge.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKAuthenticationChallenge.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKAuthenticationChallenge.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKAuthenticationChallenge_h
</span><span class="cx"> #define WKAuthenticationChallenge_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKAuthenticationDecisionListenerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKAuthenticationDecisionListener.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKAuthenticationDecisionListener.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKAuthenticationDecisionListener.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKAuthenticationDecisionListener_h
</span><span class="cx"> #define WKAuthenticationDecisionListener_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKBackForwardListItemRefh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKBackForwardListItemRef.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKBackForwardListItemRef.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKBackForwardListItemRef.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBackForwardListItemRef_h
</span><span class="cx"> #define WKBackForwardListItemRef_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKBackForwardListRefh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBackForwardListRef_h
</span><span class="cx"> #define WKBackForwardListRef_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContext.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #ifndef WKContext_h
</span><span class="cx"> #define WKContext_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContextConnectionClient.h>
-#include <WebKit2/WKContextDownloadClient.h>
-#include <WebKit2/WKContextHistoryClient.h>
-#include <WebKit2/WKContextInjectedBundleClient.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKContextConnectionClient.h>
+#include <WebKit/WKContextDownloadClient.h>
+#include <WebKit/WKContextHistoryClient.h>
+#include <WebKit/WKContextInjectedBundleClient.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKContextConnectionClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKContextConnectionClient_h
</span><span class="cx"> #define WKContextConnectionClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKContextDidCreateConnection)(WKContextRef context, WKConnectionRef connection, const void* clientInfo);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKContextDownloadClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKContextDownloadClient_h
</span><span class="cx"> #define WKContextDownloadClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKContextDownloadDidStartCallback)(WKContextRef context, WKDownloadRef download, const void *clientInfo);
</span><span class="cx"> typedef void (*WKContextDownloadDidReceiveAuthenticationChallengeCallback)(WKContextRef context, WKDownloadRef download, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKContextHistoryClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKContextHistoryClient_h
</span><span class="cx"> #define WKContextHistoryClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKContextDidNavigateWithNavigationDataCallback)(WKContextRef context, WKPageRef page, WKNavigationDataRef navigationData, WKFrameRef frame, const void *clientInfo);
</span><span class="cx"> typedef void (*WKContextDidPerformClientRedirectCallback)(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKContextInjectedBundleClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKContextInjectedBundleClient_h
</span><span class="cx"> #define WKContextInjectedBundleClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> // Injected Bundle Client
</span><span class="cx"> typedef void (*WKContextDidReceiveMessageFromInjectedBundleCallback)(WKContextRef page, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKContextPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKContextPrivate_h
</span><span class="cx"> #define WKContextPrivate_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKContext.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKContext.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKCookieManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKCookieManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKCookieManager_h
</span><span class="cx"> #define WKCookieManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKCredentialh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKCredential.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKCredential.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKCredential.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKCredential_h
</span><span class="cx"> #define WKCredential_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKCredentialTypes.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKCredentialTypes.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKDatabaseManager_h
</span><span class="cx"> #define WKDatabaseManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKDownloadh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKDownload.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKDownload.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKDownload.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKDownload_h
</span><span class="cx"> #define WKDownload_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKFormSubmissionListenerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKFormSubmissionListener_h
</span><span class="cx"> #define WKFormSubmissionListener_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFrame.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFrame.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFrame.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKFrame_h
</span><span class="cx"> #define WKFrame_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKFramePolicyListenerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFramePolicyListener.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFramePolicyListener.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKFramePolicyListener.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKFramePolicyListener_h
</span><span class="cx"> #define WKFramePolicyListener_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKGeolocationManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKGeolocationManager_h
</span><span class="cx"> #define WKGeolocationManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKGeolocationPermissionRequesth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationPermissionRequest.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationPermissionRequest.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationPermissionRequest.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKGeolocationPermissionRequest_h
</span><span class="cx"> #define WKGeolocationPermissionRequest_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKGeolocationPositionh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationPosition.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationPosition.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKGeolocationPosition.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKGeolocationPosition_h
</span><span class="cx"> #define WKGeolocationPosition_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKHitTestResulth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKHitTestResult.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKHitTestResult.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKHitTestResult.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef WKHitTestResult_h
</span><span class="cx"> #define WKHitTestResult_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKIconDatabaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKIconDatabase_h
</span><span class="cx"> #define WKIconDatabase_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKInspectorh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKInspector.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKInspector.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKInspector.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKInspector_h
</span><span class="cx"> #define WKInspector_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKKeyValueStorageManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKKeyValueStorageManager_h
</span><span class="cx"> #define WKKeyValueStorageManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKMediaCacheManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKMediaCacheManager_h
</span><span class="cx"> #define WKMediaCacheManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKNavigationDataRefh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKNavigationDataRef_h
</span><span class="cx"> #define WKNavigationDataRef_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKNotificationh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotification.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotification.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotification.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKNotification_h
</span><span class="cx"> #define WKNotification_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKNotificationManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKNotificationManager_h
</span><span class="cx">
</span><span class="cx"> #include "WKNotificationProvider.h"
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKNotificationPermissionRequesth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationPermissionRequest.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKNotificationPermissionRequest_h
</span><span class="cx"> #define WKNotificationPermissionRequest_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKNotificationProviderh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKNotificationProvider_h
</span><span class="cx"> #define WKNotificationProvider_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKOpenPanelParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef WKOpenPanelParameters_h
</span><span class="cx"> #define WKOpenPanelParameters_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKOpenPanelResultListenerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOpenPanelResultListener.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOpenPanelResultListener.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOpenPanelResultListener.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKOpenPanelResultListener_h
</span><span class="cx"> #define WKOpenPanelResultListener_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKOriginDataManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKOriginDataManager_h
</span><span class="cx"> #define WKOriginDataManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPage.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPage.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPage.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,22 +26,22 @@
</span><span class="cx"> #ifndef WKPage_h
</span><span class="cx"> #define WKPage_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKFindOptions.h>
-#include <WebKit2/WKGeometry.h>
-#include <WebKit2/WKNativeEvent.h>
-#include <WebKit2/WKPageContextMenuClient.h>
-#include <WebKit2/WKPageFindClient.h>
-#include <WebKit2/WKPageFindMatchesClient.h>
-#include <WebKit2/WKPageFormClient.h>
-#include <WebKit2/WKPageLoadTypes.h>
-#include <WebKit2/WKPageLoaderClient.h>
-#include <WebKit2/WKPagePolicyClient.h>
-#include <WebKit2/WKPageUIClient.h>
-#include <WebKit2/WKPageVisibilityTypes.h>
-#include <WebKit2/WKSessionRef.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKFindOptions.h>
+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKNativeEvent.h>
+#include <WebKit/WKPageContextMenuClient.h>
+#include <WebKit/WKPageFindClient.h>
+#include <WebKit/WKPageFindMatchesClient.h>
+#include <WebKit/WKPageFormClient.h>
+#include <WebKit/WKPageLoadTypes.h>
+#include <WebKit/WKPageLoaderClient.h>
+#include <WebKit/WKPagePolicyClient.h>
+#include <WebKit/WKPageUIClient.h>
+#include <WebKit/WKPageVisibilityTypes.h>
+#include <WebKit/WKSessionRef.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKPageContextMenuClient_h
</span><span class="cx"> #define WKPageContextMenuClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPageFindClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKPageFindClient_h
</span><span class="cx"> #define WKPageFindClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPageFindMatchesClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKPageFindMatchesClient_h
</span><span class="cx"> #define WKPageFindMatchesClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPageFormClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKPageFormClient_h
</span><span class="cx"> #define WKPageFormClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPageGrouph"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageGroup.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef WKPageGroup_h
</span><span class="cx"> #define WKPageGroup_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKUserContentInjectedFrames.h>
-#include <WebKit2/WKUserScriptInjectionTime.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKUserContentInjectedFrames.h>
+#include <WebKit/WKUserScriptInjectionTime.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPageLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef WKPageLoaderClient_h
</span><span class="cx"> #define WKPageLoaderClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKPageLoadTypes.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKPageLoadTypes.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPagePolicyClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef WKPagePolicyClient_h
</span><span class="cx"> #define WKPagePolicyClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKPageLoadTypes.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKPageLoadTypes.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKPagePrivate_h
</span><span class="cx"> #define WKPagePrivate_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKPage.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKPage.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> #ifndef WKPageUIClient_h
</span><span class="cx"> #define WKPageUIClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKGeometry.h>
-#include <WebKit2/WKNativeEvent.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKNativeEvent.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPluginSiteDataManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKPluginSiteDataManager_h
</span><span class="cx"> #define WKPluginSiteDataManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPreferencesRefh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKPreferencesRef_h
</span><span class="cx"> #define WKPreferencesRef_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKPreferencesPrivate_h
</span><span class="cx"> #define WKPreferencesPrivate_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKProtectionSpaceh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKProtectionSpace.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKProtectionSpace.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKProtectionSpace.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKProtectionSpace_h
</span><span class="cx"> #define WKProtectionSpace_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKProtectionSpaceTypes.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKProtectionSpaceTypes.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKProtectionSpaceTypesh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKProtectionSpaceTypes.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKProtectionSpaceTypes.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKProtectionSpaceTypes.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKProtectionSpaceTypes_h
</span><span class="cx"> #define WKProtectionSpaceTypes_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKResourceCacheManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKResourceCacheManager_h
</span><span class="cx"> #define WKResourceCacheManager_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWKSessionRefh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKSessionRef.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKSessionRef.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WKSessionRef.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKSessionRef_h
</span><span class="cx"> #define WKSessionRef_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICWebKit2_Ch"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WebKit2_C.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WebKit2_C.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/WebKit2_C.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,42 +26,42 @@
</span><span class="cx"> #ifndef WebKit2_C_h
</span><span class="cx"> #define WebKit2_C_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKType.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKType.h>
</ins><span class="cx">
</span><del>-#include <WebKit2/WKArray.h>
-#include <WebKit2/WKBackForwardListRef.h>
-#include <WebKit2/WKBackForwardListItemRef.h>
-#include <WebKit2/WKConnectionRef.h>
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKData.h>
-#include <WebKit2/WKDictionary.h>
-#include <WebKit2/WKError.h>
-#include <WebKit2/WKFormSubmissionListener.h>
-#include <WebKit2/WKFrame.h>
-#include <WebKit2/WKFramePolicyListener.h>
-#include <WebKit2/WKGeolocationManager.h>
-#include <WebKit2/WKGeolocationPermissionRequest.h>
-#include <WebKit2/WKGeolocationPosition.h>
-#include <WebKit2/WKHitTestResult.h>
-#include <WebKit2/WKMutableArray.h>
-#include <WebKit2/WKMutableDictionary.h>
-#include <WebKit2/WKNavigationDataRef.h>
-#include <WebKit2/WKNumber.h>
-#include <WebKit2/WKOpenPanelParameters.h>
-#include <WebKit2/WKOpenPanelResultListener.h>
-#include <WebKit2/WKPage.h>
-#include <WebKit2/WKPageGroup.h>
-#include <WebKit2/WKPreferencesRef.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKURL.h>
-#include <WebKit2/WKURLRequest.h>
-#include <WebKit2/WKURLResponse.h>
</del><ins>+#include <WebKit/WKArray.h>
+#include <WebKit/WKBackForwardListRef.h>
+#include <WebKit/WKBackForwardListItemRef.h>
+#include <WebKit/WKConnectionRef.h>
+#include <WebKit/WKContext.h>
+#include <WebKit/WKData.h>
+#include <WebKit/WKDictionary.h>
+#include <WebKit/WKError.h>
+#include <WebKit/WKFormSubmissionListener.h>
+#include <WebKit/WKFrame.h>
+#include <WebKit/WKFramePolicyListener.h>
+#include <WebKit/WKGeolocationManager.h>
+#include <WebKit/WKGeolocationPermissionRequest.h>
+#include <WebKit/WKGeolocationPosition.h>
+#include <WebKit/WKHitTestResult.h>
+#include <WebKit/WKMutableArray.h>
+#include <WebKit/WKMutableDictionary.h>
+#include <WebKit/WKNavigationDataRef.h>
+#include <WebKit/WKNumber.h>
+#include <WebKit/WKOpenPanelParameters.h>
+#include <WebKit/WKOpenPanelResultListener.h>
+#include <WebKit/WKPage.h>
+#include <WebKit/WKPageGroup.h>
+#include <WebKit/WKPreferencesRef.h>
+#include <WebKit/WKString.h>
+#include <WebKit/WKURL.h>
+#include <WebKit/WKURLRequest.h>
+#include <WebKit/WKURLResponse.h>
</ins><span class="cx">
</span><span class="cx"> #if defined(__OBJC__) && __OBJC__
</span><del>-#import <WebKit2/WKView.h>
</del><ins>+#import <WebKit/WKView.h>
</ins><span class="cx"> #elif !(defined(__APPLE__) && __APPLE__)
</span><del>-#include <WebKit2/WKView.h>
</del><ins>+#include <WebKit/WKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif /* WebKit2_C_h */
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICcgWKIconDatabaseCGh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/cg/WKIconDatabaseCG.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CFArray.h>
</span><span class="cx"> #include <CoreGraphics/CGImage.h>
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICmacWKContextPrivateMach"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKContextPrivateMac_h
</span><span class="cx"> #define WKContextPrivateMac_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICmacWKInspectorPrivateMach"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <AppKit/NSWindow.h>
</span><del>-#import <WebKit2/WKDeclarationSpecifiers.h>
-#import <WebKit2/WKInspector.h>
</del><ins>+#import <WebKit/WKDeclarationSpecifiers.h>
+#import <WebKit/WKInspector.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICmacWKPagePrivateMach"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKPagePrivateMac_h
</span><span class="cx"> #define WKPagePrivateMac_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx"> #include <sys/types.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBackForwardListh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKBackForwardListItem.h>
</del><ins>+#import <WebKit/WKBackForwardListItem.h>
</ins><span class="cx">
</span><span class="cx"> /*! @abstract A @link WKWebView @/link's list of previously-visited webpages that can be reached by
</span><span class="cx"> going back or forward.
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBackForwardListPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKBackForwardList.h>
</del><ins>+#import <WebKit/WKBackForwardList.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKBrowsingContextGroup.h>
-#import <WebKit2/WKFoundation.h>
-#import <WebKit2/WKProcessGroup.h>
-#import <WebKit2/WKRenderingProgressEvents.h>
</del><ins>+#import <WebKit/WKBrowsingContextGroup.h>
+#import <WebKit/WKFoundation.h>
+#import <WebKit/WKProcessGroup.h>
+#import <WebKit/WKRenderingProgressEvents.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKBrowsingContextController.h>
</del><ins>+#import <WebKit/WKBrowsingContextController.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> typedef NS_ENUM(NSUInteger, WKBrowsingContextPaginationMode) {
</span><span class="cx"> WKPaginationModeUnpaginated,
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextGrouph"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKUserScriptInjectionTime.h>
</del><ins>+#import <WebKit/WKUserScriptInjectionTime.h>
</ins><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKBrowsingContextGroup : NSObject
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextGroupPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroupPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroupPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroupPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKBrowsingContextGroup.h>
</del><ins>+#import <WebKit/WKBrowsingContextGroup.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> @interface WKBrowsingContextGroup (Private)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextHistoryDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextHistoryDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextHistoryDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextHistoryDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,13 +23,13 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKBrowsingContextController.h>
-#import <WebKit2/WKNavigationData.h>
</del><ins>+#import <WebKit/WKBrowsingContextController.h>
+#import <WebKit/WKNavigationData.h>
</ins><span class="cx">
</span><span class="cx"> @protocol WKBrowsingContextHistoryDelegate <NSObject>
</span><span class="cx"> @optional
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextLoadDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKBrowsingContextController.h>
</del><ins>+#import <WebKit/WKBrowsingContextController.h>
</ins><span class="cx">
</span><span class="cx"> @class WKBackForwardListItem;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextLoadDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegatePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKBrowsingContextLoadDelegate.h>
</del><ins>+#import <WebKit/WKBrowsingContextLoadDelegate.h>
</ins><span class="cx">
</span><span class="cx"> @protocol WKBrowsingContextLoadDelegatePrivate <WKBrowsingContextLoadDelegate>
</span><span class="cx"> @optional
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKBrowsingContextPolicyDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKDeclarationSpecifiers.h>
</del><ins>+#import <WebKit/WKDeclarationSpecifiers.h>
</ins><span class="cx">
</span><span class="cx"> @class WKBrowsingContextController;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKConnectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKFrameInfoh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKHistoryDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationActionh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationActionPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKNavigationAction.h>
</del><ins>+#import <WebKit/WKNavigationAction.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include <WebKit2/WKNavigationDataRef.h>
</del><ins>+#include <WebKit/WKNavigationDataRef.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKNavigationDelegate.h>
-#import <WebKit2/WKWebViewPrivate.h>
</del><ins>+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKWebViewPrivate.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKNavigationResponseh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKPreferencesh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,15 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WKPreferences_h
-#define WKPreferences_h
-
-#include <WebKit2/WKPreferencesRef.h>
-
-#ifdef __OBJC__
-
</del><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="lines">@@ -96,7 +89,3 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span><del>-
-#endif // defined(__OBJC__)
-
-#endif
</del></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include <WebKit2/WKPreferencesRefPrivate.h>
</del><ins>+#include <WebKit/WKPreferencesRefPrivate.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx">
</span><del>-#import <WebKit2/WKPreferences.h>
</del><ins>+#import <WebKit/WKPreferences.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKProcessGrouph"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKConnection.h>
</del><ins>+#import <WebKit/WKConnection.h>
</ins><span class="cx">
</span><span class="cx"> @class WKProcessGroup;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKProcessGroupPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroupPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroupPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroupPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKProcessGroup.h>
</del><ins>+#import <WebKit/WKProcessGroup.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @class WKGeolocationProviderIOS;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKProcessPoolh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKProcessPool.h>
</del><ins>+#import <WebKit/WKProcessPool.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKScriptMessageh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKScriptMessageHandlerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKScriptMessagePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessagePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKScriptMessage.h>
</del><ins>+#import <WebKit/WKScriptMessage.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKTypeRefWrapperh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKTypeRefWrapper.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKTypeRefWrapper.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKTypeRefWrapper.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKTypeRefWrapper : NSObject
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKUIDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKUIDelegate.h>
</del><ins>+#import <WebKit/WKUIDelegate.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/_WKActivatedElementInfo.h>
</del><ins>+#import <WebKit/_WKActivatedElementInfo.h>
</ins><span class="cx">
</span><span class="cx"> @protocol WKUIDelegatePrivate <WKUIDelegate>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKUserContentControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKUserContentControllerPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKUserContentController.h>
</del><ins>+#import <WebKit/WKUserContentController.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKView.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,14 +23,14 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #import <UIKit/UIKit.h>
</span><span class="cx"> #else
</span><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="cx"> #endif
</span><del>-#import <WebKit2/WKDeclarationSpecifiers.h>
</del><ins>+#import <WebKit/WKDeclarationSpecifiers.h>
</ins><span class="cx">
</span><span class="cx"> @class WKBrowsingContextController;
</span><span class="cx"> @class WKBrowsingContextGroup;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKBase.h>
-#import <WebKit2/WKView.h>
</del><ins>+#import <WebKit/WKBase.h>
+#import <WebKit/WKView.h>
</ins><span class="cx">
</span><span class="cx"> @interface WKView (Private)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKWebViewConfiguration.h>
</del><ins>+#import <WebKit/WKWebViewConfiguration.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKWebView.h>
</del><ins>+#import <WebKit/WKWebView.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWKWindowFeaturesh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWindowFeatures.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWindowFeatures.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWindowFeatures.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoaWebKit2h"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WebKit2.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WebKit2.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/WebKit2.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKBrowsingContextController.h>
-#import <WebKit2/WKBrowsingContextGroup.h>
-#import <WebKit2/WKBrowsingContextLoadDelegate.h>
-#import <WebKit2/WKBrowsingContextPolicyDelegate.h>
-#import <WebKit2/WKConnection.h>
-#import <WebKit2/WKFoundation.h>
-#import <WebKit2/WKProcessGroup.h>
-#import <WebKit2/WKView.h>
</del><ins>+#import <WebKit/WKBrowsingContextController.h>
+#import <WebKit/WKBrowsingContextGroup.h>
+#import <WebKit/WKBrowsingContextLoadDelegate.h>
+#import <WebKit/WKBrowsingContextPolicyDelegate.h>
+#import <WebKit/WKConnection.h>
+#import <WebKit/WKFoundation.h>
+#import <WebKit/WKProcessGroup.h>
+#import <WebKit/WKView.h>
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKActivatedElementInfoh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfo.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKDownloadh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKDownloadDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKElementActionh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,13 +23,13 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx">
</span><del>-#import <WebKit2/_WKActivatedElementInfo.h>
</del><ins>+#import <WebKit/_WKActivatedElementInfo.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (^WKElementActionHandler)(_WKActivatedElementInfo *);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKErrorRecoveryAttemptingh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKDeclarationSpecifiers.h>
</del><ins>+#import <WebKit/WKDeclarationSpecifiers.h>
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT extern NSString * const _WKRecoveryAttempterErrorKey;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKFindDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFindDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFindDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFindDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKFormDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKFormInputSessionh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKScriptWorldh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKThumbnailViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKVisitedLinkProviderh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessAPIcppWKRetainPtrh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKRetainPtr_h
</span><span class="cx"> #define WKRetainPtr_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKType.h>
</del><ins>+#include <WebKit/WKType.h>
</ins><span class="cx"> #include <algorithm>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessCocoaWKReloadFrameErrorRecoveryAttempterh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessCocoaWKWebViewContentProviderh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessCocoaWKWebViewContentProviderRegistryh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProviderRegistry.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProviderRegistry.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProviderRegistry.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], _NSGetMachExecuteHeader()->cputype);
</span><span class="cx"> environmentExtractor.getExtractedEnvironmentVariables(environmentVariables);
</span><span class="cx">
</span><del>- NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
- NSString *frameworksPath = [[webKit2Bundle bundlePath] stringByDeletingLastPathComponent];
</del><ins>+ NSBundle *webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
+ NSString *frameworksPath = [[webKitBundle bundlePath] stringByDeletingLastPathComponent];
</ins><span class="cx">
</span><span class="cx"> // To make engineering builds work, if the path is outside of /System set up
</span><span class="cx"> // DYLD_FRAMEWORK_PATH to pick up other frameworks, but don't do it for the
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> NSString *processShimPathNSString = nil;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if (launchOptions.processType == ProcessLauncher::PluginProcess) {
</span><del>- NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
</del><ins>+ NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
</ins><span class="cx"> NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
</span><span class="cx">
</span><span class="cx"> processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
</span><span class="lines">@@ -109,14 +109,14 @@
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> if (launchOptions.processType == ProcessLauncher::NetworkProcess) {
</span><del>- NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
</del><ins>+ NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
</ins><span class="cx"> NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
</span><span class="cx">
</span><span class="cx"> processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"SecItemShim.dylib"];
</span><span class="cx"> } else
</span><span class="cx"> #endif // ENABLE(NETWORK_PROCESS)
</span><span class="cx"> if (launchOptions.processType == ProcessLauncher::WebProcess) {
</span><del>- NSString *processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"WebProcess.app"];
</del><ins>+ NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
</ins><span class="cx"> NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
</span><span class="cx">
</span><span class="cx"> processShimPathNSString = [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"WebProcessShim.dylib"];
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> xpc_object_t bootstrapMessage = xpc_dictionary_create(0, 0, 0);
</span><span class="cx"> xpc_dictionary_set_string(bootstrapMessage, "message-name", "bootstrap");
</span><del>- xpc_dictionary_set_string(bootstrapMessage, "framework-executable-path", [[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] executablePath] fileSystemRepresentation]);
</del><ins>+ xpc_dictionary_set_string(bootstrapMessage, "framework-executable-path", [[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] executablePath] fileSystemRepresentation]);
</ins><span class="cx"> xpc_dictionary_set_mach_send(bootstrapMessage, "server-port", listeningPort);
</span><span class="cx"> xpc_dictionary_set_string(bootstrapMessage, "client-identifier", clientIdentifier.data());
</span><span class="cx"> xpc_dictionary_set_string(bootstrapMessage, "ui-process-name", [[[NSProcessInfo processInfo] processName] UTF8String]);
</span><span class="lines">@@ -374,31 +374,31 @@
</span><span class="cx"> // Insert a send right so we can send to it.
</span><span class="cx"> mach_port_insert_right(mach_task_self(), listeningPort, listeningPort, MACH_MSG_TYPE_MAKE_SEND);
</span><span class="cx">
</span><del>- NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
</del><ins>+ NSBundle *webKitBundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
</ins><span class="cx">
</span><span class="cx"> NSString *processPath = nil;
</span><span class="cx"> switch (launchOptions.processType) {
</span><span class="cx"> case ProcessLauncher::WebProcess:
</span><del>- processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"WebProcess.app"];
</del><ins>+ processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> case ProcessLauncher::PluginProcess:
</span><del>- processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
</del><ins>+ processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
</ins><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> case ProcessLauncher::NetworkProcess:
</span><del>- processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
</del><ins>+ processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
</ins><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case ProcessLauncher::DatabaseProcess:
</span><del>- processPath = [webKit2Bundle pathForAuxiliaryExecutable:@"DatabaseProcess.app"];
</del><ins>+ processPath = [webKitBundle pathForAuxiliaryExecutable:@"DatabaseProcess.app"];
</ins><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSString *frameworkExecutablePath = [webKit2Bundle executablePath];
</del><ins>+ NSString *frameworkExecutablePath = [webKitBundle executablePath];
</ins><span class="cx"> NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
</span><span class="cx">
</span><span class="cx"> NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
</span><span class="lines">@@ -520,7 +520,7 @@
</span><span class="cx"> if (tryPreexistingProcess(m_launchOptions, this, &ProcessLauncher::didFinishLaunchingProcess))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit2"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];
</del><ins>+ bool isWebKitDevelopmentBuild = ![[[[NSBundle bundleWithIdentifier:@"com.apple.WebKit"] bundlePath] stringByDeletingLastPathComponent] hasPrefix:systemDirectoryPath()];
</ins><span class="cx">
</span><span class="cx"> if (m_launchOptions.useXPC) {
</span><span class="cx"> createService(m_launchOptions, isWebKitDevelopmentBuild, this, &ProcessLauncher::didFinishLaunchingProcess);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
</span><span class="cx"> {
</span><del>- NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
</del><ins>+ NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
</ins><span class="cx"> NSString *frameworksPath = [[webKit2Bundle bundlePath] stringByDeletingLastPathComponent];
</span><span class="cx"> const char* frameworkExecutablePath = [[webKit2Bundle executablePath] fileSystemRepresentation];
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessiosWKActionSheetAssistanth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <UIKit/UIActionSheet.h>
</span><span class="cx"> #import <UIKit/UIPopoverController.h>
</span><del>-#import <WebKit2/WKDeclarationSpecifiers.h>
</del><ins>+#import <WebKit/WKDeclarationSpecifiers.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @protocol WKActionSheetDelegate;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessiosWKGeolocationProviderIOSh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #import <Foundation/NSObject.h>
</span><del>-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> class WebContext;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessiosWKGeolocationProviderIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #import "WebSecurityOrigin.h"
</span><span class="cx"> #import <WebGeolocationPosition.h>
</span><span class="cx"> #import <WebCore/GeolocationPosition.h>
</span><del>-#import <WebKit2/WKGeolocationPermissionRequest.h>
</del><ins>+#import <WebKit/WKGeolocationPermissionRequest.h>
</ins><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/PassRefPtr.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSString> cachePath = adoptNS((NSString *)WKCopyFoundationCacheDirectory());
</span><span class="cx"> if (!cachePath)
</span><del>- cachePath = @"~/Library/Caches/com.apple.WebKit2.WebProcess";
</del><ins>+ cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
</ins><span class="cx">
</span><span class="cx"> return [cachePath stringByStandardizingPath];
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><ins>+ 1A6280F619199865006AD9F9 /* PBXTargetDependency */,
</ins><span class="cx"> 1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */,
</span><span class="cx"> 51A60B2C180CCF1200F3BF50 /* PBXTargetDependency */,
</span><span class="cx"> 510CC8481613C85300D03ED3 /* PBXTargetDependency */,
</span><span class="lines">@@ -72,10 +73,6 @@
</span><span class="cx"> 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */; };
</span><span class="cx"> 0F931C1D18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */; };
</span><span class="cx"> 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; };
</span><del>- 0FC08572187CE0B100780D86 /* __init__.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856E187CE0A900780D86 /* __init__.py */; };
- 0FC08573187CE0B300780D86 /* messages.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856F187CE0A900780D86 /* messages.py */; };
- 0FC08574187CE0B400780D86 /* model.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08570187CE0A900780D86 /* model.py */; };
- 0FC08575187CE0B600780D86 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; };
</del><span class="cx"> 0FCB4E4618BBE044000FCFC9 /* PageClientImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3618BBE044000FCFC9 /* PageClientImplIOS.h */; };
</span><span class="cx"> 0FCB4E4718BBE044000FCFC9 /* PageClientImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */; };
</span><span class="cx"> 0FCB4E4818BBE044000FCFC9 /* WKActionSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3818BBE044000FCFC9 /* WKActionSheet.h */; };
</span><span class="lines">@@ -112,6 +109,10 @@
</span><span class="cx"> 1A043DC2124FF87500FFBFB5 /* PluginProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043DC0124FF87500FFBFB5 /* PluginProxy.cpp */; };
</span><span class="cx"> 1A043F6912514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */; };
</span><span class="cx"> 1A043F6A12514D8B00FFBFB5 /* WebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */; };
</span><ins>+ 1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856E187CE0A900780D86 /* __init__.py */; };
+ 1A07D2F91919B3A900ECDA16 /* messages.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856F187CE0A900780D86 /* messages.py */; };
+ 1A07D2FA1919B3A900ECDA16 /* model.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08570187CE0A900780D86 /* model.py */; };
+ 1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; };
</ins><span class="cx"> 1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */; };
</span><span class="cx"> 1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */; };
</span><span class="cx"> 1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */; };
</span><span class="lines">@@ -226,6 +227,10 @@
</span><span class="cx"> 1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */; };
</span><span class="cx"> 1A60224C18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */; };
</span><span class="cx"> 1A60224D18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */; };
</span><ins>+ 1A6280C51919949F006AD9F9 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C41919949F006AD9F9 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1A6280F019199800006AD9F9 /* WebKit2.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280EE19199800006AD9F9 /* WebKit2.m */; };
+ 1A6280F31919982A006AD9F9 /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280F21919982A006AD9F9 /* WebKit.m */; };
</ins><span class="cx"> 1A6420E412DCE2FF00CAAE2C /* ShareableBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */; };
</span><span class="cx"> 1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6420E312DCE2FF00CAAE2C /* ShareableBitmap.h */; };
</span><span class="cx"> 1A64229912DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64229712DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp */; };
</span><span class="lines">@@ -391,6 +396,7 @@
</span><span class="cx"> 1AD60F5E18E20F4C0020C034 /* WKWindowFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */; };
</span><span class="cx"> 1AD60F6018E20F740020C034 /* WKWindowFeaturesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */; };
</span><span class="cx"> 1AD8790A18B6C38A006CAFD7 /* WKUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><ins>+ 1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1ADCB86A189831B30022EE5A /* NavigationActionData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADCB868189831B30022EE5A /* NavigationActionData.cpp */; };
</span><span class="cx"> 1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADCB869189831B30022EE5A /* NavigationActionData.h */; };
</span><span class="cx"> 1ADF591A1890528E0043C145 /* WKWebViewConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */; };
</span><span class="lines">@@ -661,12 +667,11 @@
</span><span class="cx"> 37608823150414F700FC82C7 /* WKRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 37608821150414F700FC82C7 /* WKRenderObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */; };
</span><span class="cx"> 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
</span><del>- 3766F9F0189A1248003CF19B /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
</del><span class="cx"> 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BC87DFA91018101400564216 /* libicucore.dylib */; };
</span><span class="cx"> 3769079A18F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079818F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h */; };
</span><span class="cx"> 3769079E18F340A2001DFF04 /* APIInjectedBundleFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */; };
</span><span class="cx"> 37694525184FC6B600CDE21F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
</span><del>- 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 377EAD4917E2C77B002D193D /* WKUserScriptInjectionTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4717E2C77B002D193D /* WKUserScriptInjectionTime.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 3788A05C14743C90006319E5 /* WKBrowsingContextControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3788A05B14743C90006319E5 /* WKBrowsingContextControllerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -919,7 +924,7 @@
</span><span class="cx"> 51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */; };
</span><span class="cx"> 51F7DC41180CC93600212CA3 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
</span><span class="cx"> 51F7DC43180CC93600212CA3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><del>- 51F7DC44180CC93600212CA3 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
</del><ins>+ 51F7DC44180CC93600212CA3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
</ins><span class="cx"> 51FA1E1D180CCADE00C44BE9 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
</span><span class="cx"> 51FA1E1F180CCADE00C44BE9 /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
</span><span class="cx"> 51FA1E23180CCADE00C44BE9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><span class="lines">@@ -988,7 +993,7 @@
</span><span class="cx"> 7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */; };
</span><span class="cx"> 7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */; };
</span><span class="cx"> 7CD5EBB91746A15B000C1C45 /* WKObjCTypeWrapperRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBBC1746B04C000C1C45 /* WKTypeRefWrapper.mm */; };
</span><span class="cx"> 7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBD1746B04C000C1C45 /* WKTypeRefWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7CD622771739D863005BD7FF /* PluginSandboxProfile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD622751739D863005BD7FF /* PluginSandboxProfile.mm */; };
</span><span class="lines">@@ -1284,9 +1289,9 @@
</span><span class="cx"> BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82838A16B45EF200A278FE /* PluginProcessMain.mm */; };
</span><span class="cx"> BC82839916B48DC000A278FE /* WebContentServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */; };
</span><span class="cx"> BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */; };
</span><del>- BC8283DA16B4DB9300A278FE /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
</del><ins>+ BC8283DA16B4DB9300A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
</ins><span class="cx"> BC82844D16B5081C00A278FE /* PluginServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */; };
</span><del>- BC82844F16B5089800A278FE /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
</del><ins>+ BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
</ins><span class="cx"> BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */; };
</span><span class="cx"> BC8452A81162C80900CAB9B5 /* DrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8452A61162C80900CAB9B5 /* DrawingArea.h */; };
</span><span class="cx"> BC84EB1812A7100C0083F2DA /* WebPreferencesMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC84EB1712A7100C0083F2DA /* WebPreferencesMac.mm */; };
</span><span class="lines">@@ -1335,7 +1340,7 @@
</span><span class="cx"> BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
</span><span class="cx"> BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */; };
</span><span class="cx"> BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */; };
</span><del>- BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
</del><ins>+ BCAE9E08160C1C0700A33217 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
</ins><span class="cx"> BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><span class="cx"> BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><span class="cx"> BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><span class="lines">@@ -1393,7 +1398,7 @@
</span><span class="cx"> BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD25F1511D6BDE100169B0E /* WKBundleFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCD25F1811D6BDE100169B0E /* WKBundleFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD25F1611D6BDE100169B0E /* WKBundleFrame.cpp */; };
</span><span class="cx"> BCD3675C148C26C000447E87 /* WebConnectionToUIProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE9C0CF1485965D00E33D61 /* WebConnectionToUIProcess.cpp */; };
</span><del>- BCD597D0112B56AC00EC8C23 /* WKPreferencesRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597CE112B56AC00EC8C23 /* WKPreferencesRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ BCD597D0112B56AC00EC8C23 /* WKPreferencesRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597CE112B56AC00EC8C23 /* WKPreferencesRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> BCD597D1112B56AC00EC8C23 /* WKPreferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD597CF112B56AC00EC8C23 /* WKPreferences.cpp */; };
</span><span class="cx"> BCD597D6112B56DC00EC8C23 /* WKPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD597D4112B56DC00EC8C23 /* WKPage.cpp */; };
</span><span class="cx"> BCD597D7112B56DC00EC8C23 /* WKPage.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD597D5112B56DC00EC8C23 /* WKPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1402,7 +1407,7 @@
</span><span class="cx"> BCD598AC112B7FDF00EC8C23 /* WebPreferencesStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */; };
</span><span class="cx"> BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */; };
</span><span class="cx"> BCDB86C11200FB97007254BE /* APIURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* APIURL.h */; };
</span><del>- BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */; };
</span><span class="cx"> BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
</span><span class="cx"> BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; };
</span><span class="lines">@@ -1603,6 +1608,20 @@
</span><span class="cx"> remoteGlobalIDString = 1A50DB1D110A3BDC000D3FE5;
</span><span class="cx"> remoteInfo = WebProcess;
</span><span class="cx"> };
</span><ins>+ 1A6280EB191997D3006AD9F9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+ remoteInfo = WebKit;
+ };
+ 1A6280F519199865006AD9F9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 1A6280CF191997BD006AD9F9;
+ remoteInfo = WebKit2;
+ };
</ins><span class="cx"> 37F7407812721F740093869B /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
</span><span class="lines">@@ -1739,10 +1758,24 @@
</span><span class="cx"> /* End PBXContainerItemProxy section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXCopyFilesBuildPhase section */
</span><ins>+ 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = PrivateHeaders/webkit2;
+ dstSubfolderSpec = 1;
+ files = (
+ 1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */,
+ 1A07D2F91919B3A900ECDA16 /* messages.py in Copy Message Generation Scripts */,
+ 1A07D2FA1919B3A900ECDA16 /* model.py in Copy Message Generation Scripts */,
+ 1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */,
+ );
+ name = "Copy Message Generation Scripts";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> 1A50DB70110A3D67000D3FE5 /* Copy Files */ = {
</span><span class="cx"> isa = PBXCopyFilesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><del>- dstPath = WebKit2.framework;
</del><ins>+ dstPath = WebKit.framework;
</ins><span class="cx"> dstSubfolderSpec = 1;
</span><span class="cx"> files = (
</span><span class="cx"> 510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */,
</span><span class="lines">@@ -1764,20 +1797,6 @@
</span><span class="cx"> name = "Copy WebProcessShim";
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- 5D1A239015E75B100023E981 /* Copy Message Generation Scripts */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = PrivateHeaders/webkit2;
- dstSubfolderSpec = 1;
- files = (
- 0FC08572187CE0B100780D86 /* __init__.py in Copy Message Generation Scripts */,
- 0FC08573187CE0B300780D86 /* messages.py in Copy Message Generation Scripts */,
- 0FC08574187CE0B400780D86 /* model.py in Copy Message Generation Scripts */,
- 0FC08575187CE0B600780D86 /* parser.py in Copy Message Generation Scripts */,
- );
- name = "Copy Message Generation Scripts";
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> 7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */ = {
</span><span class="cx"> isa = PBXCopyFilesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -2011,6 +2030,7 @@
</span><span class="cx"> 1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1A4F976E100E7B6600637A18 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebProcess.app; sourceTree = BUILT_PRODUCTS_DIR; };
</span><ins>+ 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNavigation.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigation.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDocumentLoader.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2019,6 +2039,12 @@
</span><span class="cx"> 1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = VisitedLinkProvider.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProviderMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProviderMessages.h; sourceTree = "<group>"; };
</span><ins>+ 1A6280C41919949F006AD9F9 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
+ 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
+ 1A6280D0191997BD006AD9F9 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-WebKit2.plist"; sourceTree = "<group>"; };
+ 1A6280EE19199800006AD9F9 /* WebKit2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKit2.m; sourceTree = "<group>"; };
+ 1A6280F21919982A006AD9F9 /* WebKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; };
</ins><span class="cx"> 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableBitmap.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A6420E312DCE2FF00CAAE2C /* ShareableBitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareableBitmap.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A64228A12DD024700CAAE2C /* DrawingArea.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawingArea.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -2203,6 +2229,8 @@
</span><span class="cx"> 1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeatures.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeaturesInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUIDelegate.h; sourceTree = "<group>"; };
</span><ins>+ 1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */ = {isa = PBXFileReference; lastKnownFileType = text; path = MigrateHeadersToWebKit2.make; sourceTree = "<group>"; };
+ 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1ADCB868189831B30022EE5A /* NavigationActionData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationActionData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1ADCB869189831B30022EE5A /* NavigationActionData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationActionData.h; sourceTree = "<group>"; };
</span><span class="cx"> 1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewConfiguration.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -2888,7 +2916,7 @@
</span><span class="cx"> 86F9536218FF550B001DB2EF /* ProcessAssertion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ProcessAssertion.mm; path = ios/ProcessAssertion.mm; sourceTree = "<group>"; };
</span><span class="cx"> 8CFECE931490F140002AAA32 /* EditorState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorState.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><del>- 8DC2EF5B0486A6940098B216 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</del><ins>+ 8DC2EF5B0486A6940098B216 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</ins><span class="cx"> 905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebMemorySampler.mac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 905620E812BC248B000799B6 /* WebMemorySampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMemorySampler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 905620E912BC248B000799B6 /* WebMemorySampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMemorySampler.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3252,7 +3280,7 @@
</span><span class="cx"> BCB0B0DD12305A8C00B1341E /* InjectedBundleUserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleUserMessageCoders.h; sourceTree = "<group>"; };
</span><span class="cx"> BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageCoders.h; sourceTree = "<group>"; };
</span><span class="cx"> BCB63477116BF10600603215 /* WebKit2_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2_C.h; sourceTree = "<group>"; };
</span><del>- BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit2.xcconfig; sourceTree = "<group>"; };
</del><ins>+ BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> BCB9E2411120DACA00A137E0 /* WebContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContext.h; sourceTree = "<group>"; };
</span><span class="cx"> BCB9E2421120DACA00A137E0 /* WebContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContext.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCB9E2491120E15C00A137E0 /* WKContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContext.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3518,6 +3546,13 @@
</span><span class="cx"> /* End PBXFileReference section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFrameworksBuildPhase section */
</span><ins>+ 1A6280CC191997BD006AD9F9 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> 1AC25FAE12A48EA700BD2671 /* Frameworks */ = {
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -3545,7 +3580,7 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 51F7DC43180CC93600212CA3 /* Foundation.framework in Frameworks */,
</span><del>- 51F7DC44180CC93600212CA3 /* WebKit2.framework in Frameworks */,
</del><ins>+ 51F7DC44180CC93600212CA3 /* WebKit.framework in Frameworks */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -3565,7 +3600,6 @@
</span><span class="cx"> 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
</span><span class="cx"> 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
</span><span class="cx"> 37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
</span><del>- 3766F9F0189A1248003CF19B /* WebCore.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -3598,7 +3632,7 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */,
</span><del>- BC8283DA16B4DB9300A278FE /* WebKit2.framework in Frameworks */,
</del><ins>+ BC8283DA16B4DB9300A278FE /* WebKit.framework in Frameworks */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -3621,7 +3655,7 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- BC82844F16B5089800A278FE /* WebKit2.framework in Frameworks */,
</del><ins>+ BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -3646,7 +3680,7 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> BC9FA520160D3B430054DF9A /* Foundation.framework in Frameworks */,
</span><del>- BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */,
</del><ins>+ BCAE9E08160C1C0700A33217 /* WebKit.framework in Frameworks */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -3674,12 +3708,13 @@
</span><span class="cx"> BCDE094213272496001259FB /* PluginProcess.app */,
</span><span class="cx"> 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
</span><span class="cx"> 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */,
</span><del>- 8DC2EF5B0486A6940098B216 /* WebKit2.framework */,
</del><ins>+ 8DC2EF5B0486A6940098B216 /* WebKit.framework */,
</ins><span class="cx"> 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */,
</span><span class="cx"> CDC3830617211799008A2FC3 /* WebProcessShim.dylib */,
</span><span class="cx"> 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.xpc */,
</span><span class="cx"> 5180C71D180CCA3100FDA612 /* com.apple.WebKit.Databases.Development.xpc */,
</span><span class="cx"> 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */,
</span><ins>+ 1A6280D0191997BD006AD9F9 /* WebKit2.framework */,
</ins><span class="cx"> );
</span><span class="cx"> name = Products;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -3699,6 +3734,7 @@
</span><span class="cx"> 51F7DC0A180CC41100212CA3 /* DatabaseProcess */,
</span><span class="cx"> 510CC7DA16138E0100D03ED3 /* NetworkProcess */,
</span><span class="cx"> 1A0EC6B0124BBD36007EF4A5 /* PluginProcess */,
</span><ins>+ 1A6280CA19199754006AD9F9 /* WebKit2 Framework */,
</ins><span class="cx"> C0CE729D1247E71D00BC0EC4 /* Derived Sources */,
</span><span class="cx"> 089C1665FE841158C02AAC07 /* Resources */,
</span><span class="cx"> C0CE73351247F70E00BC0EC4 /* Scripts */,
</span><span class="lines">@@ -3939,14 +3975,27 @@
</span><span class="cx"> 5DAD7294116FF70B00EE5396 /* WebContentProcess.xcconfig */,
</span><span class="cx"> BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */,
</span><span class="cx"> BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
</span><del>- BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */,
</del><ins>+ BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */,
</ins><span class="cx"> A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */,
</span><ins>+ 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */,
</ins><span class="cx"> );
</span><span class="cx"> path = Configurations;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> tabWidth = 8;
</span><span class="cx"> usesTabs = 0;
</span><span class="cx"> };
</span><ins>+ 1A6280CA19199754006AD9F9 /* WebKit2 Framework */ = {
+ isa = PBXGroup;
+ children = (
+ 1A6280EE19199800006AD9F9 /* WebKit2.m */,
+ 1A6280ED191997EB006AD9F9 /* Info-WebKit2.plist */,
+ 1ADAE12B1919A38E00F48E21 /* MigrateHeadersToWebKit2.make */,
+ 1ADAE12D1919A5B400F48E21 /* WKPreferences.h */,
+ );
+ name = "WebKit2 Framework";
+ path = mac;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 1A6FB7AA11E64B4900DB1371 /* Plugins */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -4777,9 +4826,23 @@
</span><span class="cx"> 37DFA6FE1810BB2D001F4A9F /* Cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 373D122118A473010066D9CC /* _WKFrameHandle.h */,
+ 373D122018A473010066D9CC /* _WKFrameHandle.mm */,
+ 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
+ A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */,
+ A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */,
+ 1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */,
+ 1A9E328C182165A900F5D04C /* _WKRemoteObjectInterface.mm */,
+ 1AABFE391829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.h */,
+ 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */,
+ 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */,
+ 1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */,
</ins><span class="cx"> 1AC1337E18590AE400F3EC05 /* RemoteObjectRegistry.h */,
</span><span class="cx"> 1AC1338118590B0500F3EC05 /* RemoteObjectRegistry.messages.in */,
</span><span class="cx"> 1AC1337D18590AE400F3EC05 /* RemoteObjectRegistry.mm */,
</span><ins>+ 1A6280C41919949F006AD9F9 /* WebKit.h */,
+ 1A6280F21919982A006AD9F9 /* WebKit.m */,
+ 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */,
</ins><span class="cx"> 1AE00D4B182D6EB000087DD7 /* WKBrowsingContextHandle.h */,
</span><span class="cx"> 1AE00D4A182D6EB000087DD7 /* WKBrowsingContextHandle.mm */,
</span><span class="cx"> 1AE00D4E182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h */,
</span><span class="lines">@@ -4791,17 +4854,6 @@
</span><span class="cx"> 1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */,
</span><span class="cx"> 1F604BA61889FA7400EE0395 /* WKRenderingProgressEvents.h */,
</span><span class="cx"> 1F604BA71889FA7400EE0395 /* WKRenderingProgressEventsInternal.h */,
</span><del>- 373D122118A473010066D9CC /* _WKFrameHandle.h */,
- 373D122018A473010066D9CC /* _WKFrameHandle.mm */,
- 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */,
- A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */,
- A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */,
- 1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */,
- 1A9E328C182165A900F5D04C /* _WKRemoteObjectInterface.mm */,
- 1AABFE391829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.h */,
- 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */,
- 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */,
- 1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */,
</del><span class="cx"> );
</span><span class="cx"> path = Cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -6634,6 +6686,14 @@
</span><span class="cx"> /* End PBXGroup section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXHeadersBuildPhase section */
</span><ins>+ 1A6280CD191997BD006AD9F9 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> 1AC25FAC12A48EA700BD2671 /* Headers */ = {
</span><span class="cx"> isa = PBXHeadersBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -6977,6 +7037,7 @@
</span><span class="cx"> 1A7E377918E4A4FE003D0FFF /* WKScriptMessage.h in Headers */,
</span><span class="cx"> 1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
</span><span class="cx"> 1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */,
</span><ins>+ 1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */,
</ins><span class="cx"> 1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
</span><span class="cx"> 296BD85D15019BC30071F424 /* StringUtilities.h in Headers */,
</span><span class="cx"> 379A873A18BBFE0F00588AF2 /* _WKElementAction.h in Headers */,
</span><span class="lines">@@ -7393,6 +7454,7 @@
</span><span class="cx"> BC40761C124FF0370068F20A /* WKURLCF.h in Headers */,
</span><span class="cx"> BC40760C124FF0270068F20A /* WKURLRequest.h in Headers */,
</span><span class="cx"> BC407629124FF0400068F20A /* WKURLRequestNS.h in Headers */,
</span><ins>+ 1A6280C51919949F006AD9F9 /* WebKit.h in Headers */,
</ins><span class="cx"> 753E3E0E1887398900188496 /* SessionTracker.h in Headers */,
</span><span class="cx"> BC40760E124FF0270068F20A /* WKURLResponse.h in Headers */,
</span><span class="cx"> 759CCD5A1808F6160078E8A8 /* WebOriginDataManagerProxy.h in Headers */,
</span><span class="lines">@@ -7454,6 +7516,27 @@
</span><span class="cx"> productReference = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */;
</span><span class="cx"> productType = "com.apple.product-type.application";
</span><span class="cx"> };
</span><ins>+ 1A6280CF191997BD006AD9F9 /* WebKit2 */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */;
+ buildPhases = (
+ 1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */,
+ 1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
+ 1A6280CB191997BD006AD9F9 /* Sources */,
+ 1A6280CC191997BD006AD9F9 /* Frameworks */,
+ 1A6280CD191997BD006AD9F9 /* Headers */,
+ 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ 1A6280EC191997D3006AD9F9 /* PBXTargetDependency */,
+ );
+ name = WebKit2;
+ productName = WebKit2;
+ productReference = 1A6280D0191997BD006AD9F9 /* WebKit2.framework */;
+ productType = "com.apple.product-type.framework";
+ };
</ins><span class="cx"> 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = 1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */;
</span><span class="lines">@@ -7560,15 +7643,17 @@
</span><span class="cx"> productReference = 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */;
</span><span class="cx"> productType = "com.apple.product-type.application";
</span><span class="cx"> };
</span><del>- 8DC2EF4F0486A6940098B216 /* WebKit2 */ = {
</del><ins>+ 8DC2EF4F0486A6940098B216 /* WebKit */ = {
</ins><span class="cx"> isa = PBXNativeTarget;
</span><del>- buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit2" */;
</del><ins>+ buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit" */;
</ins><span class="cx"> buildPhases = (
</span><ins>+ 1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */,
+ 1A07D2F51919AA8A00ECDA16 /* Make Frameworks Symbolic Link */,
</ins><span class="cx"> 8DC2EF500486A6940098B216 /* Headers */,
</span><span class="cx"> 375A248817E5048E00C9A086 /* Postprocess WKBase.h */,
</span><ins>+ 1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */,
</ins><span class="cx"> 8DC2EF520486A6940098B216 /* Resources */,
</span><span class="cx"> 7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
</span><del>- 5D1A239015E75B100023E981 /* Copy Message Generation Scripts */,
</del><span class="cx"> 5D1A239215E760590023E981 /* Remove Compiled Python Files */,
</span><span class="cx"> 8DC2EF540486A6940098B216 /* Sources */,
</span><span class="cx"> 8DC2EF560486A6940098B216 /* Frameworks */,
</span><span class="lines">@@ -7577,16 +7662,17 @@
</span><span class="cx"> 5DF408C6131DD49700130071 /* Check For Framework Include Consistency */,
</span><span class="cx"> 5DF408D1131DDBEC00130071 /* Check For Inappropriate Files In Framework */,
</span><span class="cx"> A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */,
</span><ins>+ 1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */,
</ins><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><span class="cx"> 37F7407912721F740093869B /* PBXTargetDependency */,
</span><span class="cx"> );
</span><del>- name = WebKit2;
</del><ins>+ name = WebKit;
</ins><span class="cx"> productInstallPath = "$(HOME)/Library/Frameworks";
</span><span class="cx"> productName = WebKit2;
</span><del>- productReference = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */;
</del><ins>+ productReference = 8DC2EF5B0486A6940098B216 /* WebKit.framework */;
</ins><span class="cx"> productType = "com.apple.product-type.framework";
</span><span class="cx"> };
</span><span class="cx"> BC3DE46515A91763008D26FC /* WebContent */ = {
</span><span class="lines">@@ -7770,7 +7856,8 @@
</span><span class="cx"> projectRoot = "";
</span><span class="cx"> targets = (
</span><span class="cx"> 1A50DB38110A3C13000D3FE5 /* All */,
</span><del>- 8DC2EF4F0486A6940098B216 /* WebKit2 */,
</del><ins>+ 8DC2EF4F0486A6940098B216 /* WebKit */,
+ 1A6280CF191997BD006AD9F9 /* WebKit2 */,
</ins><span class="cx"> 1A50DB1D110A3BDC000D3FE5 /* WebProcess */,
</span><span class="cx"> BCDE093313272496001259FB /* PluginProcess */,
</span><span class="cx"> 51FA1E17180CCADE00C44BE9 /* DatabaseProcess */,
</span><span class="lines">@@ -7906,6 +7993,96 @@
</span><span class="cx"> /* End PBXResourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXShellScriptBuildPhase section */
</span><ins>+ 1A07D2F51919AA8A00ECDA16 /* Make Frameworks Symbolic Link */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ WebKit2.xcodeproj,
+ );
+ name = "Make Frameworks Symbolic Link";
+ outputPaths = (
+ "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
+ };
+ 1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Add Symlink in /System/Library/PrivateFrameworks";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks\" ]]; then\nmkdir -p \"${INSTALL_DIR}/../PrivateFrameworks\"\nfi\nif [[ -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" && ! -L \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\necho \"ERROR: Cannot create symlink. ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework already exists and is a directory.\"\nexit 1\nfi\n# If the symlink already exists, remove it and create the new one in its place.\nln -s -h -f ../Frameworks/WebKit.framework ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\nfi";
+ };
+ 1A6280C81919956B006AD9F9 /* Migrate WebKitLegacy Headers */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Migrate WebKitLegacy Headers";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\nmake -C mac -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
+ };
+ 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Migrate Headers to WebKit2";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n make -C mac -f \"MigrateHeadersToWebKit2.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
+ };
+ 1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(PROJECT_DIR)/Configurations/Version.xcconfig",
+ );
+ name = "Update Info.plist with version information";
+ outputPaths = (
+ "$(PROJECT_DIR)/Info.plist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/Info.plist\";\nfi;\n";
+ };
+ 1ADAE1301919A9C600F48E21 /* Update Info.plist with version information */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(PROJECT_DIR)/Configurations/Version.xcconfig",
+ );
+ name = "Update Info.plist with version information";
+ outputPaths = (
+ "${PROJECT_DIR}/mac/WebKit2.plist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/Info-WebKit2.plist\";\nfi;\n";
+ };
</ins><span class="cx"> 3713F0231429063D0036387F /* Check For Inappropriate Objective-C Class Names */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -7934,7 +8111,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n rm ${WKBASE_H}.unifdef\n ;;\n1)\n mv ${WKBASE_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
</del><ins>+ shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n rm ${WKBASE_H}.unifdef\n ;;\n1)\n mv ${WKBASE_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
</ins><span class="cx"> };
</span><span class="cx"> 5D1A239215E760590023E981 /* Remove Compiled Python Files */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -8019,11 +8196,11 @@
</span><span class="cx"> );
</span><span class="cx"> name = "Add XPCServices symlink";
</span><span class="cx"> outputPaths = (
</span><del>- "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit2.framework/XPCServices",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit.framework/XPCServices",
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n ln -sf Versions/Current/XPCServices \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/XPCServices\"\nfi\n";
</del><ins>+ shellScript = "if [[ ${PLATFORM_NAME} == macosx ]]; then\n ln -sf Versions/Current/XPCServices \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nfi\n";
</ins><span class="cx"> };
</span><span class="cx"> BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -8045,21 +8222,21 @@
</span><span class="cx"> );
</span><span class="cx"> name = "Copy XPC services for engineering builds";
</span><span class="cx"> outputPaths = (
</span><del>- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Networking.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Plugin.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.OfflineStorage.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.OfflineStorage.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Databases.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.OfflineStorage.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.OfflineStorage.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} == iphone* ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\nfi\n";
</del><ins>+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} == iphone* ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\nfi\n";
</ins><span class="cx"> };
</span><span class="cx"> C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -8086,6 +8263,14 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ 1A6280CB191997BD006AD9F9 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 1A6280F019199800006AD9F9 /* WebKit2.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> 1AC25FAD12A48EA700BD2671 /* Sources */ = {
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -8307,6 +8492,7 @@
</span><span class="cx"> 37FC194A18510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm in Sources */,
</span><span class="cx"> 516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */,
</span><span class="cx"> 513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
</span><ins>+ 1A6280F31919982A006AD9F9 /* WebKit.m in Sources */,
</ins><span class="cx"> 51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
</span><span class="cx"> 51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
</span><span class="cx"> E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
</span><span class="lines">@@ -8923,7 +9109,7 @@
</span><span class="cx"> /* Begin PBXTargetDependency section */
</span><span class="cx"> 1A50DB27110A3BEF000D3FE5 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><del>- target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
</del><ins>+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</ins><span class="cx"> targetProxy = 1A50DB26110A3BEF000D3FE5 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><span class="cx"> 1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */ = {
</span><span class="lines">@@ -8931,6 +9117,16 @@
</span><span class="cx"> target = 1A50DB1D110A3BDC000D3FE5 /* WebProcess */;
</span><span class="cx"> targetProxy = 1A50DB3B110A3C19000D3FE5 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><ins>+ 1A6280EC191997D3006AD9F9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
+ targetProxy = 1A6280EB191997D3006AD9F9 /* PBXContainerItemProxy */;
+ };
+ 1A6280F619199865006AD9F9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 1A6280CF191997BD006AD9F9 /* WebKit2 */;
+ targetProxy = 1A6280F519199865006AD9F9 /* PBXContainerItemProxy */;
+ };
</ins><span class="cx"> 37F7407912721F740093869B /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
</span><span class="lines">@@ -8943,7 +9139,7 @@
</span><span class="cx"> };
</span><span class="cx"> 510CC8511613C98D00D03ED3 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><del>- target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
</del><ins>+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</ins><span class="cx"> targetProxy = 510CC8501613C98D00D03ED3 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><span class="cx"> 51A60B2C180CCF1200F3BF50 /* PBXTargetDependency */ = {
</span><span class="lines">@@ -8963,7 +9159,7 @@
</span><span class="cx"> };
</span><span class="cx"> 51FA1E1A180CCADE00C44BE9 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><del>- target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
</del><ins>+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</ins><span class="cx"> targetProxy = 51FA1E1B180CCADE00C44BE9 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><span class="cx"> BC77F95616D0459100F8F78A /* PBXTargetDependency */ = {
</span><span class="lines">@@ -9008,7 +9204,7 @@
</span><span class="cx"> };
</span><span class="cx"> BCDE093613272496001259FB /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><del>- target = 8DC2EF4F0486A6940098B216 /* WebKit2 */;
</del><ins>+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
</ins><span class="cx"> targetProxy = BCDE093713272496001259FB /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><span class="cx"> BCDE0AC113272712001259FB /* PBXTargetDependency */ = {
</span><span class="lines">@@ -9070,6 +9266,27 @@
</span><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="cx"> };
</span><ins>+ 1A6280E4191997BE006AD9F9 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ 1A6280E5191997BE006AD9F9 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ 1A6280E6191997BE006AD9F9 /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 1A50F0F819199E42001ACD12 /* WebKit2.xcconfig */;
+ buildSettings = {
+ };
+ name = Production;
+ };
</ins><span class="cx"> 1AC25FB112A48EA700BD2671 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
</span><span class="lines">@@ -9108,7 +9325,7 @@
</span><span class="cx"> };
</span><span class="cx"> 1DEB91AE08733DA50010E9CD /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
</del><ins>+ baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
</span><span class="cx"> OTHER_LDFLAGS = (
</span><span class="lines">@@ -9120,7 +9337,7 @@
</span><span class="cx"> };
</span><span class="cx"> 1DEB91AF08733DA50010E9CD /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
</del><ins>+ baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
</span><span class="cx"> OTHER_LDFLAGS = (
</span><span class="lines">@@ -9271,7 +9488,7 @@
</span><span class="cx"> };
</span><span class="cx"> 5D22D69D11A7534600BF30E5 /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */;
</del><ins>+ baseConfigurationReference = BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> OTHER_LDFLAGS = (
</span><span class="cx"> "$(OTHER_LDFLAGS)",
</span><span class="lines">@@ -9531,6 +9748,16 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><ins>+ 1A6280E3191997BE006AD9F9 /* Build configuration list for PBXNativeTarget "WebKit2" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 1A6280E4191997BE006AD9F9 /* Debug */,
+ 1A6280E5191997BE006AD9F9 /* Release */,
+ 1A6280E6191997BE006AD9F9 /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
</ins><span class="cx"> 1AC25FBA12A48EB600BD2671 /* Build configuration list for PBXNativeTarget "PluginProcessShim" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><span class="lines">@@ -9541,7 +9768,7 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit2" */ = {
</del><ins>+ 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WebKit" */ = {
</ins><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><span class="cx"> 1DEB91AE08733DA50010E9CD /* Debug */,
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessEntryPointmacXPCServiceWebContentServiceInfoOSXplist"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> <key>EnvironmentVariables</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>DYLD_INSERT_LIBRARIES</key>
</span><del>- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
</del><ins>+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessBundleParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFormDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,13 +23,13 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKWebProcessPlugInBrowserContextController.h>
-#import <WebKit2/WKWebProcessPlugInFrame.h>
-#import <WebKit2/WKWebProcessPlugInNodeHandle.h>
</del><ins>+#import <WebKit/WKWebProcessPlugInBrowserContextController.h>
+#import <WebKit/WKWebProcessPlugInFrame.h>
+#import <WebKit/WKWebProcessPlugInNodeHandle.h>
</ins><span class="cx">
</span><span class="cx"> @protocol WKWebProcessPlugInFormDelegatePrivate <NSObject>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInHitTestResulth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInLoadDelegateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKRenderingProgressEvents.h>
</del><ins>+#import <WebKit/WKRenderingProgressEvents.h>
</ins><span class="cx">
</span><span class="cx"> @class WKWebProcessPlugInBrowsingContextController;
</span><span class="cx"> @class WKWebProcessPlugInFrame;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInNodeHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInPageGrouph"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInScriptWorldh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKBundle_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleBackForwardListh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundleBackForwardList_h
</span><span class="cx"> #define WKBundleBackForwardList_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundleBackForwardListItem_h
</span><span class="cx"> #define WKBundleBackForwardListItem_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleDOMWindowExtensionh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundleDOMWindowExtension_h
</span><span class="cx"> #define WKBundleDOMWindowExtension_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> #define WKBundleFrame_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKFrame.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKFrame.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFramePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #define WKBundleFramePrivate_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleHitTestResulth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKBundleHitTestResult_h
</span><span class="cx"> #define WKBundleHitTestResult_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInitializeh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundleInitialize_h
</span><span class="cx"> #define WKBundleInitialize_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundleInspector_h
</span><span class="cx"> #define WKBundleInspector_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNavigationActionh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef WKBundleNavigationAction_h
</span><span class="cx"> #define WKBundleNavigationAction_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKPageLoadTypes.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKPageLoadTypes.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNodeHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundleNodeHandle_h
</span><span class="cx"> #define WKBundleNodeHandle_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleNodeHandlePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> #define WKBundleNodeHandlePrivate_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
-#include <WebKit2/WKImage.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
+#include <WebKit/WKImage.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,18 +27,18 @@
</span><span class="cx"> #define WKBundlePage_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKBundlePageContextMenuClient.h>
-#include <WebKit2/WKBundlePageDiagnosticLoggingClient.h>
-#include <WebKit2/WKBundlePageEditorClient.h>
-#include <WebKit2/WKBundlePageFormClient.h>
-#include <WebKit2/WKBundlePageFullScreenClient.h>
-#include <WebKit2/WKBundlePageLoaderClient.h>
-#include <WebKit2/WKBundlePagePolicyClient.h>
-#include <WebKit2/WKBundlePageResourceLoadClient.h>
-#include <WebKit2/WKBundlePageUIClient.h>
-#include <WebKit2/WKFindOptions.h>
-#include <WebKit2/WKImage.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKBundlePageContextMenuClient.h>
+#include <WebKit/WKBundlePageDiagnosticLoggingClient.h>
+#include <WebKit/WKBundlePageEditorClient.h>
+#include <WebKit/WKBundlePageFormClient.h>
+#include <WebKit/WKBundlePageFullScreenClient.h>
+#include <WebKit/WKBundlePageLoaderClient.h>
+#include <WebKit/WKBundlePagePolicyClient.h>
+#include <WebKit/WKBundlePageResourceLoadClient.h>
+#include <WebKit/WKBundlePageUIClient.h>
+#include <WebKit/WKFindOptions.h>
+#include <WebKit/WKImage.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageBannerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef WKBundlePageBanner_h
</span><span class="cx"> #define WKBundlePageBanner_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundlePageContextMenuClient_h
</span><span class="cx"> #define WKBundlePageContextMenuClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKBundlePageGetContextMenuFromDefaultContextMenuCallback)(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKArrayRef defaultMenu, WKArrayRef* newMenu, WKTypeRef* userData, const void* clientInfo);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundlePageDiagnosticLoggingClient_h
</span><span class="cx"> #define WKBundlePageDiagnosticLoggingClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKBundlePageDiagnosticLoggingCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, WKStringRef success, const void* clientInfo);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageEditorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundlePageEditorClient_h
</span><span class="cx"> #define WKBundlePageEditorClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> kWKInsertActionTyped = 0,
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageFormClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKBundlePageFormClient_h
</span><span class="cx"> #define WKBundlePageFormClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKBundlePageEditorClient.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKBundlePageEditorClient.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKBundlePageTextFieldDidBeginEditingCallback)(WKBundlePageRef page, WKBundleNodeHandleRef htmlInputElementHandle, WKBundleFrameRef frame, const void* clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageTextFieldDidEndEditingCallback)(WKBundlePageRef page, WKBundleNodeHandleRef htmlInputElementHandle, WKBundleFrameRef frame, const void* clientInfo);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageFullScreenClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKBundlePageFullScreenClient_h
</span><span class="cx"> #define WKBundlePageFullScreenClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> typedef bool (*WKBundlePageSupportsFullScreen)(WKBundlePageRef page, WKFullScreenKeyboardRequestType requestType);
</span><span class="cx"> typedef void (*WKBundlePageEnterFullScreenForElement)(WKBundlePageRef page, WKBundleNodeHandleRef element);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageGrouph"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundlePageGroup_h
</span><span class="cx"> #define WKBundlePageGroup_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKBundlePageLoaderClient_h
</span><span class="cx"> #define WKBundlePageLoaderClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKPageLoadTypes.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKPageLoadTypes.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKBundlePageDidStartProvisionalLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlayh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef WKBundlePageOverlay_h
</span><span class="cx"> #define WKBundlePageOverlay_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePolicyClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundlePagePolicyClient_h
</span><span class="cx"> #define WKBundlePagePolicyClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> WKBundlePagePolicyActionPassThrough,
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #ifndef WKBundlePagePrivate_h
</span><span class="cx"> #define WKBundlePagePrivate_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
-#include <WebKit2/WKGeometry.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
+#include <WebKit/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageResourceLoadClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundlePageResourceLoadClient_h
</span><span class="cx"> #define WKBundlePageResourceLoadClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKBundlePageDidInitiateLoadForResourceCallback)(WKBundlePageRef, WKBundleFrameRef, uint64_t resourceIdentifier, WKURLRequestRef, bool pageIsProvisionallyLoading, const void* clientInfo);
</span><span class="cx"> typedef WKURLRequestRef (*WKBundlePageWillSendRequestForFrameCallback)(WKBundlePageRef, WKBundleFrameRef, uint64_t resourceIdentifier, WKURLRequestRef, WKURLResponseRef redirectResponse, const void *clientInfo);
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageUIClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKBundlePageUIClient_h
</span><span class="cx"> #define WKBundlePageUIClient_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
</ins><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> WKBundlePageUIElementVisibilityUnknown,
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,15 +26,15 @@
</span><span class="cx"> #ifndef WKBundlePrivate_h
</span><span class="cx"> #define WKBundlePrivate_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JSBase.h>
</span><del>-#include <WebKit2/WKUserContentInjectedFrames.h>
-#include <WebKit2/WKUserScriptInjectionTime.h>
</del><ins>+#include <WebKit/WKUserContentInjectedFrames.h>
+#include <WebKit/WKUserScriptInjectionTime.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleRangeHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundleRangeHandle_h
</span><span class="cx"> #define WKBundleRangeHandle_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleRangeHandlePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define WKBundleRangeHandlePrivate_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcWKBundleScriptWorldh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WKBundleScriptWorld_h
</span><span class="cx"> #define WKBundleScriptWorld_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
</del><ins>+#include <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMach"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef WKBundlePageBannerMac_h
</span><span class="cx"> #define WKBundlePageBannerMac_h
</span><span class="cx">
</span><del>-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKBundlePageBanner.h>
</del><ins>+#include <WebKit/WKBase.h>
+#include <WebKit/WKBundlePageBanner.h>
</ins><span class="cx">
</span><span class="cx"> @class CALayer;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMDocumenth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMDocument.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMDocument.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMDocument.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKDOMNode.h>
</del><ins>+#import <WebKit/WKDOMNode.h>
</ins><span class="cx">
</span><span class="cx"> @class WKDOMElement;
</span><span class="cx"> @class WKDOMText;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMElement.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMElement.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMElement.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKDOMNode.h>
</del><ins>+#import <WebKit/WKDOMNode.h>
</ins><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKDOMElement : WKDOMNode
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMNodeh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMNodePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKDOMNode.h>
-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKDOMNode.h>
+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMRangeh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMRangePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKDOMRange.h>
-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKDOMRange.h>
+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMTexth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMText.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKDOMNode.h>
</del><ins>+#import <WebKit/WKDOMNode.h>
</ins><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKDOMText : WKDOMNode
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKDOMTextIteratorh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> @class WKConnection;
</span><span class="cx"> @class WKWebProcessPlugInController;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit/WKFoundation.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllerPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -23,11 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <WebKit2/WKWebProcessPlugInBrowserContextController.h>
</del><ins>+#import <WebKit/WKWebProcessPlugInBrowserContextController.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKBase.h>
</del><ins>+#import <WebKit/WKBase.h>
</ins><span class="cx">
</span><span class="cx"> @class WKBrowsingContextHandle;
</span><span class="cx"> @class _WKRemoteObjectRegistry;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInPrivate.h (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInPrivate.h 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInPrivate.h 2014-05-13 21:04:14 UTC (rev 168730)
</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 <WebKit2/WKWebProcessPlugIn.h>
</del><ins>+#import <WebKit/WKWebProcessPlugIn.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2macInfoWebKit2plistfromrev168541trunkSourceWebKit2macInfoWebKit2plist"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/mac/Info-WebKit2.plist (from rev 168541, trunk/Source/WebKit2/mac/Info-WebKit2.plist) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/mac/Info-WebKit2.plist (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/mac/Info-WebKit2.plist 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.${PRODUCT_NAME}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
+</dict>
+</plist>
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2macMigrateHeadersFromWebKitLegacymakefromrev168541trunkSourceWebKit2macMigrateHeadersFromWebKitLegacymake"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make (from rev 168541, trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -0,0 +1,237 @@
</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.
+
+PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
+PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
+
+ifeq ($(PLATFORM_NAME), macosx)
+
+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 $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h))) WebKitLegacy.h)
+
+WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out $(WEBKIT_PUBLIC_HEADERS) WebKit.h, $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h))))
+
+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)/% : $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/% MigrateHeadersFromWebKitLegacy.make
+ $(PUBLIC_HEADER_CHECK_CMD)
+ $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+$(PRIVATE_HEADERS_DIR)/% : $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/% MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+all : $(WEBKIT_LEGACY_PUBLIC_HEADERS) $(WEBKIT_LEGACY_PRIVATE_HEADERS)
+
+$(PUBLIC_HEADERS_DIR)/WebKitLegacy.h : $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/WebKit.h MigrateHeadersFromWebKitLegacy.make
+ $(PUBLIC_HEADER_CHECK_CMD)
+ $(WEBKIT_LEGACY_HEADER_MIGRATE_CMD)
+
+else
+
+WEBKIT_LEGACY_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter-out WebKit.h, $(notdir $(wildcard $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/*.h))))
+
+all : $(WEBKIT_LEGACY_PRIVATE_HEADERS) $(PUBLIC_HEADERS_DIR)/WebKitLegacy.h
+
+WEBKIT_HEADER_MIGRATE_CMD = echo "\#import <WebKitLegacy/"`basename $<`">" > $@
+
+$(PRIVATE_HEADERS_DIR)/% : $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/% MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT_HEADER_MIGRATE_CMD)
+
+$(PUBLIC_HEADERS_DIR)/WebKitLegacy.h : $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/WebKit.h MigrateHeadersFromWebKitLegacy.make
+ echo "#if defined(__has_include) && __has_include(<WebKitLegacy/WebKit.h>)" > $@
+ echo "#import <WebKitLegacy/"`basename $<`">" >> $@
+ echo "#endif" >> $@
+
+endif
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2macMigrateHeadersToWebKit2makefromrev168541trunkSourceWebKit2macMigrateHeadersToWebKit2make"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersToWebKit2.make (from rev 168541, trunk/Source/WebKit2/mac/MigrateHeadersToWebKit2.make) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersToWebKit2.make (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/mac/MigrateHeadersToWebKit2.make 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
+
+WEBKIT2_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/*.h))) $(addprefix $(PRIVATE_HEADERS_DIR)/, $(notdir $(wildcard $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/*.h)))
+
+all : $(WEBKIT2_HEADERS)
+
+WEBKIT2_HEADER_MIGRATE_CMD = echo "\#import <WebKit/"`basename $<`">" > $@
+
+$(PRIVATE_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKit.framework/PrivateHeaders/% MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT2_HEADER_MIGRATE_CMD)
+
+$(PRIVATE_HEADERS_DIR)/% : $(BUILT_PRODUCTS_DIR)/WebKit.framework/Headers/% MigrateHeadersFromWebKitLegacy.make
+ $(WEBKIT2_HEADER_MIGRATE_CMD)
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2macWKPreferenceshfromrev168541trunkSourceWebKit2macWKPreferencesh"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/mac/WKPreferences.h (from rev 168541, trunk/Source/WebKit2/mac/WKPreferences.h) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/mac/WKPreferences.h (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/mac/WKPreferences.h 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+#import <WebKit2/WKPreferencesRef.h>
</ins></span></pre></div>
<a id="branchessafari53834branchSourceWebKit2macWebKit2mfromrev168541trunkSourceWebKit2macWebKit2m"></a>
<div class="copfile"><h4>Copied: branches/safari-538.34-branch/Source/WebKit2/mac/WebKit2.m (from rev 168541, trunk/Source/WebKit2/mac/WebKit2.m) (0 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebKit2/mac/WebKit2.m (rev 0)
+++ branches/safari-538.34-branch/Source/WebKit2/mac/WebKit2.m 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -0,0 +1,27 @@
</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.
+ */
+
+// This file is only here so WebKit2 has something to link against.
+
</ins></span></pre></div>
<a id="branchessafari53834branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Tools/ChangeLog (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Tools/ChangeLog 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Tools/ChangeLog 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-13 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168541
+
+ 2014-05-09 Anders Carlsson <andersca@apple.com>
+
+ Rename WebKit2.framework to WebKit.framework
+ https://bugs.webkit.org/show_bug.cgi?id=132743
+ <rdar://problem/15920046>
+
+ Reviewed by Dan Bernstein.
+
+ * Scripts/check-for-inappropriate-files-in-framework:
+ Use PRODUCT_NAME instead of PROJECT_NAME when matching frameworks.
+ Change WebKit2 to WebKit.
+
+ * Scripts/check-for-webkit-framework-include-consistency:
+ Change WebKit to WebKitLegacy.
+
</ins><span class="cx"> 2014-05-08 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168477
</span></span></pre></div>
<a id="branchessafari53834branchToolsScriptscheckforinappropriatefilesinframework"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Tools/Scripts/check-for-inappropriate-files-in-framework (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Tools/Scripts/check-for-inappropriate-files-in-framework 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Tools/Scripts/check-for-inappropriate-files-in-framework 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -24,11 +24,11 @@
</span><span class="cx"> # THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> base_directory = ENV['TARGET_BUILD_DIR'] or throw "Unable to find TARGET_BUILD_DIR in the environment!"
</span><del>-project_name = ENV['PROJECT_NAME'] or throw "Unable to find PROJECT_NAME in the environment!"
</del><ins>+project_name = ENV['PRODUCT_NAME'] or throw "Unable to find PRODUCT_NAME in the environment!"
</ins><span class="cx"> is_shallow_bundle = (ENV['SHALLOW_BUNDLE'] || "NO").upcase == "YES"
</span><span class="cx">
</span><span class="cx"> $INAPPROPRIATE_FILES = { "WebCore" => { "Resources" => ["*.in", "*.idl", "*.h"] },
</span><del>- "WebKit2" => { "Resources" => ["*.in", "*.h"] },
</del><ins>+ "WebKit" => { "Resources" => ["*.in", "*.h"] },
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Dir.chdir base_directory
</span></span></pre></div>
<a id="branchessafari53834branchToolsScriptscheckforwebkitframeworkincludeconsistency"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Tools/Scripts/check-for-webkit-framework-include-consistency (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Tools/Scripts/check-for-webkit-framework-include-consistency 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/Tools/Scripts/check-for-webkit-framework-include-consistency 2014-05-13 21:04:14 UTC (rev 168730)
</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" or framework == "WebKitLegacy") and included_header_name =~ /^WAK/
</del><ins>+ return if (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="branchessafari53834branchWebKitxcworkspacexcshareddataxcschemesAllSourcetargetWebProcessxcscheme"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -101,10 +101,10 @@
</span><span class="cx"> buildForAnalyzing = "YES">
</span><span class="cx"> <BuildableReference
</span><span class="cx"> BuildableIdentifier = "primary"
</span><del>- BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
- BuildableName = "All"
- BlueprintName = "All"
- ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
</del><ins>+ BlueprintIdentifier = "9398100A0824BF01008DF038"
+ BuildableName = "WebKitLegacy.framework"
+ BlueprintName = "WebKitLegacy"
+ ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
</ins><span class="cx"> </BuildableReference>
</span><span class="cx"> </BuildActionEntry>
</span><span class="cx"> <BuildActionEntry
</span><span class="lines">@@ -115,10 +115,10 @@
</span><span class="cx"> buildForAnalyzing = "YES">
</span><span class="cx"> <BuildableReference
</span><span class="cx"> BuildableIdentifier = "primary"
</span><del>- BlueprintIdentifier = "9398100A0824BF01008DF038"
- BuildableName = "WebKitLegacy.framework"
- BlueprintName = "WebKitLegacy"
- ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
</del><ins>+ BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
+ BuildableName = "All"
+ BlueprintName = "All"
+ ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
</ins><span class="cx"> </BuildableReference>
</span><span class="cx"> </BuildActionEntry>
</span><span class="cx"> </BuildActionEntries>
</span></span></pre></div>
<a id="branchessafari53834branchWebKitxcworkspacexcshareddataxcschemesAllSourcexcscheme"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme (168729 => 168730)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2014-05-13 20:57:07 UTC (rev 168729)
+++ branches/safari-538.34-branch/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2014-05-13 21:04:14 UTC (rev 168730)
</span><span class="lines">@@ -101,10 +101,10 @@
</span><span class="cx"> buildForAnalyzing = "YES">
</span><span class="cx"> <BuildableReference
</span><span class="cx"> BuildableIdentifier = "primary"
</span><del>- BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
- BuildableName = "All"
- BlueprintName = "All"
- ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
</del><ins>+ BlueprintIdentifier = "9398100A0824BF01008DF038"
+ BuildableName = "WebKitLegacy.framework"
+ BlueprintName = "WebKitLegacy"
+ ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
</ins><span class="cx"> </BuildableReference>
</span><span class="cx"> </BuildActionEntry>
</span><span class="cx"> <BuildActionEntry
</span><span class="lines">@@ -115,10 +115,10 @@
</span><span class="cx"> buildForAnalyzing = "YES">
</span><span class="cx"> <BuildableReference
</span><span class="cx"> BuildableIdentifier = "primary"
</span><del>- BlueprintIdentifier = "9398100A0824BF01008DF038"
- BuildableName = "WebKitLegacy.framework"
- BlueprintName = "WebKitLegacy"
- ReferencedContainer = "container:Source/WebKit/WebKit.xcodeproj">
</del><ins>+ BlueprintIdentifier = "1A50DB38110A3C13000D3FE5"
+ BuildableName = "All"
+ BlueprintName = "All"
+ ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
</ins><span class="cx"> </BuildableReference>
</span><span class="cx"> </BuildActionEntry>
</span><span class="cx"> </BuildActionEntries>
</span></span></pre>
</div>
</div>
</body>
</html>