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

[Timothy]

thatcher    05/11/10 15:02:33

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               kwq      Tag: Safari-1-3-branch KWQComboBox.mm KWQListBox.mm
  Log:
          Merged fix from TOT to Safari-1-3-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.335.2.7 +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.335.2.6
  retrieving revision 1.335.2.7
  diff -u -r1.335.2.6 -r1.335.2.7
  --- ChangeLog	10 Nov 2005 20:28:10 -0000	1.335.2.6
  +++ ChangeLog	10 Nov 2005 23:02:29 -0000	1.335.2.7
  @@ -2,6 +2,22 @@
   
           Merged fix from TOT to Safari-1-3-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-1-3-branch
  +
       2005-10-10  Geoffrey Garen  <ggaren at apple.com>
   
           - Fixed <rdar://problem/4245682> Regression: CrashTracer: 923 crashes 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.59.8.1  +2 -10     WebCore/kwq/KWQComboBox.mm
  
  Index: KWQComboBox.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQComboBox.mm,v
  retrieving revision 1.59
  retrieving revision 1.59.8.1
  diff -u -r1.59 -r1.59.8.1
  --- KWQComboBox.mm	30 Nov 2004 21:08:49 -0000	1.59
  +++ KWQComboBox.mm	10 Nov 2005 23:02:31 -0000	1.59.8.1
  @@ -323,16 +323,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.6.1  +2 -10     WebCore/kwq/KWQListBox.mm
  
  Index: KWQListBox.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQListBox.mm,v
  retrieving revision 1.51
  retrieving revision 1.51.6.1
  diff -u -r1.51 -r1.51.6.1
  --- KWQListBox.mm	3 Mar 2005 00:58:35 -0000	1.51
  +++ KWQListBox.mm	10 Nov 2005 23:02:32 -0000	1.51.6.1
  @@ -302,16 +302,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