[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:26:57 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit f99ca23d89bbc598ed838abc37c1eef6d53958dd
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 20:14:19 2002 +0000

            Support for find in HTML, find in text view coming soon.
    
            * WebView.subproj/WebDocument.h:
            * WebView.subproj/WebHTMLView.h:
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView searchFor:direction:caseSensitive:]):
            * WebView.subproj/WebTextView.h:
            * WebView.subproj/WebTextView.m:
            (-[WebTextView searchFor:direction:caseSensitive:]):
    
            Support for find in HTML.
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge searchFor:direction:caseSensitive:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 127a694..a42e274 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-07-24  Richard Williamson (Local)  <rjw at apple.com>
+
+        Support for find in HTML.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge searchFor:direction:caseSensitive:]):
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
 	- fixed 2949235 -- checkboxes in wrong place until you scroll away and back
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 127a694..a42e274 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-07-24  Richard Williamson (Local)  <rjw at apple.com>
+
+        Support for find in HTML.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge searchFor:direction:caseSensitive:]):
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
 	- fixed 2949235 -- checkboxes in wrong place until you scroll away and back
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 127a694..a42e274 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-07-24  Richard Williamson (Local)  <rjw at apple.com>
+
+        Support for find in HTML.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge searchFor:direction:caseSensitive:]):
+
 2002-07-24  Darin Adler  <darin at apple.com>
 
 	- fixed 2949235 -- checkboxes in wrong place until you scroll away and back
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 16248dd..7b96264 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -117,6 +117,8 @@ typedef khtml::RenderPart KHTMLRenderPart;
 
 - (NSDictionary *)elementInfoAtPoint:(NSPoint)point;
 
+- (BOOL)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
+
 @end
 
 // The WebCoreBridge protocol contains methods for use by the WebCore side of the bridge.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 100673c..003cbbf 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -438,4 +438,9 @@ using namespace khtml;
 }
 
 
+- (BOOL)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
+{
+    return part->findTextNext (QString::fromCFString((CFStringRef)string), forward, caseFlag, FALSE);
+}
+
 @end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fe8c089..9735d56 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-07-24  Richard Williamson (Local)  <rjw at apple.com>
+
+        Support for find in HTML, find in text view coming soon.
+        
+        * WebView.subproj/WebDocument.h:
+        * WebView.subproj/WebHTMLView.h:
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView searchFor:direction:caseSensitive:]):
+        * WebView.subproj/WebTextView.h:
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView searchFor:direction:caseSensitive:]):
+
 2002-07-23  Chris Blumenberg  <cblu at apple.com>
 
 	More plumbing for contextual menu support.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fe8c089..9735d56 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-07-24  Richard Williamson (Local)  <rjw at apple.com>
+
+        Support for find in HTML, find in text view coming soon.
+        
+        * WebView.subproj/WebDocument.h:
+        * WebView.subproj/WebHTMLView.h:
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView searchFor:direction:caseSensitive:]):
+        * WebView.subproj/WebTextView.h:
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView searchFor:direction:caseSensitive:]):
+
 2002-07-23  Chris Blumenberg  <cblu at apple.com>
 
 	More plumbing for contextual menu support.
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 232a685..153e1d5 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -23,7 +23,7 @@
 @end
 
 @protocol WebDocumentSearching
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
+- (BOOL)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
 @end
 
 @protocol WebDocumentRepresentation <NSObject>
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index 3a10a83..0daf347 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -66,10 +66,6 @@
 // Remove the selection.
 - (void)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)caseFlag;
-
 // Get an attributed string that represents the current selection.
 - (NSAttributedString *)selectedText;
 
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index a25c7d4..46fc99f 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -259,9 +259,9 @@
 
 // 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)caseFlag
+- (BOOL)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
 {
-    [NSException raise:WebMethodNotYetImplemented format:@"WebView::searchFor:direction:caseSensitive: is not implemented"];
+    return [[self _bridge] searchFor: string direction: forward caseSensitive: caseFlag];
 }
 
 
diff --git a/WebKit/WebView.subproj/WebTextView.h b/WebKit/WebView.subproj/WebTextView.h
index 5c7b436..4331fe8 100644
--- a/WebKit/WebView.subproj/WebTextView.h
+++ b/WebKit/WebView.subproj/WebTextView.h
@@ -26,6 +26,4 @@
 - (void)setCanDragTo: (BOOL)flag;
 - (BOOL)canDragTo;
 
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
-
 @end
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index c7d36f5..ae5a73f 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -78,8 +78,9 @@
     return canDragTo;
 }
 
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
+- (BOOL)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
 {
+    return NO;
 }
 
 @end

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list