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

[John]

sullivan    06/01/06 13:09:55

  Modified:    .        ChangeLog
               WebView.subproj WebPDFView.m
  Log:
          Reviewed by Vicki Murley (full credit) and Tim Omernick (half credit).
  
          - fixed <rdar://problem/4401102> REGRESSION (420+): When displaying a PDF, tabbing around stops working after reaching page
  
          * WebView.subproj/WebPDFView.m:
          (-[WebPDFView setNextKeyView:]):
          Use [PDFSubview documentView] rather than PDFSubview here, since that's the view that we now hand off first-responderhood to.
  
  Revision  Changes    Path
  1.3447    +10 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3446
  retrieving revision 1.3447
  diff -u -r1.3446 -r1.3447
  --- ChangeLog	6 Jan 2006 05:57:20 -0000	1.3446
  +++ ChangeLog	6 Jan 2006 21:09:43 -0000	1.3447
  @@ -1,3 +1,13 @@
  +2006-01-06  John Sullivan  <sullivan at apple.com>
  +
  +        Reviewed by Vicki Murley (full credit) and Tim Omernick (half credit).
  +        
  +        - fixed <rdar://problem/4401102> REGRESSION (420+): When displaying a PDF, tabbing around stops working after reaching page
  +
  +        * WebView.subproj/WebPDFView.m:
  +        (-[WebPDFView setNextKeyView:]):
  +        Use [PDFSubview documentView] rather than PDFSubview here, since that's the view that we now hand off first-responderhood to.
  +
   2006-01-05  Tim Omernick  <timo at apple.com>
   
           Reviewed by Geoff.
  
  
  
  1.35      +13 -4     WebKit/WebView.subproj/WebPDFView.m
  
  Index: WebPDFView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebPDFView.m,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- WebPDFView.m	6 Jan 2006 00:12:03 -0000	1.34
  +++ WebPDFView.m	6 Jan 2006 21:09:54 -0000	1.35
  @@ -822,10 +822,19 @@
   - (void)setNextKeyView:(NSView *)aView
   {
       // This works together with becomeFirstResponder to splice PDFSubview into
  -    // the key loop similar to the way NSScrollView does this.
  -    if (PDFSubview)
  -        [PDFSubview setNextKeyView:aView];
  -    else
  +    // the key loop similar to the way NSScrollView and NSClipView do this.
  +    NSView *documentView = [PDFSubview documentView];
  +    if (documentView) {
  +        [documentView setNextKeyView:aView];
  +        
  +        // We need to make the documentView be the next view in the keyview loop.
  +        // It would seem more sensible to do this in our init method, but it turns out
  +        // that [NSClipView setDocumentView] won't call this method if our next key view
  +        // is already set, so we wait until we're called before adding this connection.
  +        // We'll also clear it when we're called with nil, so this could go through the
  +        // same code path more than once successfully.
  +        [super setNextKeyView: aView ? documentView : nil];
  +    } else
           [super setNextKeyView:aView];
   }