Diff
Modified: branches/safari-534.59-branch/Source/WebKit2/ChangeLog (144657 => 144658)
--- branches/safari-534.59-branch/Source/WebKit2/ChangeLog 2013-03-04 20:07:05 UTC (rev 144657)
+++ branches/safari-534.59-branch/Source/WebKit2/ChangeLog 2013-03-04 20:22:45 UTC (rev 144658)
@@ -1,3 +1,11 @@
+2013-03-04 Brady Eidson <beid...@apple.com>
+
+ <rdar://problem/13337144> - Update 536.29 branch Loader and UI client layouts
+
+ Rubberstamped by Anders Carlsson.
+
+ * UIProcess/API/C/WKPage.h:
+
2013-03-03 Brady Eidson <beid...@apple.com>
Merge r143988
Modified: branches/safari-534.59-branch/Source/WebKit2/UIProcess/API/C/WKPage.h (144657 => 144658)
--- branches/safari-534.59-branch/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-03-04 20:07:05 UTC (rev 144657)
+++ branches/safari-534.59-branch/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-03-04 20:22:45 UTC (rev 144658)
@@ -115,12 +115,25 @@
WKPageDidChangeBackForwardListCallback didChangeBackForwardList;
WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem;
WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0;
+
+ // Version 1
+ void (*unused1)(void); // didDetectXSSForFrame in trunk
+ void (*unused2)(void); // didNewFirstVisuallyNonEmptyLayout in trunk
+ void (*unused3)(void); // willGoToBackForwardListItem in trunk
+ void (*unused4)(void); // interactionOccurredWhileProcessUnresponsive in trunk
WKPagePluginDidFailCallback_deprecatedForUseWithV1 pluginDidFail_deprecatedForUseWithV1;
+
+ // Version 2
+ void (*didReceiveIntentForFrame_unavailable)(void);
+ void (*registerIntentServiceForFrame_unavailable)(void);
+ void (*unused5)(void); // didLayout in trunk.
WKPagePluginLoadPolicyCallback pluginLoadPolicy;
WKPagePluginDidFailCallback pluginDidFail;
};
typedef struct WKPageLoaderClient WKPageLoaderClient;
+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);
typedef void (*WKPageDecidePolicyForNewWindowActionCallback)(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo);
@@ -256,13 +269,22 @@
WKPageDidCompleteRubberBandForMainFrameCallback didCompleteRubberBandForMainFrame;
WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+
+ // Version 1
+ void (*unused1)(void); // createNewPage in trunk
+ void (*unused2)(void); // mouseDidMoveOverElement in trunk
+ void (*unused3)(void); // decidePolicyForNotificationPermissionRequest in trunk
WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
// Version 2
+ void (*unused4)(void); // showColorPicker in trunk
+ void (*unused5)(void); // hideColorPicker in trunk
WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
};
typedef struct WKPageUIClient WKPageUIClient;
+enum { kWKPageUIClientCurrentVersion = 2 };
+
// Find client.
typedef void (*WKPageDidFindStringCallback)(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo);
typedef void (*WKPageDidFailToFindStringCallback)(WKPageRef page, WKStringRef string, const void* clientInfo);
Modified: branches/safari-534.59-branch/Tools/ChangeLog (144657 => 144658)
--- branches/safari-534.59-branch/Tools/ChangeLog 2013-03-04 20:07:05 UTC (rev 144657)
+++ branches/safari-534.59-branch/Tools/ChangeLog 2013-03-04 20:22:45 UTC (rev 144658)
@@ -1,3 +1,15 @@
+2013-03-04 Brady Eidson <beid...@apple.com>
+
+ <rdar://problem/13337144> - Update 536.29 branch Loader and UI client layouts
+
+ Rubberstamped by Anders Carlsson.
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController awakeFromNib]):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::initialize):
+
2013-03-03 Brady Eidson <beid...@apple.com>
Merge r143988
Modified: branches/safari-534.59-branch/Tools/MiniBrowser/mac/BrowserWindowController.m (144657 => 144658)
--- branches/safari-534.59-branch/Tools/MiniBrowser/mac/BrowserWindowController.m 2013-03-04 20:07:05 UTC (rev 144657)
+++ branches/safari-534.59-branch/Tools/MiniBrowser/mac/BrowserWindowController.m 2013-03-04 20:22:45 UTC (rev 144658)
@@ -573,7 +573,7 @@
[_webView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
WKPageLoaderClient loadClient = {
- 0, /* version */
+ kWKPageLoaderClientCurrentVersion,
self, /* clientInfo */
didStartProvisionalLoadForFrame,
didReceiveServerRedirectForProvisionalLoadForFrame,
@@ -599,8 +599,15 @@
processDidExit,
didChangeBackForwardList,
0, // shouldGoToBackForwardItem
- 0, // didFailToInitializePlugin
+ 0, // didFailToInitializePlugin_deprecatedForUseWithV0
+ 0, // unused1
+ 0, // unused2
+ 0, // unused3
+ 0, // unused4
0, // pluginDidFail_deprecatedForUseWithV1
+ 0, // didReceiveIntentForFrame_unavailable
+ 0, // registerIntentServiceForFrame_unavailable
+ 0, // unused5
0, // pluginLoadPolicy
0, // pluginDidFail
};
@@ -617,7 +624,7 @@
WKPageSetPagePolicyClient(_webView.pageRef, &policyClient);
WKPageUIClient uiClient = {
- 0, /* version */
+ kWKPageUIClientCurrentVersion,
self, /* clientInfo */
createNewPage,
showPage,
@@ -658,7 +665,12 @@
0, // didCompleteRubberBandForMainFrame
0, // saveDataToFileInDownloadsFolder
0, // shouldInterruptJavaScript
+ 0, // unused1
+ 0, // unused2
+ 0, // unused3
0, // unavailablePluginButtonClicked_deprecatedForUseWithV1
+ 0, // unused4
+ 0, // unused5
0, // unavailablePluginButtonClicked
};
WKPageSetPageUIClient(_webView.pageRef, &uiClient);
Modified: branches/safari-534.59-branch/Tools/WebKitTestRunner/TestController.cpp (144657 => 144658)
--- branches/safari-534.59-branch/Tools/WebKitTestRunner/TestController.cpp 2013-03-04 20:07:05 UTC (rev 144657)
+++ branches/safari-534.59-branch/Tools/WebKitTestRunner/TestController.cpp 2013-03-04 20:22:45 UTC (rev 144658)
@@ -138,7 +138,7 @@
view->resizeTo(800, 600);
WKPageUIClient otherPageUIClient = {
- 0,
+ kWKPageUIClientCurrentVersion,
view,
createOtherPage,
0, // showPage
@@ -179,7 +179,12 @@
0, // didCompleteRubberBandForMainFrame
0, // saveDataToFileInDownloadsFolder
0, // shouldInterruptJavaScript
+ 0, // unused1
+ 0, // unused2
+ 0, // unused3
0, // unavailablePluginButtonClicked_deprecatedForUseWithV1
+ 0, // unused4
+ 0, // unused5
0, // unavailablePluginButtonClicked
};
WKPageSetPageUIClient(newPage, &otherPageUIClient);
@@ -283,7 +288,7 @@
m_mainWebView = adoptPtr(new PlatformWebView(m_context.get(), m_pageGroup.get()));
WKPageUIClient pageUIClient = {
- 0,
+ kWKPageUIClientCurrentVersion,
this,
createOtherPage,
0, // showPage
@@ -324,13 +329,18 @@
0, // didCompleteRubberBandForMainFrame
0, // saveDataToFileInDownloadsFolder
0, // shouldInterruptJavaScript
+ 0, // unused1
+ 0, // unused2
+ 0, // unused3
0, // unavailablePluginButtonClicked_deprecatedForUseWithV1
+ 0, // unused4
+ 0, // unused5
0, // unavailablePluginButtonClicked
};
WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
WKPageLoaderClient pageLoaderClient = {
- 0,
+ kWKPageLoaderClientCurrentVersion,
this,
0, // didStartProvisionalLoadForFrame
0, // didReceiveServerRedirectForProvisionalLoadForFrame
@@ -355,9 +365,16 @@
0, // didBecomeResponsive
processDidCrash,
0, // didChangeBackForwardList
- 0, // shouldGoToBackForwardListItem
- 0, // didFailToInitializePlugin
+ 0, // shouldGoToBackForwardItem
+ 0, // didFailToInitializePlugin_deprecatedForUseWithV0
+ 0, // unused1
+ 0, // unused2
+ 0, // unused3
+ 0, // unused4
0, // pluginDidFail_deprecatedForUseWithV1
+ 0, // didReceiveIntentForFrame_unavailable
+ 0, // registerIntentServiceForFrame_unavailable
+ 0, // unused5
0, // pluginLoadPolicy
0, // pluginDidFail
};
