Diff
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (131958 => 131959)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-10-19 23:26:16 UTC (rev 131958)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-10-19 23:28:55 UTC (rev 131959)
@@ -1,3 +1,13 @@
+2012-10-19 Lucas Forschler <[email protected]>
+
+ <rdar://problem/12523419> Use v2 bundle page loader client structure.
+
+ We already had a callback from v2 implemented, so we should update to this version.
+
+ * Shared/APIClientTraits.cpp:
+ * Shared/APIClientTraits.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+
2012-08-31 Timothy Hatcher <[email protected]>
Merge r127319.
Modified: branches/safari-536.28-branch/Source/WebKit2/Shared/APIClientTraits.cpp (131958 => 131959)
--- branches/safari-536.28-branch/Source/WebKit2/Shared/APIClientTraits.cpp 2012-10-19 23:26:16 UTC (rev 131958)
+++ branches/safari-536.28-branch/Source/WebKit2/Shared/APIClientTraits.cpp 2012-10-19 23:28:55 UTC (rev 131959)
@@ -33,6 +33,7 @@
const size_t APIClientTraits<WKBundlePageLoaderClient>::interfaceSizesByVersion[] = {
offsetof(WKBundlePageLoaderClient, didLayoutForFrame),
+ offsetof(WKBundlePageLoaderClient, didFinishProgress),
sizeof(WKBundlePageLoaderClient)
};
Modified: branches/safari-536.28-branch/Source/WebKit2/Shared/APIClientTraits.h (131958 => 131959)
--- branches/safari-536.28-branch/Source/WebKit2/Shared/APIClientTraits.h 2012-10-19 23:26:16 UTC (rev 131958)
+++ branches/safari-536.28-branch/Source/WebKit2/Shared/APIClientTraits.h 2012-10-19 23:28:55 UTC (rev 131959)
@@ -37,7 +37,7 @@
template <typename ClientInterface> const size_t APIClientTraits<ClientInterface>::interfaceSizesByVersion[] = { sizeof(ClientInterface) };
template<> struct APIClientTraits<WKBundlePageLoaderClient> {
- static const size_t interfaceSizesByVersion[2];
+ static const size_t interfaceSizesByVersion[3];
};
template<> struct APIClientTraits<WKBundlePageResourceLoadClient> {
Modified: branches/safari-536.28-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (131958 => 131959)
--- branches/safari-536.28-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2012-10-19 23:26:16 UTC (rev 131958)
+++ branches/safari-536.28-branch/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2012-10-19 23:28:55 UTC (rev 131959)
@@ -87,6 +87,7 @@
typedef void (*WKBundlePageDidDocumentFinishLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
typedef void (*WKBundlePageDidFinishLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
typedef void (*WKBundlePageDidFinishDocumentLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
+typedef void (*WKBundlePageDidFinishProgressCallback)(WKBundlePageRef page, const void *clientInfo);
typedef void (*WKBundlePageDidFailLoadWithErrorForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef error, WKTypeRef* userData, const void *clientInfo);
typedef void (*WKBundlePageDidSameDocumentNavigationForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef* userData, const void *clientInfo);
typedef void (*WKBundlePageDidReceiveTitleForFrameCallback)(WKBundlePageRef page, WKStringRef title, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
@@ -142,11 +143,14 @@
WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject;
WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject;
WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension;
+
+ // Version 2
+ WKBundlePageDidFinishProgressCallback didFinishProgress;
WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL;
};
typedef struct WKBundlePageLoaderClient WKBundlePageLoaderClient;
-enum { kWKBundlePageLoaderClientCurrentVersion = 1 };
+enum { kWKBundlePageLoaderClientCurrentVersion = 2 };
enum {
WKBundlePagePolicyActionPassThrough,
Modified: branches/safari-536.28-branch/Tools/ChangeLog (131958 => 131959)
--- branches/safari-536.28-branch/Tools/ChangeLog 2012-10-19 23:26:16 UTC (rev 131958)
+++ branches/safari-536.28-branch/Tools/ChangeLog 2012-10-19 23:28:55 UTC (rev 131959)
@@ -1,3 +1,10 @@
+2012-10-19 Lucas Forschler <[email protected]>
+
+ <rdar://problem/12523419> Use v2 bundle page loader client structure.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::InjectedBundlePage::InjectedBundlePage):
+ Updated to v2 bundle page loader client structure, zero initializing a field we don't implement on the branch.
+
2012-08-31 Timothy Hatcher <[email protected]>
Merge r127047.
Modified: branches/safari-536.28-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (131958 => 131959)
--- branches/safari-536.28-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-10-19 23:26:16 UTC (rev 131958)
+++ branches/safari-536.28-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-10-19 23:28:55 UTC (rev 131959)
@@ -240,6 +240,7 @@
0, // willDisconnectDOMWindowExtensionFromGlobalObject
0, // didReconnectDOMWindowExtensionToGlobalObject
0, // willDestroyGlobalObjectForDOMWindowExtension
+ 0, // didFinishProgress
0 // shouldForceUniversalAccessFromLocalURL
};
WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
