[webkit-changes] cvs commit: WebKit/WebView.subproj
WebMainResourceLoader.m WebView.m
Adele
adele at opensource.apple.com
Wed Sep 28 11:43:15 PDT 2005
adele 05/09/28 11:43:15
Modified: . ChangeLog
Misc.subproj WebDownload.h
WebKit.xcodeproj project.pbxproj
WebView.subproj WebMainResourceLoader.m WebView.m
Added: Misc.subproj WebDownloadInternal.h
Log:
Reviewed by John.
Moved _downloadWithLoadingConnection and _downloadWithRequestfrom WebDownload.h to WebDownloadInternal.h
* Misc.subproj/WebDownload.h:
* Misc.subproj/WebDownloadInternal.h: Added.
* WebKit.xcodeproj/project.pbxproj: Added WebDownloadInternal.h
* WebView.subproj/WebMainResourceLoader.m: Added import of WebDownloadInternal.h
* WebView.subproj/WebView.m: ditto.
Revision Changes Path
1.3335 +12 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3334
retrieving revision 1.3335
diff -u -r1.3334 -r1.3335
--- ChangeLog 28 Sep 2005 02:25:53 -0000 1.3334
+++ ChangeLog 28 Sep 2005 18:43:11 -0000 1.3335
@@ -1,3 +1,15 @@
+2005-09-28 Adele Peterson <adele at apple.com>
+
+ Reviewed by John.
+
+ Moved _downloadWithLoadingConnection and _downloadWithRequestfrom WebDownload.h to WebDownloadInternal.h
+
+ * Misc.subproj/WebDownload.h:
+ * Misc.subproj/WebDownloadInternal.h: Added.
+ * WebKit.xcodeproj/project.pbxproj: Added WebDownloadInternal.h
+ * WebView.subproj/WebMainResourceLoader.m: Added import of WebDownloadInternal.h
+ * WebView.subproj/WebView.m: ditto.
+
2005-09-27 Adele Peterson <adele at apple.com>
Reviewed by Maciej.
1.6 +1 -13 WebKit/Misc.subproj/WebDownload.h
Index: WebDownload.h
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebDownload.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebDownload.h 6 Jun 2005 11:43:50 -0000 1.5
+++ WebDownload.h 28 Sep 2005 18:43:13 -0000 1.6
@@ -49,18 +49,6 @@
@end
- at 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;
- at end
-
/*!
@protocol WebDownloadDelegate
@discussion The WebDownloadDelegate delegate has one extra method used to choose
@@ -76,4 +64,4 @@
*/
- (NSWindow *)downloadWindowForAuthenticationSheet:(WebDownload *)download;
- at end
+ at end
\ No newline at end of file
1.1 WebKit/Misc.subproj/WebDownloadInternal.h
Index: WebDownloadInternal.h
===================================================================
/*
* Copyright (C) 2005 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#import <WebKit/WebDownload.h>
@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
1.10 +4 -0 WebKit/WebKit.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebKit/WebKit.xcodeproj/project.pbxproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.pbxproj 14 Sep 2005 23:54:14 -0000 1.9
+++ project.pbxproj 28 Sep 2005 18:43:14 -0000 1.10
@@ -284,6 +284,7 @@
9398112C0824BF01008DF038 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */; };
9398112E0824BF01008DF038 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D623DD051E791F002F47DD /* libicucore.dylib */; };
9398112F0824BF01008DF038 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 830E81E005853AC000AD0891 /* Security.framework */; };
+ ABDDF20D08EB0DDC001E1241 /* WebDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */; };
ED6BE2E7088C32B50044DEDC /* WebNSAttributedStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6BE2E5088C32B50044DEDC /* WebNSAttributedStringExtras.h */; };
ED6BE2E8088C32B50044DEDC /* WebNSAttributedStringExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = ED6BE2E6088C32B50044DEDC /* WebNSAttributedStringExtras.m */; };
/* End PBXBuildFile section */
@@ -500,6 +501,7 @@
9CE1F8A202A5C6F30ECA2ACD /* WebImageRendererFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebImageRendererFactory.h; sourceTree = "<group>"; };
9CE1F8A302A5C6F30ECA2ACD /* WebImageRendererFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebImageRendererFactory.m; sourceTree = "<group>"; };
9CF0E249021361B00ECA16EA /* WebFramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFramePrivate.h; sourceTree = "<group>"; };
+ ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = WebDownloadInternal.h; path = Misc.subproj/WebDownloadInternal.h; sourceTree = "<group>"; };
BE07CEA7047538F000CA289C /* WebDatabase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDatabase.h; sourceTree = "<group>"; };
BE07CEA8047538F000CA289C /* WebDatabase.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebDatabase.m; sourceTree = "<group>"; };
BE07CEA9047538F000CA289C /* WebFileDatabase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebFileDatabase.h; sourceTree = "<group>"; };
@@ -656,6 +658,7 @@
089C1665FE841158C02AAC07 /* Resources */,
0867D69AFE84028FC02AAC07 /* Frameworks and Libraries */,
034768DFFF38A50411DB9C8B /* Products */,
+ ABDDF20C08EB0DDC001E1241 /* WebDownloadInternal.h */,
);
name = WebKit;
sourceTree = "<group>";
@@ -1261,6 +1264,7 @@
7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */,
7E6FEF0A08985A7200C44C3F /* WebScriptDebugDelegatePrivate.h in Headers */,
22F219CC08D236730030E078 /* WebBackForwardListPrivate.h in Headers */,
+ ABDDF20D08EB0DDC001E1241 /* WebDownloadInternal.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1.275 +1 -0 WebKit/WebView.subproj/WebMainResourceLoader.m
Index: WebMainResourceLoader.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebMainResourceLoader.m,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- WebMainResourceLoader.m 15 Sep 2005 01:26:12 -0000 1.274
+++ WebMainResourceLoader.m 28 Sep 2005 18:43:14 -0000 1.275
@@ -38,6 +38,7 @@
#import <WebKit/WebDefaultPolicyDelegate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownload.h>
+#import <WebKit/WebDownloadInternal.h>
#import <WebKit/WebFrameLoadDelegate.h>
#import <WebKit/WebFrameView.h>
#import <WebKit/WebFramePrivate.h>
1.309 +1 -0 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- WebView.m 24 Sep 2005 10:58:19 -0000 1.308
+++ WebView.m 28 Sep 2005 18:43:14 -0000 1.309
@@ -49,6 +49,7 @@
#import <WebKit/WebDocumentInternal.h>
#import <WebKit/WebDynamicScrollBarsView.h>
#import <WebKit/WebDownload.h>
+#import <WebKit/WebDownloadInternal.h>
#import <WebKit/WebEditingDelegate.h>
#import <WebKit/WebFormDelegatePrivate.h>
#import <WebKit/WebFrameInternal.h>
More information about the webkit-changes
mailing list