[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit cc0db6ca0a31781de7375e5b0fbadecaad47e96a
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 29 20:02:10 2010 +0000

    <rdar://problem/8758191> REGRESSION (r72887): Mail crashes when doing searches in a message due to method name conflict
    https://bugs.webkit.org/show_bug.cgi?id=51717
    
    Reviewed by Ada Chan.
    
    Renamed -findString:options: to -_findString:options: in the WebDocumentOptionsSearching
    protocol to avoid conflict with -[WebHTMLView(MailExtras) findString:options:] which Mail defines.
    
    * WebView/WebDocumentInternal.h:
    * WebView/WebHTMLView.mm:
    (-[WebHTMLView searchFor:direction:caseSensitive:wrap:startInSelection:]):
    (-[WebHTMLView _findString:options:]):
    * WebView/WebView.mm:
    (findString):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74751 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 7221dca..7d96b65 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-29  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Ada Chan.
+
+        <rdar://problem/8758191> REGRESSION (r72887): Mail crashes when doing searches in a message due to method name conflict
+        https://bugs.webkit.org/show_bug.cgi?id=51717
+
+        Renamed -findString:options: to -_findString:options: in the WebDocumentOptionsSearching
+        protocol to avoid conflict with -[WebHTMLView(MailExtras) findString:options:] which Mail defines.
+
+        * WebView/WebDocumentInternal.h:
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView searchFor:direction:caseSensitive:wrap:startInSelection:]):
+        (-[WebHTMLView _findString:options:]):
+        * WebView/WebView.mm:
+        (findString):
+
 2010-12-28  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/mac/WebView/WebDocumentInternal.h b/WebKit/mac/WebView/WebDocumentInternal.h
index 4bf11d1..bcb6c07 100644
--- a/WebKit/mac/WebView/WebDocumentInternal.h
+++ b/WebKit/mac/WebView/WebDocumentInternal.h
@@ -68,7 +68,8 @@
 @end
 
 @protocol WebDocumentOptionsSearching <NSObject>
-- (BOOL)findString:(NSString *)string options:(WebFindOptions)options;
+// Prefixed with an underscore to avoid conflict with Mail's -[WebHTMLView(MailExtras) findString:options:].
+- (BOOL)_findString:(NSString *)string options:(WebFindOptions)options;
 @end
 
 /* Used to save and restore state in the view, typically when going back/forward */
diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm
index 3e8be9a..5ddbccc 100644
--- a/WebKit/mac/WebView/WebHTMLView.mm
+++ b/WebKit/mac/WebView/WebHTMLView.mm
@@ -6281,7 +6281,7 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
 
 - (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag startInSelection:(BOOL)startInSelection
 {
-    return [self findString:string options:(forward ? 0 : WebFindOptionsBackwards) | (caseFlag ? 0 : WebFindOptionsCaseInsensitive) | (startInSelection ? WebFindOptionsStartInSelection : 0)];
+    return [self _findString:string options:(forward ? 0 : WebFindOptionsBackwards) | (caseFlag ? 0 : WebFindOptionsCaseInsensitive) | (startInSelection ? WebFindOptionsStartInSelection : 0)];
 }
 
 @end
@@ -6352,7 +6352,7 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
     return result;
 }
 
-- (BOOL)findString:(NSString *)string options:(WebFindOptions)options
+- (BOOL)_findString:(NSString *)string options:(WebFindOptions)options
 {
     if (![string length])
         return NO;
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index bd13ff0..96ea7d0 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -4286,7 +4286,7 @@ static WebFrame *incrementFrame(WebFrame *frame, WebFindOptions options = 0)
 static BOOL findString(NSView <WebDocumentSearching> *searchView, NSString *string, WebFindOptions options)
 {
     if ([searchView conformsToProtocol:@protocol(WebDocumentOptionsSearching)])
-        return [(NSView <WebDocumentOptionsSearching> *)searchView findString:string options:options];
+        return [(NSView <WebDocumentOptionsSearching> *)searchView _findString:string options:options];
     if ([searchView conformsToProtocol:@protocol(WebDocumentIncrementalSearching)])
         return [(NSView <WebDocumentIncrementalSearching> *)searchView searchFor:string direction:!(options & WebFindOptionsBackwards) caseSensitive:!(options & WebFindOptionsCaseInsensitive) wrap:!!(options & WebFindOptionsWrapAround) startInSelection:!!(options & WebFindOptionsStartInSelection)];
     return [searchView searchFor:string direction:!(options & WebFindOptionsBackwards) caseSensitive:!(options & WebFindOptionsCaseInsensitive) wrap:!!(options & WebFindOptionsWrapAround)];

-- 
WebKit Debian packaging