<!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>[160104] trunk</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/160104">160104</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-04 10:49:49 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate all unversioned client structs in favor of having explicit versioned structs
https://bugs.webkit.org/show_bug.cgi?id=125203
Reviewed by Dan Bernstein.
Source/WebKit2:
Deprecate all the "current version" enums and unversioned client structs.
* Shared/API/c/WKConnectionRef.cpp:
(WKConnectionSetConnectionClient):
* Shared/API/c/WKConnectionRef.h:
* UIProcess/API/C/WKContext.cpp:
(WKContextSetClient):
(WKContextSetInjectedBundleClient):
(WKContextSetHistoryClient):
(WKContextSetDownloadClient):
(WKContextSetConnectionClient):
* UIProcess/API/C/WKContext.h:
* UIProcess/API/C/WKContextConnectionClient.h:
* UIProcess/API/C/WKContextDownloadClient.h:
* UIProcess/API/C/WKContextHistoryClient.h:
* UIProcess/API/C/WKContextInjectedBundleClient.h:
* UIProcess/API/C/WKCookieManager.cpp:
(WKCookieManagerSetClient):
* UIProcess/API/C/WKCookieManager.h:
* UIProcess/API/C/WKDatabaseManager.cpp:
(WKDatabaseManagerSetClient):
* UIProcess/API/C/WKDatabaseManager.h:
* UIProcess/API/C/WKGeolocationManager.cpp:
(WKGeolocationManagerSetProvider):
* UIProcess/API/C/WKGeolocationManager.h:
* UIProcess/API/C/WKIconDatabase.cpp:
(WKIconDatabaseSetIconDatabaseClient):
* UIProcess/API/C/WKIconDatabase.h:
* UIProcess/API/C/WKOriginDataManager.cpp:
(WKOriginDataManagerSetChangeClient):
* UIProcess/API/C/WKOriginDataManager.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageContextMenuClient):
(WKPageSetPageFindClient):
(WKPageSetPageFindMatchesClient):
(WKPageSetPageFormClient):
(WKPageSetPageLoaderClient):
(WKPageSetPagePolicyClient):
(WKPageSetPageUIClient):
* UIProcess/API/C/WKPage.h:
* UIProcess/API/C/WKPageContextMenuClient.h:
* UIProcess/API/C/WKPageFindClient.h:
* UIProcess/API/C/WKPageFindMatchesClient.h:
* UIProcess/API/C/WKPageFormClient.h:
* UIProcess/API/C/WKPageLoaderClient.h:
* UIProcess/API/C/WKPagePolicyClient.h:
* UIProcess/API/C/WKPageUIClient.h:
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(setUpPagePolicyClient):
* UIProcess/API/Cocoa/WKConnection.mm:
(setUpClient):
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(setUpConnectionClient):
(setUpInectedBundleClient):
(setUpHistoryClient):
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::createInspectorPage):
* UIProcess/WebUIClient.cpp:
(WebKit::WebUIClient::createNewPage):
(WebKit::WebUIClient::mouseDidMoveOverElement):
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
(WKBundleSetClient):
* WebProcess/InjectedBundle/API/c/WKBundle.h:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetContextMenuClient):
(WKBundlePageSetEditorClient):
(WKBundlePageSetFormClient):
(WKBundlePageSetPageLoaderClient):
(WKBundlePageSetResourceLoadClient):
(WKBundlePageSetPolicyClient):
(WKBundlePageSetUIClient):
(WKBundlePageSetFullScreenClient):
(WKBundlePageSetDiagnosticLoggingClient):
* WebProcess/InjectedBundle/API/c/WKBundlePage.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
(WKBundlePageOverlayCreate):
(WKBundlePageOverlaySetAccessibilityClient):
* WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
* WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h:
* WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h:
* WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm:
(WKBundlePageBannerCreateBannerWithCALayer):
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
(setUpBundleClient):
Tools:
Update for WebKit2 API changes.
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate init]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController awakeFromNib]):
* TestWebKitAPI/InjectedBundleController.cpp:
(TestWebKitAPI::InjectedBundleController::initialize):
* TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
(TestWebKitAPI::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp:
(TestWebKitAPI::DOMWindowExtensionBasic::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp:
(TestWebKitAPI::DOMWindowExtensionNoCache::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp:
(TestWebKitAPI::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
(TestWebKitAPI::DidAssociateFormControlsTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
(TestWebKitAPI::setContextDownloadClient):
(TestWebKitAPI::setPagePolicyClient):
* TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/Find.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
(TestWebKitAPI::setupGeolocationProvider):
(TestWebKitAPI::setupView):
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
(TestWebKitAPI::HitTestResultNodeHandleTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp:
(TestWebKitAPI::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp:
(TestWebKitAPI::InjectedBundleFrameHitTestTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
(TestWebKitAPI::LoadCanceledNoServerRedirectCallbackTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp:
(TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader):
* TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp:
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp:
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp:
(TestWebKitAPI::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp:
(TestWebKitAPI::ParentFrameTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm:
(TestWebKitAPI::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp:
(TestWebKitAPI::PasteboardNotificationsTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp:
(TestWebKitAPI::setInjectedBundleClient):
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp:
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp:
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp:
(TestWebKitAPI::ShouldGoToBackForwardListItemTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/UserMessage.cpp:
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::setInjectedBundleClient):
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/WKConnection.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp:
(TestWebKitAPI::WKConnectionTest::initialize):
* TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp:
(TestWebKitAPI::setPageLoaderClient):
* TestWebKitAPI/Tests/WebKit2/WebArchive.cpp:
(TestWebKitAPI::setInjectedBundleClient):
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
(TestWebKitAPI::WebKit2WillLoadTest::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp:
(TestWebKitAPI::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp:
(TestWebKitAPI::WillSendSubmitEventTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm:
(TestWebKitAPI::setInjectedBundleClient):
* TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp:
* TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp:
(TestWebKitAPI::DenyWillSendRequestTest::didCreatePage):
* TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm:
(TestWebKitAPI::didCreateConnection):
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:
(TestWebKitAPI::PageVisibilityStateWithWindowChanges::initializeView):
* TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm:
* TestWebKitAPI/mac/WebKitAgnosticTest.mm:
(TestWebKitAPI::setPageLoaderClient):
* WebKitTestRunner/GeolocationProviderMock.cpp:
(WTR::GeolocationProviderMock::GeolocationProviderMock):
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::initialize):
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::InjectedBundlePage):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::createOtherPage):
(WTR::TestController::initialize):
(WTR::TestController::createWebViewWithOptions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKConnectionRefcpp">trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKConnectionRefh">trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContexth">trunk/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextConnectionClienth">trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextDownloadClienth">trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextHistoryClienth">trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextInjectedBundleClienth">trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCookieManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKDatabaseManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKGeolocationManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKGeolocationManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKIconDatabasecpp">trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKIconDatabaseh">trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKOriginDataManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKOriginDataManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageh">trunk/Source/WebKit2/UIProcess/API/C/WKPage.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageContextMenuClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageFindClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageFindMatchesClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageFormClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePolicyClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageUIClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKConnectionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebUIClientcpp">trunk/Source/WebKit2/UIProcess/WebUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageBannerh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageContextMenuClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageDiagnosticLoggingClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageEditorClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageFormClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageFullScreenClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageLoaderClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlaycpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlayh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePolicyClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageResourceLoadClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageUIClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMach">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMacmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
<li><a href="#trunkToolsTestWebKitAPIInjectedBundleControllercpp">trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2AboutBlankLoadcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CanHandleRequestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CloseThenTerminatecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CookieManagercpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/CookieManager.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DOMWindowExtensionBasiccpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DOMWindowExtensionBasic_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DOMWindowExtensionNoCachecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DOMWindowExtensionNoCache_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DidAssociateFormControlscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DidAssociateFormControls_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DidNotHandleKeyDowncpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DocumentStartUserScriptAlertCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2DownloadDecideDestinationCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2FailedLoadcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2Findcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2FindMatchesmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ForceRepaintcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2FrameMIMETypeHTMLcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2FrameMIMETypePNGcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2Geolocationcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GetInjectedBundleInitializationUserDataCallbackcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2HitTestResultNodeHandlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2HitTestResultNodeHandle_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2InjectedBundleBasiccpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2InjectedBundleFrameHitTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2InjectedBundleFrameHitTest_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2InjectedBundleInitializationUserDataCallbackWinscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2LayoutMilestonesWithAllContentInFramecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2LoadAlternateHTMLStringWithNonDirectoryURLcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2LoadCanceledNoServerRedirectCallbackcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2LoadCanceledNoServerRedirectCallback_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2LoadPageOnCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2MouseMoveAfterCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2NewFirstVisuallyNonEmptyLayoutcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2NewFirstVisuallyNonEmptyLayoutFailscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2NewFirstVisuallyNonEmptyLayoutForImagescpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2NewFirstVisuallyNonEmptyLayoutFramescpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2PageLoadBasiccpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2PageLoadDidChangeLocationWithinPageForFramecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ParentFramecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ParentFrame_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2PasteboardNotificationsmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2PasteboardNotifications_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2PrivateBrowsingPushStateNoHistoryCallbackcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ReloadPageAfterCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ResizeReversePaginatedWebViewcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ResizeWindowAfterCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ResponsivenessTimerDoesntFireEarlycpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2RestoreSessionStateContainingFormDatacpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ScrollPinningBehaviorscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ShouldGoToBackForwardListItemcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ShouldGoToBackForwardListItem_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2SpacebarScrollingcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2TerminateTwicecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2UserMessagecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WKConnectioncpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WKConnection_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WKPageGetScaleFactorNotZerocpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WebArchivecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillLoadcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillLoad_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillSendSubmitEventcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WillSendSubmitEvent_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2macEditorCommandsmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2macGetBackingScaleFactormm">trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2macGetPIDAfterAbortedProcessLaunchcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCCustomProtocolsInvalidScheme_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCPreventImageLoadWithAutoResizing_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCWKRemoteObjectRegistrymm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacPageVisibilityStateWithWindowChangesmm">trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacWKRemoteObjectRegistry_Bundlemm">trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPImacWebKitAgnosticTestmm">trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerGeolocationProviderMockcpp">trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -1,3 +1,106 @@
</span><ins>+2013-12-03 Anders Carlsson <andersca@apple.com>
+
+ Deprecate all unversioned client structs in favor of having explicit versioned structs
+ https://bugs.webkit.org/show_bug.cgi?id=125203
+
+ Reviewed by Dan Bernstein.
+
+ Deprecate all the "current version" enums and unversioned client structs.
+
+ * Shared/API/c/WKConnectionRef.cpp:
+ (WKConnectionSetConnectionClient):
+ * Shared/API/c/WKConnectionRef.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetClient):
+ (WKContextSetInjectedBundleClient):
+ (WKContextSetHistoryClient):
+ (WKContextSetDownloadClient):
+ (WKContextSetConnectionClient):
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/C/WKContextConnectionClient.h:
+ * UIProcess/API/C/WKContextDownloadClient.h:
+ * UIProcess/API/C/WKContextHistoryClient.h:
+ * UIProcess/API/C/WKContextInjectedBundleClient.h:
+ * UIProcess/API/C/WKCookieManager.cpp:
+ (WKCookieManagerSetClient):
+ * UIProcess/API/C/WKCookieManager.h:
+ * UIProcess/API/C/WKDatabaseManager.cpp:
+ (WKDatabaseManagerSetClient):
+ * UIProcess/API/C/WKDatabaseManager.h:
+ * UIProcess/API/C/WKGeolocationManager.cpp:
+ (WKGeolocationManagerSetProvider):
+ * UIProcess/API/C/WKGeolocationManager.h:
+ * UIProcess/API/C/WKIconDatabase.cpp:
+ (WKIconDatabaseSetIconDatabaseClient):
+ * UIProcess/API/C/WKIconDatabase.h:
+ * UIProcess/API/C/WKOriginDataManager.cpp:
+ (WKOriginDataManagerSetChangeClient):
+ * UIProcess/API/C/WKOriginDataManager.h:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageContextMenuClient):
+ (WKPageSetPageFindClient):
+ (WKPageSetPageFindMatchesClient):
+ (WKPageSetPageFormClient):
+ (WKPageSetPageLoaderClient):
+ (WKPageSetPagePolicyClient):
+ (WKPageSetPageUIClient):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/C/WKPageContextMenuClient.h:
+ * UIProcess/API/C/WKPageFindClient.h:
+ * UIProcess/API/C/WKPageFindMatchesClient.h:
+ * UIProcess/API/C/WKPageFormClient.h:
+ * UIProcess/API/C/WKPageLoaderClient.h:
+ * UIProcess/API/C/WKPagePolicyClient.h:
+ * UIProcess/API/C/WKPageUIClient.h:
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (setUpPagePolicyClient):
+ * UIProcess/API/Cocoa/WKConnection.mm:
+ (setUpClient):
+ * UIProcess/API/Cocoa/WKProcessGroup.mm:
+ (setUpConnectionClient):
+ (setUpInectedBundleClient):
+ (setUpHistoryClient):
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::createInspectorPage):
+ * UIProcess/WebUIClient.cpp:
+ (WebKit::WebUIClient::createNewPage):
+ (WebKit::WebUIClient::mouseDidMoveOverElement):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleSetClient):
+ * WebProcess/InjectedBundle/API/c/WKBundle.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageSetContextMenuClient):
+ (WKBundlePageSetEditorClient):
+ (WKBundlePageSetFormClient):
+ (WKBundlePageSetPageLoaderClient):
+ (WKBundlePageSetResourceLoadClient):
+ (WKBundlePageSetPolicyClient):
+ (WKBundlePageSetUIClient):
+ (WKBundlePageSetFullScreenClient):
+ (WKBundlePageSetDiagnosticLoggingClient):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
+ (WKBundlePageOverlayCreate):
+ (WKBundlePageOverlaySetAccessibilityClient):
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h:
+ * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h:
+ * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm:
+ (WKBundlePageBannerCreateBannerWithCALayer):
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
+ (setUpBundleClient):
+
</ins><span class="cx"> 2013-12-04 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix build warnings in DownloadAuthenticationClient.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKConnectionRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> return toAPI(WebConnection::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKConnectionSetConnectionClient(WKConnectionRef connectionRef, const WKConnectionClient* wkClient)
</del><ins>+void WKConnectionSetConnectionClient(WKConnectionRef connectionRef, const WKConnectionClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(connectionRef)->initializeConnectionClient(reinterpret_cast<const WKConnectionClientBase*>(wkClient));
</del><ins>+ toImpl(connectionRef)->initializeConnectionClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKConnectionPostMessage(WKConnectionRef connectionRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKConnectionRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -48,8 +48,7 @@
</span><span class="cx"> WKConnectionDidCloseCallback didClose;
</span><span class="cx"> } WKConnectionClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { WKConnectionClientCurrentVersion = 0 };
</del><ins>+enum { WKConnectionClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKConnectionClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -57,11 +56,11 @@
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKConnectionDidReceiveMessageCallback didReceiveMessage;
</span><span class="cx"> WKConnectionDidCloseCallback didClose;
</span><del>-} WKConnectionClient;
</del><ins>+} WKConnectionClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKConnectionGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKConnectionSetConnectionClient(WKConnectionRef connection, const WKConnectionClient* client);
</del><ins>+WK_EXPORT void WKConnectionSetConnectionClient(WKConnectionRef connection, const WKConnectionClientBase* client);
</ins><span class="cx"> WK_EXPORT void WKConnectionPostMessage(WKConnectionRef connection, WKStringRef messageName, WKTypeRef messageBody);
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -80,29 +80,29 @@
</span><span class="cx"> return toAPI(context.release().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetClient(WKContextRef contextRef, const WKContextClient* wkClient)
</del><ins>+void WKContextSetClient(WKContextRef contextRef, const WKContextClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(contextRef)->initializeClient(reinterpret_cast<const WKContextClientBase*>(wkClient));
</del><ins>+ toImpl(contextRef)->initializeClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClient* wkClient)
</del><ins>+void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(contextRef)->initializeInjectedBundleClient(reinterpret_cast<const WKContextInjectedBundleClientBase*>(wkClient));
</del><ins>+ toImpl(contextRef)->initializeInjectedBundleClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClient* wkClient)
</del><ins>+void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(contextRef)->initializeHistoryClient(reinterpret_cast<const WKContextHistoryClientBase*>(wkClient));
</del><ins>+ toImpl(contextRef)->initializeHistoryClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClient* wkClient)
</del><ins>+void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(contextRef)->initializeDownloadClient(reinterpret_cast<const WKContextDownloadClientBase*>(wkClient));
</del><ins>+ toImpl(contextRef)->initializeDownloadClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetConnectionClient(WKContextRef contextRef, const WKContextConnectionClient* wkClient)
</del><ins>+void WKContextSetConnectionClient(WKContextRef contextRef, const WKContextConnectionClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(contextRef)->initializeConnectionClient(reinterpret_cast<const WKContextConnectionClientBase*>(wkClient));
</del><ins>+ toImpl(contextRef)->initializeConnectionClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKDownloadRef WKContextDownloadURLRequest(WKContextRef contextRef, const WKURLRequestRef requestRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -62,8 +62,7 @@
</span><span class="cx"> WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
</span><span class="cx"> } WKContextClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKContextClientCurrentVersion = 0 };
</del><ins>+enum { kWKContextClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKContextClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -72,7 +71,7 @@
</span><span class="cx"> WKContextPlugInAutoStartOriginHashesChangedCallback plugInAutoStartOriginHashesChanged;
</span><span class="cx"> WKContextNetworkProcessDidCrashCallback networkProcessDidCrash;
</span><span class="cx"> WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
</span><del>-} WKContextClient;
</del><ins>+} WKContextClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> kWKProcessModelSharedSecondaryProcess = 0,
</span><span class="lines">@@ -91,11 +90,11 @@
</span><span class="cx"> WK_EXPORT WKContextRef WKContextCreate();
</span><span class="cx"> WK_EXPORT WKContextRef WKContextCreateWithInjectedBundlePath(WKStringRef path);
</span><span class="cx">
</span><del>-WK_EXPORT void WKContextSetClient(WKContextRef context, const WKContextClient* client);
-WK_EXPORT void WKContextSetInjectedBundleClient(WKContextRef context, const WKContextInjectedBundleClient* client);
-WK_EXPORT void WKContextSetHistoryClient(WKContextRef context, const WKContextHistoryClient* client);
-WK_EXPORT void WKContextSetDownloadClient(WKContextRef context, const WKContextDownloadClient* client);
-WK_EXPORT void WKContextSetConnectionClient(WKContextRef context, const WKContextConnectionClient* client);
</del><ins>+WK_EXPORT void WKContextSetClient(WKContextRef context, const WKContextClientBase* client);
+WK_EXPORT void WKContextSetInjectedBundleClient(WKContextRef context, const WKContextInjectedBundleClientBase* client);
+WK_EXPORT void WKContextSetHistoryClient(WKContextRef context, const WKContextHistoryClientBase* client);
+WK_EXPORT void WKContextSetDownloadClient(WKContextRef context, const WKContextDownloadClientBase* client);
+WK_EXPORT void WKContextSetConnectionClient(WKContextRef context, const WKContextConnectionClientBase* client);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKDownloadRef WKContextDownloadURLRequest(WKContextRef context, const WKURLRequestRef request);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextConnectionClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -42,14 +42,13 @@
</span><span class="cx"> WKContextDidCreateConnection didCreateConnection;
</span><span class="cx"> } WKContextConnectionClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKContextConnectionClientCurrentVersion = 0 };
</del><ins>+enum { kWKContextConnectionClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKContextConnectionClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="cx">
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKContextDidCreateConnection didCreateConnection;
</span><del>-} WKContextConnectionClient;
</del><ins>+} WKContextConnectionClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKContextConnectionClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextDownloadClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -62,8 +62,7 @@
</span><span class="cx"> WKContextDownloadProcessDidCrashCallback processDidCrash;
</span><span class="cx"> } WKContextDownloadClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKContextDownloadClientCurrentVersion = 0 };
</del><ins>+enum { kWKContextDownloadClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKContextDownloadClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -80,6 +79,6 @@
</span><span class="cx"> WKContextDownloadDidFailCallback didFail;
</span><span class="cx"> WKContextDownloadDidCancel didCancel;
</span><span class="cx"> WKContextDownloadProcessDidCrashCallback processDidCrash;
</span><del>-} WKContextDownloadClient;
</del><ins>+} WKContextDownloadClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKContextDownloadClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextHistoryClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -50,8 +50,7 @@
</span><span class="cx"> WKContextPopulateVisitedLinksCallback populateVisitedLinks;
</span><span class="cx"> } WKContextHistoryClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKContextHistoryClientCurrentVersion = 0 };
</del><ins>+enum { kWKContextHistoryClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKContextHistoryClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -62,6 +61,6 @@
</span><span class="cx"> WKContextDidPerformServerRedirectCallback didPerformServerRedirect;
</span><span class="cx"> WKContextDidUpdateHistoryTitleCallback didUpdateHistoryTitle;
</span><span class="cx"> WKContextPopulateVisitedLinksCallback populateVisitedLinks;
</span><del>-} WKContextHistoryClient;
</del><ins>+} WKContextHistoryClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKContextHistoryClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextInjectedBundleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> WKContextGetInjectedBundleInitializationUserDataCallback getInjectedBundleInitializationUserData;
</span><span class="cx"> } WKContextInjectedBundleClientV1;
</span><span class="cx">
</span><ins>+enum { kWKContextInjectedBundleClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKContextInjectedBundleClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -67,8 +68,6 @@
</span><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKContextGetInjectedBundleInitializationUserDataCallback getInjectedBundleInitializationUserData;
</span><del>-} WKContextInjectedBundleClient;
</del><ins>+} WKContextInjectedBundleClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><del>-enum { kWKContextInjectedBundleClientCurrentVersion = 1 };
-
</del><span class="cx"> #endif // WKContextInjectedBundleClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> return toAPI(WebCookieManagerProxy::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClient* wkClient)
</del><ins>+void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(cookieManagerRef)->initializeClient(reinterpret_cast<const WKCookieManagerClientBase*>(wkClient));
</del><ins>+ toImpl(cookieManagerRef)->initializeClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManagerRef, void* context, WKCookieManagerGetCookieHostnamesFunction callback)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCookieManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -54,19 +54,18 @@
</span><span class="cx"> WKCookieManagerCookiesDidChangeCallback cookiesDidChange;
</span><span class="cx"> } WKCookieManagerClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKCookieManagerClientCurrentVersion = 0 };
</del><ins>+enum { kWKCookieManagerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKCookieManagerClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="cx">
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKCookieManagerCookiesDidChangeCallback cookiesDidChange;
</span><del>-} WKCookieManagerClient;
</del><ins>+} WKCookieManagerClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKCookieManagerGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClient* client);
</del><ins>+WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClientBase* client);
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKCookieManagerGetCookieHostnamesFunction)(WKArrayRef, WKErrorRef, void*);
</span><span class="cx"> WK_EXPORT void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetCookieHostnamesFunction function);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -120,12 +120,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManagerRef, const WKDatabaseManagerClient* wkClient)
</del><ins>+void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManagerRef, const WKDatabaseManagerClientBase* wkClient)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> if (wkClient && wkClient->version)
</span><span class="cx"> return;
</span><del>- toImpl(databaseManagerRef)->initializeClient(reinterpret_cast<const WKDatabaseManagerClientBase*>(wkClient));
</del><ins>+ toImpl(databaseManagerRef)->initializeClient(wkClient);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(databaseManagerRef);
</span><span class="cx"> UNUSED_PARAM(wkClient);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -79,8 +79,7 @@
</span><span class="cx"> WKDatabaseManagerDidModifyDatabaseCallback didModifyDatabase;
</span><span class="cx"> } WKDatabaseManagerClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKDatabaseManagerClientCurrentVersion = 0 };
</del><ins>+enum { kWKDatabaseManagerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKDatabaseManagerClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -88,11 +87,11 @@
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKDatabaseManagerDidModifyOriginCallback didModifyOrigin;
</span><span class="cx"> WKDatabaseManagerDidModifyDatabaseCallback didModifyDatabase;
</span><del>-} WKDatabaseManagerClient;
</del><ins>+} WKDatabaseManagerClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKDatabaseManagerGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManager, const WKDatabaseManagerClient* client);
</del><ins>+WK_EXPORT void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManager, const WKDatabaseManagerClientBase* client);
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKDatabaseManagerGetDatabasesByOriginFunction)(WKArrayRef, WKErrorRef, void*);
</span><span class="cx"> WK_EXPORT void WKDatabaseManagerGetDatabasesByOrigin(WKDatabaseManagerRef databaseManager, void* context, WKDatabaseManagerGetDatabasesByOriginFunction function);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKGeolocationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> return toAPI(WebGeolocationManagerProxy::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManagerRef, const WKGeolocationProvider* wkProvider)
</del><ins>+void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManagerRef, const WKGeolocationProviderBase* wkProvider)
</ins><span class="cx"> {
</span><del>- toImpl(geolocationManagerRef)->initializeProvider(reinterpret_cast<const WKGeolocationProviderBase*>(wkProvider));
</del><ins>+ toImpl(geolocationManagerRef)->initializeProvider(wkProvider);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKGeolocationManagerProviderDidChangePosition(WKGeolocationManagerRef geolocationManagerRef, WKGeolocationPositionRef positionRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKGeolocationManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -61,8 +61,7 @@
</span><span class="cx"> WKGeolocationProviderSetEnableHighAccuracyCallback setEnableHighAccuracy;
</span><span class="cx"> } WKGeolocationProviderV1;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKGeolocationProviderCurrentVersion = 1 };
</del><ins>+enum { kWKGeolocationProviderCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKGeolocationProvider {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -71,12 +70,12 @@
</span><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKGeolocationProviderSetEnableHighAccuracyCallback setEnableHighAccuracy;
</span><del>-} WKGeolocationProvider;
</del><ins>+} WKGeolocationProvider WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKGeolocationManagerGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManager, const WKGeolocationProvider* provider);
</del><ins>+WK_EXPORT void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManager, const WKGeolocationProviderBase* provider);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKGeolocationManagerProviderDidChangePosition(WKGeolocationManagerRef geolocationManager, WKGeolocationPositionRef position);
</span><span class="cx"> WK_EXPORT void WKGeolocationManagerProviderDidFailToDeterminePosition(WKGeolocationManagerRef geolocationManager);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> return toAPI(WebIconDatabase::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabaseRef, const WKIconDatabaseClient* wkClient)
</del><ins>+void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabaseRef, const WKIconDatabaseClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(iconDatabaseRef)->initializeIconDatabaseClient(reinterpret_cast<const WKIconDatabaseClientBase*>(wkClient));
</del><ins>+ toImpl(iconDatabaseRef)->initializeIconDatabaseClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKIconDatabaseRetainIconForURL(WKIconDatabaseRef iconDatabaseRef, WKURLRef pageURLRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -61,8 +61,7 @@
</span><span class="cx"> WKIconDatabaseIconDataReadyForPageURLCallback iconDataReadyForPageURL;
</span><span class="cx"> } WKIconDatabaseClientV1;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKIconDatabaseClientCurrentVersion = 1 };
</del><ins>+enum { kWKIconDatabaseClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKIconDatabaseClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -73,11 +72,11 @@
</span><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKIconDatabaseIconDataReadyForPageURLCallback iconDataReadyForPageURL;
</span><del>-} WKIconDatabaseClient;
</del><ins>+} WKIconDatabaseClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKIconDatabaseGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabase, const WKIconDatabaseClient* client);
</del><ins>+WK_EXPORT void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabase, const WKIconDatabaseClientBase* client);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKIconDatabaseRetainIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
</span><span class="cx"> WK_EXPORT void WKIconDatabaseReleaseIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKOriginDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> toImpl(originDataManagerRef)->stopObservingChanges(types);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManagerRef, const WKOriginDataManagerChangeClient *client)
</del><ins>+void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManagerRef, const WKOriginDataManagerChangeClientBase *client)
</ins><span class="cx"> {
</span><del>- toImpl(originDataManagerRef)->setChangeClient(reinterpret_cast<const WKOriginDataManagerChangeClientBase*>(client));
</del><ins>+ toImpl(originDataManagerRef)->setChangeClient(client);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKOriginDataManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> WKOriginDataManagerChangeCallback didChange;
</span><span class="cx"> } WKOriginDataManagerChangeClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
</del><span class="cx"> enum { kWKOriginDataManagerChangeClientVersion = 0 };
</span><span class="cx"> typedef struct WKOriginDataManagerChangeClient {
</span><span class="cx"> int version;
</span><span class="lines">@@ -76,11 +75,11 @@
</span><span class="cx">
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKOriginDataManagerChangeCallback didChange;
</span><del>-} WKOriginDataManagerChangeClient;
</del><ins>+} WKOriginDataManagerChangeClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKOriginDataManagerStartObservingChanges(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types);
</span><span class="cx"> WK_EXPORT void WKOriginDataManagerStopObservingChanges(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types);
</span><del>-WK_EXPORT void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManger, const WKOriginDataManagerChangeClient* client);
</del><ins>+WK_EXPORT void WKOriginDataManagerSetChangeClient(WKOriginDataManagerRef originDataManger, const WKOriginDataManagerChangeClientBase* client);
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -629,41 +629,41 @@
</span><span class="cx"> toImpl(pageRef)->countStringMatches(toImpl(string)->string(), toFindOptions(options), maxMatchCount);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageSetPageContextMenuClient(WKPageRef pageRef, const WKPageContextMenuClient* wkClient)
</del><ins>+void WKPageSetPageContextMenuClient(WKPageRef pageRef, const WKPageContextMenuClientBase* wkClient)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- toImpl(pageRef)->initializeContextMenuClient(reinterpret_cast<const WKPageContextMenuClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeContextMenuClient(wkClient);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClient* wkClient)
</del><ins>+void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeFindClient(reinterpret_cast<const WKPageFindClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeFindClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageSetPageFindMatchesClient(WKPageRef pageRef, const WKPageFindMatchesClient* wkClient)
</del><ins>+void WKPageSetPageFindMatchesClient(WKPageRef pageRef, const WKPageFindMatchesClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeFindMatchesClient(reinterpret_cast<const WKPageFindMatchesClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeFindMatchesClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClient* wkClient)
</del><ins>+void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeFormClient(reinterpret_cast<const WKPageFormClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeFormClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClient* wkClient)
</del><ins>+void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeLoaderClient(reinterpret_cast<const WKPageLoaderClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeLoaderClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClient* wkClient)
</del><ins>+void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializePolicyClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient* wkClient)
</del><ins>+void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeUIClient(reinterpret_cast<const WKPageUIClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeUIClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -190,13 +190,13 @@
</span><span class="cx"> WK_EXPORT void WKPageGetImageForFindMatch(WKPageRef page, int32_t matchIndex);
</span><span class="cx"> WK_EXPORT void WKPageSelectFindMatch(WKPageRef page, int32_t matchIndex);
</span><span class="cx">
</span><del>-WK_EXPORT void WKPageSetPageContextMenuClient(WKPageRef page, const WKPageContextMenuClient* client);
-WK_EXPORT void WKPageSetPageFindClient(WKPageRef page, const WKPageFindClient* client);
-WK_EXPORT void WKPageSetPageFindMatchesClient(WKPageRef page, const WKPageFindMatchesClient* client);
-WK_EXPORT void WKPageSetPageFormClient(WKPageRef page, const WKPageFormClient* client);
-WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClient* client);
-WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClient* client);
-WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client);
</del><ins>+WK_EXPORT void WKPageSetPageContextMenuClient(WKPageRef page, const WKPageContextMenuClientBase* client);
+WK_EXPORT void WKPageSetPageFindClient(WKPageRef page, const WKPageFindClientBase* client);
+WK_EXPORT void WKPageSetPageFindMatchesClient(WKPageRef page, const WKPageFindMatchesClientBase* client);
+WK_EXPORT void WKPageSetPageFormClient(WKPageRef page, const WKPageFormClientBase* client);
+WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClientBase* client);
+WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClientBase* client);
+WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClientBase* client);
</ins><span class="cx">
</span><span class="cx"> typedef void (*WKPageRunJavaScriptFunction)(WKSerializedScriptValueRef, WKErrorRef, void*);
</span><span class="cx"> WK_EXPORT void WKPageRunJavaScriptInMainFrame(WKPageRef page, WKStringRef script, void* context, WKPageRunJavaScriptFunction function);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -98,8 +98,7 @@
</span><span class="cx"> WKPageHideContextMenuCallback hideContextMenu;
</span><span class="cx"> } WKPageContextMenuClientV3;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKPageContextMenuClientCurrentVersion = 3 };
</del><ins>+enum { kWKPageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 3 };
</ins><span class="cx"> typedef struct WKPageContextMenuClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -117,7 +116,7 @@
</span><span class="cx"> // Version 3.
</span><span class="cx"> WKPageShowContextMenuCallback showContextMenu;
</span><span class="cx"> WKPageHideContextMenuCallback hideContextMenu;
</span><del>-} WKPageContextMenuClient;
</del><ins>+} WKPageContextMenuClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageFindClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -50,8 +50,7 @@
</span><span class="cx"> WKPageDidCountStringMatchesCallback didCountStringMatches;
</span><span class="cx"> } WKPageFindClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKPageFindClientCurrentVersion = 0 };
</del><ins>+enum { kWKPageFindClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKPageFindClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -60,7 +59,7 @@
</span><span class="cx"> WKPageDidFindStringCallback didFindString;
</span><span class="cx"> WKPageDidFailToFindStringCallback didFailToFindString;
</span><span class="cx"> WKPageDidCountStringMatchesCallback didCountStringMatches;
</span><del>-} WKPageFindClient;
</del><ins>+} WKPageFindClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageFindMatchesClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -53,14 +53,13 @@
</span><span class="cx"> WKPageDidGetImageForMatchResultCallback didGetImageForMatchResult;
</span><span class="cx"> } WKPageFindMatchesClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKPageFindMatchesClientCurrentVersion = 0 };
</del><ins>+enum { kWKPageFindMatchesClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKPageFindMatchesClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="cx"> WKPageDidFindStringMatchesCallback didFindStringMatches;
</span><span class="cx"> WKPageDidGetImageForMatchResultCallback didGetImageForMatchResult;
</span><del>-} WKPageFindMatchesClient;
</del><ins>+} WKPageFindMatchesClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageFormClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -47,15 +47,14 @@
</span><span class="cx"> WKPageWillSubmitFormCallback willSubmitForm;
</span><span class="cx"> } WKPageFormClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKPageFormClientCurrentVersion = 0 };
</del><ins>+enum { kWKPageFormClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKPageFormClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="cx">
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKPageWillSubmitFormCallback willSubmitForm;
</span><del>-} WKPageFormClient;
</del><ins>+} WKPageFormClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> } WKPageLoaderClientV3;
</span><span class="cx">
</span><span class="cx"> // FIXME: These should be deprecated.
</span><del>-enum { kWKPageLoaderClientCurrentVersion = 3 };
</del><ins>+enum { kWKPageLoaderClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 3 };
</ins><span class="cx"> typedef struct WKPageLoaderClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePolicyClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> } WKPagePolicyClientV1;
</span><span class="cx">
</span><span class="cx"> // FIXME: These should be deprecated.
</span><del>-enum { kWKPagePolicyClientCurrentVersion = 1 };
</del><ins>+enum { kWKPagePolicyClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKPagePolicyClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -249,8 +249,7 @@
</span><span class="cx"> WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
</span><span class="cx"> } WKPageUIClientV2;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKPageUIClientCurrentVersion = 2 };
</del><ins>+enum { kWKPageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
</ins><span class="cx"> typedef struct WKPageUIClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -306,7 +305,7 @@
</span><span class="cx"> WKPageShowColorPickerCallback showColorPicker;
</span><span class="cx"> WKPageHideColorPickerCallback hideColorPicker;
</span><span class="cx"> WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
</span><del>-} WKPageUIClient;
</del><ins>+} WKPageUIClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -480,11 +480,11 @@
</span><span class="cx">
</span><span class="cx"> static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
</span><span class="cx"> {
</span><del>- WKPagePolicyClient policyClient;
</del><ins>+ WKPagePolicyClientV1 policyClient;
</ins><span class="cx"> memset(&policyClient, 0, sizeof(policyClient));
</span><span class="cx">
</span><del>- policyClient.version = kWKPagePolicyClientCurrentVersion;
- policyClient.clientInfo = browsingContext;
</del><ins>+ policyClient.base.version = 1;
+ policyClient.base.clientInfo = browsingContext;
</ins><span class="cx">
</span><span class="cx"> policyClient.decidePolicyForNavigationAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
</span><span class="cx"> {
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> WKFramePolicyListenerUse(listener);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- page.initializePolicyClient(reinterpret_cast<const WKPagePolicyClientBase*>(&policyClient));
</del><ins>+ page.initializePolicyClient(&policyClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id <WKBrowsingContextLoadDelegate>)loadDelegate
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -93,15 +93,15 @@
</span><span class="cx">
</span><span class="cx"> static void setUpClient(WKConnection *connection, WKConnectionRef connectionRef)
</span><span class="cx"> {
</span><del>- WKConnectionClient client;
</del><ins>+ WKConnectionClientV0 client;
</ins><span class="cx"> memset(&client, 0, sizeof(client));
</span><span class="cx">
</span><del>- client.version = WKConnectionClientCurrentVersion;
- client.clientInfo = connection;
</del><ins>+ client.base.version = 0;
+ client.base.clientInfo = connection;
</ins><span class="cx"> client.didReceiveMessage = didReceiveMessage;
</span><span class="cx"> client.didClose = didClose;
</span><span class="cx">
</span><del>- WKConnectionSetConnectionClient(connectionRef, &client);
</del><ins>+ WKConnectionSetConnectionClient(connectionRef, &client.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)_initWithConnectionRef:(WKConnectionRef)connectionRef
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -77,14 +77,14 @@
</span><span class="cx">
</span><span class="cx"> static void setUpConnectionClient(WKProcessGroup *processGroup, WKContextRef contextRef)
</span><span class="cx"> {
</span><del>- WKContextConnectionClient connectionClient;
</del><ins>+ WKContextConnectionClientV0 connectionClient;
</ins><span class="cx"> memset(&connectionClient, 0, sizeof(connectionClient));
</span><span class="cx">
</span><del>- connectionClient.version = kWKContextConnectionClientCurrentVersion;
- connectionClient.clientInfo = processGroup;
</del><ins>+ connectionClient.base.version = 0;
+ connectionClient.base.clientInfo = processGroup;
</ins><span class="cx"> connectionClient.didCreateConnection = didCreateConnection;
</span><span class="cx">
</span><del>- WKContextSetConnectionClient(contextRef, &connectionClient);
</del><ins>+ WKContextSetConnectionClient(contextRef, &connectionClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef, const void* clientInfo)
</span><span class="lines">@@ -101,14 +101,14 @@
</span><span class="cx">
</span><span class="cx"> static void setUpInectedBundleClient(WKProcessGroup *processGroup, WKContextRef contextRef)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV1 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><span class="cx">
</span><del>- injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
- injectedBundleClient.clientInfo = processGroup;
</del><ins>+ injectedBundleClient.base.version = 1;
+ injectedBundleClient.base.clientInfo = processGroup;
</ins><span class="cx"> injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(contextRef, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(contextRef, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didNavigateWithNavigationData(WKContextRef, WKPageRef pageRef, WKNavigationDataRef navigationDataRef, WKFrameRef frameRef, const void*)
</span><span class="lines">@@ -153,17 +153,17 @@
</span><span class="cx">
</span><span class="cx"> static void setUpHistoryClient(WKProcessGroup *processGroup, WKContextRef contextRef)
</span><span class="cx"> {
</span><del>- WKContextHistoryClient historyClient;
</del><ins>+ WKContextHistoryClientV0 historyClient;
</ins><span class="cx"> memset(&historyClient, 0, sizeof(historyClient));
</span><span class="cx">
</span><del>- historyClient.version = kWKContextHistoryClientCurrentVersion;
- historyClient.clientInfo = processGroup;
</del><ins>+ historyClient.base.version = 0;
+ historyClient.base.clientInfo = processGroup;
</ins><span class="cx"> historyClient.didNavigateWithNavigationData = didNavigateWithNavigationData;
</span><span class="cx"> historyClient.didPerformClientRedirect = didPerformClientRedirect;
</span><span class="cx"> historyClient.didPerformServerRedirect = didPerformServerRedirect;
</span><span class="cx"> historyClient.didUpdateHistoryTitle = didUpdateHistoryTitle;
</span><span class="cx">
</span><del>- WKContextSetHistoryClient(contextRef, &historyClient);
</del><ins>+ WKContextSetHistoryClient(contextRef, &historyClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)init
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -438,9 +438,8 @@
</span><span class="cx"> inspectorPageID = inspectorPage->pageID();
</span><span class="cx"> inspectorPageParameters = inspectorPage->creationParameters();
</span><span class="cx">
</span><del>- WKPagePolicyClient policyClient = {
- kWKPagePolicyClientCurrentVersion,
- this, /* clientInfo */
</del><ins>+ WKPagePolicyClientV1 policyClient = {
+ { 1, this },
</ins><span class="cx"> 0, /* decidePolicyForNavigationAction_deprecatedForUseWithV0 */
</span><span class="cx"> 0, /* decidePolicyForNewWindowAction */
</span><span class="cx"> 0, /* decidePolicyForResponse_deprecatedForUseWithV0 */
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> if (!m_client.base.version && !m_client.createNewPage_deprecatedForUseWithV0)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (m_client.base.version == kWKPageUIClientCurrentVersion && !m_client.createNewPage)
</del><ins>+ if (m_client.base.version > 0 && !m_client.createNewPage)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> if (!m_client.mouseDidMoveOverElement && !m_client.mouseDidMoveOverElement_deprecatedForUseWithV0)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_client.base.version == kWKPageUIClientCurrentVersion && !m_client.mouseDidMoveOverElement)
</del><ins>+ if (m_client.base.version > 0 && !m_client.mouseDidMoveOverElement)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_client.base.version) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -399,9 +399,8 @@
</span><span class="cx">
</span><span class="cx"> WebPageProxy* inspectorPage = toImpl(m_inspectorView.get().pageRef);
</span><span class="cx">
</span><del>- WKPageUIClient uiClient = {
- kWKPageUIClientCurrentVersion,
- this, /* clientInfo */
</del><ins>+ WKPageUIClientV2 uiClient = {
+ { 2, this },
</ins><span class="cx"> 0, // createNewPage_deprecatedForUseWithV0
</span><span class="cx"> 0, // showPage
</span><span class="cx"> 0, // closePage
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx"> return toAPI(InjectedBundle::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClient *wkClient)
</del><ins>+void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClientBase *wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(bundleRef)->initializeClient(reinterpret_cast<WKBundleClientBase*>(wkClient));
</del><ins>+ toImpl(bundleRef)->initializeClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKBundlePostMessage(WKBundleRef bundleRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -68,8 +68,7 @@
</span><span class="cx"> WKBundleDidReceiveMessageToPageCallback didReceiveMessageToPage;
</span><span class="cx"> } WKBundleClientV1;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundleClientCurrentVersion = 1 };
</del><ins>+enum { kWKBundleClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKBundleClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -82,11 +81,11 @@
</span><span class="cx">
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKBundleDidReceiveMessageToPageCallback didReceiveMessageToPage;
</span><del>-} WKBundleClient;
</del><ins>+} WKBundleClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKBundleGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKBundleSetClient(WKBundleRef bundle, WKBundleClient* client);
</del><ins>+WK_EXPORT void WKBundleSetClient(WKBundleRef bundle, WKBundleClientBase* client);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKBundlePostMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody);
</span><span class="cx"> WK_EXPORT void WKBundlePostSynchronousMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody, WKTypeRef* returnData);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -61,47 +61,47 @@
</span><span class="cx"> return toAPI(WebPage::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageContextMenuClient* wkClient)
</del><ins>+void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageContextMenuClientBase* wkClient)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- toImpl(pageRef)->initializeInjectedBundleContextMenuClient(reinterpret_cast<WKBundlePageContextMenuClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundleContextMenuClient(wkClient);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClient* wkClient)
</del><ins>+void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeInjectedBundleEditorClient(reinterpret_cast<WKBundlePageEditorClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundleEditorClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClient* wkClient)
</del><ins>+void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeInjectedBundleFormClient(reinterpret_cast<WKBundlePageFormClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundleFormClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClient* wkClient)
</del><ins>+void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeInjectedBundleLoaderClient(reinterpret_cast<WKBundlePageLoaderClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundleLoaderClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClient* wkClient)
</del><ins>+void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(reinterpret_cast<WKBundlePageResourceLoadClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClient* wkClient)
</del><ins>+void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeInjectedBundlePolicyClient(reinterpret_cast<WKBundlePagePolicyClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundlePolicyClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClient* wkClient)
</del><ins>+void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClientBase* wkClient)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeInjectedBundleUIClient(reinterpret_cast<WKBundlePageUIClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundleUIClient(wkClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetFullScreenClient(WKBundlePageRef pageRef, WKBundlePageFullScreenClient* wkClient)
</del><ins>+void WKBundlePageSetFullScreenClient(WKBundlePageRef pageRef, WKBundlePageFullScreenClientBase* wkClient)
</ins><span class="cx"> {
</span><span class="cx"> #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
</span><del>- toImpl(pageRef)->initializeInjectedBundleFullScreenClient(reinterpret_cast<WKBundlePageFullScreenClientBase*>(wkClient));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundleFullScreenClient(wkClient);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span><span class="cx"> UNUSED_PARAM(wkClient);
</span><span class="lines">@@ -144,9 +144,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClient* client)
</del><ins>+void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClientBase* client)
</ins><span class="cx"> {
</span><del>- toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(reinterpret_cast<WKBundlePageDiagnosticLoggingClientBase*>(client));
</del><ins>+ toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(client);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef pageRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -57,15 +57,15 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKBundlePageGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT void WKBundlePageSetContextMenuClient(WKBundlePageRef page, WKBundlePageContextMenuClient* client);
-WK_EXPORT void WKBundlePageSetEditorClient(WKBundlePageRef page, WKBundlePageEditorClient* client);
-WK_EXPORT void WKBundlePageSetFormClient(WKBundlePageRef page, WKBundlePageFormClient* client);
-WK_EXPORT void WKBundlePageSetPageLoaderClient(WKBundlePageRef page, WKBundlePageLoaderClient* client);
-WK_EXPORT void WKBundlePageSetResourceLoadClient(WKBundlePageRef page, WKBundlePageResourceLoadClient* client);
-WK_EXPORT void WKBundlePageSetPolicyClient(WKBundlePageRef page, WKBundlePagePolicyClient* client);
-WK_EXPORT void WKBundlePageSetUIClient(WKBundlePageRef page, WKBundlePageUIClient* client);
-WK_EXPORT void WKBundlePageSetFullScreenClient(WKBundlePageRef page, WKBundlePageFullScreenClient* client);
-WK_EXPORT void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef page, WKBundlePageDiagnosticLoggingClient* client);
</del><ins>+WK_EXPORT void WKBundlePageSetContextMenuClient(WKBundlePageRef page, WKBundlePageContextMenuClientBase* client);
+WK_EXPORT void WKBundlePageSetEditorClient(WKBundlePageRef page, WKBundlePageEditorClientBase* client);
+WK_EXPORT void WKBundlePageSetFormClient(WKBundlePageRef page, WKBundlePageFormClientBase* client);
+WK_EXPORT void WKBundlePageSetPageLoaderClient(WKBundlePageRef page, WKBundlePageLoaderClientBase* client);
+WK_EXPORT void WKBundlePageSetResourceLoadClient(WKBundlePageRef page, WKBundlePageResourceLoadClientBase* client);
+WK_EXPORT void WKBundlePageSetPolicyClient(WKBundlePageRef page, WKBundlePagePolicyClientBase* client);
+WK_EXPORT void WKBundlePageSetUIClient(WKBundlePageRef page, WKBundlePageUIClientBase* client);
+WK_EXPORT void WKBundlePageSetFullScreenClient(WKBundlePageRef page, WKBundlePageFullScreenClientBase* client);
+WK_EXPORT void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef page, WKBundlePageDiagnosticLoggingClientBase* client);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef page);
</span><span class="cx"> WK_EXPORT WKBundleFrameRef WKBundlePageGetMainFrame(WKBundlePageRef page);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageBannerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -59,8 +59,7 @@
</span><span class="cx"> WKBundlePageBannerMouseDraggedCallback mouseDragged;
</span><span class="cx"> } WKBundlePageBannerClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageBannerClientCurrentVersion = 0 };
</del><ins>+enum { kWKBundlePageBannerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKBundlePageBannerClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -70,7 +69,7 @@
</span><span class="cx"> WKBundlePageBannerMouseUpCallback mouseUp;
</span><span class="cx"> WKBundlePageBannerMouseMovedCallback mouseMoved;
</span><span class="cx"> WKBundlePageBannerMouseDraggedCallback mouseDragged;
</span><del>-} WKBundlePageBannerClient;
</del><ins>+} WKBundlePageBannerClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKBundlePageBannerGetTypeID();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -42,14 +42,13 @@
</span><span class="cx"> WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu;
</span><span class="cx"> } WKBundlePageContextMenuClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageContextMenuClientCurrentVersion = 0 };
</del><ins>+enum { kWKBundlePageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKBundlePageContextMenuClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="cx">
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu;
</span><del>-} WKBundlePageContextMenuClient;
</del><ins>+} WKBundlePageContextMenuClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePageContextMenuClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -42,14 +42,13 @@
</span><span class="cx"> WKBundlePageDiagnosticLoggingCallback logDiagnosticMessage;
</span><span class="cx"> } WKBundlePageDiagnosticLoggingClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageDiagnosticLoggingClientCurrentVersion = 0 };
</del><ins>+enum { kWKBundlePageDiagnosticLoggingClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKBundlePageDiagnosticLoggingClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="cx">
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKBundlePageDiagnosticLoggingCallback logDiagnosticMessage;
</span><del>-} WKBundlePageDiagnosticLoggingClient;
</del><ins>+} WKBundlePageDiagnosticLoggingClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePageDiagnosticLoggingClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -114,8 +114,7 @@
</span><span class="cx"> WKBundlePageDidWriteToPasteboard didWriteToPasteboard;
</span><span class="cx"> } WKBundlePageEditorClientV1;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageEditorClientCurrentVersion = 1 };
</del><ins>+enum { kWKBundlePageEditorClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKBundlePageEditorClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -137,6 +136,6 @@
</span><span class="cx"> WKBundlePageWillWriteToPasteboard willWriteToPasteboard;
</span><span class="cx"> WKBundlePageGetPasteboardDataForRange getPasteboardDataForRange;
</span><span class="cx"> WKBundlePageDidWriteToPasteboard didWriteToPasteboard;
</span><del>-} WKBundlePageEditorClient;
</del><ins>+} WKBundlePageEditorClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePageEditorClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageFormClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -91,8 +91,7 @@
</span><span class="cx"> WKBundlePageDidAssociateFormControlsCallback didAssociateFormControls;
</span><span class="cx"> } WKBundlePageFormClientV2;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageFormClientCurrentVersion = 2 };
</del><ins>+enum { kWKBundlePageFormClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
</ins><span class="cx"> typedef struct WKBundlePageFormClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -112,6 +111,6 @@
</span><span class="cx"> WKBundlePageDidFocusTextFieldCallback didFocusTextField;
</span><span class="cx"> WKBundlePageShouldNotifyOnFormChangesCallback shouldNotifyOnFormChanges;
</span><span class="cx"> WKBundlePageDidAssociateFormControlsCallback didAssociateFormControls;
</span><del>-} WKBundlePageFormClient;
</del><ins>+} WKBundlePageFormClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePageFormClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageFullScreenClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -64,8 +64,7 @@
</span><span class="cx"> WKBundlePageCloseFullScreen closeFullScreen;
</span><span class="cx"> } WKBundlePageFullScreenClientV1;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageFullScreenClientCurrentVersion = 1 };
</del><ins>+enum { kWKBundlePageFullScreenClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKBundlePageFullScreenClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -79,6 +78,6 @@
</span><span class="cx"> WKBundlePageBeganEnterFullScreen beganEnterFullScreen;
</span><span class="cx"> WKBundlePageBeganExitFullScreen beganExitFullScreen;
</span><span class="cx"> WKBundlePageCloseFullScreen closeFullScreen;
</span><del>-} WKBundlePageFullScreenClient;
</del><ins>+} WKBundlePageFullScreenClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePageFullScreenClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -406,8 +406,7 @@
</span><span class="cx"> WKBundlePageWillDestroyFrame willDestroyFrame;
</span><span class="cx"> } WKBundlePageLoaderClientV7;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageLoaderClientCurrentVersion = 7 };
</del><ins>+enum { kWKBundlePageLoaderClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 7 };
</ins><span class="cx"> typedef struct WKBundlePageLoaderClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -462,6 +461,6 @@
</span><span class="cx">
</span><span class="cx"> // Version 7
</span><span class="cx"> WKBundlePageWillDestroyFrame willDestroyFrame;
</span><del>-} WKBundlePageLoaderClient;
</del><ins>+} WKBundlePageLoaderClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePageLoaderClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -147,22 +147,22 @@
</span><span class="cx"> return toAPI(PageOverlay::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClient* wkClient)
</del><ins>+WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClientBase* wkClient)
</ins><span class="cx"> {
</span><span class="cx"> if (wkClient && wkClient->version)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- auto clientImpl = std::make_unique<PageOverlayClientImpl>(reinterpret_cast<WKBundlePageOverlayClientBase*>(wkClient));
</del><ins>+ auto clientImpl = std::make_unique<PageOverlayClientImpl>(wkClient);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Looks like this leaks the clientImpl.
</span><span class="cx"> return toAPI(PageOverlay::create(clientImpl.release()).leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlayRef, WKBundlePageOverlayAccessibilityClient* client)
</del><ins>+void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlayRef, WKBundlePageOverlayAccessibilityClientBase* client)
</ins><span class="cx"> {
</span><span class="cx"> if (client && client->version)
</span><span class="cx"> return;
</span><del>- static_cast<PageOverlayClientImpl*>(toImpl(bundlePageOverlayRef)->client())->setAccessibilityClient(reinterpret_cast<WKBundlePageOverlayAccessibilityClientBase*>(client));
</del><ins>+ static_cast<PageOverlayClientImpl*>(toImpl(bundlePageOverlayRef)->client())->setAccessibilityClient(client);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKBundlePageOverlaySetNeedsDisplay(WKBundlePageOverlayRef bundlePageOverlayRef, WKRect rect)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -67,8 +67,7 @@
</span><span class="cx"> WKBundlePageOverlayMouseDraggedCallback mouseDragged;
</span><span class="cx"> } WKBundlePageOverlayClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageOverlayClientCurrentVersion = 0 };
</del><ins>+enum { kWKBundlePageOverlayClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKBundlePageOverlayClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -81,7 +80,7 @@
</span><span class="cx"> WKBundlePageOverlayMouseUpCallback mouseUp;
</span><span class="cx"> WKBundlePageOverlayMouseMovedCallback mouseMoved;
</span><span class="cx"> WKBundlePageOverlayMouseDraggedCallback mouseDragged;
</span><del>-} WKBundlePageOverlayClient;
</del><ins>+} WKBundlePageOverlayClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> typedef WKTypeRef (*WKAccessibilityAttributeValueCallback)(WKBundlePageOverlayRef pageOverlay, WKStringRef attribute, WKTypeRef parameter, const void* clientInfo);
</span><span class="cx"> typedef WKArrayRef (*WKAccessibilityAttributeNamesCallback)(WKBundlePageOverlayRef pageOverlay, bool parameterizedNames, const void* clientInfo);
</span><span class="lines">@@ -99,8 +98,7 @@
</span><span class="cx"> WKAccessibilityAttributeNamesCallback copyAccessibilityAttributeNames;
</span><span class="cx"> } WKBundlePageOverlayAccessibilityClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageOverlayAccessibilityClientCurrentVersion = 0 };
</del><ins>+enum { kWKBundlePageOverlayAccessibilityClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKBundlePageOverlayAccessibilityClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -108,14 +106,14 @@
</span><span class="cx"> // Version 0.
</span><span class="cx"> WKAccessibilityAttributeValueCallback copyAccessibilityAttributeValue;
</span><span class="cx"> WKAccessibilityAttributeNamesCallback copyAccessibilityAttributeNames;
</span><del>-} WKBundlePageOverlayAccessibilityClient;
-
</del><ins>+} WKBundlePageOverlayAccessibilityClient WK_DEPRECATED("Use an explicit versioned struct instead");
+
</ins><span class="cx"> WK_EXPORT WKTypeID WKBundlePageOverlayGetTypeID();
</span><span class="cx">
</span><del>-WK_EXPORT WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClient* client);
</del><ins>+WK_EXPORT WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClientBase* client);
</ins><span class="cx"> WK_EXPORT void WKBundlePageOverlaySetNeedsDisplay(WKBundlePageOverlayRef bundlePageOverlay, WKRect rect);
</span><span class="cx"> WK_EXPORT float WKBundlePageOverlayFractionFadedIn(WKBundlePageOverlayRef bundlePageOverlay);
</span><del>-WK_EXPORT void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlay, WKBundlePageOverlayAccessibilityClient* client);
</del><ins>+WK_EXPORT void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlay, WKBundlePageOverlayAccessibilityClientBase* client);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePolicyClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -54,8 +54,7 @@
</span><span class="cx"> WKBundlePageUnableToImplementPolicyCallback unableToImplementPolicy;
</span><span class="cx"> } WKBundlePagePolicyClientV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePagePolicyClientCurrentVersion = 0 };
</del><ins>+enum { kWKBundlePagePolicyClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</ins><span class="cx"> typedef struct WKBundlePagePolicyClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -65,6 +64,6 @@
</span><span class="cx"> WKBundlePageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction;
</span><span class="cx"> WKBundlePageDecidePolicyForResponseCallback decidePolicyForResponse;
</span><span class="cx"> WKBundlePageUnableToImplementPolicyCallback unableToImplementPolicy;
</span><del>-} WKBundlePagePolicyClient;
</del><ins>+} WKBundlePagePolicyClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePagePolicyClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageResourceLoadClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -76,8 +76,7 @@
</span><span class="cx"> WKBundlePageShouldUseCredentialStorageCallback shouldUseCredentialStorage;
</span><span class="cx"> } WKBundlePageResourceLoadClientV1;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageResourceLoadClientCurrentVersion = 1 };
</del><ins>+enum { kWKBundlePageResourceLoadClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKBundlePageResourceLoadClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -96,6 +95,6 @@
</span><span class="cx"> // Version 1.
</span><span class="cx"> WKBundlePageShouldCacheResponseCallback shouldCacheResponse;
</span><span class="cx"> WKBundlePageShouldUseCredentialStorageCallback shouldUseCredentialStorage;
</span><del>-} WKBundlePageResourceLoadClient;
</del><ins>+} WKBundlePageResourceLoadClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePageResourceLoadClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -133,8 +133,7 @@
</span><span class="cx"> WKBundlePagePlugInCreateExtraScriptCallback createPlugInExtraScript;
</span><span class="cx"> } WKBundlePageUIClientV2;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKBundlePageUIClientCurrentVersion = 2 };
</del><ins>+enum { kWKBundlePageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
</ins><span class="cx"> typedef struct WKBundlePageUIClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span><span class="lines">@@ -164,6 +163,6 @@
</span><span class="cx"> WKBundlePagePlugInCreateStartLabelSubtitleCallback createPlugInStartLabelSubtitle;
</span><span class="cx"> WKBundlePagePlugInCreateExtraStyleSheetCallback createPlugInExtraStyleSheet;
</span><span class="cx"> WKBundlePagePlugInCreateExtraScriptCallback createPlugInExtraScript;
</span><del>-} WKBundlePageUIClient;
</del><ins>+} WKBundlePageUIClient WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #endif // WKBundlePageUIClient_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.h 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-WK_EXPORT WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClient * client);
</del><ins>+WK_EXPORT WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClientBase* client);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT CALayer * WKBundlePageBannerGetLayer(WKBundlePageBannerRef pageBanner);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcmacWKBundlePageBannerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -95,12 +95,12 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClient* wkClient)
</del><ins>+WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClientBase* wkClient)
</ins><span class="cx"> {
</span><span class="cx"> if (wkClient && wkClient->version)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- auto clientImpl = std::make_unique<PageBannerClientImpl>(reinterpret_cast<WKBundlePageBannerClientBase*>(wkClient));
</del><ins>+ auto clientImpl = std::make_unique<PageBannerClientImpl>(wkClient);
</ins><span class="cx"> return toAPI(PageBanner::create(layer, height, clientImpl.release()).leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -84,15 +84,15 @@
</span><span class="cx">
</span><span class="cx"> static void setUpBundleClient(WKWebProcessPlugInController *plugInController, WKBundleRef bundleRef)
</span><span class="cx"> {
</span><del>- WKBundleClient bundleClient;
</del><ins>+ WKBundleClientV1 bundleClient;
</ins><span class="cx"> memset(&bundleClient, 0, sizeof(bundleClient));
</span><span class="cx">
</span><del>- bundleClient.version = kWKBundleClientCurrentVersion;
- bundleClient.clientInfo = plugInController;
</del><ins>+ bundleClient.base.version = 1;
+ bundleClient.base.clientInfo = plugInController;
</ins><span class="cx"> bundleClient.didCreatePage = didCreatePage;
</span><span class="cx"> bundleClient.willDestroyPage = willDestroyPage;
</span><span class="cx">
</span><del>- WKBundleSetClient(bundleRef, &bundleClient);
</del><ins>+ WKBundleSetClient(bundleRef, &bundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKWebProcessPlugInController *sharedInstance;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/ChangeLog 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -1,3 +1,178 @@
</span><ins>+2013-12-03 Anders Carlsson <andersca@apple.com>
+
+ Deprecate all unversioned client structs in favor of having explicit versioned structs
+ https://bugs.webkit.org/show_bug.cgi?id=125203
+
+ Reviewed by Dan Bernstein.
+
+ Update for WebKit2 API changes.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate init]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ * TestWebKitAPI/InjectedBundleController.cpp:
+ (TestWebKitAPI::InjectedBundleController::initialize):
+ * TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
+ (TestWebKitAPI::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp:
+ (TestWebKitAPI::DOMWindowExtensionBasic::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp:
+ (TestWebKitAPI::DOMWindowExtensionNoCache::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp:
+ (TestWebKitAPI::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
+ (TestWebKitAPI::DidAssociateFormControlsTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
+ (TestWebKitAPI::setContextDownloadClient):
+ (TestWebKitAPI::setPagePolicyClient):
+ * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/Find.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
+ (TestWebKitAPI::setupGeolocationProvider):
+ (TestWebKitAPI::setupView):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ (TestWebKitAPI::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
+ (TestWebKitAPI::HitTestResultNodeHandleTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp:
+ (TestWebKitAPI::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp:
+ (TestWebKitAPI::InjectedBundleFrameHitTestTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
+ (TestWebKitAPI::LoadCanceledNoServerRedirectCallbackTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp:
+ (TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader):
+ * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp:
+ (TestWebKitAPI::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp:
+ (TestWebKitAPI::ParentFrameTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm:
+ (TestWebKitAPI::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp:
+ (TestWebKitAPI::PasteboardNotificationsTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp:
+ (TestWebKitAPI::setInjectedBundleClient):
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp:
+ (TestWebKitAPI::ShouldGoToBackForwardListItemTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/UserMessage.cpp:
+ (TestWebKitAPI::WebKit2UserMessageRoundTripTest::setInjectedBundleClient):
+ (TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/WKConnection.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp:
+ (TestWebKitAPI::WKConnectionTest::initialize):
+ * TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/WebArchive.cpp:
+ (TestWebKitAPI::setInjectedBundleClient):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
+ (TestWebKitAPI::WebKit2WillLoadTest::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
+ * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp:
+ (TestWebKitAPI::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp:
+ (TestWebKitAPI::WillSendSubmitEventTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm:
+ (TestWebKitAPI::setInjectedBundleClient):
+ * TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp:
+ * TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp:
+ (TestWebKitAPI::DenyWillSendRequestTest::didCreatePage):
+ * TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm:
+ (TestWebKitAPI::didCreateConnection):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:
+ (TestWebKitAPI::PageVisibilityStateWithWindowChanges::initializeView):
+ * TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm:
+ * TestWebKitAPI/mac/WebKitAgnosticTest.mm:
+ (TestWebKitAPI::setPageLoaderClient):
+ * WebKitTestRunner/GeolocationProviderMock.cpp:
+ (WTR::GeolocationProviderMock::GeolocationProviderMock):
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::initialize):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::initialize):
+ (WTR::TestController::createWebViewWithOptions):
+
</ins><span class="cx"> 2013-12-04 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Style checker for .messages.in files (WTF:: prefix)
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -94,9 +94,8 @@
</span><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (self) {
</span><del>- WKContextHistoryClient historyClient = {
- kWKContextHistoryClientCurrentVersion,
- self,
</del><ins>+ WKContextHistoryClientV0 historyClient = {
+ { 0, self },
</ins><span class="cx"> didNavigateWithNavigationData,
</span><span class="cx"> didPerformClientRedirect,
</span><span class="cx"> didPerformServerRedirect,
</span><span class="lines">@@ -106,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> _processContext = WKContextCreate();
</span><span class="cx">
</span><del>- WKContextSetHistoryClient(_processContext, &historyClient);
</del><ins>+ WKContextSetHistoryClient(_processContext, &historyClient.base);
</ins><span class="cx"> WKContextSetCacheModel(_processContext, kWKCacheModelPrimaryWebBrowser);
</span><span class="cx">
</span><span class="cx"> WKStringRef pageGroupIdentifier = WKStringCreateWithCFString(CFSTR("MiniBrowser"));
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -615,9 +615,8 @@
</span><span class="cx"> [_webView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
</span><span class="cx"> [containerView addSubview:_webView];
</span><span class="cx">
</span><del>- WKPageLoaderClient loadClient = {
- kWKPageLoaderClientCurrentVersion,
- self, /* clientInfo */
</del><ins>+ WKPageLoaderClientV3 loadClient = {
+ { 3, self },
</ins><span class="cx"> didStartProvisionalLoadForFrame,
</span><span class="cx"> didReceiveServerRedirectForProvisionalLoadForFrame,
</span><span class="cx"> didFailProvisionalLoadWithErrorForFrame,
</span><span class="lines">@@ -655,13 +654,12 @@
</span><span class="cx"> 0, // pluginDidFail
</span><span class="cx"> 0, // pluginLoadPolicy
</span><span class="cx"> };
</span><del>- WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
</del><ins>+ WKPageSetPageLoaderClient(_webView.pageRef, &loadClient.base);
</ins><span class="cx">
</span><span class="cx"> _webView.browsingContextController.policyDelegate = self;
</span><span class="cx">
</span><del>- WKPageUIClient uiClient = {
- kWKPageUIClientCurrentVersion,
- self, /* clientInfo */
</del><ins>+ WKPageUIClientV2 uiClient = {
+ { 2, self },
</ins><span class="cx"> 0, /* createNewPage_deprecatedForUseWithV0 */
</span><span class="cx"> showPage,
</span><span class="cx"> closePage,
</span><span class="lines">@@ -709,7 +707,7 @@
</span><span class="cx"> 0, // hideColorPicker
</span><span class="cx"> 0, // unavailablePluginButtonClicked
</span><span class="cx"> };
</span><del>- WKPageSetPageUIClient(_webView.pageRef, &uiClient);
</del><ins>+ WKPageSetPageUIClient(_webView.pageRef, &uiClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didStartProgress
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIInjectedBundleControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -54,16 +54,15 @@
</span><span class="cx"> if (!initializationUserData)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WKBundleClient client = {
- 0,
- this,
</del><ins>+ WKBundleClientV1 client = {
+ { 0, this },
</ins><span class="cx"> didCreatePage,
</span><span class="cx"> willDestroyPage,
</span><span class="cx"> didInitializePageGroup,
</span><span class="cx"> didReceiveMessage,
</span><span class="cx"> didReceiveMessageToPage
</span><span class="cx"> };
</span><del>- WKBundleSetClient(m_bundle, &client);
</del><ins>+ WKBundleSetClient(m_bundle, &client.base);
</ins><span class="cx">
</span><span class="cx"> // Initialize the test from the "initializationUserData".
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2AboutBlankLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -43,11 +43,14 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
- memset(&loaderClient, 0 , sizeof(loaderClient));
</del><ins>+ WKPageLoaderClientV0 loaderClient;
+ memset(&loaderClient, 0, sizeof(loaderClient));
+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());
</span><span class="cx">
</span><span class="cx"> Util::run(&done);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CanHandleRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -45,11 +45,13 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, CanHandleRequest)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CloseThenTerminatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -44,10 +44,13 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0 , sizeof(loaderClient));
</span><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><ins>+
+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/CookieManager.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/CookieManager.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/CookieManager.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -72,13 +72,14 @@
</span><span class="cx"> wkContext.adopt(WKContextCreate());
</span><span class="cx"> PlatformWebView webView(wkContext.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());
</span><span class="cx">
</span><span class="cx"> Util::run(&testDone);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DOMWindowExtensionBasiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -83,12 +83,13 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("DOMWindowExtensionBasic", pageGroup.get()));
</span><span class="cx">
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 0;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><del>- WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
</del><ins>+
+ WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
</ins><span class="cx">
</span><span class="cx"> // The default cache model has a capacity of 0, so it is necessary to switch to a cache
</span><span class="cx"> // model that actually allows for a page cache.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DOMWindowExtensionBasic_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -152,18 +152,18 @@
</span><span class="cx"> {
</span><span class="cx"> m_bundle = bundle;
</span><span class="cx">
</span><del>- WKBundlePageLoaderClient pageLoaderClient;
</del><ins>+ WKBundlePageLoaderClientV1 pageLoaderClient;
</ins><span class="cx"> memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
</span><span class="cx">
</span><del>- pageLoaderClient.version = 1;
- pageLoaderClient.clientInfo = this;
</del><ins>+ pageLoaderClient.base.version = 1;
+ pageLoaderClient.base.clientInfo = this;
</ins><span class="cx"> pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrameCallback;
</span><span class="cx"> pageLoaderClient.globalObjectIsAvailableForFrame = globalObjectIsAvailableForFrameCallback;
</span><span class="cx"> pageLoaderClient.willDisconnectDOMWindowExtensionFromGlobalObject = willDisconnectDOMWindowExtensionFromGlobalObjectCallback;
</span><span class="cx"> pageLoaderClient.didReconnectDOMWindowExtensionToGlobalObject = didReconnectDOMWindowExtensionToGlobalObjectCallback;
</span><span class="cx"> pageLoaderClient.willDestroyGlobalObjectForDOMWindowExtension = willDestroyGlobalObjectForDOMWindowExtensionCallback;
</span><span class="cx">
</span><del>- WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
</del><ins>+ WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMWindowExtensionBasic::willDestroyPage(WKBundleRef, WKBundlePageRef)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DOMWindowExtensionNoCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -84,13 +84,14 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("DOMWindowExtensionNoCache", pageGroup.get()));
</span><span class="cx">
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV1 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 1;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><del>- WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
</del><span class="cx">
</span><ins>+ WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
+
</ins><span class="cx"> // Disable the page cache.
</span><span class="cx"> WKContextSetCacheModel(context.get(), kWKCacheModelDocumentViewer);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DOMWindowExtensionNoCache_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -159,18 +159,18 @@
</span><span class="cx"> {
</span><span class="cx"> m_bundle = bundle;
</span><span class="cx">
</span><del>- WKBundlePageLoaderClient pageLoaderClient;
</del><ins>+ WKBundlePageLoaderClientV7 pageLoaderClient;
</ins><span class="cx"> memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
</span><span class="cx">
</span><del>- pageLoaderClient.version = kWKBundlePageLoaderClientCurrentVersion;
- pageLoaderClient.clientInfo = this;
</del><ins>+ pageLoaderClient.base.version = 7;
+ pageLoaderClient.base.clientInfo = this;
</ins><span class="cx"> pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrameCallback;
</span><span class="cx"> pageLoaderClient.globalObjectIsAvailableForFrame = globalObjectIsAvailableForFrameCallback;
</span><span class="cx"> pageLoaderClient.willDisconnectDOMWindowExtensionFromGlobalObject = willDisconnectDOMWindowExtensionFromGlobalObjectCallback;
</span><span class="cx"> pageLoaderClient.didReconnectDOMWindowExtensionToGlobalObject = didReconnectDOMWindowExtensionToGlobalObjectCallback;
</span><span class="cx"> pageLoaderClient.willDestroyGlobalObjectForDOMWindowExtension = willDestroyGlobalObjectForDOMWindowExtensionCallback;
</span><span class="cx">
</span><del>- WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
</del><ins>+ WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMWindowExtensionNoCache::willDestroyPage(WKBundleRef, WKBundlePageRef)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DidAssociateFormControlscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -63,11 +63,13 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, DidAssociateFormControls)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DidAssociateFormControls_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -64,15 +64,15 @@
</span><span class="cx">
</span><span class="cx"> void DidAssociateFormControlsTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
</span><span class="cx"> {
</span><del>- WKBundlePageFormClient formClient;
</del><ins>+ WKBundlePageFormClientV2 formClient;
</ins><span class="cx"> memset(&formClient, 0, sizeof(formClient));
</span><span class="cx">
</span><del>- formClient.version = 2;
- formClient.clientInfo = this;
</del><ins>+ formClient.base.version = 2;
+ formClient.base.clientInfo = this;
</ins><span class="cx"> formClient.shouldNotifyOnFormChanges = shouldNotifyOnFormChanges;
</span><span class="cx"> formClient.didAssociateFormControls = didAssociateFormControls;
</span><span class="cx">
</span><del>- WKBundlePageSetFormClient(page, &formClient);
</del><ins>+ WKBundlePageSetFormClient(page, &formClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DidNotHandleKeyDowncpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -50,19 +50,22 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><del>- WKPageUIClient uiClient;
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
+ WKPageUIClientV0 uiClient;
</ins><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><span class="cx">
</span><ins>+ uiClient.base.version = 0;
</ins><span class="cx"> uiClient.didNotHandleKeyEvent = didNotHandleKeyEventCallback;
</span><del>- WKPageSetPageUIClient(webView.page(), &uiClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageUIClient(webView.page(), &uiClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DocumentStartUserScriptAlertCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -50,13 +50,14 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("DocumentStartUserScriptAlertCrashTest", pageGroup.get()));
</span><span class="cx"> PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx">
</span><del>- WKPageUIClient uiClient;
</del><ins>+ WKPageUIClientV0 uiClient;
</ins><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><del>- uiClient.version = 0;
- uiClient.clientInfo = 0;
</del><ins>+
+ uiClient.base.version = 0;
</ins><span class="cx"> uiClient.runJavaScriptAlert = runJavaScriptAlert;
</span><del>- WKPageSetPageUIClient(webView.page(), &uiClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageUIClient(webView.page(), &uiClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2DownloadDecideDestinationCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -46,21 +46,24 @@
</span><span class="cx">
</span><span class="cx"> static void setContextDownloadClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextDownloadClient client;
</del><ins>+ WKContextDownloadClientV0 client;
</ins><span class="cx"> memset(&client, 0, sizeof(client));
</span><ins>+
+ client.base.version = 0;
</ins><span class="cx"> client.decideDestinationWithSuggestedFilename = decideDestinationWithSuggestedFilename;
</span><span class="cx">
</span><del>- WKContextSetDownloadClient(context, &client);
</del><ins>+ WKContextSetDownloadClient(context, &client.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setPagePolicyClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPagePolicyClient policyClient;
</del><ins>+ WKPagePolicyClientV1 policyClient;
</ins><span class="cx"> memset(&policyClient, 0, sizeof(policyClient));
</span><del>- policyClient.version = 1;
</del><ins>+
+ policyClient.base.version = 1;
</ins><span class="cx"> policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
</span><span class="cx">
</span><del>- WKPageSetPagePolicyClient(page, &policyClient);
</del><ins>+ WKPageSetPagePolicyClient(page, &policyClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, DownloadDecideDestinationCrash)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2FailedLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -50,14 +50,14 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
- loaderClient.clientInfo = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::URLForNonExistentResource());
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2Findcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -51,20 +51,22 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><del>- WKPageFindClient findClient;
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
+ WKPageFindClientV0 findClient;
</ins><span class="cx"> memset(&findClient, 0, sizeof(findClient));
</span><span class="cx">
</span><del>- findClient.version = 0;
</del><ins>+ findClient.base.version = 0;
</ins><span class="cx"> findClient.didCountStringMatches = didCountStringMatches;
</span><del>- WKPageSetPageFindClient(webView.page(), &findClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageFindClient(webView.page(), &findClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("find", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2FindMatchesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -112,21 +112,22 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><del>- WKPageFindMatchesClient findMatchesClient;
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
+ WKPageFindMatchesClientV0 findMatchesClient;
</ins><span class="cx"> memset(&findMatchesClient, 0, sizeof(findMatchesClient));
</span><span class="cx">
</span><del>- findMatchesClient.version = 0;
</del><ins>+ findMatchesClient.base.version = 0;
</ins><span class="cx"> findMatchesClient.didFindStringMatches = didFindStringMatches;
</span><span class="cx"> findMatchesClient.didGetImageForMatchResult = didGetImageForMatchResult;
</span><span class="cx">
</span><del>- WKPageSetPageFindMatchesClient(webView.page(), &findMatchesClient);
</del><ins>+ WKPageSetPageFindMatchesClient(webView.page(), &findMatchesClient.base);
</ins><span class="cx">
</span><span class="cx"> // This HTML file contains 3 occurrences of the word Hello and has the second occurence of the word 'world' selected.
</span><span class="cx"> // It contains 1 occurrence of the word 'crazy' that is before the selected word.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ForceRepaintcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -51,13 +51,14 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-accelerated-compositing", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2FrameMIMETypeHTMLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -58,16 +58,16 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
- loaderClient.clientInfo = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
</span><span class="cx"> loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
</span><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2FrameMIMETypePNGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -57,16 +57,16 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
- loaderClient.clientInfo = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
</span><span class="cx"> loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
</span><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("icon", "png"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2Geolocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -102,23 +102,27 @@
</span><span class="cx">
</span><span class="cx"> void setupGeolocationProvider(WKContextRef context, void *clientInfo)
</span><span class="cx"> {
</span><del>- WKGeolocationProvider providerCallback;
</del><ins>+ WKGeolocationProviderV1 providerCallback;
</ins><span class="cx"> memset(&providerCallback, 0, sizeof(WKGeolocationProvider));
</span><del>- providerCallback.version = kWKGeolocationProviderCurrentVersion;
- providerCallback.clientInfo = clientInfo;
</del><ins>+
+ providerCallback.base.version = 1;
+ providerCallback.base.clientInfo = clientInfo;
</ins><span class="cx"> providerCallback.startUpdating = GeolocationStateTracker::startUpdatingCallback;
</span><span class="cx"> providerCallback.stopUpdating = GeolocationStateTracker::stopUpdatingCallback;
</span><span class="cx"> providerCallback.setEnableHighAccuracy = GeolocationStateTracker::setEnableHighAccuracyCallback;
</span><del>- WKGeolocationManagerSetProvider(WKContextGetGeolocationManager(context), &providerCallback);
</del><ins>+
+ WKGeolocationManagerSetProvider(WKContextGetGeolocationManager(context), &providerCallback.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setupView(PlatformWebView& webView)
</span><span class="cx"> {
</span><del>- WKPageUIClient uiClient;
</del><ins>+ WKPageUIClientV2 uiClient;
</ins><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><del>- uiClient.version = kWKPageUIClientCurrentVersion;
</del><ins>+
+ uiClient.base.version = 2;
</ins><span class="cx"> uiClient.decidePolicyForGeolocationPermissionRequest = decidePolicyForGeolocationPermissionRequestCallBack;
</span><del>- WKPageSetPageUIClient(webView.page(), &uiClient);
</del><ins>+
+ WKPageSetPageUIClient(webView.page(), &uiClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // GeolocationBasic.
</span><span class="lines">@@ -311,12 +315,16 @@
</span><span class="cx"> setupView(lowAccuracyWebView);
</span><span class="cx">
</span><span class="cx"> bool finishedSecondStep = false;
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+
+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.clientInfo = &finishedSecondStep;
</del><ins>+
+ loaderClient.base.version = 0;
+ loaderClient.base.clientInfo = &finishedSecondStep;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(lowAccuracyWebView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(lowAccuracyWebView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> lowAccuracyURL(AdoptWK, Util::createURLForResource("geolocationWatchPosition", "html"));
</span><span class="cx"> WKPageLoadURL(lowAccuracyWebView.page(), lowAccuracyURL.get());
</span><span class="cx"> Util::run(&finishedSecondStep);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GetInjectedBundleInitializationUserDataCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -47,14 +47,15 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
</span><span class="cx">
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV1 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 1;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 1;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx"> injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
</span><del>- WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
</del><span class="cx">
</span><ins>+ WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
+
</ins><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2HitTestResultNodeHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -48,22 +48,24 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 0;
</del><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 0;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+
+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, HitTestResultNodeHandle)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2HitTestResultNodeHandle_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -51,11 +51,13 @@
</span><span class="cx">
</span><span class="cx"> virtual void didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
</span><span class="cx"> {
</span><del>- WKBundlePageContextMenuClient contextMenuClient;
</del><ins>+ WKBundlePageContextMenuClientV0 contextMenuClient;
</ins><span class="cx"> memset(&contextMenuClient, 0, sizeof(contextMenuClient));
</span><ins>+
+ contextMenuClient.base.version = 0;
</ins><span class="cx"> contextMenuClient.getContextMenuFromDefaultMenu = getContextMenuFromDefaultMenu;
</span><span class="cx">
</span><del>- WKBundlePageSetContextMenuClient(page, &contextMenuClient);
</del><ins>+ WKBundlePageSetContextMenuClient(page, &contextMenuClient.base);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2InjectedBundleBasiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -52,22 +52,24 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("InjectedBundleBasicTest"));
</span><span class="cx">
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 0;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><del>- WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
</del><ins>+
+ WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
</ins><span class="cx">
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 0;
- loaderClient.clientInfo = 0;
</del><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2InjectedBundleFrameHitTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -43,12 +43,13 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 0;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+
+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, InjectedBundleFrameHitTest)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2InjectedBundleFrameHitTest_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -58,14 +58,14 @@
</span><span class="cx"> {
</span><span class="cx"> m_bundle = bundle;
</span><span class="cx">
</span><del>- WKBundlePageLoaderClient pageLoaderClient;
</del><ins>+ WKBundlePageLoaderClientV1 pageLoaderClient;
</ins><span class="cx"> memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
</span><span class="cx">
</span><del>- pageLoaderClient.version = 1;
- pageLoaderClient.clientInfo = this;
</del><ins>+ pageLoaderClient.base.version = 1;
+ pageLoaderClient.base.clientInfo = this;
</ins><span class="cx"> pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrameCallback;
</span><span class="cx">
</span><del>- WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
</del><ins>+ WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundleFrameHitTestTest::frameLoadFinished(WKBundleFrameRef frame)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2InjectedBundleInitializationUserDataCallbackWinscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -49,14 +49,15 @@
</span><span class="cx"> WKRetainPtr<WKDictionaryRef> initializationDictionary(AdoptWK, Util::createInitializationDictionaryForInjectedBundleTest("InjectedBundleInitializationUserDataCallbackWinsTest", Util::toWK("Set with WKContextSetInitializationUserDataForInjectedBundle").get()));
</span><span class="cx"> WKContextSetInitializationUserDataForInjectedBundle(context.get(), initializationDictionary.get());
</span><span class="cx">
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV1 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 1;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 1;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx"> injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
</span><del>- WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
</del><span class="cx">
</span><ins>+ WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
+
</ins><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2LayoutMilestonesWithAllContentInFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -47,13 +47,15 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+
+ loaderClient.base.version = 3;
+ loaderClient.base.clientInfo = &webView;
</ins><span class="cx"> loaderClient.didLayout = didLayout;
</span><del>- loaderClient.clientInfo = &webView;
</del><span class="cx">
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKPageListenForLayoutMilestones(webView.page(), kWKDidFirstVisuallyNonEmptyLayout);
</span><span class="cx"> WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("all-content-in-one-iframe", "html")).get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2LoadAlternateHTMLStringWithNonDirectoryURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKURLRef> fileURL(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKRetainPtr<WKStringRef> alternateHTMLString(AdoptWK, WKStringCreateWithUTF8CString("<html><body><img src='icon.png'></body></html>"));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2LoadCanceledNoServerRedirectCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -59,28 +59,31 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("LoadCanceledNoServerRedirectCallbackTest"));
</span><span class="cx">
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 0;
- injectedBundleClient.clientInfo = 0;
- WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient);
</del><span class="cx">
</span><ins>+ injectedBundleClient.base.version = 0;
+
+ WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient.base);
+
</ins><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><ins>+
+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</ins><span class="cx">
</span><del>- WKContextHistoryClient historyClient;
</del><ins>+ WKContextHistoryClientV0 historyClient;
</ins><span class="cx"> memset(&historyClient, 0, sizeof(historyClient));
</span><span class="cx">
</span><del>- historyClient.version = 0;
</del><ins>+ historyClient.base.version = 0;
</ins><span class="cx"> historyClient.didPerformServerRedirect = didPerformServerRedirect;
</span><del>- WKContextSetHistoryClient(context.get(), &historyClient);
</del><span class="cx">
</span><ins>+ WKContextSetHistoryClient(context.get(), &historyClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-iframe", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx"> Util::run(&loadedAllFrames);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2LoadCanceledNoServerRedirectCallback_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -56,13 +56,13 @@
</span><span class="cx">
</span><span class="cx"> virtual void didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
</span><span class="cx"> {
</span><del>- WKBundlePageResourceLoadClient resourceLoadClient;
</del><ins>+ WKBundlePageResourceLoadClientV0 resourceLoadClient;
</ins><span class="cx"> memset(&resourceLoadClient, 0, sizeof(resourceLoadClient));
</span><span class="cx">
</span><del>- resourceLoadClient.version = 0;
</del><ins>+ resourceLoadClient.base.version = 0;
</ins><span class="cx"> resourceLoadClient.willSendRequestForFrame = willSendRequestForFrame;
</span><span class="cx">
</span><del>- WKBundlePageSetResourceLoadClient(page, &resourceLoadClient);
</del><ins>+ WKBundlePageSetResourceLoadClient(page, &resourceLoadClient.base);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2LoadPageOnCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -43,9 +43,12 @@
</span><span class="cx"> , secondSuccessfulLoad(false)
</span><span class="cx"> {
</span><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.clientInfo = this;
</del><ins>+
+ loaderClient.base.version = 0;
+ loaderClient.base.clientInfo = this;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoad;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><ins>+
+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void loadUrl()
</span><span class="lines">@@ -59,7 +62,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKContextRef> context;
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> PlatformWebView webView;
</span><span class="cx"> WKRetainPtr<WKURLRef> url;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2MouseMoveAfterCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -39,13 +39,13 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 0;
- loaderClient.clientInfo = 0;
</del><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2NewFirstVisuallyNonEmptyLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -57,12 +57,13 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+
+ loaderClient.base.version = 3;
</ins><span class="cx"> loaderClient.didLayout = didLayout;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This test has been broken since http://trac.webkit.org/changeset/115752 It's failing because
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2NewFirstVisuallyNonEmptyLayoutFailscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -56,13 +56,14 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+
+ loaderClient.base.version = 3;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx"> loaderClient.didLayout = didLayout;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, NewFirstVisuallyNonEmptyLayoutFails)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2NewFirstVisuallyNonEmptyLayoutForImagescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -57,12 +57,13 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+
+ loaderClient.base.version = 3;
</ins><span class="cx"> loaderClient.didLayout = didLayout;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This test has been broken since http://trac.webkit.org/changeset/115752 It's failing because
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2NewFirstVisuallyNonEmptyLayoutFramescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -61,13 +61,14 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+
+ loaderClient.base.version = kWKPageLoaderClientCurrentVersion;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx"> loaderClient.didLayout = didLayout;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, NewFirstVisuallyNonEmptyLayoutFrames)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2PageLoadBasiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -115,26 +115,28 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
- loaderClient.clientInfo = &state;
</del><ins>+ loaderClient.base.version = 0;
+ loaderClient.base.clientInfo = &state;
</ins><span class="cx"> loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
</span><span class="cx"> loaderClient.didCommitLoadForFrame = didCommitLoadForFrame;
</span><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><del>- WKPagePolicyClient policyClient;
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
+ WKPagePolicyClientV1 policyClient;
</ins><span class="cx"> memset(&policyClient, 0, sizeof(policyClient));
</span><span class="cx">
</span><del>- policyClient.version = 1;
- policyClient.clientInfo = &state;
</del><ins>+ policyClient.base.version = 1;
+ policyClient.base.clientInfo = &state;
</ins><span class="cx"> policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
</span><span class="cx"> policyClient.decidePolicyForNewWindowAction = decidePolicyForNewWindowAction;
</span><span class="cx"> policyClient.decidePolicyForResponse = decidePolicyForResponse;
</span><del>- WKPageSetPagePolicyClient(webView.page(), &policyClient);
</del><span class="cx">
</span><ins>+ WKPageSetPagePolicyClient(webView.page(), &policyClient.base);
+
</ins><span class="cx"> // Before loading anything, the active url should be null
</span><span class="cx"> EXPECT_NULL(WKPageCopyActiveURL(webView.page()));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2PageLoadDidChangeLocationWithinPageForFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -60,12 +60,15 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx"> loaderClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("file-with-anchor", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx"> Util::run(&didFinishLoad);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ParentFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -45,11 +45,13 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, ParentFrame)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ParentFrame_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -67,13 +67,13 @@
</span><span class="cx"> {
</span><span class="cx"> testBundle = bundle;
</span><span class="cx">
</span><del>- WKBundlePageLoaderClient pageLoaderClient;
</del><ins>+ WKBundlePageLoaderClientV1 pageLoaderClient;
</ins><span class="cx"> memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
</span><span class="cx">
</span><del>- pageLoaderClient.version = 1;
</del><ins>+ pageLoaderClient.base.version = 1;
</ins><span class="cx"> pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx">
</span><del>- WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
</del><ins>+ WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2PasteboardNotificationsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -46,12 +46,13 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 0;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+
+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, PasteboardNotifications)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2PasteboardNotifications_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -69,17 +69,16 @@
</span><span class="cx">
</span><span class="cx"> void PasteboardNotificationsTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
</span><span class="cx"> {
</span><del>- WKBundlePageEditorClient pageEditorClient;
-
</del><ins>+ WKBundlePageEditorClientV1 pageEditorClient;
</ins><span class="cx"> memset(&pageEditorClient, 0, sizeof(pageEditorClient));
</span><span class="cx">
</span><del>- pageEditorClient.version = 1;
- pageEditorClient.clientInfo = this;
</del><ins>+ pageEditorClient.base.version = 1;
+ pageEditorClient.base.clientInfo = this;
</ins><span class="cx"> pageEditorClient.willWriteToPasteboard = willWriteToPasteboard;
</span><span class="cx"> pageEditorClient.getPasteboardDataForRange = getPasteboardDataForRange;
</span><span class="cx"> pageEditorClient.didWriteToPasteboard = didWriteToPasteboard;
</span><span class="cx">
</span><del>- WKBundlePageSetEditorClient(page, &pageEditorClient);
</del><ins>+ WKBundlePageSetEditorClient(page, &pageEditorClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2PrivateBrowsingPushStateNoHistoryCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -48,24 +48,24 @@
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx">
</span><del>- WKContextHistoryClient historyClient;
</del><ins>+ WKContextHistoryClientV0 historyClient;
</ins><span class="cx"> memset(&historyClient, 0, sizeof(historyClient));
</span><span class="cx">
</span><del>- historyClient.version = 0;
- historyClient.clientInfo = 0;
</del><ins>+ historyClient.base.version = 0;
</ins><span class="cx"> historyClient.didNavigateWithNavigationData = didNavigateWithNavigationData;
</span><del>- WKContextSetHistoryClient(context.get(), &historyClient);
</del><span class="cx">
</span><ins>+ WKContextSetHistoryClient(context.get(), &historyClient.base);
+
</ins><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient pageLoaderClient;
</del><ins>+ WKPageLoaderClientV0 pageLoaderClient;
</ins><span class="cx"> memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
</span><span class="cx">
</span><del>- pageLoaderClient.version = 0;
- pageLoaderClient.clientInfo = 0;
</del><ins>+ pageLoaderClient.base.version = 0;
</ins><span class="cx"> pageLoaderClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &pageLoaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &pageLoaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKPreferencesRef> preferences(AdoptWK, WKPreferencesCreate());
</span><span class="cx"> WKPreferencesSetPrivateBrowsingEnabled(preferences.get(), true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ReloadPageAfterCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -65,12 +65,15 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoad;
</span><span class="cx"> loaderClient.processDidCrash = didCrash;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
</span><span class="cx"> // Load a blank page and next kills WebProcess.
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ResizeReversePaginatedWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -61,13 +61,14 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+
+ loaderClient.base.version = 3;
+ loaderClient.base.clientInfo = &webView;
</ins><span class="cx"> loaderClient.didLayout = didLayout;
</span><del>- loaderClient.clientInfo = &webView;
</del><span class="cx">
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</ins><span class="cx">
</span><span class="cx"> WKPageListenForLayoutMilestones(webView.page(), kWKDidFirstLayoutAfterSuppressedIncrementalRendering);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ResizeWindowAfterCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -75,13 +75,16 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> TestStatesData states(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.clientInfo = &states;
</del><ins>+
+ loaderClient.base.version = 0;
+ loaderClient.base.clientInfo = &states;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoad;
</span><span class="cx"> loaderClient.processDidCrash = didCrash;
</span><del>- WKPageSetPageLoaderClient(states.webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(states.webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
</span><span class="cx"> // Load a blank page and next kills WebProcess.
</span><span class="cx"> WKPageLoadURL(states.webView.page(), url.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ResponsivenessTimerDoesntFireEarlycpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -51,25 +51,25 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = 0;
- injectedBundleClient.clientInfo = 0;
</del><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 0;
- loaderClient.clientInfo = 0;
</del><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx"> loaderClient.processDidBecomeUnresponsive = processDidBecomeUnresponsive;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, ResponsivenessTimerDoesntFireEarly)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2RestoreSessionStateContainingFormDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -40,12 +40,13 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 0;
</del><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKRetainPtr<WKDataRef> createSessionStateContainingFormData(WKContextRef context)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ScrollPinningBehaviorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -79,13 +79,14 @@
</span><span class="cx">
</span><span class="cx"> PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+
+ loaderClient.base.version = 3;
+ loaderClient.base.clientInfo = &webView;
</ins><span class="cx"> loaderClient.didFinishDocumentLoadForFrame = didFinishDocumentLoadForFrame;
</span><del>- loaderClient.clientInfo = &webView;
</del><span class="cx">
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</ins><span class="cx">
</span><span class="cx"> WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple-tall", "html")).get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ShouldGoToBackForwardListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -56,14 +56,14 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV1 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 1;
- loaderClient.clientInfo = 0;
</del><ins>+
+ loaderClient.base.version = 1;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx"> loaderClient.willGoToBackForwardListItem = willGoToBackForwardListItem;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, ShouldGoToBackForwardListItem)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ShouldGoToBackForwardListItem_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -57,14 +57,14 @@
</span><span class="cx">
</span><span class="cx"> void ShouldGoToBackForwardListItemTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
</span><span class="cx"> {
</span><del>- WKBundlePageLoaderClient pageLoaderClient;
</del><ins>+ WKBundlePageLoaderClientV1 pageLoaderClient;
</ins><span class="cx"> memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
</span><span class="cx">
</span><del>- pageLoaderClient.version = 1;
- pageLoaderClient.clientInfo = this;
</del><ins>+ pageLoaderClient.base.version = 1;
+ pageLoaderClient.base.clientInfo = this;
</ins><span class="cx"> pageLoaderClient.shouldGoToBackForwardListItem = shouldGoToBackForwardListItemCallback;
</span><span class="cx">
</span><del>- WKBundlePageSetPageLoaderClient(page, &pageLoaderClient);
</del><ins>+ WKBundlePageSetPageLoaderClient(page, &pageLoaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2SpacebarScrollingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -58,19 +58,22 @@
</span><span class="cx">
</span><span class="cx"> PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><del>- WKPageUIClient uiClient;
</del><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
+ WKPageUIClientV0 uiClient;
</ins><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><span class="cx">
</span><ins>+ uiClient.base.version = 0;
</ins><span class="cx"> uiClient.didNotHandleKeyEvent = didNotHandleKeyEventCallback;
</span><del>- WKPageSetPageUIClient(webView.page(), &uiClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageUIClient(webView.page(), &uiClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("spacebar-scrolling", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx"> Util::run(&didFinishLoad);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2TerminateTwicecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -41,13 +41,14 @@
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2UserMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -65,24 +65,26 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context, const void* clientInfo)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV1 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
- injectedBundleClient.clientInfo = clientInfo;
</del><ins>+
+ injectedBundleClient.base.version = 1;
+ injectedBundleClient.base.clientInfo = clientInfo;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
- loaderClient.clientInfo = clientInfo;
</del><ins>+
+ loaderClient.base.version = kWKPageLoaderClientCurrentVersion;
+ loaderClient.base.clientInfo = clientInfo;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void SetUp()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WKConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -71,12 +71,13 @@
</span><span class="cx">
</span><span class="cx"> // Set up the context's connection client so that we can access the connection when
</span><span class="cx"> // it is created.
</span><del>- WKContextConnectionClient contextConnectionClient;
</del><ins>+ WKContextConnectionClientV0 contextConnectionClient;
</ins><span class="cx"> memset(&contextConnectionClient, 0, sizeof(contextConnectionClient));
</span><del>- contextConnectionClient.version = kWKContextConnectionClientCurrentVersion;
- contextConnectionClient.clientInfo = 0;
</del><ins>+
+ contextConnectionClient.base.version = kWKContextConnectionClientCurrentVersion;
</ins><span class="cx"> contextConnectionClient.didCreateConnection = didCreateConnection;
</span><del>- WKContextSetConnectionClient(context.get(), &contextConnectionClient);
</del><ins>+
+ WKContextSetConnectionClient(context.get(), &contextConnectionClient.base);
</ins><span class="cx">
</span><span class="cx"> // Load a simple page to start the WebProcess and establish a connection.
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="lines">@@ -89,13 +90,14 @@
</span><span class="cx">
</span><span class="cx"> // Setup a client on the connection so we can listen for messages and
</span><span class="cx"> // tear down notifications.
</span><del>- WKConnectionClient connectionClient;
</del><ins>+ WKConnectionClientV0 connectionClient;
</ins><span class="cx"> memset(&connectionClient, 0, sizeof(connectionClient));
</span><del>- connectionClient.version = WKConnectionClientCurrentVersion;
- connectionClient.clientInfo = 0;
</del><ins>+
+ connectionClient.base.version = 0;
</ins><span class="cx"> connectionClient.didReceiveMessage = connectionDidReceiveMessage;
</span><span class="cx"> connectionClient.didClose = connectionDidClose;
</span><del>- WKConnectionSetConnectionClient(connectionToBundle, &connectionClient);
</del><ins>+
+ WKConnectionSetConnectionClient(connectionToBundle, &connectionClient.base);
</ins><span class="cx">
</span><span class="cx"> // Post a simple message to the bundle via the connection.
</span><span class="cx"> WKConnectionPostMessage(connectionToBundle, Util::toWK("PingMessageName").get(), Util::toWK("PingMessageBody").get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WKConnection_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKConnection_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -46,12 +46,13 @@
</span><span class="cx">
</span><span class="cx"> virtual void initialize(WKBundleRef bundle, WKTypeRef)
</span><span class="cx"> {
</span><del>- WKConnectionClient connectionClient;
</del><ins>+ WKConnectionClientV0 connectionClient;
</ins><span class="cx"> memset(&connectionClient, 0, sizeof(connectionClient));
</span><del>- connectionClient.version = WKConnectionClientCurrentVersion;
- connectionClient.clientInfo = 0;
</del><ins>+
+ connectionClient.base.version = WKConnectionClientCurrentVersion;
</ins><span class="cx"> connectionClient.didReceiveMessage = connectionDidReceiveMessage;
</span><del>- WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient);
</del><ins>+
+ WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient.base);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WKPageGetScaleFactorNotZerocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -39,12 +39,13 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 0;
</del><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKRetainPtr<WKDataRef> createSessionState(WKContextRef context)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -88,11 +88,13 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)
</span><span class="lines">@@ -107,13 +109,14 @@
</span><span class="cx">
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV3 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = kWKPageLoaderClientCurrentVersion;
</del><ins>+ loaderClient.base.version = 3;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple", "html")).get());
</span><span class="cx">
</span><span class="cx"> // Wait till the load finishes before getting the web archive.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -56,13 +56,14 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context, const void* clientInfo)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV1 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><del>- injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
- injectedBundleClient.clientInfo = clientInfo;
</del><ins>+
+ injectedBundleClient.base.version = 1;
+ injectedBundleClient.base.clientInfo = clientInfo;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void SetUp()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillLoad_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -67,15 +67,15 @@
</span><span class="cx">
</span><span class="cx"> virtual void didCreatePage(WKBundleRef, WKBundlePageRef bundlePage) OVERRIDE
</span><span class="cx"> {
</span><del>- WKBundlePageLoaderClient pageLoaderClient;
</del><ins>+ WKBundlePageLoaderClientV6 pageLoaderClient;
</ins><span class="cx"> memset(&pageLoaderClient, 0, sizeof(pageLoaderClient));
</span><span class="cx">
</span><del>- pageLoaderClient.version = 6;
- pageLoaderClient.clientInfo = this;
</del><ins>+ pageLoaderClient.base.version = 6;
+ pageLoaderClient.base.clientInfo = this;
</ins><span class="cx"> pageLoaderClient.willLoadURLRequest = willLoadURLRequest;
</span><span class="cx"> pageLoaderClient.willLoadDataRequest = willLoadDataRequest;
</span><span class="cx">
</span><del>- WKBundlePageSetPageLoaderClient(bundlePage, &pageLoaderClient);
</del><ins>+ WKBundlePageSetPageLoaderClient(bundlePage, &pageLoaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillSendSubmitEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -57,11 +57,13 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><span class="cx">
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, WillSendSubmitEvent)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WillSendSubmitEvent_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -52,14 +52,14 @@
</span><span class="cx">
</span><span class="cx"> void WillSendSubmitEventTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
</span><span class="cx"> {
</span><del>- WKBundlePageFormClient formClient;
</del><ins>+ WKBundlePageFormClientV1 formClient;
</ins><span class="cx"> memset(&formClient, 0, sizeof(formClient));
</span><span class="cx">
</span><del>- formClient.version = 1;
- formClient.clientInfo = this;
</del><ins>+ formClient.base.version = 1;
+ formClient.base.clientInfo = this;
</ins><span class="cx"> formClient.willSendSubmitEvent = willSendSubmitEvent;
</span><span class="cx">
</span><del>- WKBundlePageSetFormClient(page, &formClient);
</del><ins>+ WKBundlePageSetFormClient(page, &formClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2macEditorCommandsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/EditorCommands.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -52,12 +52,14 @@
</span><span class="cx">
</span><span class="cx"> PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 0;
</del><ins>+
+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-tall", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx"> Util::run(&didFinishLoad);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2macGetBackingScaleFactormm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetBackingScaleFactor.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -47,10 +47,13 @@
</span><span class="cx">
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span><span class="cx"> {
</span><del>- WKContextInjectedBundleClient injectedBundleClient;
</del><ins>+ WKContextInjectedBundleClientV0 injectedBundleClient;
</ins><span class="cx"> memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
</span><ins>+
+ injectedBundleClient.base.version = 0;
</ins><span class="cx"> injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
</span><del>- WKContextSetInjectedBundleClient(context, &injectedBundleClient);
</del><ins>+
+ WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RetainPtr<SyntheticBackingScaleFactorWindow> createWindow()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2macGetPIDAfterAbortedProcessLaunchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -46,13 +46,14 @@
</span><span class="cx">
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">
</span><del>- loaderClient.version = 0;
</del><ins>+ loaderClient.base.version = 0;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><del>- WKPageSetPageLoaderClient(webView.page(), &loaderClient);
</del><span class="cx">
</span><ins>+ WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
+
</ins><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx"> WKPageLoadURL(webView.page(), url.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCCustomProtocolsInvalidScheme_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -47,10 +47,13 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void didCreatePage(WKBundleRef, WKBundlePageRef bundlePage) OVERRIDE
</span><span class="cx"> {
</span><del>- WKBundlePagePolicyClient policyClient;
</del><ins>+ WKBundlePagePolicyClientV0 policyClient;
</ins><span class="cx"> memset(&policyClient, 0, sizeof(policyClient));
</span><ins>+
+ policyClient.base.version = 0;
</ins><span class="cx"> policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
</span><del>- WKBundlePageSetPolicyClient(bundlePage, &policyClient);
</del><ins>+
+ WKBundlePageSetPolicyClient(bundlePage, &policyClient.base);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCPreventImageLoadWithAutoResizing_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -48,13 +48,13 @@
</span><span class="cx">
</span><span class="cx"> virtual void didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
</span><span class="cx"> {
</span><del>- WKBundlePageResourceLoadClient resourceLoadClient;
</del><ins>+ WKBundlePageResourceLoadClientV0 resourceLoadClient;
</ins><span class="cx"> memset(&resourceLoadClient, 0, sizeof(resourceLoadClient));
</span><span class="cx">
</span><del>- resourceLoadClient.version = 0;
</del><ins>+ resourceLoadClient.base.version = 0;
</ins><span class="cx"> resourceLoadClient.willSendRequestForFrame = willSendRequestForFrame;
</span><span class="cx">
</span><del>- WKBundlePageSetResourceLoadClient(page, &resourceLoadClient);
</del><ins>+ WKBundlePageSetResourceLoadClient(page, &resourceLoadClient.base);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCWKRemoteObjectRegistrymm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKRemoteObjectRegistry.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -59,14 +59,15 @@
</span><span class="cx">
</span><span class="cx"> // Setup a client on the connection so we can listen for messages and
</span><span class="cx"> // tear down notifications.
</span><del>- WKConnectionClient connectionClient;
</del><ins>+ WKConnectionClientV0 connectionClient;
</ins><span class="cx"> memset(&connectionClient, 0, sizeof(connectionClient));
</span><del>- connectionClient.version = WKConnectionClientCurrentVersion;
- connectionClient.clientInfo = 0;
</del><ins>+
+ connectionClient.base.version = 0;
</ins><span class="cx"> connectionClient.didReceiveMessage = connectionDidReceiveMessage;
</span><span class="cx"> connectionClient.didClose = connectionDidClose;
</span><del>- WKConnectionSetConnectionClient(connection, &connectionClient);
</del><span class="cx">
</span><ins>+ WKConnectionSetConnectionClient(connection, &connectionClient.base);
+
</ins><span class="cx"> // Store off the conneciton to use.
</span><span class="cx"> remoteObjectRegistry = [[WKRemoteObjectRegistry alloc] _initWithConnectionRef:connection];
</span><span class="cx"> }
</span><span class="lines">@@ -77,13 +78,14 @@
</span><span class="cx">
</span><span class="cx"> // Set up the context's connection client so that we can access the connection when
</span><span class="cx"> // it is created.
</span><del>- WKContextConnectionClient contextConnectionClient;
</del><ins>+ WKContextConnectionClientV0 contextConnectionClient;
</ins><span class="cx"> memset(&contextConnectionClient, 0, sizeof(contextConnectionClient));
</span><del>- contextConnectionClient.version = kWKContextConnectionClientCurrentVersion;
- contextConnectionClient.clientInfo = 0;
</del><ins>+
+ contextConnectionClient.base.version = 0;
</ins><span class="cx"> contextConnectionClient.didCreateConnection = didCreateConnection;
</span><del>- WKContextSetConnectionClient(context.get(), &contextConnectionClient);
</del><span class="cx">
</span><ins>+ WKContextSetConnectionClient(context.get(), &contextConnectionClient.base);
+
</ins><span class="cx"> // Load a simple page to start the WebProcess and establish a connection.
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx"> WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacPageVisibilityStateWithWindowChangesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -89,12 +89,13 @@
</span><span class="cx">
</span><span class="cx"> void PageVisibilityStateWithWindowChanges::initializeView(WKView *wkView)
</span><span class="cx"> {
</span><del>- WKPageUIClient uiClient;
</del><ins>+ WKPageUIClientV0 uiClient;
</ins><span class="cx"> memset(&uiClient, 0, sizeof(uiClient));
</span><del>- uiClient.version = 0;
- uiClient.clientInfo = 0;
</del><ins>+
+ uiClient.base.version = 0;
</ins><span class="cx"> uiClient.runJavaScriptAlert = runJavaScriptAlert;
</span><del>- WKPageSetPageUIClient(wkView.pageRef, &uiClient);
</del><ins>+
+ WKPageSetPageUIClient(wkView.pageRef, &uiClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageVisibilityStateWithWindowChanges::teardownView(WKView *wkView)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacWKRemoteObjectRegistry_Bundlemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/WKRemoteObjectRegistry_Bundle.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -75,17 +75,18 @@
</span><span class="cx"> BundleObject *bundleObject = [[BundleObject alloc] init];
</span><span class="cx"> [m_objectRegistry registerExportedObject:bundleObject interface:bundleInterface];
</span><span class="cx">
</span><del>- WKConnectionClient connectionClient;
</del><ins>+ WKConnectionClientV0 connectionClient;
</ins><span class="cx"> memset(&connectionClient, 0, sizeof(connectionClient));
</span><del>- connectionClient.version = WKConnectionClientCurrentVersion;
- connectionClient.clientInfo = this;
</del><ins>+
+ connectionClient.base.version = WKConnectionClientCurrentVersion;
+ connectionClient.base.clientInfo = this;
</ins><span class="cx"> connectionClient.didReceiveMessage = [](WKConnectionRef connection, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo) {
</span><span class="cx"> const WKRemoteObjectRegistryTest* test = static_cast<const WKRemoteObjectRegistryTest*>(clientInfo);
</span><span class="cx">
</span><span class="cx"> [test->m_objectRegistry.get() _handleMessageWithName:messageName body:messageBody];
</span><span class="cx"> };
</span><span class="cx">
</span><del>- WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient);
</del><ins>+ WKConnectionSetConnectionClient(WKBundleGetApplicationConnection(bundle), &connectionClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacWebKitAgnosticTestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -66,13 +66,14 @@
</span><span class="cx">
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page, bool* didFinishLoad)
</span><span class="cx"> {
</span><del>- WKPageLoaderClient loaderClient;
</del><ins>+ WKPageLoaderClientV0 loaderClient;
</ins><span class="cx"> memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>- loaderClient.version = 0;
- loaderClient.clientInfo = didFinishLoad;
</del><ins>+
+ loaderClient.base.version = 0;
+ loaderClient.base.clientInfo = didFinishLoad;
</ins><span class="cx"> loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</span><span class="cx">
</span><del>- WKPageSetPageLoaderClient(page, &loaderClient);
</del><ins>+ WKPageSetPageLoaderClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebKitAgnosticTest::WebKitAgnosticTest()
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerGeolocationProviderMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -51,13 +51,13 @@
</span><span class="cx"> {
</span><span class="cx"> m_geolocationManager = WKContextGetGeolocationManager(context);
</span><span class="cx">
</span><del>- WKGeolocationProvider providerCallback;
</del><ins>+ WKGeolocationProviderV1 providerCallback;
</ins><span class="cx"> memset(&providerCallback, 0, sizeof(WKGeolocationProvider));
</span><del>- providerCallback.version = 0;
- providerCallback.clientInfo = this;
</del><ins>+ providerCallback.base.version = 1;
+ providerCallback.base.clientInfo = this;
</ins><span class="cx"> providerCallback.startUpdating = startUpdatingCallback;
</span><span class="cx"> providerCallback.stopUpdating = stopUpdatingCallback;
</span><del>- WKGeolocationManagerSetProvider(m_geolocationManager, &providerCallback);
</del><ins>+ WKGeolocationManagerSetProvider(m_geolocationManager, &providerCallback.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GeolocationProviderMock::~GeolocationProviderMock()
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -88,16 +88,15 @@
</span><span class="cx"> {
</span><span class="cx"> m_bundle = bundle;
</span><span class="cx">
</span><del>- WKBundleClient client = {
- kWKBundleClientCurrentVersion,
- this,
</del><ins>+ WKBundleClientV1 client = {
+ { 1, this },
</ins><span class="cx"> didCreatePage,
</span><span class="cx"> willDestroyPage,
</span><span class="cx"> didInitializePageGroup,
</span><span class="cx"> didReceiveMessage,
</span><span class="cx"> didReceiveMessageToPage
</span><span class="cx"> };
</span><del>- WKBundleSetClient(m_bundle, &client);
</del><ins>+ WKBundleSetClient(m_bundle, &client.base);
</ins><span class="cx">
</span><span class="cx"> platformInitialize(initializationUserData);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -268,9 +268,8 @@
</span><span class="cx"> : m_page(page)
</span><span class="cx"> , m_world(AdoptWK, WKBundleScriptWorldCreateWorld())
</span><span class="cx"> {
</span><del>- WKBundlePageLoaderClient loaderClient = {
- kWKBundlePageLoaderClientCurrentVersion,
- this,
</del><ins>+ WKBundlePageLoaderClientV7 loaderClient = {
+ { 7, this },
</ins><span class="cx"> didStartProvisionalLoadForFrame,
</span><span class="cx"> didReceiveServerRedirectForProvisionalLoadForFrame,
</span><span class="cx"> didFailProvisionalLoadWithErrorForFrame,
</span><span class="lines">@@ -307,11 +306,10 @@
</span><span class="cx"> 0, // willLoadDataRequest
</span><span class="cx"> 0, // willDestroyFrame
</span><span class="cx"> };
</span><del>- WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
</del><ins>+ WKBundlePageSetPageLoaderClient(m_page, &loaderClient.base);
</ins><span class="cx">
</span><del>- WKBundlePageResourceLoadClient resourceLoadClient = {
- kWKBundlePageResourceLoadClientCurrentVersion,
- this,
</del><ins>+ WKBundlePageResourceLoadClientV1 resourceLoadClient = {
+ { 1, this },
</ins><span class="cx"> didInitiateLoadForResource,
</span><span class="cx"> willSendRequestForFrame,
</span><span class="cx"> didReceiveResponseForResource,
</span><span class="lines">@@ -321,21 +319,19 @@
</span><span class="cx"> shouldCacheResponse,
</span><span class="cx"> 0 // shouldUseCredentialStorage
</span><span class="cx"> };
</span><del>- WKBundlePageSetResourceLoadClient(m_page, &resourceLoadClient);
</del><ins>+ WKBundlePageSetResourceLoadClient(m_page, &resourceLoadClient.base);
</ins><span class="cx">
</span><del>- WKBundlePagePolicyClient policyClient = {
- kWKBundlePagePolicyClientCurrentVersion,
- this,
</del><ins>+ WKBundlePagePolicyClientV0 policyClient = {
+ { 0, this },
</ins><span class="cx"> decidePolicyForNavigationAction,
</span><span class="cx"> decidePolicyForNewWindowAction,
</span><span class="cx"> decidePolicyForResponse,
</span><span class="cx"> unableToImplementPolicy
</span><span class="cx"> };
</span><del>- WKBundlePageSetPolicyClient(m_page, &policyClient);
</del><ins>+ WKBundlePageSetPolicyClient(m_page, &policyClient.base);
</ins><span class="cx">
</span><del>- WKBundlePageUIClient uiClient = {
- kWKBundlePageUIClientCurrentVersion,
- this,
</del><ins>+ WKBundlePageUIClientV2 uiClient = {
+ { 2, this },
</ins><span class="cx"> willAddMessageToConsole,
</span><span class="cx"> willSetStatusbarText,
</span><span class="cx"> willRunJavaScriptAlert,
</span><span class="lines">@@ -357,11 +353,10 @@
</span><span class="cx"> 0, /*plugInExtraStyleSheet*/
</span><span class="cx"> 0, /*plugInExtraScript*/
</span><span class="cx"> };
</span><del>- WKBundlePageSetUIClient(m_page, &uiClient);
</del><ins>+ WKBundlePageSetUIClient(m_page, &uiClient.base);
</ins><span class="cx">
</span><del>- WKBundlePageEditorClient editorClient = {
- kWKBundlePageEditorClientCurrentVersion,
- this,
</del><ins>+ WKBundlePageEditorClientV1 editorClient = {
+ { 1, this },
</ins><span class="cx"> shouldBeginEditing,
</span><span class="cx"> shouldEndEditing,
</span><span class="cx"> shouldInsertNode,
</span><span class="lines">@@ -377,12 +372,11 @@
</span><span class="cx"> 0, /* getPasteboardDataForRange */
</span><span class="cx"> 0 /* didWriteToPasteboard */
</span><span class="cx"> };
</span><del>- WKBundlePageSetEditorClient(m_page, &editorClient);
</del><ins>+ WKBundlePageSetEditorClient(m_page, &editorClient.base);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- WKBundlePageFullScreenClient fullScreenClient = {
- kWKBundlePageFullScreenClientCurrentVersion,
- this,
</del><ins>+ WKBundlePageFullScreenClientV1 fullScreenClient = {
+ { 1, this },
</ins><span class="cx"> supportsFullScreen,
</span><span class="cx"> enterFullScreenForElement,
</span><span class="cx"> exitFullScreenForElement,
</span><span class="lines">@@ -390,7 +384,7 @@
</span><span class="cx"> beganExitFullScreen,
</span><span class="cx"> closeFullScreen,
</span><span class="cx"> };
</span><del>- WKBundlePageSetFullScreenClient(m_page, &fullScreenClient);
</del><ins>+ WKBundlePageSetFullScreenClient(m_page, &fullScreenClient.base);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (160103 => 160104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2013-12-04 18:48:55 UTC (rev 160103)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2013-12-04 18:49:49 UTC (rev 160104)
</span><span class="lines">@@ -190,9 +190,8 @@
</span><span class="cx">
</span><span class="cx"> view->resizeTo(800, 600);
</span><span class="cx">
</span><del>- WKPageUIClient otherPageUIClient = {
- kWKPageUIClientCurrentVersion,
- view,
</del><ins>+ WKPageUIClientV2 otherPageUIClient = {
+ { 2, view },
</ins><span class="cx"> 0, // createNewPage_deprecatedForUseWithV0
</span><span class="cx"> 0, // showPage
</span><span class="cx"> closeOtherPage,
</span><span class="lines">@@ -240,7 +239,7 @@
</span><span class="cx"> 0, // hideColorPicker
</span><span class="cx"> 0, // unavailablePluginButtonClicked
</span><span class="cx"> };
</span><del>- WKPageSetPageUIClient(newPage, &otherPageUIClient);
</del><ins>+ WKPageSetPageUIClient(newPage, &otherPageUIClient.base);
</ins><span class="cx">
</span><span class="cx"> view->didInitializeClients();
</span><span class="cx">
</span><span class="lines">@@ -366,14 +365,13 @@
</span><span class="cx">
</span><span class="cx"> platformInitializeContext();
</span><span class="cx">
</span><del>- WKContextInjectedBundleClient injectedBundleClient = {
- kWKContextInjectedBundleClientCurrentVersion,
- this,
</del><ins>+ WKContextInjectedBundleClientV1 injectedBundleClient = {
+ { 1, this },
</ins><span class="cx"> didReceiveMessageFromInjectedBundle,
</span><span class="cx"> didReceiveSynchronousMessageFromInjectedBundle,
</span><span class="cx"> 0 // getInjectedBundleInitializationUserData
</span><span class="cx"> };
</span><del>- WKContextSetInjectedBundleClient(m_context.get(), &injectedBundleClient);
</del><ins>+ WKContextSetInjectedBundleClient(m_context.get(), &injectedBundleClient.base);
</ins><span class="cx">
</span><span class="cx"> WKNotificationManagerRef notificationManager = WKContextGetNotificationManager(m_context.get());
</span><span class="cx"> WKNotificationProviderV0 notificationKit = m_webNotificationProvider.provider();
</span><span class="lines">@@ -391,9 +389,8 @@
</span><span class="cx"> void TestController::createWebViewWithOptions(WKDictionaryRef options)
</span><span class="cx"> {
</span><span class="cx"> m_mainWebView = adoptPtr(new PlatformWebView(m_context.get(), m_pageGroup.get(), 0, options));
</span><del>- WKPageUIClient pageUIClient = {
- kWKPageUIClientCurrentVersion,
- m_mainWebView.get(),
</del><ins>+ WKPageUIClientV2 pageUIClient = {
+ { 2, m_mainWebView.get() },
</ins><span class="cx"> 0, // createNewPage_deprecatedForUseWithV0
</span><span class="cx"> 0, // showPage
</span><span class="cx"> 0, // close
</span><span class="lines">@@ -441,11 +438,10 @@
</span><span class="cx"> 0, // hideColorPicker
</span><span class="cx"> unavailablePluginButtonClicked,
</span><span class="cx"> };
</span><del>- WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
</del><ins>+ WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient.base);
</ins><span class="cx">
</span><del>- WKPageLoaderClient pageLoaderClient = {
- kWKPageLoaderClientCurrentVersion,
- this,
</del><ins>+ WKPageLoaderClientV3 pageLoaderClient = {
+ { 3, this },
</ins><span class="cx"> 0, // didStartProvisionalLoadForFrame
</span><span class="cx"> 0, // didReceiveServerRedirectForProvisionalLoadForFrame
</span><span class="cx"> 0, // didFailProvisionalLoadWithErrorForFrame
</span><span class="lines">@@ -483,11 +479,10 @@
</span><span class="cx"> 0, // pluginDidFail
</span><span class="cx"> pluginLoadPolicy, // pluginLoadPolicy
</span><span class="cx"> };
</span><del>- WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
</del><ins>+ WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient.base);
</ins><span class="cx">
</span><del>- WKPagePolicyClient pagePolicyClient = {
- kWKPagePolicyClientCurrentVersion,
- this,
</del><ins>+ WKPagePolicyClientV1 pagePolicyClient = {
+ { 1, this },
</ins><span class="cx"> 0, // decidePolicyForNavigationAction_deprecatedForUseWithV0
</span><span class="cx"> 0, // decidePolicyForNewWindowAction
</span><span class="cx"> 0, // decidePolicyForResponse_deprecatedForUseWithV0
</span><span class="lines">@@ -495,7 +490,7 @@
</span><span class="cx"> decidePolicyForNavigationAction,
</span><span class="cx"> decidePolicyForResponse,
</span><span class="cx"> };
</span><del>- WKPageSetPagePolicyClient(m_mainWebView->page(), &pagePolicyClient);
</del><ins>+ WKPageSetPagePolicyClient(m_mainWebView->page(), &pagePolicyClient.base);
</ins><span class="cx">
</span><span class="cx"> m_mainWebView->didInitializeClients();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>