webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 1 insertions, 22 deletions

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
index 2acde682c..fee6cc2e7 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
@@ -26,7 +26,7 @@
 #ifndef WKBundlePageResourceLoadClient_h
 #define WKBundlePageResourceLoadClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 typedef void (*WKBundlePageDidInitiateLoadForResourceCallback)(WKBundlePageRef, WKBundleFrameRef, uint64_t resourceIdentifier, WKURLRequestRef, bool pageIsProvisionallyLoading, const void* clientInfo);
 typedef WKURLRequestRef (*WKBundlePageWillSendRequestForFrameCallback)(WKBundlePageRef, WKBundleFrameRef, uint64_t resourceIdentifier, WKURLRequestRef, WKURLResponseRef redirectResponse, const void *clientInfo);
@@ -76,25 +76,4 @@ typedef struct WKBundlePageResourceLoadClientV1 {
     WKBundlePageShouldUseCredentialStorageCallback                      shouldUseCredentialStorage;
 } WKBundlePageResourceLoadClientV1;
 
-enum { kWKBundlePageResourceLoadClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKBundlePageResourceLoadClient {
-    int                                                                 version;
-    const void *                                                        clientInfo;
-
-    // Version 0.
-    WKBundlePageDidInitiateLoadForResourceCallback                      didInitiateLoadForResource;
-
-    // willSendRequestForFrame is supposed to return a retained reference to the URL request.
-    WKBundlePageWillSendRequestForFrameCallback                         willSendRequestForFrame;
-
-    WKBundlePageDidReceiveResponseForResourceCallback                   didReceiveResponseForResource;
-    WKBundlePageDidReceiveContentLengthForResourceCallback              didReceiveContentLengthForResource;
-    WKBundlePageDidFinishLoadForResourceCallback                        didFinishLoadForResource;
-    WKBundlePageDidFailLoadForResourceCallback                          didFailLoadForResource;
-
-    // Version 1.
-    WKBundlePageShouldCacheResponseCallback                             shouldCacheResponse;
-    WKBundlePageShouldUseCredentialStorageCallback                      shouldUseCredentialStorage;
-} WKBundlePageResourceLoadClient WK_DEPRECATED("Use an explicit versioned struct instead");
-
 #endif // WKBundlePageResourceLoadClient_h