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

David hyatt at opensource.apple.com
Wed Nov 9 15:05:10 PST 2005


hyatt       05/11/09 15:05:10

  Modified:    .        ChangeLog
               khtml/rendering render_layer.cpp
               kwq      KWQComboBox.mm KWQListBox.mm
  Log:
  	Fix hit testing of relative positioned inline flows inside
  	clipped overflow blocks so that they aren't mistakenly included
  	in hit testing.
  
  	Reviewed by Beth.
  
          * khtml/rendering/render_layer.cpp:
          (khtml::RenderLayer::containsPoint):
          * kwq/KWQComboBox.mm:
          (QComboBox::focusPolicy):
          * kwq/KWQListBox.mm:
          (QListBox::focusPolicy):
  
  Revision  Changes    Path
  1.350     +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.349
  retrieving revision 1.350
  diff -u -r1.349 -r1.350
  --- ChangeLog	9 Nov 2005 19:56:44 -0000	1.349
  +++ ChangeLog	9 Nov 2005 23:05:06 -0000	1.350
  @@ -1,3 +1,18 @@
  +2005-11-09  David Hyatt  <hyatt at apple.com>
  +
  +	Fix hit testing of relative positioned inline flows inside
  +	clipped overflow blocks so that they aren't mistakenly included
  +	in hit testing.
  +
  +	Reviewed by Beth.
  +
  +        * khtml/rendering/render_layer.cpp:
  +        (khtml::RenderLayer::containsPoint):
  +        * kwq/KWQComboBox.mm:
  +        (QComboBox::focusPolicy):
  +        * kwq/KWQListBox.mm:
  +        (QListBox::focusPolicy):
  +
   2005-11-09  David Harrison  <harrison at apple.com>
   
           Reviewed by Justin.
  
  
  
  1.123     +1 -1      WebCore/khtml/rendering/render_layer.cpp
  
  Index: render_layer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.cpp,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- render_layer.cpp	3 Nov 2005 20:00:57 -0000	1.122
  +++ render_layer.cpp	9 Nov 2005 23:05:09 -0000	1.123
  @@ -1321,7 +1321,7 @@
   
   bool RenderLayer::containsPoint(int x, int y, const QRect& damageRect) const
   {
  -    return mustExamineRenderer(renderer()) || damageRect.contains(x, y);
  +    return damageRect.contains(x, y);
   }
   
   void RenderLayer::clearClipRects()
  
  
  
  1.73      +2 -10     WebCore/kwq/KWQComboBox.mm
  
  Index: KWQComboBox.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQComboBox.mm,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- KWQComboBox.mm	28 Oct 2005 17:35:43 -0000	1.72
  +++ KWQComboBox.mm	9 Nov 2005 23:05:09 -0000	1.73
  @@ -335,16 +335,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.65      +2 -10     WebCore/kwq/KWQListBox.mm
  
  Index: KWQListBox.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQListBox.mm,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- KWQListBox.mm	28 Oct 2005 17:35:43 -0000	1.64
  +++ KWQListBox.mm	9 Nov 2005 23:05:09 -0000	1.65
  @@ -330,16 +330,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
  
  
  



More information about the webkit-changes mailing list