[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:27:50 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9a2966df367f2308bc1c4dcb8ad09829ec9e867f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 6 23:25:21 2003 +0000
Move tweaks to WebKit API.
Removed [WebFrame setController:] from public API.
Removed [WebDataSource stringWithData:] from public API.
Reviewed by hyatt.
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
(-[WebDataSource mainDocumentError]):
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _stringWithData:]):
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebHTMLRepresentation.m:
* WebView.subproj/WebTextRepresentation.m:
(-[WebTextRepresentation setDataSource:]):
* WebView.subproj/WebTextView.m:
(-[WebTextView dataSourceUpdated:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3769 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index abed39b..2bcee76 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,30 @@
2003-03-06 Richard Williamson <rjw at apple.com>
+ Move tweaks to WebKit API.
+
+ Removed [WebFrame setController:] from public API.
+ Removed [WebDataSource stringWithData:] from public API.
+
+ Reviewed by hyatt.
+
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource mainDocumentError]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _stringWithData:]):
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ * WebView.subproj/WebTextRepresentation.m:
+ (-[WebTextRepresentation setDataSource:]):
+ * WebView.subproj/WebTextView.m:
+ (-[WebTextView dataSourceUpdated:]):
+
+2003-03-06 Richard Williamson <rjw at apple.com>
+
Tweaks to WebKit API.
Dropped URL on WebDataSource.
Dropped start/stop loading on WebDataSource.
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 15a04db..2657484 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -115,16 +115,6 @@
- (WebError *)mainDocumentError;
/*!
- @method stringWithData:
- @result A string decoded using the determined encoding.
- @discussion The overidden encoding is used if one is present. If no overidden encoding is specified,
- the server specified encoding is used. If no server specified encoding is specified,
- kCFStringEncodingISOLatin1 is used.
-*/
-- (NSString *)stringWithData:(NSData *)data;
-
-
-/*!
@method isDownloading
@result Description forthcoming.
*/
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 24a2c81..c861036 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -13,9 +13,9 @@
#import <WebKit/WebController.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebView.h>
-#import <WebFoundation/WebAssertions.h>
#import <WebKit/WebKitStatisticsPrivate.h>
+#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/WebRequest.h>
@@ -142,21 +142,6 @@
return _private->mainDocumentError;
}
-- (NSString *)stringWithData:(NSData *)data
-{
- NSString *textEncodingName = [self _overrideEncoding];
-
- if(!textEncodingName){
- textEncodingName = [[self response] textEncodingName];
- }
-
- if(textEncodingName){
- return [WebBridge stringWithData:data textEncodingName:textEncodingName];
- }else{
- return [WebBridge stringWithData:data textEncoding:kCFStringEncodingISOLatin1];
- }
-}
-
+ (void)registerRepresentationClass:(Class)repClass forMIMEType:(NSString *)MIMEType
{
// FIXME: OK to allow developers to override built-in reps?
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 5d4feb0..55f01e8 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -113,6 +113,7 @@
@interface WebDataSource (WebPrivate)
+- (NSString *)_stringWithData:(NSData *)data;
- (void)_startLoading;
- (void)_stopLoading;
- (NSURL *)_URL;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 5407512..71c9e94 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -766,6 +766,19 @@
return [[self request] URL];
}
+- (NSString *)_stringWithData:(NSData *)data
+{
+ NSString *textEncodingName = [self _overrideEncoding];
+
+ if(!textEncodingName){
+ textEncodingName = [[self response] textEncodingName];
+ }
+ if(textEncodingName){
+ return [WebBridge stringWithData:data textEncodingName:textEncodingName];
+ }else{
+ return [WebBridge stringWithData:data textEncoding:kCFStringEncodingISOLatin1];
+ }
+}
@end
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index e3e3427..1bb0139 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -43,12 +43,6 @@
- (NSString *)name;
/*!
- @method setController:
- @param controller The controller to assign to this frame.
-*/
-- (void)setController: (WebController *)controller;
-
-/*!
@method controller
@result Returns the controller of this frame.
*/
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index a679160..a92041a 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -87,14 +87,6 @@
}
-- (void)setController: (WebController *)controller
-{
- // To set controller to nil, we have to use _controllerWillBeDeallocated, not this.
- ASSERT(controller);
- [_private setController: controller];
-}
-
-
- (WebDataSource *)provisionalDataSource
{
return [_private provisionalDataSource];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 752d483..4f3c746 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -99,6 +99,7 @@ typedef enum {
@end
@interface WebFrame (WebPrivate)
+- (void)setController: (WebController *)controller;
- (void)_setName:(NSString *)name;
- (WebFrame *)_descendantFrameNamed:(NSString *)name;
- (void)_controllerWillBeDeallocated;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 047898d..d45197a 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -229,6 +229,14 @@ Repeat load of the same URL (by any other means of navigation other than the rel
@implementation WebFrame (WebPrivate)
+- (void)setController: (WebController *)controller
+{
+ // To set controller to nil, we have to use _controllerWillBeDeallocated, not this.
+ ASSERT(controller);
+ [_private setController: controller];
+}
+
+
// helper method used in various nav cases below
- (WebHistoryItem *)_addBackForwardItemClippedAtTarget:(BOOL)doClip
{
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index dc7e875..1af0935 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -5,7 +5,7 @@
#import <WebKit/WebHTMLRepresentation.h>
-#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebFramePrivate.h>
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index 5a64e5f..2c906f2 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -5,7 +5,7 @@
#import "WebTextRepresentation.h"
-#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebFoundation/WebResponse.h>
@implementation WebTextRepresentation
@@ -20,7 +20,7 @@
{
hasRTFSource = [[[dataSource response] contentType] isEqualToString:@"text/rtf"];
if (hasRTFSource){
- RTFSource = [[dataSource stringWithData: [dataSource data]] retain];
+ RTFSource = [[dataSource _stringWithData: [dataSource data]] retain];
}
}
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index e84354e..0599865 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -9,7 +9,7 @@
#import <WebFoundation/WebResponse.h>
#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPreferences.h>
@@ -59,7 +59,7 @@
} else {
[self setRichText:NO];
[self setFixedWidthFont];
- [self setString:[dataSource stringWithData:[dataSource data]]];
+ [self setString:[dataSource _stringWithData:[dataSource data]]];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list