Reviewed by Chris Blumenberg.

        - some refactoring cleanup in the selection/searching code

        * Misc.subproj/WebSearchableTextView.h:
        moved WebDocumentSelection protocol conformation to this class, was in subclass WebTextView
        * Misc.subproj/WebSearchableTextView.m:
        (-[WebSearchableTextView selectionRect]):
        new method (moved here from Safari) to return a single rect encompassing all selected text
        (-[WebSearchableTextView pasteboardTypesForSelection]):
        moved here from WebTextView
        (-[WebSearchableTextView writeSelectionWithPasteboardTypes:toPasteboard:]):
        ditto

        * WebView.subproj/WebDocumentInternal.h:
        moved WebDocumentSelection protocol out of here

        * WebView.subproj/WebDocumentPrivate.h:
        moved WebDocumentSelection protocol into here, added selectionRect method

        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView selectionRect]):
        new method, calls existing bridge method formerly called by _selectionRect
        (-[WebHTMLView _selectionRect]):
        now calls [self selectionRect]. We can't just delete _selectionRect because it's used by Mail.

        * WebView.subproj/WebHTMLViewPrivate.h:
        removed _selectionRect since it's in WebDocumentSelection now

        * WebView.subproj/WebTextView.h:
        removed WebDocumentSelection from protocol list since it's in superclass now

        * WebView.subproj/WebTextView.m:
        removed old WebDocumentSelection methods because they are in superclass now

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5adba91..1eaf5e2 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,40 @@
+2005-07-18  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Chris Blumenberg.
+        
+        - some refactoring cleanup in the selection/searching code
+
+        * Misc.subproj/WebSearchableTextView.h:
+        moved WebDocumentSelection protocol conformation to this class, was in subclass WebTextView
+        * Misc.subproj/WebSearchableTextView.m:
+        (-[WebSearchableTextView selectionRect]):
+        new method (moved here from Safari) to return a single rect encompassing all selected text
+        (-[WebSearchableTextView pasteboardTypesForSelection]):
+        moved here from WebTextView
+        (-[WebSearchableTextView writeSelectionWithPasteboardTypes:toPasteboard:]):
+        ditto
+        
+        * WebView.subproj/WebDocumentInternal.h:
+        moved WebDocumentSelection protocol out of here
+        
+        * WebView.subproj/WebDocumentPrivate.h:
+        moved WebDocumentSelection protocol into here, added selectionRect method
+        
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView selectionRect]):
+        new method, calls existing bridge method formerly called by _selectionRect
+        (-[WebHTMLView _selectionRect]):
+        now calls [self selectionRect]. We can't just delete _selectionRect because it's used by Mail.
+        
+        * WebView.subproj/WebHTMLViewPrivate.h:
+        removed _selectionRect since it's in WebDocumentSelection now
+        
+        * WebView.subproj/WebTextView.h:
+        removed WebDocumentSelection from protocol list since it's in superclass now
+        
+        * WebView.subproj/WebTextView.m:
+        removed old WebDocumentSelection methods because they are in superclass now
+
 2005-07-15  Adele Peterson  <adele@apple.com>
 
         Written by Trey Matteson  <trey@usa.net>

diff --git a/WebKit/Misc.subproj/WebSearchableTextView.h b/WebKit/Misc.subproj/WebSearchableTextView.h
index cd9bf55..ad2c9b9 100644 (file)
--- a/WebKit/Misc.subproj/WebSearchableTextView.h
+++ b/WebKit/Misc.subproj/WebSearchableTextView.h
@@ -29,6 +29,7 @@
 #import <Cocoa/Cocoa.h>
 
 @protocol WebDocumentSearching;
+@protocol WebDocumentSelection;
 
-@interface WebSearchableTextView : NSTextView <WebDocumentSearching>
+@interface WebSearchableTextView : NSTextView <WebDocumentSearching, WebDocumentSelection>
 @end

diff --git a/WebKit/Misc.subproj/WebSearchableTextView.m b/WebKit/Misc.subproj/WebSearchableTextView.m
index bc307a3..68422ea 100644 (file)
--- a/WebKit/Misc.subproj/WebSearchableTextView.m
+++ b/WebKit/Misc.subproj/WebSearchableTextView.m
@@ -27,7 +27,7 @@
  */
 
 #import "WebSearchableTextView.h"
-#import "WebDocument.h"
+#import "WebDocumentPrivate.h"
 
 @interface NSString (_Web_StringTextFinding)
 - (NSRange)findString:(NSString *)string selectedRange:(NSRange)selectedRange options:(unsigned)mask wrap:(BOOL)wrapFlag;
@@ -77,6 +77,47 @@
     }
 }
 
+- (NSRect)selectionRect
+{
+    // Note that this method would work for any NSTextView; some day we might want to use it
+    // for an NSTextView that isn't a WebTextView.
+    NSRect result = NSZeroRect;
+    
+    // iterate over multiple selected ranges
+    NSEnumerator *rangeEnumerator = [[self selectedRanges] objectEnumerator];
+    NSValue *rangeAsValue;
+    while ((rangeAsValue = [rangeEnumerator nextObject]) != nil) {
+        NSRange range = [rangeAsValue rangeValue];
+        unsigned rectCount;
+        NSRectArray rectArray = [[self layoutManager] rectArrayForCharacterRange:range 
+                                                    withinSelectedCharacterRange:range 
+                                                                 inTextContainer:[self textContainer] 
+                                                                       rectCount:&rectCount];
+        unsigned i;
+        // iterate over multiple rects in each selected range
+        for (i = 0; i < rectCount; ++i) {
+            NSRect rect = rectArray[i];
+            if (NSEqualRects(result, NSZeroRect)) {
+                result = rect;
+            } else {
+                result = NSUnionRect(result, rect);
+            }
+        }
+    }
+    
+    return result;
+}
+
+- (NSArray *)pasteboardTypesForSelection
+{
+    return [self writablePasteboardTypes];
+}
+
+- (void)writeSelectionWithPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard
+{
+    [self writeSelectionToPasteboard:pasteboard types:types];
+}
+
 @end
 
 @implementation NSString (_Web_StringTextFinding)

diff --git a/WebKit/WebView.subproj/WebDocumentInternal.h b/WebKit/WebView.subproj/WebDocumentInternal.h
index d435922..16de340 100644 (file)
--- a/WebKit/WebView.subproj/WebDocumentInternal.h
+++ b/WebKit/WebView.subproj/WebDocumentInternal.h
@@ -50,8 +50,3 @@
 @protocol WebDocumentElement <NSObject>
 - (NSDictionary *)elementAtPoint:(NSPoint)point;
 @end
-
-@protocol WebDocumentSelection <NSObject>
-- (NSArray *)pasteboardTypesForSelection;
-- (void)writeSelectionWithPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard;
-@end

diff --git a/WebKit/WebView.subproj/WebDocumentPrivate.h b/WebKit/WebView.subproj/WebDocumentPrivate.h
index f153175..1f051a3 100644 (file)
--- a/WebKit/WebView.subproj/WebDocumentPrivate.h
+++ b/WebKit/WebView.subproj/WebDocumentPrivate.h
@@ -38,3 +38,9 @@
 @protocol WebDocumentDOM <NSObject>
 - (DOMDocument *)DOMDocument;
 @end
+
+@protocol WebDocumentSelection <NSObject>
+- (NSArray *)pasteboardTypesForSelection;
+- (void)writeSelectionWithPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard;
+- (NSRect)selectionRect;
+@end

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index faff4f2..529819b 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1439,11 +1439,6 @@ static WebHTMLView *lastHitView = nil;
     [super _web_layoutIfNeededRecursive:displayRect testDirtyRect:NO];
 }
 
-- (NSRect)_selectionRect
-{
-    return [[self _bridge] selectionRect];
-}
-
 - (void)_startAutoscrollTimer: (NSEvent *)triggerEvent
 {
     if (_private->autoscrollTimer == nil) {
@@ -1453,6 +1448,13 @@ static WebHTMLView *lastHitView = nil;
     }
 }
 
+// FIXME: _selectionRect is deprecated in favor of selectionRect, which is in protocol WebDocumentSelection.
+// We can't remove this yet because it's still in use by Mail.
+- (NSRect)_selectionRect
+{
+    return [self selectionRect];
+}
+
 - (void)_stopAutoscrollTimer
 {
     NSTimer *timer = _private->autoscrollTimer;
@@ -1867,6 +1869,11 @@ static WebHTMLView *lastHitView = nil;
     [[self _bridge] jumpToSelection];
 }
 
+- (NSRect)selectionRect
+{
+    return [[self _bridge] selectionRect];
+}
+
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item 
 {
     SEL action = [item action];

diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 5b0d6b7..ef4f6b4 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -65,6 +65,8 @@
 
 - (WebPluginController *)_pluginController;
 
+// FIXME: _selectionRect is deprecated in favor of selectionRect, which is in protocol WebDocumentSelection.
+// We can't remove this yet because it's still in use by Mail.
 - (NSRect)_selectionRect;
 
 - (void)_startAutoscrollTimer:(NSEvent *)event;

diff --git a/WebKit/WebView.subproj/WebTextView.h b/WebKit/WebView.subproj/WebTextView.h
index 911958a..a2d779b 100644 (file)
--- a/WebKit/WebView.subproj/WebTextView.h
+++ b/WebKit/WebView.subproj/WebTextView.h
@@ -31,7 +31,7 @@
 
 @class WebDataSource;
 
-@interface WebTextView : WebSearchableTextView <WebDocumentView, WebDocumentText, WebDocumentElement, WebDocumentSelection>
+@interface WebTextView : WebSearchableTextView <WebDocumentView, WebDocumentText, WebDocumentElement>
 {
     float _textSizeMultiplier;
 }

diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index b46acc3..9b8842a 100644 (file)
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -339,16 +339,6 @@
     return [webView _menuForElement:[self _elementAtWindowPoint:[event locationInWindow]] defaultItems:nil];
 }
 
-- (NSArray *)pasteboardTypesForSelection
-{
-    return [self writablePasteboardTypes];
-}
-
-- (void)writeSelectionWithPasteboardTypes:(NSArray *)types toPasteboard:(NSPasteboard *)pasteboard
-{
-    [self writeSelectionToPasteboard:pasteboard types:types];
-}
-
 // This approach could be relaxed when dealing with 3228554
 - (BOOL)resignFirstResponder
 {