Changeset 15487 in webkit

Timestamp:

Jul 17, 2006 12:38:48 PM (18 years ago)

Author:

justing

Message:

LayoutTests:

Reviewed by levi

• editing/selection/drag-to-contenteditable-iframe-expected.txt:
• editing/selection/subframe-with-selection-expected.txt:

WebKit:

Reviewed by levi

Rolled the first fix for:
<​http://bugzilla.opendarwin.org/show_bug.cgi?id=9642>
GMail Editor: Operations that use drop down menus blow away the selection
back in and removed the call to _clearSelectionInOtherFrames from
-[WebHTMLView becomeFirstResponder] to fix the bug.

• WebView/WebHTMLView.m: (-[NSArray maintainsInactiveSelection]): (-[NSArray becomeFirstResponder]):
• WebView/WebView.m: (-[WebView maintainsInactiveSelection]):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebView/WebHTMLView.m (modified) (4 diffs)
• WebKit/WebView/WebView.m (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-07-14  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by levi
+
+        * editing/selection/drag-to-contenteditable-iframe-expected.txt:
+        * editing/selection/subframe-with-selection-expected.txt:
+
 2006-07-17  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-07-17  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by levi
+        
+        Rolled the first fix for:
+        <http://bugzilla.opendarwin.org/show_bug.cgi?id=9642>
+        GMail Editor: Operations that use drop down menus blow away the selection
+        back in and removed the call to _clearSelectionInOtherFrames from 
+        -[WebHTMLView becomeFirstResponder] to fix the bug.
+
+        * WebView/WebHTMLView.m:
+        (-[NSArray maintainsInactiveSelection]):
+        (-[NSArray becomeFirstResponder]):
+        * WebView/WebView.m:
+        (-[WebView maintainsInactiveSelection]):
+
 2006-07-15  Darin Adler  <darin@apple.com>
 

trunk/WebKit/WebView/WebHTMLView.m

@@ -2206 +2206 @@
 - (BOOL)maintainsInactiveSelection
 {
-    // This method helps to determing whether the view should maintain
-    // an inactive selection when the view is not first responder.
+    // This method helps to determine whether the WebHTMLView should maintain
+    // an inactive selection when it's not first responder.
     // Traditionally, these views have not maintained such selections,
     // clearing them when the view was not first responder. However,
@@ -2214 +2214 @@
     //                            when they're not firstResponder"
     // it was decided to add a switch to act more like an NSTextView.
-    // For now, however, the view only acts in this way when the
-    // web view is set to be editable. This will maintain traditional
-    // behavior for WebKit clients dating back to before this change,
-    // and will likely be a decent switch for the long term, since
-    // clients to ste the web view to be editable probably want it
-    // to act like a "regular" Cocoa view in terms of its selection
-    // behavior.
     id nextResponder = [[self window] _newFirstResponderAfterResigning];
 
@@ -2241 +2234 @@
         return YES;
 
-    if (![[self _webView] maintainsInactiveSelection])
-        return NO;
-    
-    // editable views lose selection when losing first responder status
-    // to a widget in the same page, but not otherwise
-    BOOL loseSelection = [nextResponder isKindOfClass:[NSView class]]
-        && [nextResponder isDescendantOf:[self _webView]];
-
-    return !loseSelection;
+    return [[self _webView] maintainsInactiveSelection] || [[self _bridge] isSelectionEditable];
 }
 
@@ -2993 +2978 @@
     if (view)
         [[self window] makeFirstResponder:view];
-    [[self _frame] _clearSelectionInOtherFrames];
     [self _updateActiveState];
     [self _updateFontPanel];

trunk/WebKit/WebView/WebView.m

@@ -3049 +3049 @@
 - (BOOL)maintainsInactiveSelection
 {
-    return [self isEditable];
+    return NO;
 }