Title: [171072] trunk
- Revision
- 171072
- Author
- [email protected]
- Date
- 2014-07-14 12:14:21 -0700 (Mon, 14 Jul 2014)
Log Message
Make shouldKeepCurrentBackForwardListItemInList part of WKPageLoaderClientV5 to avoid breaking ABI
https://bugs.webkit.org/show_bug.cgi?id=134889
Reviewed by Beth Dakin.
Source/WebKit2:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/C/WKPageLoaderClient.h:
Tools:
Bump loader version number to 5.
* TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp:
(TestWebKitAPI::setPageLoaderClient):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::createWebViewWithOptions):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171071 => 171072)
--- trunk/Source/WebKit2/ChangeLog 2014-07-14 18:54:24 UTC (rev 171071)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-14 19:14:21 UTC (rev 171072)
@@ -1,3 +1,13 @@
+2014-07-14 Anders Carlsson <[email protected]>
+
+ Make shouldKeepCurrentBackForwardListItemInList part of WKPageLoaderClientV5 to avoid breaking ABI
+ https://bugs.webkit.org/show_bug.cgi?id=134889
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/C/WKPageLoaderClient.h:
+
2014-07-14 Dan Bernstein <[email protected]>
REGRESSION (r171045): Reproducible crash on navigation in PageClientImpl::willRecordNavigationSnapshot
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (171071 => 171072)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-14 18:54:24 UTC (rev 171071)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-14 19:14:21 UTC (rev 171072)
@@ -66,7 +66,7 @@
namespace API {
template<> struct ClientTraits<WKPageLoaderClientBase> {
- typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3, WKPageLoaderClientV4> Versions;
+ typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3, WKPageLoaderClientV4, WKPageLoaderClientV5> Versions;
};
template<> struct ClientTraits<WKPagePolicyClientBase> {
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (171071 => 171072)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-07-14 18:54:24 UTC (rev 171071)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2014-07-14 19:14:21 UTC (rev 171072)
@@ -333,9 +333,71 @@
// Version 4
WKPageWebGLLoadPolicyCallback webGLLoadPolicy;
WKPageWebGLLoadPolicyCallback resolveWebGLLoadPolicy;
- WKPageShouldKeepCurrentBackForwardListItemInListCallback shouldKeepCurrentBackForwardListItemInList;
} WKPageLoaderClientV4;
+typedef struct WKPageLoaderClientV5 {
+ WKPageLoaderClientBase base;
+
+ // Version 0.
+ WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame;
+ WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame;
+ WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame;
+ WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame;
+ WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame;
+ WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame;
+ WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame;
+ WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame;
+ WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame;
+ WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame;
+ WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame;
+ WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy;
+ WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame;
+ WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame;
+ WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame;
+ WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame;
+
+ // FIXME: Move to progress client.
+ WKPageLoaderClientCallback didStartProgress;
+ WKPageLoaderClientCallback didChangeProgress;
+ WKPageLoaderClientCallback didFinishProgress;
+
+ // FIXME: These three functions should not be part of this client.
+ WKPageLoaderClientCallback processDidBecomeUnresponsive;
+ WKPageLoaderClientCallback processDidBecomeResponsive;
+ WKPageLoaderClientCallback processDidCrash;
+ WKPageDidChangeBackForwardListCallback didChangeBackForwardList;
+ WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem;
+ WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0;
+
+ // Version 1.
+ WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame;
+
+ void* didNewFirstVisuallyNonEmptyLayout_unavailable;
+
+ WKPageWillGoToBackForwardListItemCallback willGoToBackForwardListItem;
+
+ WKPageLoaderClientCallback interactionOccurredWhileProcessUnresponsive;
+ WKPagePluginDidFailCallback_deprecatedForUseWithV1 pluginDidFail_deprecatedForUseWithV1;
+
+ // Version 2.
+ void (*didReceiveIntentForFrame_unavailable)(void);
+ void (*registerIntentServiceForFrame_unavailable)(void);
+
+ WKPageDidLayoutCallback didLayout;
+ WKPagePluginLoadPolicyCallback_deprecatedForUseWithV2 pluginLoadPolicy_deprecatedForUseWithV2;
+ WKPagePluginDidFailCallback pluginDidFail;
+
+ // Version 3.
+ WKPagePluginLoadPolicyCallback pluginLoadPolicy;
+
+ // Version 4.
+ WKPageWebGLLoadPolicyCallback webGLLoadPolicy;
+ WKPageWebGLLoadPolicyCallback resolveWebGLLoadPolicy;
+
+ // Version 5.
+ WKPageShouldKeepCurrentBackForwardListItemInListCallback shouldKeepCurrentBackForwardListItemInList;
+} WKPageLoaderClientV5;
+
// FIXME: These should be deprecated.
enum { kWKPageLoaderClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 3 };
typedef struct WKPageLoaderClient {
Modified: trunk/Tools/ChangeLog (171071 => 171072)
--- trunk/Tools/ChangeLog 2014-07-14 18:54:24 UTC (rev 171071)
+++ trunk/Tools/ChangeLog 2014-07-14 19:14:21 UTC (rev 171072)
@@ -1,3 +1,17 @@
+2014-07-14 Anders Carlsson <[email protected]>
+
+ Make shouldKeepCurrentBackForwardListItemInList part of WKPageLoaderClientV5 to avoid breaking ABI
+ https://bugs.webkit.org/show_bug.cgi?id=134889
+
+ Reviewed by Beth Dakin.
+
+ Bump loader version number to 5.
+
+ * TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createWebViewWithOptions):
+
2014-07-14 Daniel Bates <[email protected]>
Teach check-webkit-style to suggest WTF::move() when it sees std::move()
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp (171071 => 171072)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp 2014-07-14 18:54:24 UTC (rev 171071)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp 2014-07-14 19:14:21 UTC (rev 171072)
@@ -114,10 +114,10 @@
static void setPageLoaderClient(WKPageRef page)
{
- WKPageLoaderClientV4 loaderClient;
+ WKPageLoaderClientV5 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
- loaderClient.base.version = 4;
+ loaderClient.base.version = 5;
loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
loaderClient.shouldKeepCurrentBackForwardListItemInList = shouldKeepCurrentBackForwardListItemInList;
loaderClient.willGoToBackForwardListItem = willGoToBackForwardListItem;
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (171071 => 171072)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-07-14 18:54:24 UTC (rev 171071)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-07-14 19:14:21 UTC (rev 171072)
@@ -469,8 +469,8 @@
};
WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient.base);
- WKPageLoaderClientV4 pageLoaderClient = {
- { 4, this },
+ WKPageLoaderClientV5 pageLoaderClient = {
+ { 5, this },
0, // didStartProvisionalLoadForFrame
0, // didReceiveServerRedirectForProvisionalLoadForFrame
0, // didFailProvisionalLoadWithErrorForFrame
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
