[webkit-changes] cvs commit: WebCore/kwq KWQComboBox.mm KWQListBox.mm

[Timothy]

thatcher    05/11/10 15:04:03

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               kwq      Tag: Safari-2-0-branch KWQComboBox.mm KWQListBox.mm
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-11-09  Dave Hyatt  <hyatt at apple.com>
  
          Fixed <rdar://problem/4237617> selects should be in the tab order
          in all keyboard modes
  
          Reviewed by Vicki
  
          * kwq/KWQComboBox.mm:
          (QComboBox::focusPolicy):
          * kwq/KWQListBox.mm:
          (QListBox::focusPolicy):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.45  +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.44
  retrieving revision 1.1.2.45
  diff -u -r1.1.2.44 -r1.1.2.45
  --- ChangeLog	10 Nov 2005 20:28:54 -0000	1.1.2.44
  +++ ChangeLog	10 Nov 2005 23:03:57 -0000	1.1.2.45
  @@ -2,6 +2,22 @@
   
           Merged fix from TOT to Safari-2-0-branch
   
  +    2005-11-09  Dave Hyatt  <hyatt at apple.com>
  +    
  +        Fixed <rdar://problem/4237617> selects should be in the tab order
  +        in all keyboard modes
  +        
  +        Reviewed by Vicki
  +        
  +        * kwq/KWQComboBox.mm:
  +        (QComboBox::focusPolicy):
  +        * kwq/KWQListBox.mm:
  +        (QListBox::focusPolicy):
  +    
  +2005-11-10  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
       2005-10-10  Geoffrey Garen  <ggaren at apple.com>
   
           - Fixed <rdar://problem/4245682> Regression: CrashTracer: 923 crashes 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.59.10.5 +2 -10     WebCore/kwq/KWQComboBox.mm
  
  Index: KWQComboBox.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQComboBox.mm,v
  retrieving revision 1.59.10.4
  retrieving revision 1.59.10.5
  diff -u -r1.59.10.4 -r1.59.10.5
  --- KWQComboBox.mm	10 Nov 2005 18:22:33 -0000	1.59.10.4
  +++ KWQComboBox.mm	10 Nov 2005 23:04:01 -0000	1.59.10.5
  @@ -328,16 +328,8 @@
   
   QWidget::FocusPolicy QComboBox::focusPolicy() const
   {
  -    KWQ_BLOCK_EXCEPTIONS;
  -    
  -    WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(this);
  -    if (!bridge || ![bridge part] || ![bridge part]->tabsToAllControls()) {
  -        return NoFocus;
  -    }
  -    
  -    KWQ_UNBLOCK_EXCEPTIONS;
  -    
  -    return QWidget::focusPolicy();
  +    FocusPolicy policy = QWidget::focusPolicy();
  +    return policy == TabFocus ? StrongFocus : policy;
   }
   
   void QComboBox::setWritingDirection(QPainter::TextDirection direction)
  
  
  
  1.51.8.6  +2 -10     WebCore/kwq/KWQListBox.mm
  
  Index: KWQListBox.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQListBox.mm,v
  retrieving revision 1.51.8.5
  retrieving revision 1.51.8.6
  diff -u -r1.51.8.5 -r1.51.8.6
  --- KWQListBox.mm	10 Nov 2005 18:22:34 -0000	1.51.8.5
  +++ KWQListBox.mm	10 Nov 2005 23:04:02 -0000	1.51.8.6
  @@ -329,16 +329,8 @@
   
   QWidget::FocusPolicy QListBox::focusPolicy() const
   {
  -    KWQ_BLOCK_EXCEPTIONS;
  -    
  -    WebCoreBridge *bridge = KWQKHTMLPart::bridgeForWidget(this);
  -    if (!bridge || ![bridge part] || ![bridge part]->tabsToAllControls()) {
  -        return NoFocus;
  -    }
  -    
  -    KWQ_UNBLOCK_EXCEPTIONS;
  -    
  -    return QScrollView::focusPolicy();
  +    FocusPolicy policy = QWidget::focusPolicy();
  +    return policy == TabFocus ? StrongFocus : policy;
   }
   
   bool QListBox::checksDescendantsForFocus() const