[webkit-changes] cvs commit: WebKit/WebView.subproj WebFrameView.m

[John]

sullivan    05/07/29 14:01:38

  Modified:    .        ChangeLog
               WebView.subproj WebFrameView.m
  Log:
          Reviewed by Chris Blumenberg.
  
          * WebView.subproj/WebFrameView.m:
          (-[WebFrameView _firstResponderIsFormControl]):
          renamed from _firstResponderIsControl for clarity. Explicitly rejects WebHTMLView, since
          it's now a control.
          (-[WebFrameView keyDown:]):
          updated for renamed method.
  
  Revision  Changes    Path
  1.3265    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3264
  retrieving revision 1.3265
  diff -u -r1.3264 -r1.3265
  --- ChangeLog	28 Jul 2005 20:30:35 -0000	1.3264
  +++ ChangeLog	29 Jul 2005 21:01:35 -0000	1.3265
  @@ -1,3 +1,14 @@
  +2005-07-29  John Sullivan  <sullivan at apple.com>
  +
  +        Reviewed by Chris Blumenberg.
  +
  +        * WebView.subproj/WebFrameView.m:
  +        (-[WebFrameView _firstResponderIsFormControl]):
  +        renamed from _firstResponderIsControl for clarity. Explicitly rejects WebHTMLView, since
  +        it's now a control.
  +        (-[WebFrameView keyDown:]):
  +        updated for renamed method.
  +
   2005-07-28  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Beth Dakin.
  
  
  
  1.185     +9 -3      WebKit/WebView.subproj/WebFrameView.m
  
  Index: WebFrameView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebFrameView.m,v
  retrieving revision 1.184
  retrieving revision 1.185
  diff -u -r1.184 -r1.185
  --- WebFrameView.m	13 Jun 2005 03:28:08 -0000	1.184
  +++ WebFrameView.m	29 Jul 2005 21:01:37 -0000	1.185
  @@ -626,9 +626,15 @@
       [self _scrollLineVertically:NO];
   }
   
  -- (BOOL)_firstResponderIsControl
  +- (BOOL)_firstResponderIsFormControl
   {
  -    return [[[self window] firstResponder] isKindOfClass:[NSControl class]];
  +    NSResponder *firstResponder = [[self window] firstResponder];
  +    
  +    // WebHTMLView is an NSControl subclass these days, but it's not a form control
  +    if ([firstResponder isKindOfClass:[WebHTMLView class]]) {
  +        return NO;
  +    }
  +    return [firstResponder isKindOfClass:[NSControl class]];
   }
   
   - (void)keyDown:(NSEvent *)event
  @@ -659,7 +665,7 @@
                   // Checking for a control will allow events to percolate 
                   // correctly when the focus is on a form control and we
                   // are in full keyboard access mode.
  -                if (![self allowsScrolling] || [self _firstResponderIsControl]) {
  +                if (![self allowsScrolling] || [self _firstResponderIsFormControl]) {
                       callSuper = YES;
                       break;
                   }