[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit bd2e992e80ae7c67994926e4fab42c01a5cf97df
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 3 15:22:34 2004 +0000

            Reviewed by John
    
            Fix for these bugs:
    
            <rdar://problem/3675806>: "Make API name change for -webViewShouldBeginEditing:inDOMRange:"
            <rdar://problem/3675809>: "Make API name change for -webViewShouldEndEditing:inDOMRange:"
    
            New names are -webView:shouldBeginEditingInDOMRange: and -webView:shouldEndEditingInDOMRange:,
            respectively.
    
            * WebView.subproj/WebDefaultEditingDelegate.m:
            (-[WebDefaultEditingDelegate webView:shouldBeginEditingInDOMRange:]):
            (-[WebDefaultEditingDelegate webView:shouldEndEditingInDOMRange:]):
            * WebView.subproj/WebEditingDelegate.h:
            * WebView.subproj/WebView.m:
            (-[WebView _shouldBeginEditingInDOMRange:]):
            (-[WebView _shouldEndEditingInDOMRange:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6753 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f8432c3..ebb09b6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2004-06-02  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by John
+
+        Fix for these bugs:
+        
+        <rdar://problem/3675806>: "Make API name change for -webViewShouldBeginEditing:inDOMRange:"
+        <rdar://problem/3675809>: "Make API name change for -webViewShouldEndEditing:inDOMRange:"
+
+        New names are -webView:shouldBeginEditingInDOMRange: and -webView:shouldEndEditingInDOMRange:, 
+        respectively.
+
+        * WebView.subproj/WebDefaultEditingDelegate.m:
+        (-[WebDefaultEditingDelegate webView:shouldBeginEditingInDOMRange:]):
+        (-[WebDefaultEditingDelegate webView:shouldEndEditingInDOMRange:]):
+        * WebView.subproj/WebEditingDelegate.h:
+        * WebView.subproj/WebView.m:
+        (-[WebView _shouldBeginEditingInDOMRange:]):
+        (-[WebView _shouldEndEditingInDOMRange:]):
+
 2004-06-02  Richard Williamson   <rjw at apple.com>
 
 		conformsToProtocol:@protocol(WebPlugin) becomes
diff --git a/WebKit/WebView.subproj/WebDefaultEditingDelegate.m b/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
index c4d0663..f6bcd05 100644
--- a/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
@@ -22,12 +22,12 @@ static WebDefaultEditingDelegate *sharedDelegate = nil;
     return sharedDelegate;
 }
 
-- (BOOL)webViewShouldBeginEditing:(WebView *)webView inDOMRange:(DOMRange *)range
+- (BOOL)webView:(WebView *)webView shouldBeginEditingInDOMRange:(DOMRange *)range
 {
     return YES;
 }
 
-- (BOOL)webViewShouldEndEditing:(WebView *)webView inDOMRange:(DOMRange *)range
+- (BOOL)webView:(WebView *)webView shouldEndEditingInDOMRange:(DOMRange *)range
 {
     return YES;
 }
diff --git a/WebKit/WebView.subproj/WebEditingDelegate.h b/WebKit/WebView.subproj/WebEditingDelegate.h
index 74f0599..a9086ba 100644
--- a/WebKit/WebView.subproj/WebEditingDelegate.h
+++ b/WebKit/WebView.subproj/WebEditingDelegate.h
@@ -18,8 +18,8 @@ typedef enum {
 } WebViewInsertAction;
 
 @interface NSObject (WebViewEditingDelegate)
-- (BOOL)webViewShouldBeginEditing:(WebView *)webView inDOMRange:(DOMRange *)range;
-- (BOOL)webViewShouldEndEditing:(WebView *)webView inDOMRange:(DOMRange *)range;
+- (BOOL)webView:(WebView *)webView shouldBeginEditingInDOMRange:(DOMRange *)range;
+- (BOOL)webView:(WebView *)webView shouldEndEditingInDOMRange:(DOMRange *)range;
 - (BOOL)webView:(WebView *)webView shouldInsertNode:(DOMNode *)node replacingDOMRange:(DOMRange *)range givenAction:(WebViewInsertAction)action;
 - (BOOL)webView:(WebView *)webView shouldInsertText:(NSString *)text replacingDOMRange:(DOMRange *)range givenAction:(WebViewInsertAction)action;
 - (BOOL)webView:(WebView *)webView shouldDeleteDOMRange:(DOMRange *)range;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index a2dafe7..72bf367 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -2351,12 +2351,12 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
 
 - (BOOL)_shouldBeginEditingInDOMRange:(DOMRange *)range
 {
-    return [[self _editingDelegateForwarder] webViewShouldBeginEditing:self inDOMRange:range];
+    return [[self _editingDelegateForwarder] webView:self shouldBeginEditingInDOMRange:range];
 }
 
 - (BOOL)_shouldEndEditingInDOMRange:(DOMRange *)range
 {
-    return [[self _editingDelegateForwarder] webViewShouldEndEditing:self inDOMRange:range];
+    return [[self _editingDelegateForwarder] webView:self shouldEndEditingInDOMRange:range];
 }
 
 - (void)setSelectedDOMRange:(DOMRange *)range affinity:(NSSelectionAffinity)selectionAffinity

-- 
WebKit Debian packaging