Diff
Modified: trunk/Tools/ChangeLog (90162 => 90163)
--- trunk/Tools/ChangeLog 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/ChangeLog 2011-06-30 21:46:39 UTC (rev 90163)
@@ -1,3 +1,33 @@
+2011-06-30 Mark Rowe <[email protected]>
+
+ Reviewed by Anders Carlsson.
+
+ Update MiniBrowser and WebKitTestRunner to use the client version constants.
+
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (browserWindowLoaderClientInit):
+ (browserWindowUIClientInit):
+ * MiniBrowser/gtk/WebBundle/WebBundleMain.c:
+ (didCreatePage):
+ (WKBundleInitialize):
+ * MiniBrowser/gtk/main.c:
+ (createWKContextWithInjectedBundle):
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate init]):
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController awakeFromNib]):
+ * MiniBrowser/mac/WebBundle/WebBundleMain.m:
+ (WKBundleInitialize):
+ * MiniBrowser/win/BrowserView.cpp:
+ (BrowserView::create):
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::initialize):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::initialize):
+
2011-06-30 Adam Roben <[email protected]>
Identify revisions that modified failing tests on TestFailures page
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (90162 => 90163)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2011-06-30 21:46:39 UTC (rev 90163)
@@ -488,7 +488,7 @@
static void browserWindowLoaderClientInit(BrowserWindow* window)
{
WKPageLoaderClient loadClient = {
- 0, /* version */
+ kWKPageLoaderClientCurrentVersion,
window, /* clientInfo */
didStartProvisionalLoadForFrame,
didReceiveServerRedirectForProvisionalLoadForFrame,
@@ -609,7 +609,7 @@
static void browserWindowUIClientInit(BrowserWindow *window)
{
WKPageUIClient uiClient = {
- 0, /* version */
+ kWKPageUIClientCurrentVersion,
window, /* clientInfo */
createNewPage,
showPage,
Modified: trunk/Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c (90162 => 90163)
--- trunk/Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/MiniBrowser/gtk/WebBundle/WebBundleMain.c 2011-06-30 21:46:39 UTC (rev 90163)
@@ -41,6 +41,7 @@
{
WKBundlePageUIClient uiClient;
memset(&uiClient, 0, sizeof(uiClient));
+ uiClient.version = WKBundlePageUIClientCurrentVersion;
uiClient.mouseDidMoveOverElement = mouseDidMoveOverElement;
WKBundlePageSetUIClient(page, &uiClient);
@@ -51,8 +52,8 @@
globalBundle = bundle;
WKBundleClient client = {
+ kWKBundleClientCurrentVersion,
0,
- 0,
didCreatePage,
0, /* willDestroyPage */
0, /* didInitializePageGroup */
Modified: trunk/Tools/MiniBrowser/gtk/main.c (90162 => 90163)
--- trunk/Tools/MiniBrowser/gtk/main.c 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2011-06-30 21:46:39 UTC (rev 90163)
@@ -36,10 +36,10 @@
WKStringRef bundlePath = WKStringCreateWithUTF8CString("Libraries/.libs/libMiniBrowserWebBundle.so");
WKContextRef processContext = WKContextCreateWithInjectedBundlePath(bundlePath);
WKContextInjectedBundleClient bundleClient = {
- 0, /* version */
- 0, /* clientInfo */
- 0, /* didRecieveMessageFromInjectedBundle,*/
- 0
+ kWKContextInjectedBundleClientCurrentVersion,
+ 0, /* clientInfo */
+ 0, /* didRecieveMessageFromInjectedBundle,*/
+ 0
};
WKContextSetInjectedBundleClient(processContext, &bundleClient);
WKRelease(bundlePath);
Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (90162 => 90163)
--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2011-06-30 21:46:39 UTC (rev 90163)
@@ -119,7 +119,7 @@
_currentProcessModel = kProcessModelSharedSecondaryProcess;
WKContextHistoryClient historyClient = {
- 0,
+ kWKContextHistoryClientCurrentVersion,
self,
didNavigateWithNavigationData,
didPerformClientRedirect,
@@ -138,7 +138,7 @@
_processContext = WKContextCreateWithInjectedBundlePath(bundlePath);
WKContextInjectedBundleClient bundleClient = {
- 0, /* version */
+ kWKContextInjectedBundleClientCurrentVersion,
0, /* clientInfo */
didRecieveMessageFromInjectedBundle,
0
Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (90162 => 90163)
--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2011-06-30 21:46:39 UTC (rev 90163)
@@ -573,7 +573,7 @@
[_webView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
WKPageLoaderClient loadClient = {
- 0, /* version */
+ kWKPageLoaderClientCurrentVersion,
self, /* clientInfo */
didStartProvisionalLoadForFrame,
didReceiveServerRedirectForProvisionalLoadForFrame,
@@ -604,7 +604,7 @@
WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
WKPagePolicyClient policyClient = {
- 0, /* version */
+ kWKPagePolicyClientCurrentVersion,
self, /* clientInfo */
decidePolicyForNavigationAction,
decidePolicyForNewWindowAction,
@@ -614,7 +614,7 @@
WKPageSetPagePolicyClient(_webView.pageRef, &policyClient);
WKPageUIClient uiClient = {
- 0, /* version */
+ kWKPageUIClientCurrentVersion,
self, /* clientInfo */
createNewPage,
showPage,
Modified: trunk/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m (90162 => 90163)
--- trunk/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m 2011-06-30 21:46:39 UTC (rev 90163)
@@ -93,8 +93,8 @@
globalBundle = bundle;
WKBundleClient client = {
+ kWKBundleClientCurrentVersion,
0,
- 0,
didCreatePage,
willDestroyPage,
0, // didInitializePageGroup
Modified: trunk/Tools/MiniBrowser/win/BrowserView.cpp (90162 => 90163)
--- trunk/Tools/MiniBrowser/win/BrowserView.cpp 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/MiniBrowser/win/BrowserView.cpp 2011-06-30 21:46:39 UTC (rev 90163)
@@ -93,7 +93,7 @@
m_webView = WKViewCreate(webViewRect, context, 0, parentWindow->window());
WKPageUIClient uiClient = {
- 0, /* version */
+ kWKPageUIClientCurrentVersion,
parentWindow, /* clientInfo */
createNewPage,
showPage,
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (90162 => 90163)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2011-06-30 21:46:39 UTC (rev 90163)
@@ -79,7 +79,7 @@
m_bundle = bundle;
WKBundleClient client = {
- 0,
+ kWKBundleClientCurrentVersion,
this,
didCreatePage,
willDestroyPage,
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (90162 => 90163)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2011-06-30 21:46:39 UTC (rev 90163)
@@ -168,7 +168,7 @@
, m_world(AdoptWK, WKBundleScriptWorldCreateWorld())
{
WKBundlePageLoaderClient loaderClient = {
- 0,
+ kWKBundlePageLoaderClientCurrentVersion,
this,
didStartProvisionalLoadForFrame,
didReceiveServerRedirectForProvisionalLoadForFrame,
@@ -193,7 +193,7 @@
WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
WKBundlePageResourceLoadClient resourceLoadClient = {
- 0,
+ kWKBundlePageResourceLoadClientCurrentVersion,
this,
didInitiateLoadForResource,
willSendRequestForFrame,
@@ -205,7 +205,7 @@
WKBundlePageSetResourceLoadClient(m_page, &resourceLoadClient);
WKBundlePagePolicyClient policyClient = {
- 0,
+ kWKBundlePagePolicyClientCurrentVersion,
this,
decidePolicyForNavigationAction,
decidePolicyForNewWindowAction,
@@ -215,7 +215,7 @@
WKBundlePageSetPolicyClient(m_page, &policyClient);
WKBundlePageUIClient uiClient = {
- 0,
+ kWKBundlePageUIClientCurrentVersion,
this,
willAddMessageToConsole,
willSetStatusbarText,
@@ -235,7 +235,7 @@
WKBundlePageSetUIClient(m_page, &uiClient);
WKBundlePageEditorClient editorClient = {
- 0,
+ kWKBundlePageEditorClientCurrentVersion,
this,
shouldBeginEditing,
shouldEndEditing,
@@ -253,7 +253,7 @@
#if ENABLE(FULLSCREEN_API)
WKBundlePageFullScreenClient fullScreenClient = {
- 0,
+ kWKBundlePageFullScreenClientCurrentVersion,
this,
supportsFullScreen,
enterFullScreenForElement,
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (90162 => 90163)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2011-06-30 21:46:35 UTC (rev 90162)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2011-06-30 21:46:39 UTC (rev 90163)
@@ -136,7 +136,7 @@
view->resizeTo(800, 600);
WKPageUIClient otherPageUIClient = {
- 0,
+ kWKPageUIClientCurrentVersion,
view,
createOtherPage,
0, // showPage
@@ -267,7 +267,7 @@
platformInitializeContext();
WKContextInjectedBundleClient injectedBundleClient = {
- 0,
+ kWKContextInjectedBundleClientCurrentVersion,
this,
didReceiveMessageFromInjectedBundle,
didReceiveSynchronousMessageFromInjectedBundle
@@ -279,7 +279,7 @@
m_mainWebView = adoptPtr(new PlatformWebView(m_context.get(), m_pageGroup.get()));
WKPageUIClient pageUIClient = {
- 0,
+ kWKPageUIClientCurrentVersion,
this,
createOtherPage,
0, // showPage
@@ -324,7 +324,7 @@
WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
WKPageLoaderClient pageLoaderClient = {
- 0,
+ kWKPageLoaderClientCurrentVersion,
this,
0, // didStartProvisionalLoadForFrame
0, // didReceiveServerRedirectForProvisionalLoadForFrame
