webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 17 insertions, 16 deletions

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
index 0224a6f7b..ee142dedf 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
@@ -26,8 +26,8 @@
 #ifndef WKBundlePageLoaderClient_h
 #define WKBundlePageLoaderClient_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKPageLoadTypes.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKPageLoadTypes.h>
 
 typedef void (*WKBundlePageDidStartProvisionalLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
 typedef void (*WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
@@ -61,7 +61,7 @@ typedef void (*WKBundlePageDidLayoutCallback)(WKBundlePageRef page, WKLayoutMile
 typedef void (*WKBundlePageFeaturesUsedInPageCallback)(WKBundlePageRef page, WKArrayRef featureStrings, const void *clientInfo);
 typedef void (*WKBundlePageWillLoadURLRequestCallback)(WKBundlePageRef page, WKURLRequestRef request, WKTypeRef userData, const void *clientInfo);
 typedef void (*WKBundlePageWillLoadDataRequestCallback)(WKBundlePageRef page, WKURLRequestRef request, WKDataRef data, WKStringRef MIMEType, WKStringRef encodingName, WKURLRef unreachableURL, WKTypeRef userData, const void *clientInfo);
-typedef void (*WKBundlePageWillDestroyFrame)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
+typedef WKStringRef (*WKBundlePageUserAgentForURLCallback)(WKBundleFrameRef frame, WKURLRef url, const void *clientInfo);
 
 typedef struct WKBundlePageLoaderClientBase {
     int                                                                     version;
@@ -403,14 +403,12 @@ typedef struct WKBundlePageLoaderClientV7 {
     WKBundlePageWillLoadDataRequestCallback                                 willLoadDataRequest;
 
     // Version 7
-    WKBundlePageWillDestroyFrame                                            willDestroyFrame;
+    void *                                                                  willDestroyFrame_unavailable;
 } WKBundlePageLoaderClientV7;
 
-enum { kWKBundlePageLoaderClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 7 };
-typedef struct WKBundlePageLoaderClient {
-    int                                                                     version;
-    const void *                                                            clientInfo;
-
+typedef struct WKBundlePageLoaderClientV8 {
+    WKBundlePageLoaderClientBase                                            base;
+    
     // Version 0.
     WKBundlePageDidStartProvisionalLoadForFrameCallback                     didStartProvisionalLoadForFrame;
     WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback  didReceiveServerRedirectForProvisionalLoadForFrame;
@@ -430,7 +428,7 @@ typedef struct WKBundlePageLoaderClient {
     WKBundlePageDidCancelClientRedirectForFrameCallback                     didCancelClientRedirectForFrame;
     WKBundlePageWillPerformClientRedirectForFrameCallback                   willPerformClientRedirectForFrame;
     WKBundlePageDidHandleOnloadEventsForFrameCallback                       didHandleOnloadEventsForFrame;
-
+    
     // Version 1.
     WKBundlePageDidLayoutForFrameCallback                                   didLayoutForFrame;
     void *                                                                  didNewFirstVisuallyNonEmptyLayout_unavailable;
@@ -444,23 +442,26 @@ typedef struct WKBundlePageLoaderClient {
     // Version 2
     WKBundlePageDidFinishProgressCallback                                   didFinishProgress;
     WKBundlePageShouldForceUniversalAccessFromLocalURLCallback              shouldForceUniversalAccessFromLocalURL;
-
+    
     // Version 3
     void *                                                                  didReceiveIntentForFrame_unavailable;
     void *                                                                  registerIntentServiceForFrame_unavailable;
-
+    
     // Version 4
     WKBundlePageDidLayoutCallback                                           didLayout;
-
+    
     // Version 5
     WKBundlePageFeaturesUsedInPageCallback                                  featuresUsedInPage;
     
     // Version 6
     WKBundlePageWillLoadURLRequestCallback                                  willLoadURLRequest;
     WKBundlePageWillLoadDataRequestCallback                                 willLoadDataRequest;
-
+    
     // Version 7
-    WKBundlePageWillDestroyFrame                                            willDestroyFrame;
-} WKBundlePageLoaderClient WK_DEPRECATED("Use an explicit versioned struct instead");
+    void *                                                                  willDestroyFrame_unavailable;
+    
+    // Version 8
+    WKBundlePageUserAgentForURLCallback                                     userAgentForURL;
+} WKBundlePageLoaderClientV8;
 
 #endif // WKBundlePageLoaderClient_h