Diff
Modified: trunk/Source/WebKit2/ChangeLog (99100 => 99101)
--- trunk/Source/WebKit2/ChangeLog 2011-11-02 21:57:20 UTC (rev 99100)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-02 22:01:58 UTC (rev 99101)
@@ -1,5 +1,17 @@
2011-11-02 Anders Carlsson <[email protected]>
+ Fix build and WebKit2 ABI.
+
+ * Shared/APIClientTraits.cpp:
+ * Shared/APIClientTraits.h:
+ Add page loader client sizes.
+
+ * UIProcess/API/C/WKPage.h:
+ Move the newly added callback functions in the loader client last and bump the
+ WKPageLoaderClient version.
+
+2011-11-02 Anders Carlsson <[email protected]>
+
Fix build.
* WebProcess/Plugins/PluginView.h:
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.cpp (99100 => 99101)
--- trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2011-11-02 21:57:20 UTC (rev 99100)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.cpp 2011-11-02 22:01:58 UTC (rev 99101)
@@ -39,7 +39,12 @@
offsetof(WKPageContextMenuClient, contextMenuDismissed),
sizeof(WKPageContextMenuClient)
};
-
+
+const size_t APIClientTraits<WKPageLoaderClient>::interfaceSizesByVersion[] = {
+ offsetof(WKPageLoaderClient, didFailToInitializePlugin),
+ sizeof(WKPageLoaderClient)
+};
+
const size_t APIClientTraits<WKPageUIClient>::interfaceSizesByVersion[] = {
offsetof(WKPageUIClient, createNewPage),
sizeof(WKPageUIClient)
Modified: trunk/Source/WebKit2/Shared/APIClientTraits.h (99100 => 99101)
--- trunk/Source/WebKit2/Shared/APIClientTraits.h 2011-11-02 21:57:20 UTC (rev 99100)
+++ trunk/Source/WebKit2/Shared/APIClientTraits.h 2011-11-02 22:01:58 UTC (rev 99101)
@@ -46,6 +46,10 @@
static const size_t interfaceSizesByVersion[2];
};
+template<> struct APIClientTraits<WKPageLoaderClient> {
+ static const size_t interfaceSizesByVersion[2];
+};
+
template<> struct APIClientTraits<WKPageUIClient>
{
static const size_t interfaceSizesByVersion[2];
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (99100 => 99101)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2011-11-02 21:57:20 UTC (rev 99100)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2011-11-02 22:01:58 UTC (rev 99101)
@@ -86,9 +86,6 @@
WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame;
WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame;
WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy;
- WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame;
- WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame;
- WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame;
WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame;
WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame;
@@ -104,10 +101,15 @@
WKPageDidChangeBackForwardListCallback didChangeBackForwardList;
WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem;
WKPageDidFailToInitializePluginCallback didFailToInitializePlugin;
+
+ // Version 1
+ WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame;
+ WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame;
+ WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame;
};
typedef struct WKPageLoaderClient WKPageLoaderClient;
-enum { kWKPageLoaderClientCurrentVersion = 0 };
+enum { kWKPageLoaderClientCurrentVersion = 1 };
// 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/Tools/ChangeLog (99100 => 99101)
--- trunk/Tools/ChangeLog 2011-11-02 21:57:20 UTC (rev 99100)
+++ trunk/Tools/ChangeLog 2011-11-02 22:01:58 UTC (rev 99101)
@@ -1,3 +1,14 @@
+2011-11-02 Anders Carlsson <[email protected]>
+
+ Fix build.
+
+ Add new functions to the page loader client.
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController awakeFromNib]):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+
2011-11-02 Dan Bernstein <[email protected]>
<rdar://problem/10336700> Add API to get rendered text image without having to select it
Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (99100 => 99101)
--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2011-11-02 21:57:20 UTC (rev 99100)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2011-11-02 22:01:58 UTC (rev 99101)
@@ -596,9 +596,6 @@
didFirstLayoutForFrame,
didFirstVisuallyNonEmptyLayoutForFrame,
didRemoveFrameFromHierarchy,
- didDisplayInsecureContentForFrame,
- didRunInsecureContentForFrame,
- didDetectXSSForFrame,
0, // canAuthenticateAgainstProtectionSpaceInFrame
0, // didReceiveAuthenticationChallengeInFrame
didStartProgress,
@@ -609,7 +606,10 @@
processDidExit,
didChangeBackForwardList,
0, // shouldGoToBackForwardItem
- 0 // didFailToInitializePlugin
+ 0, // didFailToInitializePlugin
+ didDisplayInsecureContentForFrame,
+ didRunInsecureContentForFrame,
+ didDetectXSSForFrame,
};
WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (99100 => 99101)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2011-11-02 21:57:20 UTC (rev 99100)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2011-11-02 22:01:58 UTC (rev 99101)
@@ -374,8 +374,6 @@
0, // didFirstLayoutForFrame
0, // didFirstVisuallyNonEmptyLayoutForFrame
0, // didRemoveFrameFromHierarchy
- 0, // didDisplayInsecureContentForFrame
- 0, // didRunInsecureContentForFrame
0, // canAuthenticateAgainstProtectionSpaceInFrame
0, // didReceiveAuthenticationChallengeInFrame
0, // didStartProgress
@@ -386,7 +384,10 @@
processDidCrash,
0, // didChangeBackForwardList
0, // shouldGoToBackForwardListItem
- 0 // didFailToInitializePlugin
+ 0, // didFailToInitializePlugin
+ 0, // didDisplayInsecureContentForFrame
+ 0, // didRunInsecureContentForFrame
+ 0, // didDetectXSSForFrame
};
WKPageSetPageLoaderClient(m_mainWebView->page(), &pageLoaderClient);
}
