Changeset 235117 in webkit
- Timestamp:
- Aug 21, 2018, 9:16:54 AM (6 years ago)
- Location:
- trunk/Tools
- Files:
-
- 48 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r235116 r235117 1 2018-08-20 Alex Christensen <achristensen@webkit.org> 2 3 Replace WKPageLoaderClient with WKPageNavigationClient in many API tests 4 https://bugs.webkit.org/show_bug.cgi?id=188771 5 6 Reviewed by Tim Horton. 7 8 * TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp: 9 (TestWebKitAPI::didFinishNavigation): 10 (TestWebKitAPI::TEST): 11 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 12 * TestWebKitAPI/Tests/WebKit/CookieManager.cpp: 13 (TestWebKitAPI::didFinishNavigation): 14 (TestWebKitAPI::TEST): 15 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 16 * TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm: 17 (TestWebKitAPI::didFinishNavigation): 18 (TestWebKitAPI::setPageLoaderClient): 19 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 20 * TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp: 21 (TestWebKitAPI::TEST): 22 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 23 * TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp: 24 (TestWebKitAPI::didFinishNavigation): 25 (TestWebKitAPI::setPageLoaderClient): 26 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 27 * TestWebKitAPI/Tests/WebKit/EventModifiers.cpp: 28 (TestWebKitAPI::didFinishNavigation): 29 (TestWebKitAPI::setClients): 30 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 31 * TestWebKitAPI/Tests/WebKit/Find.cpp: 32 (TestWebKitAPI::didFinishNavigation): 33 (TestWebKitAPI::TEST): 34 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 35 * TestWebKitAPI/Tests/WebKit/FindMatches.mm: 36 (TestWebKitAPI::didFinishNavigation): 37 (TestWebKitAPI::TEST): 38 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 39 * TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp: 40 (TestWebKitAPI::didFinishNavigation): 41 (TestWebKitAPI::TEST): 42 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 43 * TestWebKitAPI/Tests/WebKit/FrameHandle.cpp: 44 (TestWebKitAPI::didFinishNavigation): 45 (TestWebKitAPI::TEST): 46 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 47 * TestWebKitAPI/Tests/WebKit/Geolocation.cpp: 48 (TestWebKitAPI::didFinishNavigation): 49 (TestWebKitAPI::TEST): 50 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 51 * TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp: 52 (TestWebKitAPI::didFinishNavigation): 53 (TestWebKitAPI::setPageLoaderClient): 54 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 55 * TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp: 56 (TestWebKitAPI::didFinishNavigation): 57 (TestWebKitAPI::TEST): 58 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 59 * TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp: 60 (TestWebKitAPI::didFinishLoadForFrame): 61 * TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp: 62 (TestWebKitAPI::didFinishNavigation): 63 (TestWebKitAPI::loadAlternateHTMLString): 64 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 65 * TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp: 66 (TestWebKitAPI::didFinishNavigation): 67 (TestWebKitAPI::TEST): 68 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 69 * TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp: 70 (TestWebKitAPI::WebKit2CrashLoader::WebKit2CrashLoader): 71 (TestWebKitAPI::didFinishLoad): 72 * TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp: 73 (TestWebKitAPI::didFinishNavigation): 74 (TestWebKitAPI::setPageLoaderClient): 75 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 76 * TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp: 77 (TestWebKitAPI::didFinishNavigation): 78 (TestWebKitAPI::setPageLoaderClient): 79 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 80 * TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp: 81 (TestWebKitAPI::didFinishLoadForFrame): 82 * TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp: 83 (TestWebKitAPI::TEST): 84 * TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp: 85 (TestWebKitAPI::TEST): 86 * TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp: 87 (TestWebKitAPI::didFinishLoad): 88 (TestWebKitAPI::TEST): 89 * TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp: 90 (TestWebKitAPI::didFinishNavigation): 91 (TestWebKitAPI::setPageLoaderClient): 92 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 93 * TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp: 94 (TestWebKitAPI::didFinishNavigation): 95 (TestWebKitAPI::setPageLoaderClient): 96 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 97 * TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp: 98 (TestWebKitAPI::didFinishNavigation): 99 (TestWebKitAPI::TEST): 100 (TestWebKitAPI::didFinishDocumentLoadForFrame): Deleted. 101 * TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp: 102 (TestWebKitAPI::didFinishNavigation): 103 (TestWebKitAPI::TEST): 104 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 105 * TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp: 106 (TestWebKitAPI::didFailProvisionalNavigation): 107 (TestWebKitAPI::TEST): 108 (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame): Deleted. 109 * TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp: 110 (TestWebKitAPI::didFinishNavigation): 111 (TestWebKitAPI::TEST): 112 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 113 * TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp: 114 (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishNavigation): 115 (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::setPageLoaderClient): 116 (TestWebKitAPI::WebKit2TextFieldBeginAndEditEditingTest::didFinishLoadForFrame): Deleted. 117 * TestWebKitAPI/Tests/WebKit/UserMessage.cpp: 118 (TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishNavigation): 119 (TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient): 120 (TestWebKitAPI::WebKit2UserMessageRoundTripTest::didFinishLoadForFrame): Deleted. 121 * TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp: 122 (TestWebKitAPI::didFinishNavigation): 123 (TestWebKitAPI::setPageLoaderClient): 124 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 125 * TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp: 126 (TestWebKitAPI::didFinishNavigation): 127 (TestWebKitAPI::setPageLoaderClient): 128 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 129 * TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp: 130 (TestWebKitAPI::didFinishNavigation): 131 (TestWebKitAPI::setPageLoaderClient): 132 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 133 * TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp: 134 (TestWebKitAPI::didFinishNavigation): 135 (TestWebKitAPI::setUpClients): 136 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 137 * TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm: 138 (TestWebKitAPI::didFinishNavigation): 139 (TestWebKitAPI::setPageLoaderClient): 140 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 141 * TestWebKitAPI/Tests/WebKit/WebArchive.cpp: 142 (TestWebKitAPI::didFinishNavigation): 143 (TestWebKitAPI::TEST): 144 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 145 * TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm: 146 (TestWebKitAPI::didFinishNavigation): 147 (TestWebKitAPI::TEST): 148 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 149 * TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm: 150 (TestWebKitAPI::didFinishNavigation): 151 (TestWebKitAPI::TEST): 152 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 153 * TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm: 154 (TestWebKitAPI::didFinishNavigation): 155 (TestWebKitAPI::TEST): 156 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 157 * TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm: 158 (TestWebKitAPI::didFinishNavigation): 159 (TestWebKitAPI::TEST): 160 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 161 * TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp: 162 (TestWebKitAPI::didFinishNavigation): 163 (TestWebKitAPI::TEST): 164 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 165 * TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp: 166 (TestWebKitAPI::didFinishNavigation): 167 (TestWebKitAPI::TEST): 168 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 169 * TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm: 170 (didFinishNavigation): 171 (TestWebKitAPI::TEST): 172 (didFinishLoadForFrame): Deleted. 173 * TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm: 174 (didFinishNavigation): 175 (TestWebKitAPI::TEST): 176 (didFinishLoadForFrame): Deleted. 177 * TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm: 178 (TestWebKitAPI::didFinishNavigation): 179 (TestWebKitAPI::TEST): 180 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 181 * TestWebKitAPI/mac/WebKitAgnosticTest.mm: 182 (TestWebKitAPI::didFinishNavigation): 183 (TestWebKitAPI::setPageLoaderClient): 184 (TestWebKitAPI::didFinishLoadForFrame): Deleted. 185 1 186 2018-08-21 Adrian Perez de Castro <aperez@igalia.com> 2 187 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/CloseThenTerminate.cpp
r221505 r235117 35 35 static bool loaded; 36 36 37 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)37 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 38 38 { 39 39 loaded = true; … … 48 48 PlatformWebView webView(context.get()); 49 49 50 WKPage LoaderClientV0 loaderClient;50 WKPageNavigationClientV0 loaderClient; 51 51 memset(&loaderClient, 0 , sizeof(loaderClient)); 52 52 53 53 loaderClient.base.version = 0; 54 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;54 loaderClient.didFinishNavigation = didFinishNavigation; 55 55 56 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);56 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 57 57 58 58 WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/CookieManager.cpp
r221505 r235117 65 65 } 66 66 67 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)67 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 68 68 { 69 69 WKCookieManagerRef cookieManager = WKContextGetCookieManager(wkContext.get()); … … 76 76 PlatformWebView webView(wkContext.get()); 77 77 78 WKPage LoaderClientV0 loaderClient;78 WKPageNavigationClientV0 loaderClient; 79 79 memset(&loaderClient, 0, sizeof(loaderClient)); 80 80 81 81 loaderClient.base.version = 0; 82 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;82 loaderClient.didFinishNavigation = didFinishNavigation; 83 83 84 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);84 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 85 85 86 86 WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get()); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/DeferredViewInWindowStateChange.mm
r221505 r235117 37 37 static bool didFinishLoad; 38 38 39 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)39 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 40 40 { 41 41 didFinishLoad = true; … … 44 44 static void setPageLoaderClient(WKPageRef page) 45 45 { 46 WKPage LoaderClientV0 loaderClient;46 WKPageNavigationClientV0 loaderClient; 47 47 memset(&loaderClient, 0, sizeof(loaderClient)); 48 48 49 49 loaderClient.base.version = 0; 50 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;50 loaderClient.didFinishNavigation = didFinishNavigation; 51 51 52 WKPageSetPage LoaderClient(page, &loaderClient.base);52 WKPageSetPageNavigationClient(page, &loaderClient.base); 53 53 } 54 54 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/DidNotHandleKeyDown.cpp
r221505 r235117 38 38 static bool didNotHandleKeyDownEvent; 39 39 40 static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)41 {42 }43 44 40 static void didNotHandleKeyEventCallback(WKPageRef, WKNativeEventPtr event, const void*) 45 41 { … … 53 49 WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextWithInjectedBundle()); 54 50 PlatformWebView webView(context.get()); 55 56 WKPageLoaderClientV0 loaderClient;57 memset(&loaderClient, 0, sizeof(loaderClient));58 59 loaderClient.base.version = 0;60 loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;61 62 WKPageSetPageLoaderClient(webView.page(), &loaderClient.base);63 51 64 52 WKPageUIClientV0 uiClient; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/DidRemoveFrameFromHiearchyInPageCache.cpp
r221505 r235117 39 39 static int didRemoveFrameFromHierarchyCount; 40 40 41 static void didFinish LoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void*)41 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 42 42 { 43 // Only mark finished when the main frame loads44 if (!WKFrameIsMainFrame(frame))45 return;46 47 43 finished = true; 48 44 } … … 50 46 static void setPageLoaderClient(WKPageRef page) 51 47 { 52 WKPage LoaderClientV1 loaderClient;48 WKPageNavigationClientV1 loaderClient; 53 49 memset(&loaderClient, 0, sizeof(loaderClient)); 54 50 55 51 loaderClient.base.version = 1; 56 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;52 loaderClient.didFinishNavigation = didFinishNavigation; 57 53 58 WKPageSetPage LoaderClient(page, &loaderClient.base);54 WKPageSetPageNavigationClient(page, &loaderClient.base); 59 55 } 60 56 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/EventModifiers.cpp
r221505 r235117 37 37 static bool mouseMoveCallbackFinished { false }; 38 38 39 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)39 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 40 40 { 41 41 didFinishLoad = true; … … 50 50 static void setClients(WKPageRef page) 51 51 { 52 WKPage LoaderClientV0 loaderClient;52 WKPageNavigationClientV0 loaderClient; 53 53 memset(&loaderClient, 0, sizeof(loaderClient)); 54 54 loaderClient.base.version = 0; 55 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;56 WKPageSetPage LoaderClient(page, &loaderClient.base);55 loaderClient.didFinishNavigation = didFinishNavigation; 56 WKPageSetPageNavigationClient(page, &loaderClient.base); 57 57 58 58 WKPageUIClientV1 uiClient; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/Find.cpp
r221505 r235117 37 37 static bool didCallCountStringMatches = false; 38 38 39 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)39 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 40 40 { 41 41 didFinishLoad = true; … … 55 55 PlatformWebView webView(context.get()); 56 56 57 WKPage LoaderClientV0 loaderClient;57 WKPageNavigationClientV0 loaderClient; 58 58 memset(&loaderClient, 0, sizeof(loaderClient)); 59 59 60 60 loaderClient.base.version = 0; 61 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;61 loaderClient.didFinishNavigation = didFinishNavigation; 62 62 63 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);63 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 64 64 65 65 WKPageFindClientV0 findClient; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/FindMatches.mm
r231806 r235117 59 59 RetainPtr<WebView> webkit1View; 60 60 61 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)61 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 62 62 { 63 63 didFinishLoad = true; … … 122 122 PlatformWebView webView(context.get()); 123 123 124 WKPage LoaderClientV0 loaderClient;124 WKPageNavigationClientV0 loaderClient; 125 125 memset(&loaderClient, 0, sizeof(loaderClient)); 126 126 127 127 loaderClient.base.version = 0; 128 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;128 loaderClient.didFinishNavigation = didFinishNavigation; 129 129 130 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);130 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 131 131 132 132 WKPageFindMatchesClientV0 findMatchesClient; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/ForceRepaint.cpp
r221505 r235117 44 44 } 45 45 46 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)46 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 47 47 { 48 48 test1Done = true; … … 55 55 PlatformWebView webView(context.get()); 56 56 57 WKPage LoaderClientV0 loaderClient;57 WKPageNavigationClientV0 loaderClient; 58 58 memset(&loaderClient, 0, sizeof(loaderClient)); 59 59 60 60 loaderClient.base.version = 0; 61 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;61 loaderClient.didFinishNavigation = didFinishNavigation; 62 62 63 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);63 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 64 64 65 65 WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-accelerated-compositing", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/FrameHandle.cpp
r221505 r235117 39 39 static bool done; 40 40 41 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)41 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 42 42 { 43 43 done = true; … … 49 49 PlatformWebView webView(context.get()); 50 50 51 WKPage LoaderClientV0 loaderClient;51 WKPageNavigationClientV0 loaderClient; 52 52 memset(&loaderClient, 0, sizeof(loaderClient)); 53 53 loaderClient.base.version = 0; 54 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;55 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);54 loaderClient.didFinishNavigation = didFinishNavigation; 55 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 56 56 57 57 WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get()); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/Geolocation.cpp
r221505 r235117 308 308 }; 309 309 310 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)310 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 311 311 { 312 312 *static_cast<bool*>(const_cast<void*>(clientInfo)) = true; … … 332 332 bool finishedSecondStep = false; 333 333 334 WKPage LoaderClientV0 loaderClient;334 WKPageNavigationClientV0 loaderClient; 335 335 memset(&loaderClient, 0, sizeof(loaderClient)); 336 336 337 337 loaderClient.base.version = 0; 338 338 loaderClient.base.clientInfo = &finishedSecondStep; 339 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;340 341 WKPageSetPage LoaderClient(lowAccuracyWebView.page(), &loaderClient.base);339 loaderClient.didFinishNavigation = didFinishNavigation; 340 341 WKPageSetPageNavigationClient(lowAccuracyWebView.page(), &loaderClient.base); 342 342 343 343 WKRetainPtr<WKURLRef> lowAccuracyURL(AdoptWK, Util::createURLForResource("geolocationWatchPosition", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/HitTestResultNodeHandle.cpp
r221505 r235117 38 38 static bool didFinishLoad; 39 39 40 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)40 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 41 41 { 42 42 didFinishLoad = true; … … 52 52 static void setPageLoaderClient(WKPageRef page) 53 53 { 54 WKPage LoaderClientV0 loaderClient;54 WKPageNavigationClientV0 loaderClient; 55 55 memset(&loaderClient, 0, sizeof(loaderClient)); 56 56 57 57 loaderClient.base.version = 0; 58 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;58 loaderClient.didFinishNavigation = didFinishNavigation; 59 59 60 WKPageSetPage LoaderClient(page, &loaderClient.base);60 WKPageSetPageNavigationClient(page, &loaderClient.base); 61 61 } 62 62 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/InjectedBundleBasic.cpp
r221505 r235117 45 45 } 46 46 47 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)47 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 48 48 { 49 49 loadDone = true; … … 66 66 PlatformWebView webView(context.get()); 67 67 68 WKPage LoaderClientV0 loaderClient;68 WKPageNavigationClientV0 loaderClient; 69 69 memset(&loaderClient, 0, sizeof(loaderClient)); 70 70 71 71 loaderClient.base.version = 0; 72 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;72 loaderClient.didFinishNavigation = didFinishNavigation; 73 73 74 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);74 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 75 75 76 76 WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/LimitTitleSize.cpp
r221505 r235117 39 39 static size_t maxTitleLength = 4096; 40 40 41 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)41 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef userData, const void* clientInfo) 42 42 { 43 43 didFinishLoad = true; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
r221505 r235117 41 41 static bool didFinishLoad = false; 42 42 43 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)43 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 44 44 { 45 45 didFinishLoad = true; … … 51 51 PlatformWebView webView(context.get()); 52 52 53 WKPage LoaderClientV0 loaderClient;53 WKPageNavigationClientV0 loaderClient; 54 54 memset(&loaderClient, 0, sizeof(loaderClient)); 55 55 56 56 loaderClient.base.version = 0; 57 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;58 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);57 loaderClient.didFinishNavigation = didFinishNavigation; 58 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 59 59 60 60 WKRetainPtr<WKStringRef> alternateHTMLString(AdoptWK, WKStringCreateWithUTF8CString("<html><body><img src='icon.png'></body></html>")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp
r221505 r235117 38 38 namespace TestWebKitAPI { 39 39 40 static bool loadedMainFrame;41 static bool loadedIFrame;42 40 static bool loadedAllFrames; 43 41 44 42 static bool performedServerRedirect; 45 43 46 static void didFinish LoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void*)44 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 47 45 { 48 if (WKFrameIsMainFrame(frame)) 49 loadedMainFrame = true; 50 else 51 loadedIFrame = true; 52 53 loadedAllFrames = loadedMainFrame && loadedIFrame; 46 loadedAllFrames = true; 54 47 } 55 48 … … 72 65 PlatformWebView webView(context.get()); 73 66 74 WKPage LoaderClientV0 loaderClient;67 WKPageNavigationClientV0 loaderClient; 75 68 memset(&loaderClient, 0, sizeof(loaderClient)); 76 69 77 70 loaderClient.base.version = 0; 78 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;71 loaderClient.didFinishNavigation = didFinishNavigation; 79 72 80 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);73 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 81 74 82 75 WKContextHistoryClientV0 historyClient; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/LoadPageOnCrash.cpp
r221505 r235117 35 35 namespace TestWebKitAPI { 36 36 37 static void didFinishLoad(WKPageRef, WK FrameRef, WKTypeRef, const void*);37 static void didFinishLoad(WKPageRef, WKNavigationRef, WKTypeRef, const void*); 38 38 39 39 class WebKit2CrashLoader { … … 50 50 loaderClient.base.version = 0; 51 51 loaderClient.base.clientInfo = this; 52 loaderClient.didFinish LoadForFrame= didFinishLoad;52 loaderClient.didFinishNavigation = didFinishLoad; 53 53 54 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);54 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 55 55 } 56 56 … … 66 66 67 67 WKRetainPtr<WKContextRef> context; 68 WKPage LoaderClientV0 loaderClient;68 WKPageNavigationClientV0 loaderClient; 69 69 PlatformWebView webView; 70 70 WKRetainPtr<WKURLRef> url; … … 76 76 // We are going to have 2 load events intertwined by a simulated crash 77 77 // (i.e. Load -> Crash -> Load). 78 void didFinishLoad(WKPageRef page, WK FrameRef frame, WKTypeRef userData, const void* clientInfo)78 void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 79 79 { 80 80 WebKit2CrashLoader* testHelper = const_cast<WebKit2CrashLoader*>(static_cast<const WebKit2CrashLoader*>(clientInfo)); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/MenuTypesForMouseEvents.cpp
r221505 r235117 36 36 static bool didFinishLoad; 37 37 38 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)38 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 39 39 { 40 40 didFinishLoad = true; … … 43 43 static void setPageLoaderClient(WKPageRef page) 44 44 { 45 WKPage LoaderClientV0 loaderClient;45 WKPageNavigationClientV0 loaderClient; 46 46 memset(&loaderClient, 0, sizeof(loaderClient)); 47 47 48 48 loaderClient.base.version = 0; 49 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;49 loaderClient.didFinishNavigation = didFinishNavigation; 50 50 51 WKPageSetPage LoaderClient(page, &loaderClient.base);51 WKPageSetPageNavigationClient(page, &loaderClient.base); 52 52 } 53 53 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/MouseMoveAfterCrash.cpp
r221505 r235117 36 36 static bool didFinishLoad; 37 37 38 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)38 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 39 39 { 40 40 didFinishLoad = true; … … 43 43 static void setPageLoaderClient(WKPageRef page) 44 44 { 45 WKPage LoaderClientV0 loaderClient;45 WKPageNavigationClientV0 loaderClient; 46 46 memset(&loaderClient, 0, sizeof(loaderClient)); 47 47 48 48 loaderClient.base.version = 0; 49 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;49 loaderClient.didFinishNavigation = didFinishNavigation; 50 50 51 WKPageSetPage LoaderClient(page, &loaderClient.base);51 WKPageSetPageNavigationClient(page, &loaderClient.base); 52 52 } 53 53 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp
r221505 r235117 46 46 } 47 47 48 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)48 static void didFinishLoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef userData, const void* clientInfo) 49 49 { 50 50 test1Done = true; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/PageLoadBasic.cpp
r230245 r235117 183 183 static unsigned loadsCount = 0; 184 184 185 WKPage LoaderClientV0 loaderClient;185 WKPageNavigationClientV0 loaderClient; 186 186 memset(&loaderClient, 0, sizeof(loaderClient)); 187 187 loaderClient.base.version = 0; 188 188 loaderClient.base.clientInfo = nullptr; 189 loaderClient.didFailProvisional LoadWithErrorForFrame = [](WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void *clientInfo) {189 loaderClient.didFailProvisionalNavigation = [](WKPageRef page, WKNavigationRef, WKErrorRef error, WKTypeRef userData, const void *clientInfo) { 190 190 loadsCount++; 191 191 WKPageReload(page); 192 192 }; 193 loaderClient.didFinish LoadForFrame = [](WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo) {193 loaderClient.didFinishNavigation = [](WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) { 194 194 if (++loadsCount == 3) { 195 195 test1Done = true; … … 198 198 WKPageReload(page); 199 199 }; 200 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);200 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 201 201 202 202 WKRetainPtr<WKURLRef> url1(AdoptWK, Util::createURLForResource("simple", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/PendingAPIRequestURL.cpp
r221505 r235117 42 42 PlatformWebView webView(context.get()); 43 43 44 WKPage LoaderClientV0 loaderClient;44 WKPageNavigationClientV0 loaderClient; 45 45 memset(&loaderClient, 0, sizeof(loaderClient)); 46 46 loaderClient.base.version = 0; 47 loaderClient.didFinishLoadForFrame = [](WKPageRef, WKFrameRef, WKTypeRef, const void*) { done = true; }; 48 WKPageSetPageLoaderClient(webView.page(), &loaderClient.base); 47 loaderClient.didFinishNavigation = [](WKPageRef, WKNavigationRef, WKTypeRef, const void*) { 48 done = true; 49 }; 50 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 49 51 50 52 WKRetainPtr<WKURLRef> activeURL = adoptWK(WKPageCopyActiveURL(webView.page())); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/ResizeWindowAfterCrash.cpp
r221505 r235117 48 48 }; 49 49 50 static void didFinishLoad(WKPageRef page, WK FrameRef frame, WKTypeRef userData, const void* clientInfo)50 static void didFinishLoad(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 51 51 { 52 52 TestStatesData* states = const_cast<TestStatesData*>(static_cast<const TestStatesData*>(clientInfo)); … … 79 79 TestStatesData states(context.get()); 80 80 81 WKPage LoaderClientV0 loaderClient;81 WKPageNavigationClientV0 loaderClient; 82 82 memset(&loaderClient, 0, sizeof(loaderClient)); 83 83 84 84 loaderClient.base.version = 0; 85 85 loaderClient.base.clientInfo = &states; 86 loaderClient.didFinish LoadForFrame= didFinishLoad;87 loaderClient. processDidCrash = didCrash;86 loaderClient.didFinishNavigation = didFinishLoad; 87 loaderClient.webProcessDidCrash = didCrash; 88 88 89 WKPageSetPage LoaderClient(states.webView.page(), &loaderClient.base);89 WKPageSetPageNavigationClient(states.webView.page(), &loaderClient.base); 90 90 91 91 WKRetainPtr<WKURLRef> url = adoptWK(WKURLCreateWithUTF8CString("about:blank")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp
r234714 r235117 39 39 static bool didFinishLoad; 40 40 41 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)41 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 42 42 { 43 43 didFinishLoad = true; … … 62 62 static void setPageLoaderClient(WKPageRef page) 63 63 { 64 WKPage LoaderClientV0 loaderClient;64 WKPageNavigationClientV0 loaderClient; 65 65 memset(&loaderClient, 0, sizeof(loaderClient)); 66 66 67 67 loaderClient.base.version = 0; 68 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;68 loaderClient.didFinishNavigation = didFinishNavigation; 69 69 70 WKPageSetPage LoaderClient(page, &loaderClient.base);70 WKPageSetPageNavigationClient(page, &loaderClient.base); 71 71 } 72 72 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionStateContainingFormData.cpp
r221505 r235117 38 38 static bool didFinishLoad; 39 39 40 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)40 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 41 41 { 42 42 didFinishLoad = true; … … 45 45 static void setPageLoaderClient(WKPageRef page) 46 46 { 47 WKPage LoaderClientV0 loaderClient;47 WKPageNavigationClientV0 loaderClient; 48 48 memset(&loaderClient, 0, sizeof(loaderClient)); 49 49 50 50 loaderClient.base.version = 0; 51 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;51 loaderClient.didFinishNavigation = didFinishNavigation; 52 52 53 WKPageSetPage LoaderClient(page, &loaderClient.base);53 WKPageSetPageNavigationClient(page, &loaderClient.base); 54 54 } 55 55 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/ScrollPinningBehaviors.cpp
r221505 r235117 42 42 static bool testDone; 43 43 44 static void didFinish DocumentLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)44 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void *clientInfo) 45 45 { 46 46 WKPageSetScrollPinningBehavior(page, kWKScrollPinningBehaviorPinToBottom); … … 83 83 PlatformWebView webView(context.get(), pageGroup.get()); 84 84 85 WKPage LoaderClientV3loaderClient;85 WKPageNavigationClientV0 loaderClient; 86 86 memset(&loaderClient, 0, sizeof(loaderClient)); 87 87 88 loaderClient.base.version = 3;88 loaderClient.base.version = 0; 89 89 loaderClient.base.clientInfo = &webView; 90 loaderClient.didFinish DocumentLoadForFrame = didFinishDocumentLoadForFrame;90 loaderClient.didFinishNavigation = didFinishNavigation; 91 91 92 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);92 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 93 93 94 94 WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple-tall", "html")).get()); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/SpacebarScrolling.cpp
r221505 r235117 39 39 static bool didNotHandleKeyDownEvent; 40 40 41 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)41 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 42 42 { 43 43 didFinishLoad = true; … … 62 62 PlatformWebView webView(context.get(), pageGroup.get()); 63 63 64 WKPage LoaderClientV0 loaderClient;64 WKPageNavigationClientV0 loaderClient; 65 65 memset(&loaderClient, 0, sizeof(loaderClient)); 66 66 67 67 loaderClient.base.version = 0; 68 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;68 loaderClient.didFinishNavigation = didFinishNavigation; 69 69 70 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);70 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 71 71 72 72 WKPageUIClientV0 uiClient; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/StopLoadingDuringDidFailProvisionalLoad.cpp
r221505 r235117 54 54 } 55 55 56 static void didFailProvisional LoadWithErrorForFrame(WKPageRef, WKFrameRef, WKErrorRef, WKTypeRef, const void*)56 static void didFailProvisionalNavigation(WKPageRef, WKNavigationRef, WKErrorRef, WKTypeRef, const void*) 57 57 { 58 58 // The injected bundle is notified of the failed load first. If we also receive this callback, the test didn't crash. … … 68 68 PlatformWebView webView(context.get()); 69 69 70 WKPage LoaderClientV0 loaderClient;70 WKPageNavigationClientV0 loaderClient; 71 71 memset(&loaderClient, 0, sizeof(loaderClient)); 72 loaderClient.didFailProvisional LoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;73 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);72 loaderClient.didFailProvisionalNavigation = didFailProvisionalNavigation; 73 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 74 74 75 75 WKRetainPtr<WKURLRef> url(AdoptWK, Util::URLForNonExistentResource()); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/TerminateTwice.cpp
r221505 r235117 35 35 static bool loaded; 36 36 37 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)37 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 38 38 { 39 39 loaded = true; … … 45 45 PlatformWebView webView(context.get()); 46 46 47 WKPage LoaderClientV0 loaderClient;47 WKPageNavigationClientV0 loaderClient; 48 48 memset(&loaderClient, 0, sizeof(loaderClient)); 49 49 50 50 loaderClient.base.version = 0; 51 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;51 loaderClient.didFinishNavigation = didFinishNavigation; 52 52 53 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);53 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 54 54 55 55 WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp
r202578 r235117 50 50 } 51 51 52 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)52 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo) 53 53 { 54 54 WebKit2TextFieldBeginAndEditEditingTest& client = *static_cast<WebKit2TextFieldBeginAndEditEditingTest*>(const_cast<void*>(clientInfo)); … … 70 70 static void setPageLoaderClient(WKPageRef page, const void* clientInfo) 71 71 { 72 WKPage LoaderClientV6loaderClient;72 WKPageNavigationClientV0 loaderClient; 73 73 memset(&loaderClient, 0, sizeof(loaderClient)); 74 74 75 loaderClient.base.version = 6;75 loaderClient.base.version = 0; 76 76 loaderClient.base.clientInfo = clientInfo; 77 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;77 loaderClient.didFinishNavigation = didFinishNavigation; 78 78 79 WKPageSetPage LoaderClient(page, &loaderClient.base);79 WKPageSetPageNavigationClient(page, &loaderClient.base); 80 80 } 81 81 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/UserMessage.cpp
r185496 r235117 60 60 } 61 61 62 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* clientInfo)62 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* clientInfo) 63 63 { 64 64 ((WebKit2UserMessageRoundTripTest*)clientInfo)->didFinishLoad = true; … … 79 79 static void setPageLoaderClient(WKPageRef page, const void* clientInfo) 80 80 { 81 WKPage LoaderClientV3 loaderClient;81 WKPageNavigationClientV3 loaderClient; 82 82 memset(&loaderClient, 0, sizeof(loaderClient)); 83 83 84 84 loaderClient.base.version = 3; 85 85 loaderClient.base.clientInfo = clientInfo; 86 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;86 loaderClient.didFinishNavigation = didFinishNavigation; 87 87 88 WKPageSetPage LoaderClient(page, &loaderClient.base);88 WKPageSetPageNavigationClient(page, &loaderClient.base); 89 89 } 90 90 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageConfiguration.cpp
r221505 r235117 49 49 static bool didFinishLoad; 50 50 51 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)51 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 52 52 { 53 53 didFinishLoad = true; … … 56 56 static void setPageLoaderClient(WKPageRef page) 57 57 { 58 WKPage LoaderClientV0 loaderClient;58 WKPageNavigationClientV0 loaderClient; 59 59 memset(&loaderClient, 0, sizeof(loaderClient)); 60 60 61 61 loaderClient.base.version = 0; 62 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;62 loaderClient.didFinishNavigation = didFinishNavigation; 63 63 64 WKPageSetPage LoaderClient(page, &loaderClient.base);64 WKPageSetPageNavigationClient(page, &loaderClient.base); 65 65 } 66 66 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp
r221505 r235117 38 38 static WKRetainPtr<WKSessionStateRef> sessionStateWithAllItemsRemoved; 39 39 40 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)40 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 41 41 { 42 42 didFinishLoad = true; … … 45 45 static void setPageLoaderClient(WKPageRef page) 46 46 { 47 WKPage LoaderClientV0 loaderClient;47 WKPageNavigationClientV0 loaderClient; 48 48 memset(&loaderClient, 0, sizeof(loaderClient)); 49 49 50 50 loaderClient.base.version = 0; 51 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;51 loaderClient.didFinishNavigation = didFinishNavigation; 52 52 53 WKPageSetPage LoaderClient(page, &loaderClient.base);53 WKPageSetPageNavigationClient(page, &loaderClient.base); 54 54 } 55 55 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp
r221505 r235117 36 36 static bool didFinishLoad; 37 37 38 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)38 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 39 39 { 40 40 didFinishLoad = true; … … 43 43 static void setPageLoaderClient(WKPageRef page) 44 44 { 45 WKPage LoaderClientV0 loaderClient;45 WKPageNavigationClientV0 loaderClient; 46 46 memset(&loaderClient, 0, sizeof(loaderClient)); 47 47 48 48 loaderClient.base.version = 0; 49 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;49 loaderClient.didFinishNavigation = didFinishNavigation; 50 50 51 WKPageSetPage LoaderClient(page, &loaderClient.base);51 WKPageSetPageNavigationClient(page, &loaderClient.base); 52 52 } 53 53 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPageIsPlayingAudio.cpp
r221505 r235117 67 67 } 68 68 69 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)69 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef, const void*) 70 70 { 71 71 didFinishLoad = true; … … 79 79 static void setUpClients(WKPageRef page) 80 80 { 81 WKPage LoaderClientV0 loaderClient;81 WKPageNavigationClientV0 loaderClient; 82 82 memset(&loaderClient, 0, sizeof(loaderClient)); 83 83 84 84 loaderClient.base.version = 0; 85 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;85 loaderClient.didFinishNavigation = didFinishNavigation; 86 86 87 WKPageSetPage LoaderClient(page, &loaderClient.base);87 WKPageSetPageNavigationClient(page, &loaderClient.base); 88 88 89 89 WKPageUIClientV5 uiClient; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/WKThumbnailView.mm
r224696 r235117 79 79 #if WK_HAVE_C_SPI 80 80 81 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)81 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 82 82 { 83 83 didFinishLoad = true; … … 86 86 static void setPageLoaderClient(WKPageRef page) 87 87 { 88 WKPage LoaderClientV0 loaderClient;88 WKPageNavigationClientV0 loaderClient; 89 89 memset(&loaderClient, 0, sizeof(loaderClient)); 90 90 91 91 loaderClient.base.version = 0; 92 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;93 94 WKPageSetPage LoaderClient(page, &loaderClient.base);92 loaderClient.didFinishNavigation = didFinishNavigation; 93 94 WKPageSetPageNavigationClient(page, &loaderClient.base); 95 95 } 96 96 -
trunk/Tools/TestWebKitAPI/Tests/WebKit/WebArchive.cpp
r221505 r235117 101 101 } 102 102 103 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef, WKTypeRef, const void*)103 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 104 104 { 105 105 didFinishLoad = true; … … 113 113 PlatformWebView webView(context.get()); 114 114 115 WKPage LoaderClientV3 loaderClient;115 WKPageNavigationClientV3 loaderClient; 116 116 memset(&loaderClient, 0, sizeof(loaderClient)); 117 117 118 118 loaderClient.base.version = 3; 119 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;119 loaderClient.didFinishNavigation = didFinishNavigation; 120 120 121 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);121 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 122 122 123 123 WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple", "html")).get()); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/AttributedSubstringForProposedRangeWithImage.mm
r221505 r235117 41 41 static bool didReceiveInvalidMessage = false; 42 42 43 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)43 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 44 44 { 45 45 didFinishLoad = true; … … 62 62 PlatformWebView webView(context.get(), pageGroup.get()); 63 63 64 WKPage LoaderClientV0 loaderClient;64 WKPageNavigationClientV0 loaderClient; 65 65 memset(&loaderClient, 0, sizeof(loaderClient)); 66 66 loaderClient.base.version = 0; 67 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;68 loaderClient. processDidCrash = processDidCrash;69 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);67 loaderClient.didFinishNavigation = didFinishNavigation; 68 loaderClient.webProcessDidCrash = processDidCrash; 69 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 70 70 71 71 WKContextSetInvalidMessageFunction(invalidMessageFunction); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/ContextMenuDownload.mm
r222468 r235117 42 42 static WKPageRef expectedOriginatingPage; 43 43 44 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)44 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 45 45 { 46 46 didFinishLoad = true; … … 92 92 PlatformWebView webView(context.get(), pageGroup.get()); 93 93 94 WKPage LoaderClientV0 loaderClient;94 WKPageNavigationClientV0 loaderClient; 95 95 memset(&loaderClient, 0, sizeof(loaderClient)); 96 96 loaderClient.base.version = 0; 97 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;98 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);97 loaderClient.didFinishNavigation = didFinishNavigation; 98 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 99 99 100 100 WKPageContextMenuClientV3 contextMenuClient; … … 139 139 PlatformWebView webView(context.get(), pageGroup.get()); 140 140 141 WKPage LoaderClientV0 loaderClient;141 WKPageNavigationClientV0 loaderClient; 142 142 memset(&loaderClient, 0, sizeof(loaderClient)); 143 143 loaderClient.base.version = 0; 144 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;145 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);144 loaderClient.didFinishNavigation = didFinishNavigation; 145 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 146 146 147 147 WKPageContextMenuClientV3 contextMenuClient; -
trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/CustomBundleParameter.mm
r233207 r235117 68 68 } 69 69 70 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)70 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 71 71 { 72 72 loadDone = true; … … 89 89 PlatformWebView webView(context.get()); 90 90 91 WKPage LoaderClientV0 loaderClient;91 WKPageNavigationClientV0 loaderClient; 92 92 memset(&loaderClient, 0, sizeof(loaderClient)); 93 93 94 94 loaderClient.base.version = 0; 95 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;95 loaderClient.didFinishNavigation = didFinishNavigation; 96 96 97 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);97 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 98 98 99 99 WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/EditorCommands.mm
r221505 r235117 36 36 static bool didFinishLoad; 37 37 38 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)38 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 39 39 { 40 40 didFinishLoad = true; … … 53 53 PlatformWebView webView(context.get(), pageGroup.get()); 54 54 55 WKPage LoaderClientV0 loaderClient;55 WKPageNavigationClientV0 loaderClient; 56 56 memset(&loaderClient, 0, sizeof(loaderClient)); 57 57 58 58 loaderClient.base.version = 0; 59 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;59 loaderClient.didFinishNavigation = didFinishNavigation; 60 60 61 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);61 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 62 62 63 63 WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple-tall", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/GetPIDAfterAbortedProcessLaunch.cpp
r221505 r235117 36 36 static bool loaded; 37 37 38 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)38 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 39 39 { 40 40 loaded = true; … … 47 47 PlatformWebView webView(context.get()); 48 48 49 WKPage LoaderClientV0 loaderClient;49 WKPageNavigationClientV0 loaderClient; 50 50 memset(&loaderClient, 0, sizeof(loaderClient)); 51 51 52 52 loaderClient.base.version = 0; 53 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;53 loaderClient.didFinishNavigation = didFinishNavigation; 54 54 55 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);55 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 56 56 57 57 WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKit/mac/InjectedBundleAppleEvent.cpp
r221505 r235117 59 59 } 60 60 61 static void didFinish LoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)61 static void didFinishNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo) 62 62 { 63 63 loadDone = true; … … 80 80 PlatformWebView webView(context.get()); 81 81 82 WKPage LoaderClientV0 loaderClient;82 WKPageNavigationClientV0 loaderClient; 83 83 memset(&loaderClient, 0, sizeof(loaderClient)); 84 84 85 85 loaderClient.base.version = 0; 86 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;86 loaderClient.didFinishNavigation = didFinishNavigation; 87 87 88 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);88 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 89 89 90 90 WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html")); -
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm
r233878 r235117 45 45 static bool receivedDidExitFullscreenMessage; 46 46 47 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)47 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 48 48 { 49 49 receivedLoadedMessage = true; … … 128 128 WKPageSetFullscreenDelegate(webView.page(), handler.get()); 129 129 130 WKPage LoaderClientV0 loaderClient;130 WKPageNavigationClientV0 loaderClient; 131 131 memset(&loaderClient, 0 , sizeof(loaderClient)); 132 132 133 133 loaderClient.base.version = 0; 134 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;135 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);134 loaderClient.didFinishNavigation = didFinishNavigation; 135 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 136 136 137 137 receivedLoadedMessage = false; -
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm
r233889 r235117 79 79 } 80 80 81 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)81 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 82 82 { 83 83 receivedLoadedMessage = true; … … 166 166 WKPageSetPageUIClient(webView.page(), &uiClient.base); 167 167 168 WKPage LoaderClientV0 loaderClient;168 WKPageNavigationClientV0 loaderClient; 169 169 memset(&loaderClient, 0 , sizeof(loaderClient)); 170 170 loaderClient.base.version = 0; 171 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;172 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);171 loaderClient.didFinishNavigation = didFinishNavigation; 172 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 173 173 174 174 RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]); -
trunk/Tools/TestWebKitAPI/Tests/mac/FirstResponderScrollingPosition.mm
r221505 r235117 37 37 static bool didFinishLoad; 38 38 39 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)39 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void*) 40 40 { 41 41 didFinishLoad = true; … … 59 59 PlatformWebView webView(context.get(), pageGroup.get()); 60 60 61 WKPage LoaderClientV0 loaderClient;61 WKPageNavigationClientV0 loaderClient; 62 62 memset(&loaderClient, 0, sizeof(loaderClient)); 63 63 loaderClient.base.version = 0; 64 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;65 WKPageSetPage LoaderClient(webView.page(), &loaderClient.base);64 loaderClient.didFinishNavigation = didFinishNavigation; 65 WKPageSetPageNavigationClient(webView.page(), &loaderClient.base); 66 66 67 67 [window.get().contentView addSubview:webView.platformView()]; … … 84 84 85 85 PlatformWebView newWebView(context.get(), pageGroup.get()); 86 WKPageSetPage LoaderClient(newWebView.page(), &loaderClient.base);86 WKPageSetPageNavigationClient(newWebView.page(), &loaderClient.base); 87 87 88 88 [window.get().contentView addSubview:newWebView.platformView()]; -
trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm
r221064 r235117 60 60 namespace TestWebKitAPI { 61 61 62 static void didFinish LoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void* context)62 static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef, const void* context) 63 63 { 64 64 *static_cast<bool*>(const_cast<void*>(context)) = true; … … 67 67 static void setPageLoaderClient(WKPageRef page, bool* didFinishLoad) 68 68 { 69 WKPage LoaderClientV0 loaderClient;69 WKPageNavigationClientV0 loaderClient; 70 70 memset(&loaderClient, 0, sizeof(loaderClient)); 71 71 72 72 loaderClient.base.version = 0; 73 73 loaderClient.base.clientInfo = didFinishLoad; 74 loaderClient.didFinish LoadForFrame = didFinishLoadForFrame;74 loaderClient.didFinishNavigation = didFinishNavigation; 75 75 76 WKPageSetPage LoaderClient(page, &loaderClient.base);76 WKPageSetPageNavigationClient(page, &loaderClient.base); 77 77 } 78 78
Note:
See TracChangeset
for help on using the changeset viewer.