Diff
Modified: trunk/Source/WebKit2/ChangeLog (142761 => 142762)
--- trunk/Source/WebKit2/ChangeLog 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-13 18:51:56 UTC (rev 142762)
@@ -1,3 +1,22 @@
+2013-02-13 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r142736.
+ http://trac.webkit.org/changeset/142736
+ https://bugs.webkit.org/show_bug.cgi?id=109716
+
+ Broke ABI, nightly builds crash on launch (Requested by ap on
+ #webkit).
+
+ * Shared/APIClientTraits.cpp:
+ (WebKit):
+ * Shared/APIClientTraits.h:
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/gtk/WebKitLoaderClient.cpp:
+ (attachLoaderClientToView):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/qt/QtBuiltinBundlePage.cpp:
+ (WebKit::QtBuiltinBundlePage::QtBuiltinBundlePage):
+
2013-02-13 Kenneth Rohde Christiansen <[email protected]>
[WK2][EFL] Cleanup of graphics related code in EwkView
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.cpp (142761 => 142762)
--- trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2013-02-13 18:51:56 UTC (rev 142762)
@@ -39,6 +39,8 @@
const size_t APIClientTraits<WKBundlePageLoaderClient>::interfaceSizesByVersion[] = {
offsetof(WKBundlePageLoaderClient, didLayoutForFrame),
offsetof(WKBundlePageLoaderClient, didFinishProgress),
+ offsetof(WKBundlePageLoaderClient, didReceiveIntentForFrame_unavailable),
+ offsetof(WKBundlePageLoaderClient, registerIntentServiceForFrame_unavailable),
sizeof(WKBundlePageLoaderClient)
};
@@ -60,6 +62,7 @@
const size_t APIClientTraits<WKPageLoaderClient>::interfaceSizesByVersion[] = {
offsetof(WKPageLoaderClient, didDetectXSSForFrame),
+ offsetof(WKPageLoaderClient, didReceiveIntentForFrame_unavailable),
sizeof(WKPageLoaderClient)
};
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.h (142761 => 142762)
--- trunk/Source/WebKit2/Shared/APIClientTraits.h 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.h 2013-02-13 18:51:56 UTC (rev 142762)
@@ -44,7 +44,7 @@
};
template<> struct APIClientTraits<WKBundlePageLoaderClient> {
- static const size_t interfaceSizesByVersion[3];
+ static const size_t interfaceSizesByVersion[5];
};
template<> struct APIClientTraits<WKBundlePageResourceLoadClient> {
@@ -64,7 +64,7 @@
};
template<> struct APIClientTraits<WKPageLoaderClient> {
- static const size_t interfaceSizesByVersion[2];
+ static const size_t interfaceSizesByVersion[3];
};
template<> struct APIClientTraits<WKPageUIClient> {
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (142761 => 142762)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-02-13 18:51:56 UTC (rev 142762)
@@ -124,11 +124,15 @@
WKPageCallback interactionOccurredWhileProcessUnresponsive;
WKPagePluginDidFailCallback pluginDidFail;
+ // Version 2
+ void (*didReceiveIntentForFrame_unavailable)(void);
+ void (*registerIntentServiceForFrame_unavailable)(void);
+
WKPageDidLayoutCallback didLayout;
};
typedef struct WKPageLoaderClient WKPageLoaderClient;
-enum { kWKPageLoaderClientCurrentVersion = 1 };
+enum { kWKPageLoaderClientCurrentVersion = 2 };
// Policy Client.
typedef void (*WKPageDecidePolicyForNavigationActionCallback)(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp (142761 => 142762)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2013-02-13 18:51:56 UTC (rev 142762)
@@ -169,6 +169,8 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail
+ 0, // didReceiveIntentForFrame
+ 0, // registerIntentServiceForFrame
0, // didLayout
};
WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (142761 => 142762)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-02-13 18:51:56 UTC (rev 142762)
@@ -149,11 +149,16 @@
WKBundlePageDidFinishProgressCallback didFinishProgress;
WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL;
+ // Version 3
+ void * didReceiveIntentForFrame_unavailable;
+ void * registerIntentServiceForFrame_unavailable;
+
+ // Version 4
WKBundlePageDidLayoutCallback didLayout;
};
typedef struct WKBundlePageLoaderClient WKBundlePageLoaderClient;
-enum { kWKBundlePageLoaderClientCurrentVersion = 2 };
+enum { kWKBundlePageLoaderClientCurrentVersion = 4 };
enum {
WKBundlePagePolicyActionPassThrough,
Modified: trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp (142761 => 142762)
--- trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Source/WebKit2/WebProcess/qt/QtBuiltinBundlePage.cpp 2013-02-13 18:51:56 UTC (rev 142762)
@@ -76,6 +76,8 @@
0, // willDestroyGlobalObjectForDOMWindowExtension
0, // didFinishProgress
0, // shouldForceUniversalAccessFromLocalURL
+ 0, // didReceiveIntentForFrame
+ 0, // registerIntentServiceForFrame
0, // didLayout
};
WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
Modified: trunk/Tools/ChangeLog (142761 => 142762)
--- trunk/Tools/ChangeLog 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Tools/ChangeLog 2013-02-13 18:51:56 UTC (rev 142762)
@@ -1,3 +1,19 @@
+2013-02-13 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r142736.
+ http://trac.webkit.org/changeset/142736
+ https://bugs.webkit.org/show_bug.cgi?id=109716
+
+ Broke ABI, nightly builds crash on launch (Requested by ap on
+ #webkit).
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createWebViewWithOptions):
+
2013-02-13 Mikhail Pozdnyakov <[email protected]>
[WK2][EFL][WTR] Regression(r141836): WTR crashes on exit
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (142761 => 142762)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-02-13 18:51:56 UTC (rev 142762)
@@ -639,6 +639,8 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail
+ 0, // didReceiveIntentForFrame
+ 0, // registerIntentServiceForFrame
0, // didLayout
};
WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (142761 => 142762)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-02-13 18:51:56 UTC (rev 142762)
@@ -319,6 +319,8 @@
0, // willDestroyGlobalObjectForDOMWindowExtension
didFinishProgress, // didFinishProgress
0, // shouldForceUniversalAccessFromLocalURL
+ 0, // didReceiveIntentForFrame
+ 0, // registerIntentServiceForFrame
0, // didLayout
};
WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (142761 => 142762)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2013-02-13 18:49:15 UTC (rev 142761)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2013-02-13 18:51:56 UTC (rev 142762)
@@ -465,6 +465,8 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail
+ 0, // didReceiveIntentForFrame
+ 0, // registerIntentServiceForFrame
0, // didLayout
};
WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
