Changeset 18331 in webkit

Timestamp:

Dec 19, 2006, 5:07:15 PM (18 years ago)

Author:

sullivan

Message:

Reviewed by Darin

• fix for unrepro infinite recursion bug: <rdar://problem/4448181> CrashTracer: 154 crashes in Safari at com.apple.AppKit: -[NSView isDescendantOf:] + 24; infinite recursion in makeFirstResponder logic

• WebView/WebView.mm: added becomingFirstResponder BOOL to private struct (-[WebView becomeFirstResponder]): use _private->becomingFirstResponder to guard against infinite recursion; complain on debug builds if we run into this problem

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (4 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-12-19  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Darin
+
+        - fix for unrepro infinite recursion bug:
+        <rdar://problem/4448181> CrashTracer: 154 crashes in Safari at com.apple.AppKit: 
+        -[NSView isDescendantOf:] + 24; infinite recursion in makeFirstResponder logic
+
+        * WebView/WebView.mm:
+        added becomingFirstResponder BOOL to private struct
+        (-[WebView becomeFirstResponder]):
+        use _private->becomingFirstResponder to guard against infinite recursion; complain on
+        debug builds if we run into this problem
+
 2006-12-19  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebKit/WebView/WebView.mm

@@ -295 +295 @@
     BOOL tabKeyCyclesThroughElements;
     BOOL tabKeyCyclesThroughElementsChanged;
+    BOOL becomingFirstResponder;
 
     NSColor *backgroundColor;
@@ -2483 +2484 @@
 - (BOOL)becomeFirstResponder
 {
+    if (_private->becomingFirstResponder) {
+        // Fix for unrepro infinite recursion reported in radar 4448181. If we hit this assert on
+        // a debug build, we should figure out what causes the problem and do a better fix.
+        ASSERT_NOT_REACHED();
+        return NO;
+    }
+    
     // This works together with setNextKeyView to splice the WebView into
     // the key loop similar to the way NSScrollView does this. Note that
@@ -2492 +2500 @@
         NSView *previousValidKeyView = [self previousValidKeyView];
         if ((previousValidKeyView != self) && (previousValidKeyView != mainFrameView)) {
+            _private->becomingFirstResponder = YES;
             [window makeFirstResponder:previousValidKeyView];
+            _private->becomingFirstResponder = NO;
             return YES;
         } else {
@@ -2500 +2510 @@
     
     if ([mainFrameView acceptsFirstResponder]) {
+        _private->becomingFirstResponder = YES;
         [window makeFirstResponder:mainFrameView];
+        _private->becomingFirstResponder = NO;
         return YES;
     }