WebCore:

        Reviewed by Darin.

        - more code laundering - add wkSupportsMultipartXMixedReplace

        * WebCore.exp:
        * platform/mac/WebCoreSystemInterface.h:
        * platform/mac/WebCoreSystemInterface.mm:

WebKit:

        Reviewed by Darin.

        - avoid need for WebKitSystemInterface in loader code, via WebCore cover for wkSupportsMultipartXMixedReplace

        * Loader/WebDocumentLoader.m:
        (-[WebDocumentLoader initWithRequest:]):
        * Loader/WebMainResourceLoader.m:
        * Loader/WebSubresourceLoader.m:
        (+[WebSubresourceLoader startLoadingResource:withRequest:customHeaders:referrer:forFrameLoader:]):
        * WebCoreSupport/WebSystemInterface.m:
        (InitWebCoreSystemInterface):
        * WebView/WebDataSource.m:
        (-[WebDataSource _initWithDocumentLoader:]):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 56c1acdf70ba736e919d858b2ae25c2a8e02d947..089f2c2c3d8275ba8213f8450960c713d82ee8e5 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-08  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+        - more code laundering - add wkSupportsMultipartXMixedReplace
+
+        * WebCore.exp:
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/mac/WebCoreSystemInterface.mm:
+
 2006-10-08  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Darin and Oliver.

diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index fc319c8aee20e67940f0d1cf7ab95ef6f7592a88..dcc349e0a2cdbd20b851da01ba9e87961d6c3dcb 100644 (file)
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -161,3 +161,4 @@ _wkSetUpFontCache
 _wkSignalCFReadStreamEnd
 _wkSignalCFReadStreamError
 _wkSignalCFReadStreamHasBytes
+_wkSupportsMultipartXMixedReplace

diff --git a/WebCore/platform/mac/WebCoreSystemInterface.h b/WebCore/platform/mac/WebCoreSystemInterface.h
index 6123f58b36f2c20365c5b9210c0331e4483d3707..b44d7000224d32af34334ce49cd47a2a049d0c1d 100644 (file)
--- a/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -41,10 +41,12 @@ typedef struct _NSRect NSRect;
 
 #ifdef __OBJC__
 @class NSFont;
+@class NSMutableURLRequest;
 #else
 typedef struct NSFont NSFont;
 typedef struct NSImage NSImage;
 typedef struct NSMenu NSMenu;
+typedef struct NSMutableURLRequest NSMutableURLRequest;
 typedef struct NSString NSString;
 typedef struct NSURLConnection NSURLConnection;
 typedef struct NSView NSView;
@@ -100,6 +102,7 @@ extern void (*wkSetUpFontCache)(size_t);
 extern void (*wkSignalCFReadStreamEnd)(CFReadStreamRef stream);
 extern void (*wkSignalCFReadStreamError)(CFReadStreamRef stream, CFStreamError *error);
 extern void (*wkSignalCFReadStreamHasBytes)(CFReadStreamRef stream);
+extern BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);
 
 #ifdef __cplusplus
 }

diff --git a/WebCore/platform/mac/WebCoreSystemInterface.mm b/WebCore/platform/mac/WebCoreSystemInterface.mm
index b339b138f42dc1bf8eeabe1056a9d36571024835..54016173ca9ba59457d6c825b6e90ebc53126c17 100644 (file)
--- a/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -67,4 +67,4 @@ CFReadStreamRef (*wkCreateCustomCFReadStream)(void *(*formCreate)(CFReadStreamRe
     void *context);
 void (*wkSetNSURLConnectionDefersCallbacks)(NSURLConnection *, BOOL);
 id (*wkCreateNSURLConnectionDelegateProxy)(void);
-
+BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cf2ba8ae2af0218d1aff56f1a170f755ae4b83d2..b1ef96a8dea6a399e6fdac76b58da9f933203cbb 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2006-10-08  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+        
+        - avoid need for WebKitSystemInterface in loader code, via WebCore cover for wkSupportsMultipartXMixedReplace
+
+        * Loader/WebDocumentLoader.m:
+        (-[WebDocumentLoader initWithRequest:]):
+        * Loader/WebMainResourceLoader.m:
+        * Loader/WebSubresourceLoader.m:
+        (+[WebSubresourceLoader startLoadingResource:withRequest:customHeaders:referrer:forFrameLoader:]):
+        * WebCoreSupport/WebSystemInterface.m:
+        (InitWebCoreSystemInterface):
+        * WebView/WebDataSource.m:
+        (-[WebDataSource _initWithDocumentLoader:]):
+
 2006-10-08  Darin Adler  <darin@apple.com>
 
         - build fix (also a fix for a crasher I forgot to commit before)

diff --git a/WebKit/Loader/WebDocumentLoader.m b/WebKit/Loader/WebDocumentLoader.m
index 55e5f7dfff88f15bb830de8aa92286b79395e3ee..ab032d4552eb327c5271d8a0a4c670dabd54a364 100644 (file)
--- a/WebKit/Loader/WebDocumentLoader.m
+++ b/WebKit/Loader/WebDocumentLoader.m
@@ -32,8 +32,7 @@
 #import "WebFrameLoader.h"
 #import "WebDataProtocol.h"
 #import "WebFrameBridge.h"
-
-#import <WebKitSystemInterface.h>
+#import <WebCore/WebCoreSystemInterface.h>
 
 @implementation WebDocumentLoader
 
@@ -46,6 +45,7 @@
     originalRequest = [req retain];
     originalRequestCopy = [originalRequest copy];
     request = [originalRequest mutableCopy];
+    wkSupportsMultipartXMixedReplace(request);
 
     return self;
 }

diff --git a/WebKit/Loader/WebMainResourceLoader.m b/WebKit/Loader/WebMainResourceLoader.m
index d455979864a758a2789282dc17cda5caf9c86294..f86c3e3aaaf9d6e1f9f4a8bd83e89fcefa52ed8c 100644 (file)
--- a/WebKit/Loader/WebMainResourceLoader.m
+++ b/WebKit/Loader/WebMainResourceLoader.m
@@ -36,7 +36,6 @@
 
 #import <WebCore/WebCoreSystemInterface.h>
 #import <WebKit/WebDataProtocol.h>
-#import <WebKit/WebNSURLExtras.h>
 #import <WebKit/WebFrameLoader.h>
 
 // FIXME: More that is in common with WebSubresourceLoader should move up into WebLoader.

diff --git a/WebKit/Loader/WebSubresourceLoader.m b/WebKit/Loader/WebSubresourceLoader.m
index 38140748d286b331ec0b582e522ef69930f64d82..28d68d0c4e0470d72ce1f8c68dc459f2988ec55d 100644 (file)
--- a/WebKit/Loader/WebSubresourceLoader.m
+++ b/WebKit/Loader/WebSubresourceLoader.m
@@ -33,7 +33,7 @@
 #import <WebCore/WebCoreResourceLoader.h>
 #import <WebKit/WebFormDataStream.h>
 #import <WebKit/WebFrameLoader.h>
-#import <WebKitSystemInterface.h>
+#import <WebCore/WebCoreSystemInterface.h>
 
 @implementation WebSubresourceLoader
 
@@ -100,7 +100,7 @@ static void setHTTPReferrer(NSMutableURLRequest *request, NSString *theReferrer)
     if ([fl state] == WebFrameStateProvisional)
         return nil;
         
-    WKSupportsMultipartXMixedReplace(newRequest);
+    wkSupportsMultipartXMixedReplace(newRequest);
 
     WebSubresourceLoader *loader = [[[self alloc] initWithLoader:rLoader frameLoader:fl] autorelease];
     

diff --git a/WebKit/WebCoreSupport/WebSystemInterface.m b/WebKit/WebCoreSupport/WebSystemInterface.m
index f73629de99b9771bc46449637ee6b5ef011df92b..7e215cf13c7120bff94f6e6e2941e43ba3ec7067 100644 (file)
--- a/WebKit/WebCoreSupport/WebSystemInterface.m
+++ b/WebKit/WebCoreSupport/WebSystemInterface.m
@@ -72,6 +72,7 @@ void InitWebCoreSystemInterface(void)
     INIT(CreateCustomCFReadStream);
     INIT(SetNSURLConnectionDefersCallbacks);
     INIT(CreateNSURLConnectionDelegateProxy);
+    INIT(SupportsMultipartXMixedReplace);
     
     didInit = true;
 }

diff --git a/WebKit/WebView/WebDataSource.m b/WebKit/WebView/WebDataSource.m
index c4e1136e8beba70321ccf28701a4b5bcb83e5102..71ee577a7318acc4e8fb12df00de9d6b0602cdee 100644 (file)
--- a/WebKit/WebView/WebDataSource.m
+++ b/WebKit/WebView/WebDataSource.m
@@ -368,12 +368,10 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
     _private->loader = [loader retain];
         
     LOG(Loading, "creating datasource for %@", [[_private->loader request] URL]);
-    WKSupportsMultipartXMixedReplace([_private->loader request]);
     
     ++WebDataSourceCount;
     
-    return self;
-    
+    return self;    
 }
 
 @end