[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 06:40:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit baede385c7eead6873b912e1e2303922bd950a91
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 19 02:23:31 2002 +0000
More documentation stuff.
Added attributed text API as requested (yuck!).
Add reconstructedDocumentSource API as requested.
Removed cruft (stale API, bogus comments).
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebHTMLRepresentation.h:
* WebView.subproj/WebHTMLRepresentation.m:
(-[WebHTMLRepresentation reconstructedDocumentSource]):
(-[WebHTMLRepresentation attributedText]):
* WebView.subproj/WebHTMLRepresentationPrivate.h:
* WebView.subproj/WebHTMLView.h:
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView selectedAttributedText]):
(-[WebHTMLView selectedText]):
* WebView.subproj/WebView.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2095 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d3abb42..d1535bf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,7 +1,27 @@
2002-09-18 Richard Williamson <rjw at apple.com>
+ More documentation stuff.
+ Added attributed text API as requested (yuck!).
+ Add reconstructedDocumentSource API as requested.
+ Removed cruft (stale API, bogus comments).
+
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebHTMLRepresentation.h:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation reconstructedDocumentSource]):
+ (-[WebHTMLRepresentation attributedText]):
+ * WebView.subproj/WebHTMLRepresentationPrivate.h:
+ * WebView.subproj/WebHTMLView.h:
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView selectedAttributedText]):
+ (-[WebHTMLView selectedText]):
+ * WebView.subproj/WebView.h:
+
+2002-09-18 Richard Williamson <rjw at apple.com>
+
Added document keywords to headers.
- Made bookmark related APIs private.
+ Made bookmark related APIs private (for now).
* Misc.subproj/WebIconDatabase.h:
* Misc.subproj/WebIconLoader.h:
* Misc.subproj/WebKitErrors.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d3abb42..d1535bf 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,7 +1,27 @@
2002-09-18 Richard Williamson <rjw at apple.com>
+ More documentation stuff.
+ Added attributed text API as requested (yuck!).
+ Add reconstructedDocumentSource API as requested.
+ Removed cruft (stale API, bogus comments).
+
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebHTMLRepresentation.h:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ (-[WebHTMLRepresentation reconstructedDocumentSource]):
+ (-[WebHTMLRepresentation attributedText]):
+ * WebView.subproj/WebHTMLRepresentationPrivate.h:
+ * WebView.subproj/WebHTMLView.h:
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView selectedAttributedText]):
+ (-[WebHTMLView selectedText]):
+ * WebView.subproj/WebView.h:
+
+2002-09-18 Richard Williamson <rjw at apple.com>
+
Added document keywords to headers.
- Made bookmark related APIs private.
+ Made bookmark related APIs private (for now).
* Misc.subproj/WebIconDatabase.h:
* Misc.subproj/WebIconLoader.h:
* Misc.subproj/WebKitErrors.h:
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 8788c25..0ad5677 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -173,48 +173,11 @@
- (BOOL)isDocumentHTML;
/*!
- @method base
- @abstract URL reference point, these should probably not be public for 1.0.
-*/
-- (NSURL *)base;
-
-/*!
- @method baseTarget
-*/
-- (NSString *)baseTarget;
-
-/*!
@method encoding
*/
- (NSString *)encoding;
/*!
- @method setUserStyleSheetFromURL:
- @param URL
-*/
-- (void)setUserStyleSheetFromURL: (NSURL *)URL;
-
-/*!
- @method setUserStyleSheetFromString:
- @param sheet
-*/
-- (void)setUserStyleSheetFromString: (NSString *)sheet;
-
-/*!
- @method icon
- @discussion a.k.a shortcut icons, http://msdn.microsoft.com/workshop/Author/dhtml/howto/ShortcutIcon.asp.
- This method may be moved to a category to prevent unnecessary linkage to the AppKit. Note, however
- that WebCore also has dependencies on the appkit.
-*/
-- (NSImage *)icon;
-
-/*!
- @method isPageSecure
- @discussion Is page secure, e.g. https, ftps
-*/
-- (BOOL)isPageSecure;
-
-/*!
@method pageTitle
@discussion Returns nil or the page title.
*/
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 05b962f..3a039c3 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -249,52 +249,11 @@
return [[self representation] isKindOfClass: [WebHTMLRepresentation class]];
}
-// URL reference point, these should probably not be public for 1.0.
-- (NSURL *)base
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::base is not implemented"];
- return nil;
-}
-
-
-- (NSString *)baseTarget
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::baseTarget is not implemented"];
- return nil;
-}
-
- (NSString *)encoding
{
return _private->encoding;
}
-// Style sheet
-- (void)setUserStyleSheetFromURL:(NSURL *)URL
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::setUserStyleSheetFromURL: is not implemented"];
-}
-
-- (void)setUserStyleSheetFromString:(NSString *)sheet
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::setUserStyleSheetFromString: is not implemented"];
-}
-
-// a.k.a shortcut icons, http://msdn.microsoft.com/workshop/Author/dhtml/howto/ShortcutIcon.asp.
-// This method may be moved to a category to prevent unnecessary linkage to the AppKit. Note, however
-// that WebCore also has dependencies on the appkit.
-- (NSImage *)icon
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::icon is not implemented"];
- return nil;
-}
-
-// Is page secure, e.g. https, ftps
-- (BOOL)isPageSecure
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::isPageSecure is not implemented"];
- return NO;
-}
-
// Returns nil or the page title.
- (NSString *)pageTitle
{
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index bc10015..900915a 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -7,10 +7,6 @@
#import <Cocoa/Cocoa.h>
-/*
- =============================================================================
-*/
-
@class WebDataSource;
@class WebController;
@class WebViewPrivate;
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.h b/WebKit/WebView.subproj/WebHTMLRepresentation.h
index df9b31f..fcb40e0 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.h
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.h
@@ -30,5 +30,10 @@
*/
- (NSString *)reconstructedDocumentSource;
+/*!
+ @method attributedText
+ @discussion Return the document source as an attributed string.
+*/
+- (NSAttributedString *)attributedText;
@end
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 0502c1c..04ba106 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -1,5 +1,5 @@
/*
- WebHTMLRepresentation.mm
+ WebHTMLRepresentation.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
@@ -79,5 +79,11 @@
return @"";
}
+- (NSAttributedString *)attributedText
+{
+ // FIXME: Implement
+ return nil;
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentationPrivate.h b/WebKit/WebView.subproj/WebHTMLRepresentationPrivate.h
index 3f4a09d..f3bf1bb 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentationPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLRepresentationPrivate.h
@@ -1,5 +1,5 @@
/*
- WebHTMLRepresentationPrivate.h
+ WebHTMLRepresentationPrivate.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index 58ca2cb..efc2606 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -2,46 +2,72 @@
WebHTMLView.h
Copyright 2002, Apple, Inc. All rights reserved.
- Private header file.
+ Public header file.
*/
#import <Cocoa/Cocoa.h>
#import <WebKit/WebDocument.h>
-/*
- =============================================================================
-*/
@class WebDataSource;
@class WebController;
@class WebHTMLViewPrivate;
+/*!
+ @class WebHTMLView
+*/
@interface WebHTMLView : NSView <WebDocumentView, WebDocumentDragSettings, WebDocumentSearching, WebDocumentTextEncoding>
{
@private
WebHTMLViewPrivate *_private;
}
-- initWithFrame: (NSRect)frame;
-
+/*!
+ @method setNeedsLayout:
+ @param flag
+*/
- (void)setNeedsLayout: (BOOL)flag;
-// Set needsToApplyStyles if you change anything that might impact styles, like
-// font preferences.
+/*!
+ @method setNeedsToApplyStyles:
+ @param flag
+*/
- (void)setNeedsToApplyStyles: (BOOL)flag;
-// Reapplies style information to the document. This should not be called directly,
-// instead call setNeedsToApplyStyles:.
+/*!
+ @method reapplyStyles
+ @discussion Reapplies style information to the document. This should not be called directly,
+ instead call setNeedsToApplyStyles:.
+*/
- (void)reapplyStyles;
+/*!
+ @method setContextMenusEnabled:
+ @param flag
+*/
- (void)setContextMenusEnabled: (BOOL)flag;
+
+/*!
+ @method contextMenusEnabled:
+*/
- (BOOL)contextMenusEnabled;
-// Remove the selection.
+/*!
+ @method deselectText
+*/
- (void)deselectText;
-// Get an attributed string that represents the current selection.
-- (NSAttributedString *)selectedText;
+/*!
+ @method selectedAttributedText
+ @abstract Get an attributed string that represents the current selection.
+*/
+- (NSAttributedString *)selectedAttributedText;
+
+/*!
+ @method selectedText
+ @abstract Get an string that represents the current selection.
+*/
+- (NSString *)selectedText;
@end
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index f923f6a..5c00e34 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -186,8 +186,6 @@
}
-// This method should not be public until we have more completely
-// understood how WebView will be subclassed.
- (void)layout
{
// Ensure that we will receive mouse move events. Is this the best place to put this?
@@ -296,13 +294,19 @@
// Get an attributed string that represents the current selection.
-- (NSAttributedString *)selectedText
+- (NSAttributedString *)selectedAttributedText
{
[NSException raise:WebMethodNotYetImplemented format:@"WebView::selectedText is not implemented"];
return nil;
}
+- (NSString *)selectedText
+{
+ return [[self _bridge] selectedText];
+}
+
+
- (BOOL)isOpaque
{
return YES;
@@ -330,7 +334,6 @@
}
-// This should eventually be removed.
- (void)drawRect:(NSRect)rect
{
LOG(View, "%@ drawing", self);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list