Diff
Modified: branches/safari-536.29-branch/Source/WebKit2/ChangeLog (144652 => 144653)
--- branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-04 19:32:03 UTC (rev 144652)
+++ branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-04 19:42:57 UTC (rev 144653)
@@ -1,3 +1,13 @@
+2013-03-04 Brady Eidson <beid...@apple.com>
+
+ <rdar://problem/13337144> - Update 536.29 branch Loader and UI client layouts
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/APIClientTraits.cpp:
+ * Shared/APIClientTraits.h:
+ * UIProcess/API/C/WKPage.h:
+
2013-03-01 Brady Eidson <beid...@apple.com>
Merge 143988
Modified: branches/safari-536.29-branch/Source/WebKit2/Shared/APIClientTraits.cpp (144652 => 144653)
--- branches/safari-536.29-branch/Source/WebKit2/Shared/APIClientTraits.cpp 2013-03-04 19:32:03 UTC (rev 144652)
+++ branches/safari-536.29-branch/Source/WebKit2/Shared/APIClientTraits.cpp 2013-03-04 19:42:57 UTC (rev 144653)
@@ -54,11 +54,13 @@
const size_t APIClientTraits<WKPageLoaderClient>::interfaceSizesByVersion[] = {
offsetof(WKPageLoaderClient, didFailToInitializePlugin_deprecatedForUseWithV0),
+ offsetof(WKPageLoaderClient, didReceiveIntentForFrame_unavailable),
sizeof(WKPageLoaderClient)
};
const size_t APIClientTraits<WKPageUIClient>::interfaceSizesByVersion[] = {
offsetof(WKPageUIClient, createNewPage),
+ offsetof(WKPageUIClient, unused2),
sizeof(WKPageUIClient)
};
Modified: branches/safari-536.29-branch/Source/WebKit2/Shared/APIClientTraits.h (144652 => 144653)
--- branches/safari-536.29-branch/Source/WebKit2/Shared/APIClientTraits.h 2013-03-04 19:32:03 UTC (rev 144652)
+++ branches/safari-536.29-branch/Source/WebKit2/Shared/APIClientTraits.h 2013-03-04 19:42:57 UTC (rev 144653)
@@ -53,11 +53,11 @@
};
template<> struct APIClientTraits<WKPageLoaderClient> {
- static const size_t interfaceSizesByVersion[2];
+ static const size_t interfaceSizesByVersion[3];
};
template<> struct APIClientTraits<WKPageUIClient> {
- static const size_t interfaceSizesByVersion[2];
+ static const size_t interfaceSizesByVersion[3];
};
template<> struct APIClientTraits<WKBundlePageFormClient> {
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h (144652 => 144653)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-03-04 19:32:03 UTC (rev 144652)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-03-04 19:42:57 UTC (rev 144653)
@@ -122,21 +122,23 @@
// Version 1
WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame;
-
- // FIXME: didFirstVisuallyNonEmptyLayoutForFrame and didNewFirstVisuallyNonEmptyLayout should be merged.
+ // FIXME: didNewFirstVisuallyNonEmptyLayout should be removed. We should consider removing didFirstVisuallyNonEmptyLayoutForFrame
+ // as well. Their functionality is replaced by didLayout.
WKPageDidNewFirstVisuallyNonEmptyLayoutCallback didNewFirstVisuallyNonEmptyLayout;
-
WKPageWillGoToBackForwardListItemCallback willGoToBackForwardListItem;
-
WKPageCallback interactionOccurredWhileProcessUnresponsive;
WKPagePluginDidFailCallback_deprecatedForUseWithV1 pluginDidFail_deprecatedForUseWithV1;
+ // Version 2
+ void (*didReceiveIntentForFrame_unavailable)(void);
+ void (*registerIntentServiceForFrame_unavailable)(void);
+ void (*unused1)(void); // didLayout in trunk.
WKPagePluginLoadPolicyCallback pluginLoadPolicy;
WKPagePluginDidFailCallback pluginDidFail;
};
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);
@@ -289,12 +291,15 @@
WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest;
WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
+
+ // Version 2
+ void (*unused2)(void); // showColorPicker in trunk
+ void (*unused3)(void); // hideColorPicker in trunk
WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
-
};
typedef struct WKPageUIClient WKPageUIClient;
-enum { kWKPageUIClientCurrentVersion = 1 };
+enum { kWKPageUIClientCurrentVersion = 2 };
// Find client.
typedef void (*WKPageDidFindStringCallback)(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo);
Modified: branches/safari-536.29-branch/Tools/ChangeLog (144652 => 144653)
--- branches/safari-536.29-branch/Tools/ChangeLog 2013-03-04 19:32:03 UTC (rev 144652)
+++ branches/safari-536.29-branch/Tools/ChangeLog 2013-03-04 19:42:57 UTC (rev 144653)
@@ -1,3 +1,15 @@
+2013-03-04 Brady Eidson <beid...@apple.com>
+
+ <rdar://problem/13337144> - Update 536.29 branch Loader and UI client layouts
+
+ Reviewed by Anders Carlsson.
+
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController awakeFromNib]):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createOtherPage):
+ (WTR::TestController::initialize):
+
2013-03-01 Brady Eidson <beid...@apple.com>
Merge 143988
Modified: branches/safari-536.29-branch/Tools/MiniBrowser/mac/BrowserWindowController.m (144652 => 144653)
--- branches/safari-536.29-branch/Tools/MiniBrowser/mac/BrowserWindowController.m 2013-03-04 19:32:03 UTC (rev 144652)
+++ branches/safari-536.29-branch/Tools/MiniBrowser/mac/BrowserWindowController.m 2013-03-04 19:42:57 UTC (rev 144653)
@@ -612,6 +612,9 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail_deprecatedForUseWithV1
+ 0, // didReceiveIntentForFrame_unavailable
+ 0, // registerIntentServiceForFrame_unavailable
+ 0, // unused1
0, // pluginLoadPolicy
0, // pluginDidFail
};
@@ -673,6 +676,8 @@
mouseDidMoveOverElement,
0, // decidePolicyForNotificationPermissionRequest
0, // unavailablePluginButtonClicked_deprecatedForUseWithV1
+ 0, // unused2
+ 0, // unused3
0, // unavailablePluginButtonClicked
};
WKPageSetPageUIClient(_webView.pageRef, &uiClient);
Modified: branches/safari-536.29-branch/Tools/WebKitTestRunner/TestController.cpp (144652 => 144653)
--- branches/safari-536.29-branch/Tools/WebKitTestRunner/TestController.cpp 2013-03-04 19:32:03 UTC (rev 144652)
+++ branches/safari-536.29-branch/Tools/WebKitTestRunner/TestController.cpp 2013-03-04 19:42:57 UTC (rev 144653)
@@ -213,6 +213,8 @@
0, // mouseDidMoveOverElement
0, // decidePolicyForNotificationPermissionRequest
0, // unavailablePluginButtonClicked_deprecatedForUseWithV1
+ 0, // unused2
+ 0, // unused3
0, // unavailablePluginButtonClicked
};
WKPageSetPageUIClient(newPage, &otherPageUIClient);
@@ -374,6 +376,8 @@
0, // mouseDidMoveOverElement
0, // decidePolicyForNotificationPermissionRequest
0, // unavailablePluginButtonClicked_deprecatedForUseWithV1
+ 0, // unused2
+ 0, // unused3
0, // unavailablePluginButtonClicked
};
WKPageSetPageUIClient(m_mainWebView->page(), &pageUIClient);
@@ -411,6 +415,9 @@
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail_deprecatedForUseWithV1
+ 0, // didReceiveIntentForFrame_unavailable
+ 0, // registerIntentServiceForFrame_unavailable
+ 0, // unused1
0, // pluginLoadPolicy
0, // pluginDidFail
};
