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

[John]

sullivan    05/07/22 14:52:11

  Modified:    .        ChangeLog
               WebView.subproj WebView.m
  Log:
          Reviewed by Justin Garcia.
  
          Mail (running on tip of tree WebKit) was running into an assertion I recently added.
          The assertion is actually correct, catching an old bug in this code.
  
          * WebView.subproj/WebView.m:
          (-[WebView selectedFrame]):
          if the first responder is a WebFrameView, then we've found the WebFrameView we're
          looking for, and we shouldn't look at its superviews.
  
  Revision  Changes    Path
  1.3251    +12 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3250
  retrieving revision 1.3251
  diff -u -r1.3250 -r1.3251
  --- ChangeLog	22 Jul 2005 18:09:23 -0000	1.3250
  +++ ChangeLog	22 Jul 2005 21:52:08 -0000	1.3251
  @@ -1,5 +1,17 @@
   2005-07-22  John Sullivan  <sullivan at apple.com>
   
  +        Reviewed by Justin Garcia.
  +        
  +        Mail (running on tip of tree WebKit) was running into an assertion I recently added.
  +        The assertion is actually correct, catching an old bug in this code.
  +
  +        * WebView.subproj/WebView.m:
  +        (-[WebView selectedFrame]):
  +        if the first responder is a WebFrameView, then we've found the WebFrameView we're 
  +        looking for, and we shouldn't look at its superviews.
  +
  +2005-07-22  John Sullivan  <sullivan at apple.com>
  +
           Reviewed by Chris Blumenberg.
   
           - some changes in the direction of weaning all the form-related SPI from NSView
  
  
  
  1.296     +3 -1      WebKit/WebView.subproj/WebView.m
  
  Index: WebView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
  retrieving revision 1.295
  retrieving revision 1.296
  diff -u -r1.295 -r1.296
  --- WebView.m	20 Jul 2005 18:30:15 -0000	1.295
  +++ WebView.m	22 Jul 2005 21:52:11 -0000	1.296
  @@ -2548,7 +2548,9 @@
       // where the focused frame doesn't actually contain a selection.
       NSResponder *resp = [[self window] firstResponder];
       if (resp && [resp isKindOfClass:[NSView class]] && [(NSView *)resp isDescendantOf:self]) {
  -        WebFrameView *frameView = (WebFrameView *)[(NSView *)resp _web_superviewOfClass:[WebFrameView class]];
  +        WebFrameView *frameView = [resp isKindOfClass:[WebFrameView class]] 
  +            ? (WebFrameView *)resp 
  +            : (WebFrameView *)[(NSView *)resp _web_superviewOfClass:[WebFrameView class]];
           ASSERT(frameView != nil);
   #ifndef NDEBUG
           WebFrame *frameWithSelection = [self _findSelectedFrame];