[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 05:53:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d37b9a3e452eaa1e898a4ab4a17cf5ddd95e511c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 15 01:59:23 2001 +0000
Added files to temporarily hold incomplete API.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@504 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/WebView.subproj/IFGrabBag.h b/WebKit/WebView.subproj/IFGrabBag.h
new file mode 100644
index 0000000..de4d4fd
--- /dev/null
+++ b/WebKit/WebView.subproj/IFGrabBag.h
@@ -0,0 +1,26 @@
+/*
+ WKWebController.h
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Public header file.
+*/
+#import <Cocoa/Cocoa.h>
+
+#ifdef READY_FOR_PRIMETIME
+
+
+
+/*
+ =============================================================================
+*/
+ at protocol WKContextMenuHandler
+// Returns the array of menu items for this node that will be displayed in the context menu.
+// Typically this would be implemented by returning the results of WKWebView defaultContextMenuItemsForNode:
+// after making any desired changes or additions.
+- (NSArray *)contextMenuItemsForNode: (WKDOMNode *);
+ at end
+
+
+
+#endif
+
diff --git a/WebKit/WebView.subproj/IFPreferences.h b/WebKit/WebView.subproj/IFPreferences.h
new file mode 100644
index 0000000..d829800
--- /dev/null
+++ b/WebKit/WebView.subproj/IFPreferences.h
@@ -0,0 +1,59 @@
+/*
+ WKWebController.h
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Public header file.
+*/
+#import <Cocoa/Cocoa.h>
+
+#ifdef READY_FOR_PRIMETIME
+
+
+
+
+/*
+ =============================================================================
+
+ This class provides a cover for URL-based preference items.
+*/
+ at interface WKPreferences
++ getPreferencesForURL: (NSURL *)url;
+
+// Encoding that will be used in none specified on page? or in header?
++ setEncoding: (NSString *)encoding;
++ (NSString *)encoding;
+
+// Javascript preferences
+- (void)setJScriptEnabled: (BOOL)flag;
+- (BOOL)jScriptEnabled;
+
+// Java preferences
+- (void)setJavaEnabled: (BOOL)flag
+- (BOOL)javaEnabled;
+
+// Document refreshes allowed
+- setRefreshEnabled: (BOOL)flag;
+- (BOOL)refreshEnabled;
+
+// Plugins
+- (void)setPluginsEnabled: (BOOL)flag;
+- (BOOL)pluginEnabled;
+
+// Should images be loaded.
+- (void)setAutoloadImages: (BOOL)flag;
+- (BOOL)autoloadImages;
+
+/*
+ Specify whether only local references ( stylesheets, images, scripts, subdocuments )
+ should be loaded. ( default false - everything is loaded, if the more specific
+ options allow )
+ This is carried over from KDE.
+*/
+- (void)setOnlyLocalReferences: (BOOL)flag;
+- (BOOL)onlyLocalReferences;
+
+ at end
+
+
+#endif
+
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index a0b66e5..99220ff 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -92,10 +92,15 @@
Removed inputURL:resolvedTo: methods, per discussion with Don.
+ Remove WKContextMenuHandler for want of a better way to describe the
+ not-yet-existing WKDOMNode. We can't think of any initial clients that want
+ to override the default behavior anyway. Put it in WKGrabBag.h for now.
*/
/*
+ =============================================================================
+
WKWebController implements all the behavior that ties together WKWebView
and WKWebDataSource. See each inherited protocol for a more complete
description.
@@ -104,7 +109,7 @@
describe snippets of behavior, but do we explicity reference them anywhere,
or do we just use the umbrella protocol?]
*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKCredentialsHandler, WKLocationChangeHandler>
+ at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
@end
@@ -143,7 +148,7 @@
WKWebViewDelegates implement protocols that modify the behavior of
WKWebViews. A WKWebView does not require a delegate.
*/
- at protocol WKWebViewDelegate <WKContextMenuHandler>
+ at protocol WKWebViewDelegate <?>
@end
@@ -245,16 +250,6 @@
@end
-/*
- =============================================================================
-*/
- at protocol WKContextMenuHandler
-// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of WKWebView defaultContextMenuItemsForNode:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (WKDOMNode *);
- at end
-
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 29d1726..85e7dcf 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -7,6 +7,7 @@
#import <Cocoa/Cocoa.h>
#import <WebKit/WKWebController.h>
+#import <WebKit/WKWebCache.h>
/*
=============================================================================
@@ -56,14 +57,19 @@
Removed all mentions of resolved URLs, because browsers don't
actuall treat DNS aliases specially.
-
+
+ Moved search API to WKWebView.
+
+ Moved WKPreferences to a new file, WKPreferences.h. We are still discussing
+ this item and it will not make it into the white paper.
+
Minor naming changes.
============================================================================= */
#ifdef READY_FOR_PRIMETIME
- at interface WKWebDataSource : NSObject
+ at interface WKWebDataSource : NSObject <WKWebDataSource>
{
@private
id _dataSourcePrivate;
@@ -175,11 +181,6 @@
- (void)setUserStyleSheet: (NSString *)sheet;
-// Searching, to support find in clients. regular expressions?
-- (WKSearchState *)beginSearch;
-- (NSString *)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case state: (WKSearchState *)state;
-
-
// 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.
@@ -195,50 +196,5 @@
@end
-
-
-/*
- =============================================================================
-
- This class provides a cover for URL-based preference items.
-*/
- at interface WKPreferences
-+ getPreferencesForURL: (NSURL *)url;
-
-// Encoding that will be used in none specified on page? or in header?
-+ setEncoding: (NSString *)encoding;
-+ (NSString *)encoding;
-
-// Javascript preferences
-- (void)setJScriptEnabled: (BOOL)flag;
-- (BOOL)jScriptEnabled;
-
-// Java preferences
-- (void)setJavaEnabled: (BOOL)flag;
-- (BOOL)javaEnabled;
-
-// Document refreshes allowed
-- setRefreshEnabled: (BOOL)flag;
-- (BOOL)refreshEnabled;
-
-// Plugins
-- (void)setPluginsEnabled: (BOOL)flag;
-- (BOOL)pluginsEnabled;
-
-// Should images be loaded.
-- (void)setAutoloadImages: (BOOL)flag;
-- (BOOL)autoloadImages;
-
-/*
- Specify whether only local references ( stylesheets, images, scripts, subdocuments )
- should be loaded. ( default false - everything is loaded, if the more specific
- options allow )
- This is carried over from KDE.
-*/
-- (void)setOnlyLocalReferences: (BOOL)flag;
-- (BOOL)onlyLocalReferences;
-
- at end
-
#endif
diff --git a/WebKit/WebView.subproj/IFWebView.h b/WebKit/WebView.subproj/IFWebView.h
index 788de59..ddbb4dc 100644
--- a/WebKit/WebView.subproj/IFWebView.h
+++ b/WebKit/WebView.subproj/IFWebView.h
@@ -64,6 +64,22 @@
this point.
=============================================================================
+
+ Changes:
+
+ 2001-12-14
+
+ Added the following methods:
+ - (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case
+ - deselectText;
+ - (NSAttributedString *)selectedText;
+
+
+ Remove explicit API to get/set the selection range. This will be postponed until we
+ have a DOM API that allows us to express selection ranges correctly. Instead we have API
+ that should support searching and getting a NSAttributedString that corresponds to
+ the selected text.
+
*/
@interface WKWebView : NSView
{
@@ -121,18 +137,17 @@
- (BOOL)contextMenusEnabled;
-// Most folks want selection API on the view. Don suggested we mirror the
-// NSText API. NSText represents selection as a range. What does this mean
-// in the context of an HTML page? What is the selection range in a table?
-// What can you do with the selection range? I'm not sure if can get away
-// with this simplistic API. We may have to use something similar to the
-// DOM selection API. I'm also still uncomfortable putting this API on the
-// view.
-- (void)setSelectedRange:(NSRange)aRange;
-- (NSRange)selectedRange;
+// Remove the selection.
+- deselectText;
+
+
+// Search from the end of the currently selected location, or from the beginning of the document if nothing
+// is selected.
+- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case
-// Maciej thinks we need high level find API on view.
+// Get an attributed string that represents the current selection.
+- (NSAttributedString *)selectedText;
@end
diff --git a/WebKit/WebView.subproj/WKGrabBag.h b/WebKit/WebView.subproj/WKGrabBag.h
new file mode 100644
index 0000000..de4d4fd
--- /dev/null
+++ b/WebKit/WebView.subproj/WKGrabBag.h
@@ -0,0 +1,26 @@
+/*
+ WKWebController.h
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Public header file.
+*/
+#import <Cocoa/Cocoa.h>
+
+#ifdef READY_FOR_PRIMETIME
+
+
+
+/*
+ =============================================================================
+*/
+ at protocol WKContextMenuHandler
+// Returns the array of menu items for this node that will be displayed in the context menu.
+// Typically this would be implemented by returning the results of WKWebView defaultContextMenuItemsForNode:
+// after making any desired changes or additions.
+- (NSArray *)contextMenuItemsForNode: (WKDOMNode *);
+ at end
+
+
+
+#endif
+
diff --git a/WebKit/WebView.subproj/WKPreferences.h b/WebKit/WebView.subproj/WKPreferences.h
new file mode 100644
index 0000000..d829800
--- /dev/null
+++ b/WebKit/WebView.subproj/WKPreferences.h
@@ -0,0 +1,59 @@
+/*
+ WKWebController.h
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Public header file.
+*/
+#import <Cocoa/Cocoa.h>
+
+#ifdef READY_FOR_PRIMETIME
+
+
+
+
+/*
+ =============================================================================
+
+ This class provides a cover for URL-based preference items.
+*/
+ at interface WKPreferences
++ getPreferencesForURL: (NSURL *)url;
+
+// Encoding that will be used in none specified on page? or in header?
++ setEncoding: (NSString *)encoding;
++ (NSString *)encoding;
+
+// Javascript preferences
+- (void)setJScriptEnabled: (BOOL)flag;
+- (BOOL)jScriptEnabled;
+
+// Java preferences
+- (void)setJavaEnabled: (BOOL)flag
+- (BOOL)javaEnabled;
+
+// Document refreshes allowed
+- setRefreshEnabled: (BOOL)flag;
+- (BOOL)refreshEnabled;
+
+// Plugins
+- (void)setPluginsEnabled: (BOOL)flag;
+- (BOOL)pluginEnabled;
+
+// Should images be loaded.
+- (void)setAutoloadImages: (BOOL)flag;
+- (BOOL)autoloadImages;
+
+/*
+ Specify whether only local references ( stylesheets, images, scripts, subdocuments )
+ should be loaded. ( default false - everything is loaded, if the more specific
+ options allow )
+ This is carried over from KDE.
+*/
+- (void)setOnlyLocalReferences: (BOOL)flag;
+- (BOOL)onlyLocalReferences;
+
+ at end
+
+
+#endif
+
diff --git a/WebKit/WebView.subproj/WKWebController.h b/WebKit/WebView.subproj/WKWebController.h
index a0b66e5..99220ff 100644
--- a/WebKit/WebView.subproj/WKWebController.h
+++ b/WebKit/WebView.subproj/WKWebController.h
@@ -92,10 +92,15 @@
Removed inputURL:resolvedTo: methods, per discussion with Don.
+ Remove WKContextMenuHandler for want of a better way to describe the
+ not-yet-existing WKDOMNode. We can't think of any initial clients that want
+ to override the default behavior anyway. Put it in WKGrabBag.h for now.
*/
/*
+ =============================================================================
+
WKWebController implements all the behavior that ties together WKWebView
and WKWebDataSource. See each inherited protocol for a more complete
description.
@@ -104,7 +109,7 @@
describe snippets of behavior, but do we explicity reference them anywhere,
or do we just use the umbrella protocol?]
*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKCredentialsHandler, WKLocationChangeHandler>
+ at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
@end
@@ -143,7 +148,7 @@
WKWebViewDelegates implement protocols that modify the behavior of
WKWebViews. A WKWebView does not require a delegate.
*/
- at protocol WKWebViewDelegate <WKContextMenuHandler>
+ at protocol WKWebViewDelegate <?>
@end
@@ -245,16 +250,6 @@
@end
-/*
- =============================================================================
-*/
- at protocol WKContextMenuHandler
-// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of WKWebView defaultContextMenuItemsForNode:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (WKDOMNode *);
- at end
-
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WKWebDataSource.h b/WebKit/WebView.subproj/WKWebDataSource.h
index 29d1726..85e7dcf 100644
--- a/WebKit/WebView.subproj/WKWebDataSource.h
+++ b/WebKit/WebView.subproj/WKWebDataSource.h
@@ -7,6 +7,7 @@
#import <Cocoa/Cocoa.h>
#import <WebKit/WKWebController.h>
+#import <WebKit/WKWebCache.h>
/*
=============================================================================
@@ -56,14 +57,19 @@
Removed all mentions of resolved URLs, because browsers don't
actuall treat DNS aliases specially.
-
+
+ Moved search API to WKWebView.
+
+ Moved WKPreferences to a new file, WKPreferences.h. We are still discussing
+ this item and it will not make it into the white paper.
+
Minor naming changes.
============================================================================= */
#ifdef READY_FOR_PRIMETIME
- at interface WKWebDataSource : NSObject
+ at interface WKWebDataSource : NSObject <WKWebDataSource>
{
@private
id _dataSourcePrivate;
@@ -175,11 +181,6 @@
- (void)setUserStyleSheet: (NSString *)sheet;
-// Searching, to support find in clients. regular expressions?
-- (WKSearchState *)beginSearch;
-- (NSString *)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case state: (WKSearchState *)state;
-
-
// 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.
@@ -195,50 +196,5 @@
@end
-
-
-/*
- =============================================================================
-
- This class provides a cover for URL-based preference items.
-*/
- at interface WKPreferences
-+ getPreferencesForURL: (NSURL *)url;
-
-// Encoding that will be used in none specified on page? or in header?
-+ setEncoding: (NSString *)encoding;
-+ (NSString *)encoding;
-
-// Javascript preferences
-- (void)setJScriptEnabled: (BOOL)flag;
-- (BOOL)jScriptEnabled;
-
-// Java preferences
-- (void)setJavaEnabled: (BOOL)flag;
-- (BOOL)javaEnabled;
-
-// Document refreshes allowed
-- setRefreshEnabled: (BOOL)flag;
-- (BOOL)refreshEnabled;
-
-// Plugins
-- (void)setPluginsEnabled: (BOOL)flag;
-- (BOOL)pluginsEnabled;
-
-// Should images be loaded.
-- (void)setAutoloadImages: (BOOL)flag;
-- (BOOL)autoloadImages;
-
-/*
- Specify whether only local references ( stylesheets, images, scripts, subdocuments )
- should be loaded. ( default false - everything is loaded, if the more specific
- options allow )
- This is carried over from KDE.
-*/
-- (void)setOnlyLocalReferences: (BOOL)flag;
-- (BOOL)onlyLocalReferences;
-
- at end
-
#endif
diff --git a/WebKit/WebView.subproj/WKWebView.h b/WebKit/WebView.subproj/WKWebView.h
index 788de59..ddbb4dc 100644
--- a/WebKit/WebView.subproj/WKWebView.h
+++ b/WebKit/WebView.subproj/WKWebView.h
@@ -64,6 +64,22 @@
this point.
=============================================================================
+
+ Changes:
+
+ 2001-12-14
+
+ Added the following methods:
+ - (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case
+ - deselectText;
+ - (NSAttributedString *)selectedText;
+
+
+ Remove explicit API to get/set the selection range. This will be postponed until we
+ have a DOM API that allows us to express selection ranges correctly. Instead we have API
+ that should support searching and getting a NSAttributedString that corresponds to
+ the selected text.
+
*/
@interface WKWebView : NSView
{
@@ -121,18 +137,17 @@
- (BOOL)contextMenusEnabled;
-// Most folks want selection API on the view. Don suggested we mirror the
-// NSText API. NSText represents selection as a range. What does this mean
-// in the context of an HTML page? What is the selection range in a table?
-// What can you do with the selection range? I'm not sure if can get away
-// with this simplistic API. We may have to use something similar to the
-// DOM selection API. I'm also still uncomfortable putting this API on the
-// view.
-- (void)setSelectedRange:(NSRange)aRange;
-- (NSRange)selectedRange;
+// Remove the selection.
+- deselectText;
+
+
+// Search from the end of the currently selected location, or from the beginning of the document if nothing
+// is selected.
+- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case
-// Maciej thinks we need high level find API on view.
+// Get an attributed string that represents the current selection.
+- (NSAttributedString *)selectedText;
@end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index a0b66e5..99220ff 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -92,10 +92,15 @@
Removed inputURL:resolvedTo: methods, per discussion with Don.
+ Remove WKContextMenuHandler for want of a better way to describe the
+ not-yet-existing WKDOMNode. We can't think of any initial clients that want
+ to override the default behavior anyway. Put it in WKGrabBag.h for now.
*/
/*
+ =============================================================================
+
WKWebController implements all the behavior that ties together WKWebView
and WKWebDataSource. See each inherited protocol for a more complete
description.
@@ -104,7 +109,7 @@
describe snippets of behavior, but do we explicity reference them anywhere,
or do we just use the umbrella protocol?]
*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKCredentialsHandler, WKLocationChangeHandler>
+ at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
@end
@@ -143,7 +148,7 @@
WKWebViewDelegates implement protocols that modify the behavior of
WKWebViews. A WKWebView does not require a delegate.
*/
- at protocol WKWebViewDelegate <WKContextMenuHandler>
+ at protocol WKWebViewDelegate <?>
@end
@@ -245,16 +250,6 @@
@end
-/*
- =============================================================================
-*/
- at protocol WKContextMenuHandler
-// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of WKWebView defaultContextMenuItemsForNode:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (WKDOMNode *);
- at end
-
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 29d1726..85e7dcf 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -7,6 +7,7 @@
#import <Cocoa/Cocoa.h>
#import <WebKit/WKWebController.h>
+#import <WebKit/WKWebCache.h>
/*
=============================================================================
@@ -56,14 +57,19 @@
Removed all mentions of resolved URLs, because browsers don't
actuall treat DNS aliases specially.
-
+
+ Moved search API to WKWebView.
+
+ Moved WKPreferences to a new file, WKPreferences.h. We are still discussing
+ this item and it will not make it into the white paper.
+
Minor naming changes.
============================================================================= */
#ifdef READY_FOR_PRIMETIME
- at interface WKWebDataSource : NSObject
+ at interface WKWebDataSource : NSObject <WKWebDataSource>
{
@private
id _dataSourcePrivate;
@@ -175,11 +181,6 @@
- (void)setUserStyleSheet: (NSString *)sheet;
-// Searching, to support find in clients. regular expressions?
-- (WKSearchState *)beginSearch;
-- (NSString *)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case state: (WKSearchState *)state;
-
-
// 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.
@@ -195,50 +196,5 @@
@end
-
-
-/*
- =============================================================================
-
- This class provides a cover for URL-based preference items.
-*/
- at interface WKPreferences
-+ getPreferencesForURL: (NSURL *)url;
-
-// Encoding that will be used in none specified on page? or in header?
-+ setEncoding: (NSString *)encoding;
-+ (NSString *)encoding;
-
-// Javascript preferences
-- (void)setJScriptEnabled: (BOOL)flag;
-- (BOOL)jScriptEnabled;
-
-// Java preferences
-- (void)setJavaEnabled: (BOOL)flag;
-- (BOOL)javaEnabled;
-
-// Document refreshes allowed
-- setRefreshEnabled: (BOOL)flag;
-- (BOOL)refreshEnabled;
-
-// Plugins
-- (void)setPluginsEnabled: (BOOL)flag;
-- (BOOL)pluginsEnabled;
-
-// Should images be loaded.
-- (void)setAutoloadImages: (BOOL)flag;
-- (BOOL)autoloadImages;
-
-/*
- Specify whether only local references ( stylesheets, images, scripts, subdocuments )
- should be loaded. ( default false - everything is loaded, if the more specific
- options allow )
- This is carried over from KDE.
-*/
-- (void)setOnlyLocalReferences: (BOOL)flag;
-- (BOOL)onlyLocalReferences;
-
- at end
-
#endif
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 788de59..ddbb4dc 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -64,6 +64,22 @@
this point.
=============================================================================
+
+ Changes:
+
+ 2001-12-14
+
+ Added the following methods:
+ - (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case
+ - deselectText;
+ - (NSAttributedString *)selectedText;
+
+
+ Remove explicit API to get/set the selection range. This will be postponed until we
+ have a DOM API that allows us to express selection ranges correctly. Instead we have API
+ that should support searching and getting a NSAttributedString that corresponds to
+ the selected text.
+
*/
@interface WKWebView : NSView
{
@@ -121,18 +137,17 @@
- (BOOL)contextMenusEnabled;
-// Most folks want selection API on the view. Don suggested we mirror the
-// NSText API. NSText represents selection as a range. What does this mean
-// in the context of an HTML page? What is the selection range in a table?
-// What can you do with the selection range? I'm not sure if can get away
-// with this simplistic API. We may have to use something similar to the
-// DOM selection API. I'm also still uncomfortable putting this API on the
-// view.
-- (void)setSelectedRange:(NSRange)aRange;
-- (NSRange)selectedRange;
+// Remove the selection.
+- deselectText;
+
+
+// Search from the end of the currently selected location, or from the beginning of the document if nothing
+// is selected.
+- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case
-// Maciej thinks we need high level find API on view.
+// Get an attributed string that represents the current selection.
+- (NSAttributedString *)selectedText;
@end
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
new file mode 100644
index 0000000..d829800
--- /dev/null
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -0,0 +1,59 @@
+/*
+ WKWebController.h
+ Copyright 2001, Apple, Inc. All rights reserved.
+
+ Public header file.
+*/
+#import <Cocoa/Cocoa.h>
+
+#ifdef READY_FOR_PRIMETIME
+
+
+
+
+/*
+ =============================================================================
+
+ This class provides a cover for URL-based preference items.
+*/
+ at interface WKPreferences
++ getPreferencesForURL: (NSURL *)url;
+
+// Encoding that will be used in none specified on page? or in header?
++ setEncoding: (NSString *)encoding;
++ (NSString *)encoding;
+
+// Javascript preferences
+- (void)setJScriptEnabled: (BOOL)flag;
+- (BOOL)jScriptEnabled;
+
+// Java preferences
+- (void)setJavaEnabled: (BOOL)flag
+- (BOOL)javaEnabled;
+
+// Document refreshes allowed
+- setRefreshEnabled: (BOOL)flag;
+- (BOOL)refreshEnabled;
+
+// Plugins
+- (void)setPluginsEnabled: (BOOL)flag;
+- (BOOL)pluginEnabled;
+
+// Should images be loaded.
+- (void)setAutoloadImages: (BOOL)flag;
+- (BOOL)autoloadImages;
+
+/*
+ Specify whether only local references ( stylesheets, images, scripts, subdocuments )
+ should be loaded. ( default false - everything is loaded, if the more specific
+ options allow )
+ This is carried over from KDE.
+*/
+- (void)setOnlyLocalReferences: (BOOL)flag;
+- (BOOL)onlyLocalReferences;
+
+ at end
+
+
+#endif
+
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index a0b66e5..99220ff 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -92,10 +92,15 @@
Removed inputURL:resolvedTo: methods, per discussion with Don.
+ Remove WKContextMenuHandler for want of a better way to describe the
+ not-yet-existing WKDOMNode. We can't think of any initial clients that want
+ to override the default behavior anyway. Put it in WKGrabBag.h for now.
*/
/*
+ =============================================================================
+
WKWebController implements all the behavior that ties together WKWebView
and WKWebDataSource. See each inherited protocol for a more complete
description.
@@ -104,7 +109,7 @@
describe snippets of behavior, but do we explicity reference them anywhere,
or do we just use the umbrella protocol?]
*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKCredentialsHandler, WKLocationChangeHandler>
+ at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
@end
@@ -143,7 +148,7 @@
WKWebViewDelegates implement protocols that modify the behavior of
WKWebViews. A WKWebView does not require a delegate.
*/
- at protocol WKWebViewDelegate <WKContextMenuHandler>
+ at protocol WKWebViewDelegate <?>
@end
@@ -245,16 +250,6 @@
@end
-/*
- =============================================================================
-*/
- at protocol WKContextMenuHandler
-// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of WKWebView defaultContextMenuItemsForNode:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (WKDOMNode *);
- at end
-
/*
=============================================================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list