[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:28:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6d280b28d65be3daf59a2f9fdf3861e0a71f7a37
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 7 23:10:32 2003 +0000
WebKit:
Drop mainDocumentError from WebDataSource.
Combine registerView: and registerRepresentation: into one method on WebFrame.
Reviewed by trey.
* Plugins.subproj/WebPluginDatabase.m:
(-[WebPluginDatabase init]):
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _mainDocumentError]):
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFrame.m:
(+[WebFrame registerViewClass:representationClass:forMIMEType:]):
* WebView.subproj/WebFramePrivate.m:
(switch):
* WebView.subproj/WebView.h:
* WebView.subproj/WebView.m:
Tests:
Drop mainDocumentError from WebDataSource.
Combine registerView: and registerRepresentation: into one method on WebFrame.
Reviewed by trey.
* PDFViewer/ApplicationController.m:
(-[ApplicationController awakeFromNib]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3780 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index de37ffc..30b9dfe 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2003-03-07 Richard Williamson <rjw at apple.com>
+
+ Drop mainDocumentError from WebDataSource.
+ Combine registerView: and registerRepresentation: into one method on WebFrame.
+
+ Reviewed by trey.
+
+ * Plugins.subproj/WebPluginDatabase.m:
+ (-[WebPluginDatabase init]):
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _mainDocumentError]):
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFrame.m:
+ (+[WebFrame registerViewClass:representationClass:forMIMEType:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (switch):
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+
+=======
2003-03-07 John Sullivan <sullivan at apple.com>
WebKit part of fixes to these two synching-related bugs:
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 665a893..3fef73f 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -6,6 +6,7 @@
#import <WebKit/WebBasePluginPackage.h>
#import <WebKit/WebDataSource.h>
+#import <WebKit/WebFrame.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNetscapePluginPackage.h>
@@ -183,8 +184,7 @@ static NSArray *pluginLocations(void)
// Don't override previously registered types.
if(![viewTypes containsObject:mime]){
// FIXME: This won't work for the new plug-ins.
- [WebView registerViewClass:[WebNetscapePluginDocumentView class] forMIMEType:mime];
- [WebDataSource registerRepresentationClass:[WebNetscapePluginRepresentation class] forMIMEType:mime];
+ [WebFrame registerViewClass:[WebNetscapePluginDocumentView class] representationClass:[WebNetscapePluginRepresentation class] forMIMEType:mime];
}
}
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 767dd10..fe753c2 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -102,23 +102,4 @@
*/
- (NSString *)pageTitle;
-/*!
- @method mainDocumentError
- @result Returns a WebError associated with the load of the main document, or nil if no error occurred.
-*/
-- (WebError *)mainDocumentError;
-
-/*!
- @method registerRepresentationClass:forMIMEType:
- @discussion A class that implements WebDocumentRepresentation may be registered
- with this method.
- A document class may register for a primary MIME type by excluding
- a subtype, i.e. "video/" will match the document class with
- all video types. More specific matching takes precedence
- over general matching.
- @param repClass The WebDocumentRepresentation class to use to represent data of the given MIME type.
- @param MIMEType The MIME type to represent with an object of the given class.
-*/
-+ (void) registerRepresentationClass:(Class)repClass forMIMEType:(NSString *)MIMEType;
-
@end
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index a5d9a2b..396f769 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -132,15 +132,4 @@
return _private->pageTitle;
}
-- (WebError *)mainDocumentError
-{
- return _private->mainDocumentError;
-}
-
-+ (void)registerRepresentationClass:(Class)repClass forMIMEType:(NSString *)MIMEType
-{
- // FIXME: OK to allow developers to override built-in reps?
- [[self _repTypes] setObject:repClass forKey:MIMEType];
-}
-
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index b5e9f85..1d49b62 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -113,6 +113,7 @@
@interface WebDataSource (WebPrivate)
+- (WebError *)_mainDocumentError;
- (NSString *)_stringWithData:(NSData *)data;
- (void)_startLoading;
- (void)_stopLoading;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 592a951..19e5018 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -742,4 +742,10 @@
}
}
+- (WebError *)_mainDocumentError
+{
+ return _private->mainDocumentError;
+}
+
+
@end
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 1569e32..dd727ea 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -124,5 +124,17 @@
*/
- (NSArray *)children;
+/*!
+ @method registerViewClass:representationClass:forMIMEType:
+ @discussion Register classes that implement WebDocumentView and WebDocumentRepresentation respectively.
+ A document class may register for a primary MIME type by excluding
+ a subtype, i.e. "video/" will match the document class with
+ all video types. More specific matching takes precedence
+ over general matching.
+ @param viewClass The WebDocumentView class to use to render data for a given MIME type.
+ @param representationClass The WebDocumentRepresentation class to use to represent data of the given MIME type.
+ @param MIMEType The MIME type to represent with an object of the given class.
+*/
++ (void) registerViewClass:(Class)viewClass representationClass: (Class)representationClass forMIMEType:(NSString *)MIMEType;
@end
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 9023c8c..6a4ef4f 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -216,4 +216,12 @@
return [[_private->children copy] autorelease];
}
++ (void) registerViewClass:(Class)viewClass representationClass: (Class)representationClass forMIMEType:(NSString *)MIMEType
+{
+ [[WebView _viewTypes] setObject:viewClass forKey:MIMEType];
+ [[WebDataSource _repTypes] setObject:representationClass forKey:MIMEType];
+}
+
+
+
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 535fb0c..243279f 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -836,14 +836,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
LOG(Loading, "%@: checking complete in WebFrameStateProvisional", [self name]);
// If we've received any errors we may be stuck in the provisional state and actually
// complete.
- if ([pd mainDocumentError]) {
+ if ([pd _mainDocumentError]) {
// Check all children first.
LOG(Loading, "%@: checking complete, current state WebFrameStateProvisional", [self name]);
[self _resetBackForwardListToCurrent];
if (![pd isLoading]) {
LOG(Loading, "%@: checking complete in WebFrameStateProvisional, load done", [self name]);
- [[[self controller] _locationChangeDelegateForwarder] locationChangeDone:[pd mainDocumentError] forDataSource:pd];
+ [[[self controller] _locationChangeDelegateForwarder] locationChangeDone:[pd _mainDocumentError] forDataSource:pd];
// We know the provisional data source didn't cut the muster, release it.
[self _setProvisionalDataSource:nil];
@@ -922,7 +922,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
}
}
- [[[self controller] _locationChangeDelegateForwarder] locationChangeDone:[ds mainDocumentError] forDataSource:ds];
+ [[[self controller] _locationChangeDelegateForwarder] locationChangeDone:[ds _mainDocumentError] forDataSource:ds];
//if ([ds isDocumentHTML])
// [[ds representation] part]->closeURL();
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 5c360a5..cc4db7a 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -71,18 +71,5 @@
*/
- (BOOL)allowsScrolling;
-/*!
- @method registerViewClass:forMIMEType:
- @abstract Registers an NSView subclass to use to render data of the given MIME type
- @discussion Extends the views that WebKit supports.
- The view must conform to the WebDocumentView protocol
- A view may register for a primary MIME type by excluding
- a subtype, i.e. "video/" will match the view with
- all video types. More specific matching takes precedence
- over general matching.
- @param viewClass The NSView subclass to instantiate when rendering data of the given MIME type
- @param MIMEType The MIME type for which to instantiate the given class
-*/
-+ (void)registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType;
@end
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index cfa4a15..8309d1e 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -133,12 +133,6 @@ enum {
}
}
-+ (void) registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType
-{
- // FIXME: OK to allow developers to override built-in views?
- [[self _viewTypes] setObject:viewClass forKey:MIMEType];
-}
-
-(BOOL)acceptsFirstResponder
{
return YES;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list