<!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>[235117] trunk/Tools</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/235117">235117</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2018-08-21 09:16:54 -0700 (Tue, 21 Aug 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Replace WKPageLoaderClient with WKPageNavigationClient in many API tests
https://bugs.webkit.org/show_bug.cgi?id=188771

Reviewed by Tim Horton.

* TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/CookieManager.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp:
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/EventModifiers.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setClients):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/Find.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/FindMatches.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/FrameHandle.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/Geolocation.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp:
(TestWebKitAPI::didFinishLoadForFrame):
* TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::loadAlternateHTMLString):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp:
(TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader):
(TestWebKitAPI::didFinishLoad):
* TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp:
(TestWebKitAPI::didFinishLoadForFrame):
* TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp:
(TestWebKitAPI::didFinishLoad):
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishDocumentLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp:
(TestWebKitAPI::didFailProvisionalNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp:
(TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishNavigation):
(TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::setPageLoaderClient):
(TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/UserMessage.cpp:
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishNavigation):
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):
(TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setUpClients):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/WebArchive.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm:
(didFinishNavigation):
(TestWebKitAPI::TEST):
(didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm:
(didFinishNavigation):
(TestWebKitAPI::TEST):
(didFinishLoadForFrame): Deleted.
* TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::TEST):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.
* TestWebKitAPI/mac/WebKitAgnosticTest.mm:
(TestWebKitAPI::didFinishNavigation):
(TestWebKitAPI::setPageLoaderClient):
(TestWebKitAPI::didFinishLoadForFrame): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCloseThenTerminatecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCookieManagercpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitDeferredViewInWindowStateChangemm">trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitDidNotHandleKeyDowncpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitDidRemoveFrameFromHiearchyInPageCachecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitEventModifierscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitFindcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitFindMatchesmm">trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitForceRepaintcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitFrameHandlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitGeolocationcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitHitTestResultNodeHandlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitInjectedBundleBasiccpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitLimitTitleSizecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitLoadAlternateHTMLStringWithNonDirectoryURLcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitLoadCanceledNoServerRedirectCallbackcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitLoadPageOnCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitMenuTypesForMouseEventscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitMouseMoveAfterCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitNewFirstVisuallyNonEmptyLayoutFailscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitPageLoadBasiccpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitPendingAPIRequestURLcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitResizeWindowAfterCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitRestoreSessionStatecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitRestoreSessionStateContainingFormDatacpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitScrollPinningBehaviorscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitSpacebarScrollingcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitStopLoadingDuringDidFailProvisionalLoadcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitTerminateTwicecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitTextFieldDidBeginAndEndEditingcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitUserMessagecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitWKPageConfigurationcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitWKPageCopySessionStateWithFilteringcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitWKPageGetScaleFactorNotZerocpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitWKPageIsPlayingAudiocpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitWKThumbnailViewmm">trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitWebArchivecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitmacAttributedSubstringForProposedRangeWithImagemm">trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitmacContextMenuDownloadmm">trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitmacCustomBundleParametermm">trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitmacEditorCommandsmm">trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitmacGetPIDAfterAbortedProcessLaunchcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitmacInjectedBundleAppleEventcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaFullscreenDelegatemm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaPictureInPictureDelegatemm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacFirstResponderScrollingPositionmm">trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPImacWebKitAgnosticTestmm">trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/ChangeLog       2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -1,3 +1,188 @@
</span><ins>+2018-08-20  Alex Christensen  <achristensen@webkit.org>
+
+        Replace WKPageLoaderClient with WKPageNavigationClient in many API tests
+        https://bugs.webkit.org/show_bug.cgi?id=188771
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/CookieManager.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp:
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/EventModifiers.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setClients):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/Find.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/FindMatches.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/FrameHandle.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/Geolocation.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp:
+        (TestWebKitAPI::didFinishLoadForFrame):
+        * TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::loadAlternateHTMLString):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp:
+        (TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader):
+        (TestWebKitAPI::didFinishLoad):
+        * TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp:
+        (TestWebKitAPI::didFinishLoadForFrame):
+        * TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp:
+        (TestWebKitAPI::didFinishLoad):
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishDocumentLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp:
+        (TestWebKitAPI::didFailProvisionalNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp:
+        (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishNavigation):
+        (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::setPageLoaderClient):
+        (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/UserMessage.cpp:
+        (TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishNavigation):
+        (TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):
+        (TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setUpClients):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/WebArchive.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm:
+        (didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm:
+        (didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+        * TestWebKitAPI/mac/WebKitAgnosticTest.mm:
+        (TestWebKitAPI::didFinishNavigation):
+        (TestWebKitAPI::setPageLoaderClient):
+        (TestWebKitAPI::didFinishLoadForFrame): Deleted.
+
</ins><span class="cx"> 2018-08-21  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WPE] Update to use libwpe-1.0.0 and WPEBackend-fdo-1.0.0
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCloseThenTerminatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp    2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp       2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">     
</span><span class="cx"> static bool loaded;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     loaded = true;
</span><span class="cx"> }
</span><span class="lines">@@ -47,13 +47,13 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context = adoptWK(WKContextCreate());
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0 , sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx">     
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(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="trunkToolsTestWebKitAPITestsWebKitCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp    2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">     WKCookieManagerGetHTTPCookieAcceptPolicy(cookieManager, reinterpret_cast<void*>(0x1234578), didGetTestHTTPCookieAcceptPolicy);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     WKCookieManagerRef cookieManager = WKContextGetCookieManager(wkContext.get());
</span><span class="cx">     WKCookieManagerGetHTTPCookieAcceptPolicy(cookieManager, reinterpret_cast<void*>(0x1234578), didGetUserHTTPCookieAcceptPolicy);
</span><span class="lines">@@ -75,13 +75,13 @@
</span><span class="cx">     wkContext.adopt(WKContextCreate());
</span><span class="cx">     PlatformWebView webView(wkContext.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitDeferredViewInWindowStateChangemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WebKit, DeferredViewInWindowStateChange)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitDidNotHandleKeyDowncpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -37,10 +37,6 @@
</span><span class="cx"> static bool didFinishTest;
</span><span class="cx"> static bool didNotHandleKeyDownEvent;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
-{
-}
-
</del><span class="cx"> static void didNotHandleKeyEventCallback(WKPageRef, WKNativeEventPtr event, const void*)
</span><span class="cx"> {
</span><span class="cx">     if (Util::isKeyDown(event))
</span><span class="lines">@@ -53,14 +49,6 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle());
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
-    memset(&loaderClient, 0, sizeof(loaderClient));
-    
-    loaderClient.base.version = 0;
-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
-
</del><span class="cx">     WKPageUIClientV0 uiClient;
</span><span class="cx">     memset(&uiClient, 0, sizeof(uiClient));
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitDidRemoveFrameFromHiearchyInPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp    2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -38,24 +38,20 @@
</span><span class="cx"> static bool finished = false;
</span><span class="cx"> static int didRemoveFrameFromHierarchyCount;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><del>-    // Only mark finished when the main frame loads
-    if (!WKFrameIsMainFrame(frame))
-        return;
-
</del><span class="cx">     finished = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV1 loaderClient;
</del><ins>+    WKPageNavigationClientV1 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 1;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void didReceivePageMessageFromInjectedBundle(WKPageRef, WKStringRef messageName, WKTypeRef, const void*)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitEventModifierscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> static bool didFinishLoad { false };
</span><span class="cx"> static bool mouseMoveCallbackFinished { false };
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -49,11 +49,11 @@
</span><span class="cx"> 
</span><span class="cx"> static void setClients(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx">     
</span><span class="cx">     WKPageUIClientV1 uiClient;
</span><span class="cx">     memset(&uiClient, 0, sizeof(uiClient));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitFindcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp  2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp     2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> static bool didFinishLoad = false;
</span><span class="cx"> static bool didCallCountStringMatches = false;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx">     
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageFindClientV0 findClient;
</span><span class="cx">     memset(&findClient, 0, sizeof(findClient));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitFindMatchesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm    2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm       2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> 
</span><span class="cx"> RetainPtr<WebView> webkit1View;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -121,13 +121,13 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx">     
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageFindMatchesClientV0 findMatchesClient;
</span><span class="cx">     memset(&findMatchesClient, 0, sizeof(findMatchesClient));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitForceRepaintcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp  2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp     2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">     test2Done = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     test1Done = true;
</span><span class="cx">     WKPageForceRepaint(page, 0, didForceRepaint);
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-accelerated-compositing", "html"));
</span><span class="cx">     WKPageLoadURL(webView.page(), url.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitFrameHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool done;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     done = true;
</span><span class="cx"> }
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get());
</span><span class="cx">     Util::run(&done);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitGeolocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     *static_cast<bool*>(const_cast<void*>(clientInfo)) = true;
</span><span class="cx"> }
</span><span class="lines">@@ -331,14 +331,14 @@
</span><span class="cx"> 
</span><span class="cx">     bool finishedSecondStep = false;
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><span class="cx">     loaderClient.base.clientInfo = &finishedSecondStep;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(lowAccuracyWebView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(lowAccuracyWebView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKURLRef> lowAccuracyURL(AdoptWK, Util::createURLForResource("geolocationWatchPosition", "html"));
</span><span class="cx">     WKPageLoadURL(lowAccuracyWebView.page(), lowAccuracyURL.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitHitTestResultNodeHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp       2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp  2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> static bool messageReceived;
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -51,13 +51,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void setInjectedBundleClient(WKContextRef context)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitInjectedBundleBasiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">         done = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     loadDone = true;
</span><span class="cx">     if (messageReceived)
</span><span class="lines">@@ -65,13 +65,13 @@
</span><span class="cx">  
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(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="trunkToolsTestWebKitAPITestsWebKitLimitTitleSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> static bool didFinishLoad = false;
</span><span class="cx"> static size_t maxTitleLength = 4096;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitLoadAlternateHTMLStringWithNonDirectoryURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp    2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp       2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">     
</span><span class="cx"> static bool didFinishLoad = false;
</span><span class="cx">     
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKStringRef> alternateHTMLString(AdoptWK, WKStringCreateWithUTF8CString("<html><body><img src='icon.png'></body></html>"));
</span><span class="cx">     WKPageLoadAlternateHTMLString(webView.page(), alternateHTMLString.get(), baseURL, unreachableURL);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitLoadCanceledNoServerRedirectCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp  2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp     2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -37,20 +37,13 @@
</span><span class="cx"> 
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx"> 
</span><del>-static bool loadedMainFrame;
-static bool loadedIFrame;
</del><span class="cx"> static bool loadedAllFrames;
</span><span class="cx"> 
</span><span class="cx"> static bool performedServerRedirect;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><del>-    if (WKFrameIsMainFrame(frame))
-        loadedMainFrame = true;
-    else
-        loadedIFrame = true;
-
-    loadedAllFrames = loadedMainFrame && loadedIFrame;
</del><ins>+    loadedAllFrames = true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void didPerformServerRedirect(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo)
</span><span class="lines">@@ -71,13 +64,13 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx">     
</span><span class="cx">     WKContextHistoryClientV0 historyClient;
</span><span class="cx">     memset(&historyClient, 0, sizeof(historyClient));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitLoadPageOnCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp       2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp  2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx"> 
</span><del>-static void didFinishLoad(WKPageRef, WKFrameRef, WKTypeRef, const void*);
</del><ins>+static void didFinishLoad(WKPageRef, WKNavigationRef, WKTypeRef, const void*);
</ins><span class="cx"> 
</span><span class="cx"> class WebKit2CrashLoader {
</span><span class="cx"> public:
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> 
</span><span class="cx">         loaderClient.base.version = 0;
</span><span class="cx">         loaderClient.base.clientInfo = this;
</span><del>-        loaderClient.didFinishLoadForFrame = didFinishLoad;
</del><ins>+        loaderClient.didFinishNavigation = didFinishLoad;
</ins><span class="cx"> 
</span><del>-        WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+        WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     void loadUrl()
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKContextRef> context;
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     PlatformWebView webView;
</span><span class="cx">     WKRetainPtr<WKURLRef> url;
</span><span class="cx"> 
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> 
</span><span class="cx"> // We are going to have 2 load events intertwined by a simulated crash
</span><span class="cx"> // (i.e. Load -> Crash -> Load).
</span><del>-void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     WebKit2CrashLoader* testHelper = const_cast<WebKit2CrashLoader*>(static_cast<const WebKit2CrashLoader*>(clientInfo));
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitMenuTypesForMouseEventscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp       2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp  2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -42,13 +42,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void buildAndPerformTest(WKEventMouseButton button, WKEventModifiers modifiers, const char* expectedButton, const char* expectedMenuType)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitMouseMoveAfterCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -42,13 +42,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WebKit, MouseMoveAfterCrash)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitNewFirstVisuallyNonEmptyLayoutFailscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">     test2Done = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     test1Done = true;
</span><span class="cx">     WKPageForceRepaint(page, 0, didForceRepaint);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitPageLoadBasiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp    2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -182,15 +182,15 @@
</span><span class="cx">     test1Done = false;
</span><span class="cx">     static unsigned loadsCount = 0;
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><span class="cx">     loaderClient.base.clientInfo = nullptr;
</span><del>-    loaderClient.didFailProvisionalLoadWithErrorForFrame = [](WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void *clientInfo) {
</del><ins>+    loaderClient.didFailProvisionalNavigation = [](WKPageRef page, WKNavigationRef, WKErrorRef error, WKTypeRef userData, const void *clientInfo) {
</ins><span class="cx">         loadsCount++;
</span><span class="cx">         WKPageReload(page);
</span><span class="cx">     };
</span><del>-    loaderClient.didFinishLoadForFrame = [](WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo) {
</del><ins>+    loaderClient.didFinishNavigation = [](WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) {
</ins><span class="cx">         if (++loadsCount == 3) {
</span><span class="cx">             test1Done = true;
</span><span class="cx">             return;
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">         }
</span><span class="cx">         WKPageReload(page);
</span><span class="cx">     };
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKURLRef> url1(AdoptWK, Util::createURLForResource("simple", "html"));
</span><span class="cx">     WKRetainPtr<WKURLRef> url2(AdoptWK, Util::createURLForResource("simple2", "html"));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitPendingAPIRequestURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp  2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp     2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -41,11 +41,13 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = [](WKPageRef, WKFrameRef, WKTypeRef, const void*) { done = true; };
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = [](WKPageRef, WKNavigationRef, WKTypeRef, const void*) {
+        done = true;
+    };
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKURLRef> activeURL = adoptWK(WKPageCopyActiveURL(webView.page()));
</span><span class="cx">     EXPECT_NULL(activeURL.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitResizeWindowAfterCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">     bool resizeAfterCrash;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-static void didFinishLoad(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     TestStatesData* states = const_cast<TestStatesData*>(static_cast<const TestStatesData*>(clientInfo));
</span><span class="cx">     if (!states->firstLoad) {
</span><span class="lines">@@ -78,15 +78,15 @@
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="cx">     TestStatesData states(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><span class="cx">     loaderClient.base.clientInfo = &states;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoad;
-    loaderClient.processDidCrash = didCrash;
</del><ins>+    loaderClient.didFinishNavigation = didFinishLoad;
+    loaderClient.webProcessDidCrash = didCrash;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(states.webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(states.webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKURLRef> url = adoptWK(WKURLCreateWithUTF8CString("about:blank"));
</span><span class="cx">     // Load a blank page and next kills WebProcess.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitRestoreSessionStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -61,13 +61,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static WKRetainPtr<WKDataRef> createSessionStateData(WKContextRef context)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitRestoreSessionStateContainingFormDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp 2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp    2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static WKRetainPtr<WKDataRef> createSessionStateDataContainingFormData(WKContextRef context)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitScrollPinningBehaviorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool testDone;
</span><span class="cx"> 
</span><del>-static void didFinishDocumentLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void *clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     WKPageSetScrollPinningBehavior(page, kWKScrollPinningBehaviorPinToBottom);
</span><span class="cx"> 
</span><span class="lines">@@ -82,14 +82,14 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV3 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><del>-    loaderClient.base.version = 3;
</del><ins>+    loaderClient.base.version = 0;
</ins><span class="cx">     loaderClient.base.clientInfo = &webView;
</span><del>-    loaderClient.didFinishDocumentLoadForFrame = didFinishDocumentLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(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="trunkToolsTestWebKitAPITestsWebKitSpacebarScrollingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp     2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp        2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> static bool didNotHandleKeyDownEvent;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -61,13 +61,13 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageUIClientV0 uiClient;
</span><span class="cx">     memset(&uiClient, 0, sizeof(uiClient));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitStopLoadingDuringDidFailProvisionalLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp       2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp  2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFailProvisionalLoadWithErrorForFrame(WKPageRef, WKFrameRef, WKErrorRef, WKTypeRef, const void*)
</del><ins>+static void didFailProvisionalNavigation(WKPageRef, WKNavigationRef, WKErrorRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     // The injected bundle is notified of the failed load first. If we also receive this callback, the test didn't crash.
</span><span class="cx">     EXPECT_TRUE(receivedMessageFromBundle);
</span><span class="lines">@@ -67,10 +67,10 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><del>-    loaderClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFailProvisionalNavigation = didFailProvisionalNavigation;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKURLRef> url(AdoptWK, Util::URLForNonExistentResource());
</span><span class="cx">     WKPageLoadURL(webView.page(), url.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitTerminateTwicecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool loaded;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     loaded = true;
</span><span class="cx"> }
</span><span class="lines">@@ -44,13 +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>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(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="trunkToolsTestWebKitAPITestsWebKitTextFieldDidBeginAndEndEditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">         client.didReceiveMessage = true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)
</del><ins>+    static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo)
</ins><span class="cx">     {
</span><span class="cx">         WebKit2TextFieldBeginAndEditEditingTest& client = *static_cast<WebKit2TextFieldBeginAndEditEditingTest*>(const_cast<void*>(clientInfo));
</span><span class="cx">         client.didFinishLoad = true;
</span><span class="lines">@@ -69,14 +69,14 @@
</span><span class="cx"> 
</span><span class="cx">     static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
</span><span class="cx">     {
</span><del>-        WKPageLoaderClientV6 loaderClient;
</del><ins>+        WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">         memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><del>-        loaderClient.base.version = 6;
</del><ins>+        loaderClient.base.version = 0;
</ins><span class="cx">         loaderClient.base.clientInfo = clientInfo;
</span><del>-        loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+        loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-        WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+        WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     static void nullJavaScriptCallback(WKSerializedScriptValueRef, WKErrorRef, void*)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitUserMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">         ((WebKit2UserMessageRoundTripTest*)clientInfo)->didReceiveMessage = true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)
</del><ins>+    static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo)
</ins><span class="cx">     {
</span><span class="cx">         ((WebKit2UserMessageRoundTripTest*)clientInfo)->didFinishLoad = true;
</span><span class="cx">     }
</span><span class="lines">@@ -78,14 +78,14 @@
</span><span class="cx"> 
</span><span class="cx">     static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
</span><span class="cx">     {
</span><del>-        WKPageLoaderClientV3 loaderClient;
</del><ins>+        WKPageNavigationClientV3 loaderClient;
</ins><span class="cx">         memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">         loaderClient.base.version = 3;
</span><span class="cx">         loaderClient.base.clientInfo = clientInfo;
</span><del>-        loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+        loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-        WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+        WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     virtual void SetUp()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitWKPageConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -55,13 +55,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WebKit, WKPageConfigurationBasic)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitWKPageCopySessionStateWithFilteringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> static WKRetainPtr<WKSessionStateRef> sessionStateWithFirstItemRemoved;
</span><span class="cx"> static WKRetainPtr<WKSessionStateRef> sessionStateWithAllItemsRemoved;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static bool filterFirstItemCallback(WKPageRef page, WKStringRef valueType, WKTypeRef value, void* context)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitWKPageGetScaleFactorNotZerocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -42,13 +42,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static WKRetainPtr<WKSessionStateRef> createSessionState(WKContextRef context)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitWKPageIsPlayingAudiocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp  2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp     2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     JSGlobalContextRelease(scriptContext);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -78,13 +78,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setUpClients(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageUIClientV5 uiClient;
</span><span class="cx">     memset(&uiClient, 0, sizeof(uiClient));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitWKThumbnailViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if WK_HAVE_C_SPI
</span><span class="cx">     
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -85,13 +85,13 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TEST(WebKit, WKThumbnailViewKeepSnapshotWhenRemovedFromSuperview)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp    2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp       2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">     WKContextSetInjectedBundleClient(context, &injectedBundleClient.base);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -112,13 +112,13 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV3 loaderClient;
</del><ins>+    WKPageNavigationClientV3 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     
</span><span class="cx">     loaderClient.base.version = 3;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple", "html")).get());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitmacAttributedSubstringForProposedRangeWithImagemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm       2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm  2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> static bool didObserveWebProcessToCrash = false;
</span><span class="cx"> static bool didReceiveInvalidMessage = false;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -61,12 +61,12 @@
</span><span class="cx">     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("AttributedSubstringForProposedRangeWithImagePageGroup").get()));
</span><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    loaderClient.processDidCrash = processDidCrash;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    loaderClient.webProcessDidCrash = processDidCrash;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKContextSetInvalidMessageFunction(invalidMessageFunction);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitmacContextMenuDownloadmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> static bool didDecideDownloadDestination;
</span><span class="cx"> static WKPageRef expectedOriginatingPage;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -91,11 +91,11 @@
</span><span class="cx">     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("MyGroup").get()));
</span><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageContextMenuClientV3 contextMenuClient;
</span><span class="cx">     memset(&contextMenuClient, 0, sizeof(contextMenuClient));
</span><span class="lines">@@ -138,11 +138,11 @@
</span><span class="cx">     WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("MyGroup").get()));
</span><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKPageContextMenuClientV3 contextMenuClient;
</span><span class="cx">     memset(&contextMenuClient, 0, sizeof(contextMenuClient));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitmacCustomBundleParametermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm      2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm 2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">         done = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     loadDone = true;
</span><span class="cx">     if (messageReceived)
</span><span class="lines">@@ -88,13 +88,13 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx">     
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx">     
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(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="trunkToolsTestWebKitAPITestsWebKitmacEditorCommandsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm     2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm        2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -52,13 +52,13 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-tall", "html"));
</span><span class="cx">     WKPageLoadURL(webView.page(), url.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitmacGetPIDAfterAbortedProcessLaunchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> static bool loaded;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     loaded = true;
</span><span class="cx"> }
</span><span class="lines">@@ -46,13 +46,13 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(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="trunkToolsTestWebKitAPITestsWebKitmacInjectedBundleAppleEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp  2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp     2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">         done = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
</del><ins>+static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
</ins><span class="cx"> {
</span><span class="cx">     loadDone = true;
</span><span class="cx">     if (messageReceived)
</span><span class="lines">@@ -79,13 +79,13 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(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="trunkToolsTestWebKitAPITestsWebKitCocoaFullscreenDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm        2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm   2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> static bool receivedWillExitFullscreenMessage;
</span><span class="cx"> static bool receivedDidExitFullscreenMessage;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     receivedLoadedMessage = true;
</span><span class="cx"> }
</span><span class="lines">@@ -127,12 +127,12 @@
</span><span class="cx">     RetainPtr<FullscreenDelegateMessageHandler> handler = adoptNS([[FullscreenDelegateMessageHandler alloc] init]);
</span><span class="cx">     WKPageSetFullscreenDelegate(webView.page(), handler.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0 , sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     receivedLoadedMessage = false;
</span><span class="cx">     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("FullscreenDelegate", "html"));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaPictureInPictureDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm  2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm     2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     receivedLoadedMessage = true;
</span><span class="cx"> }
</span><span class="lines">@@ -165,11 +165,11 @@
</span><span class="cx">     uiClient.hasVideoInPictureInPictureDidChange = hasVideoInPictureInPictureDidChange;
</span><span class="cx">     WKPageSetPageUIClient(webView.page(), &uiClient.base);
</span><span class="cx">     
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0 , sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx">     
</span><span class="cx">     RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]);
</span><span class="cx">     [window.get() makeKeyAndOrderFront:nil];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacFirstResponderScrollingPositionmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm   2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm      2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">     
</span><span class="cx"> static bool didFinishLoad;
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*)
</ins><span class="cx"> {
</span><span class="cx">     didFinishLoad = true;
</span><span class="cx"> }
</span><span class="lines">@@ -58,11 +58,11 @@
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView webView(context.get(), pageGroup.get());
</span><span class="cx"> 
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx">     loaderClient.base.version = 0;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
+    WKPageSetPageNavigationClient(webView.page(), &loaderClient.base);
</ins><span class="cx">     
</span><span class="cx">     [window.get().contentView addSubview:webView.platformView()];
</span><span class="cx">     [window.get() makeFirstResponder:webView.platformView()];
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">     EXPECT_JS_EQ(webView.page(), "window.scrollY", "40");
</span><span class="cx"> 
</span><span class="cx">     PlatformWebView newWebView(context.get(), pageGroup.get());
</span><del>-    WKPageSetPageLoaderClient(newWebView.page(), &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(newWebView.page(), &loaderClient.base);
</ins><span class="cx"> 
</span><span class="cx">     [window.get().contentView addSubview:newWebView.platformView()];
</span><span class="cx">     [window.get() makeFirstResponder:newWebView.platformView()];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacWebKitAgnosticTestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm (235116 => 235117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm      2018-08-21 14:25:44 UTC (rev 235116)
+++ trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm 2018-08-21 16:16:54 UTC (rev 235117)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx"> 
</span><del>-static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* context)
</del><ins>+static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* context)
</ins><span class="cx"> {
</span><span class="cx">     *static_cast<bool*>(const_cast<void*>(context)) = true;
</span><span class="cx"> }
</span><span class="lines">@@ -66,14 +66,14 @@
</span><span class="cx"> 
</span><span class="cx"> static void setPageLoaderClient(WKPageRef page, bool* didFinishLoad)
</span><span class="cx"> {
</span><del>-    WKPageLoaderClientV0 loaderClient;
</del><ins>+    WKPageNavigationClientV0 loaderClient;
</ins><span class="cx">     memset(&loaderClient, 0, sizeof(loaderClient));
</span><span class="cx"> 
</span><span class="cx">     loaderClient.base.version = 0;
</span><span class="cx">     loaderClient.base.clientInfo = didFinishLoad;
</span><del>-    loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
</del><ins>+    loaderClient.didFinishNavigation = didFinishNavigation;
</ins><span class="cx"> 
</span><del>-    WKPageSetPageLoaderClient(page, &loaderClient.base);
</del><ins>+    WKPageSetPageNavigationClient(page, &loaderClient.base);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebKitAgnosticTest::WebKitAgnosticTest()
</span></span></pre>
</div>
</div>

</body>
</html>