[webkit-changes] cvs commit: WebKit/WebView.subproj WebHTMLView.m
WebView.m
John
sullivan at opensource.apple.com
Wed Jul 13 17:26:26 PDT 2005
sullivan 05/07/13 17:26:25
Modified: . ChangeLog
WebView.subproj WebHTMLView.m WebView.m
Log:
Reviewed by Maciej Stachowiak.
- cleaned up Find-related experimental code that I checked in a while back
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView searchFor:direction:caseSensitive:wrap:]):
remove variant of this method that had findInSelection flag; this method is now
the same as it was on Tiger.
* WebView.subproj/WebView.m:
(-[WebView searchFor:direction:caseSensitive:wrap:]):
ditto
Revision Changes Path
1.3223 +15 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3222
retrieving revision 1.3223
diff -u -r1.3222 -r1.3223
--- ChangeLog 12 Jul 2005 17:44:07 -0000 1.3222
+++ ChangeLog 14 Jul 2005 00:26:22 -0000 1.3223
@@ -1,3 +1,18 @@
+2005-07-13 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Maciej Stachowiak.
+
+ - cleaned up Find-related experimental code that I checked in a while back
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView searchFor:direction:caseSensitive:wrap:]):
+ remove variant of this method that had findInSelection flag; this method is now
+ the same as it was on Tiger.
+
+ * WebView.subproj/WebView.m:
+ (-[WebView searchFor:direction:caseSensitive:wrap:]):
+ ditto
+
2005-07-12 Geoffrey Garen <ggaren at apple.com>
-rolled in patch by opendarwin.org at mitzpettel.com
1.454 +1 -12 WebKit/WebView.subproj/WebHTMLView.m
Index: WebHTMLView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- WebHTMLView.m 24 Jun 2005 20:48:59 -0000 1.453
+++ WebHTMLView.m 14 Jul 2005 00:26:25 -0000 1.454
@@ -2334,20 +2334,9 @@
return [[self _webView] _menuForElement:element defaultItems:nil];
}
-// Search from the end of the currently selected location, or from the beginning of the
-// document if nothing is selected.
- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag
{
- return [[self _bridge] searchFor:string direction:forward caseSensitive:caseFlag wrap:wrapFlag findInSelection:NO];
-}
-
-// Private method that adds a findInSelection parameter; might be public someday
-// FIXME: this is currently discovered using respondsToSelector; no SPI or API yet
-// FIXME: this needs to be done for other WebDocumentSearching implementors also, such as
-// WebPDFView and WebSearchableTextView
-- (BOOL)_searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag findInSelection:(BOOL)inSelectionFlag
-{
- return [[self _bridge] searchFor:string direction:forward caseSensitive:caseFlag wrap:wrapFlag findInSelection:inSelectionFlag];
+ return [[self _bridge] searchFor:string direction:forward caseSensitive:caseFlag wrap:wrapFlag];
}
- (DOMRange *)_documentRange
1.291 +3 -28 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- WebView.m 29 Jun 2005 22:53:51 -0000 1.290
+++ WebView.m 14 Jul 2005 00:26:25 -0000 1.291
@@ -190,11 +190,6 @@
- (BOOL)_shouldAutoscrollForDraggingInfo:(id)dragInfo;
@end
- at interface NSObject (WebDocumentSearchingHack)
-// FIXME: this should be part of a protocol (new version of <WebDocumentSearching>)
-- (BOOL)_searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag findInSelection:(BOOL)inSelectionFlag;
- at end
-
@interface WebView (WebFileInternal)
- (void)_preflightSpellChecker;
- (BOOL)_continuousCheckingAllowed;
@@ -2169,9 +2164,7 @@
: [curr _previousFrameWithWrap:wrapFlag];
}
-// Search from the end of the currently selected location, or from the beginning of the
-// document if nothing is selected. Deals with subframes.
-- (BOOL)_searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag findInSelection:(BOOL)findInSelection
+- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag
{
// Get the frame holding the selection, or start with the main frame
WebFrame *startFrame = [self _frameForCurrentSelection];
@@ -2199,13 +2192,7 @@
// Note at this point we are assuming the search will be done top-to-bottom,
// not starting at any selection that exists. See 3228554.
- BOOL success;
- if ([searchView respondsToSelector:@selector(_searchFor:direction:caseSensitive:wrap:findInSelection:)]) {
- success = [searchView _searchFor:string direction:forward caseSensitive:caseFlag wrap:NO findInSelection:findInSelection];
- } else {
- success = [searchView searchFor:string direction:forward caseSensitive:caseFlag wrap:NO];
- }
- if (success) {
+ if ([searchView searchFor:string direction:forward caseSensitive:caseFlag wrap:NO]) {
[[self window] makeFirstResponder:searchView];
return YES;
}
@@ -2216,13 +2203,7 @@
// Search contents of startFrame, on the other side of the selection that we did earlier.
// We cheat a bit and just research with wrap on
if (wrapFlag && startHasSelection && startSearchView) {
- BOOL success;
- if ([startSearchView respondsToSelector:@selector(_searchFor:direction:caseSensitive:wrap:findInSelection:)]) {
- success = [startSearchView _searchFor:string direction:forward caseSensitive:caseFlag wrap:YES findInSelection:findInSelection];
- } else {
- success = [startSearchView searchFor:string direction:forward caseSensitive:caseFlag wrap:YES];
- }
- if (success) {
+ if ([startSearchView searchFor:string direction:forward caseSensitive:caseFlag wrap:YES]) {
[[self window] makeFirstResponder:startSearchView];
return YES;
}
@@ -2230,12 +2211,6 @@
return NO;
}
-- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag
-{
- return [self _searchFor:string direction:forward caseSensitive:caseFlag wrap:wrapFlag findInSelection:NO];
-}
-
-
+ (void)registerViewClass:(Class)viewClass representationClass:(Class)representationClass forMIMEType:(NSString *)MIMEType
{
[[WebFrameView _viewTypesAllowImageTypeOmission:YES] setObject:viewClass forKey:MIMEType];
More information about the webkit-changes
mailing list