[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 8fde38d058f92e4b4ca63e2900d1f8b19f2a5abf
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 31 16:46:16 2003 +0000

    WebCore:
    
            Reviewed by Darin
    
    	Fix for this bug:
    
    	<rdar://problem/3469088>: focus not removed from text link
    	when user hits cmd-L or clicks in window chrome
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge deselectAll]): Now clears the focus ring as well.
            (-[WebCoreBridge deselectText]): Just clears text selection.
    
    WebKit:
    
            Reviewed by Darin
    
            Fix for this bug:
    
            <rdar://problem/3469088>: focus not removed from text link
    	when user hits cmd-L or clicks in window chrome
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView deselectText]): Added new method just to deselect text.
            (-[WebHTMLView resignFirstResponder]): Just deseclect text if we
    	are doing a programmatic setting of focus. Deselect all otherwise.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5339 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 756c2ed..20309ee 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-10-31  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+	Fix for this bug:
+
+	<rdar://problem/3469088>: focus not removed from text link 
+	when user hits cmd-L or clicks in window chrome
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge deselectAll]): Now clears the focus ring as well.
+        (-[WebCoreBridge deselectText]): Just clears text selection.
+
 2003-10-31  David Hyatt  <hyatt at apple.com>
 
 	Three simple fixes:
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 91d4f9a..66e5750 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -198,6 +198,7 @@ typedef enum {
 
 - (void)selectAll;
 - (void)deselectAll;
+- (void)deselectText;
 
 - (NSRect)selectionRect;
 - (NSRect)visibleSelectionRect;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index e6b4f3c..9ed502d 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -340,6 +340,15 @@ static bool initializedObjectCacheSize = FALSE;
 
 - (void)deselectAll
 {
+    [self deselectText];
+    DocumentImpl *doc = _part->xmlDocImpl();
+    if (doc) {
+        doc->setFocusNode(0);
+    }
+}
+
+- (void)deselectText
+{
     _part->slotClearSelection();
 }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5e818f3..94053bf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-10-31  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+        Fix for this bug:
+
+        <rdar://problem/3469088>: focus not removed from text link         
+	when user hits cmd-L or clicks in window chrome
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView deselectText]): Added new method just to deselect text.
+        (-[WebHTMLView resignFirstResponder]): Just deseclect text if we
+	are doing a programmatic setting of focus. Deselect all otherwise.
+
 2003-10-30  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3458368>: drawing to the screen while window hidden: http://www.bhphotovideo.com/
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 9c15397..a2ec8e2 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1252,6 +1252,11 @@ static WebHTMLView *lastHitView = nil;
     [[self _bridge] deselectAll];
 }
 
+- (void)deselectText
+{
+    [[self _bridge] deselectText];
+}
+
 - (BOOL)isOpaque
 {
     return YES;
@@ -1587,7 +1592,12 @@ static WebHTMLView *lastHitView = nil;
 {
     BOOL resign = [super resignFirstResponder];
     if (resign) {
-        [self deselectAll];
+        if ([[self _webView] _isPerformingProgrammaticFocus]) {
+            [self deselectText];
+        }
+        else {
+            [self deselectAll];
+        }
         [self updateTextBackgroundColor];
     }
     return resign;

-- 
WebKit Debian packaging