- more SPI use removal
authormjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jun 2005 11:43:50 +0000 (11:43 +0000)
committermjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jun 2005 11:43:50 +0000 (11:43 +0000)
        * Misc.subproj/WebDownload.h:
        * Misc.subproj/WebNSURLExtras.m:
        (-[NSURL _webkit_canonicalize]):
        * WebView.subproj/WebMainResourceClient.h:
        * WebView.subproj/WebMainResourceClient.m:
        (-[WebMainResourceClient initWithDataSource:]):
        * WebView.subproj/WebView.m:
        (-[WebView _commonInitializationWithFrameName:groupName:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9299 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/Misc.subproj/WebDownload.h
WebKit/Misc.subproj/WebNSURLExtras.m
WebKit/WebView.subproj/WebMainResourceClient.h
WebKit/WebView.subproj/WebMainResourceClient.m
WebKit/WebView.subproj/WebMainResourceLoader.h
WebKit/WebView.subproj/WebMainResourceLoader.m
WebKit/WebView.subproj/WebView.m

index bfe26e0ec08ff9b38fa3b9afdc8721fd268f940b..383ae4e8fae32c37b292534163876b3ebf503f1d 100644 (file)
@@ -1,3 +1,16 @@
+2005-06-06  Maciej Stachowiak  <mjs@apple.com>
+
+        - more SPI use removal
+
+        * Misc.subproj/WebDownload.h:
+        * Misc.subproj/WebNSURLExtras.m:
+        (-[NSURL _webkit_canonicalize]):
+        * WebView.subproj/WebMainResourceClient.h:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient initWithDataSource:]):
+        * WebView.subproj/WebView.m:
+        (-[WebView _commonInitializationWithFrameName:groupName:]):
+
 2005-06-06  Maciej Stachowiak  <mjs@apple.com>
 
        - remove unneeded header include
index 363029e5bdb214e3f109fbc3b1eb85a7d88164ee..45d535f1700b10b13d7651caef2f86f40c4d2080 100644 (file)
 
 @end
 
+@interface WebDownload (WebDownloadCreation)
++(id)_downloadWithLoadingConnection:(NSURLConnection *)connection
+                                                       request:(NSURLRequest *)request
+                                                       response:(NSURLResponse *)r
+                                                       delegate:(id)delegate
+                                                          proxy:(id)proxy;
+
++(id)_downloadWithRequest:(NSURLRequest *)request
+                 delegate:(id)delegate
+                               directory:(NSString *)directory;
+@end
 
 /*!
     @protocol WebDownloadDelegate
index 4bc208fd427afa84e86e7916f9d3d210aa74cd79..d537f87e622f50dbab8eb5acbf310e1cb83e47e0 100644 (file)
@@ -36,7 +36,6 @@
 
 #import <WebKitSystemInterface.h>
 
-#import <Foundation/NSURLProtocolPrivate.h>
 #import <Foundation/NSURLRequest.h>
 
 #import <unicode/uchar.h>
@@ -517,7 +516,7 @@ static NSString *mapHostNames(NSString *string, BOOL encode)
 - (NSURL *)_webkit_canonicalize
 {
     NSURLRequest *request = [[NSURLRequest alloc] initWithURL:self];
-    Class concreteClass = [NSURLProtocol _protocolClassForRequest:request];
+    Class concreteClass = WKNSURLProtocolClassForReqest(request);
     if (!concreteClass) {
         [request release];
         return self;
index 07ac7c9507e1b50ecd470ef8bd978905e38f8580..2ec1c975b3918fa709a86aec044253e1953b07cc 100644 (file)
@@ -29,8 +29,8 @@
 #import <Foundation/Foundation.h>
 
 #import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebKitSystemInterface.h>
 
-@class NSURLConnectionDelegateProxy;
 @class WebPolicyDecisionListener;
 @class WebDataSource;
 
@@ -40,7 +40,7 @@
     int _bytesReceived; // for logging only
     WebPolicyDecisionListener *listener;
     NSURLResponse *policyResponse;
-    NSURLConnectionDelegateProxy *proxy;
+    WKNSURLConnectionDelegateProxyPtr proxy;
     NSURLRequest *_initialRequest;
 }
 
index cdefb3587d1d08f5377aed2f45645f6aee53f3a1..09b747a600932c40ef0bc87c8112e8ac301fb92d 100644 (file)
@@ -30,7 +30,6 @@
 
 #import <Foundation/NSHTTPCookie.h>
 #import <Foundation/NSURLConnection.h>
-#import <Foundation/NSURLDownloadPrivate.h>
 #import <Foundation/NSURLRequest.h>
 #import <Foundation/NSURLResponse.h>
 
@@ -62,7 +61,7 @@
     
     if (self) {
         [self setDataSource:ds];
-        proxy = [[NSURLConnectionDelegateProxy alloc] init];
+        proxy = WKCreateNSURLConnectionDelegateProxy();
         [proxy setDelegate:self];
     }
 
index 07ac7c9507e1b50ecd470ef8bd978905e38f8580..2ec1c975b3918fa709a86aec044253e1953b07cc 100644 (file)
@@ -29,8 +29,8 @@
 #import <Foundation/Foundation.h>
 
 #import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebKitSystemInterface.h>
 
-@class NSURLConnectionDelegateProxy;
 @class WebPolicyDecisionListener;
 @class WebDataSource;
 
@@ -40,7 +40,7 @@
     int _bytesReceived; // for logging only
     WebPolicyDecisionListener *listener;
     NSURLResponse *policyResponse;
-    NSURLConnectionDelegateProxy *proxy;
+    WKNSURLConnectionDelegateProxyPtr proxy;
     NSURLRequest *_initialRequest;
 }
 
index cdefb3587d1d08f5377aed2f45645f6aee53f3a1..09b747a600932c40ef0bc87c8112e8ac301fb92d 100644 (file)
@@ -30,7 +30,6 @@
 
 #import <Foundation/NSHTTPCookie.h>
 #import <Foundation/NSURLConnection.h>
-#import <Foundation/NSURLDownloadPrivate.h>
 #import <Foundation/NSURLRequest.h>
 #import <Foundation/NSURLResponse.h>
 
@@ -62,7 +61,7 @@
     
     if (self) {
         [self setDataSource:ds];
-        proxy = [[NSURLConnectionDelegateProxy alloc] init];
+        proxy = WKCreateNSURLConnectionDelegateProxy();
         [proxy setDelegate:self];
     }
 
index 6faaa4fec3fd927ecd12cf21e374b669e1bd033d..5a790ca57ff74e0c5ab5a33fbe90dc851e613f39 100644 (file)
 #import <WebCore/WebCoreView.h>
 
 #import <Foundation/NSURLConnection.h>
-#import <Foundation/NSURLDownloadPrivate.h>
-
-#if !BUILDING_ON_PANTHER         
-#include <CoreGraphics/CGSConnection.h>
-#endif
 
 #define FOR_EACH_RESPONDER_SELECTOR(macro) \
 macro(alignCenter) \
@@ -195,12 +190,6 @@ macro(yankAndSelect) \
 - (BOOL)_shouldAutoscrollForDraggingInfo:(id)dragInfo;
 @end
 
-#if !BUILDING_ON_PANTHER         
-@interface NSApplication (AppKitSecrectsIKnow)
-- (CGSConnectionID)contextID;
-@end
-#endif
-
 @interface NSObject (WebDocumentSearchingHack)
 // FIXME: this should be part of a protocol (new version of <WebDocumentSearching>)
 - (BOOL)_searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag findInSelection:(BOOL)inSelectionFlag;
@@ -1518,8 +1507,7 @@ static bool CGContextInitialized = false;
 {
 #if !BUILDING_ON_PANTHER         
     if (!CGContextInitialized) {
-        CFStringRef key = CFSTR(kCGSDisableDeferredUpdates);
-        CGSSetConnectionProperty([NSApp contextID], [NSApp contextID], (CGSValueObj)key, (CGSValueObj)kCFBooleanTrue);
+               WKDisableCGDeferredUpdates();
         CGContextInitialized = true;
     }
 #endif