[webkit-changes] cvs commit: WebCore/khtml/rendering render_layer.cpp

[Timothy]

thatcher    05/11/30 14:15:44

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml/rendering Tag: Safari-1-3-branch render_layer.cpp
  Log:
          Merged fix from TOT to Safari-1-3-branch
  
      2005-11-29  Vicki Murley  <vicki at apple.com>
  
          Changes by Mitz Pettel, reviewed by Maciej.
  
          - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5829 (REGRESSION: cursor tracking and hit
          testing in scrollable block don't take borders into account)
  
          * khtml/rendering/render_layer.cpp:
            (khtml::RenderLayer::hitTestLayer): don't add left and bottom borders when hit testing
          * manual-tests/scrollbar-hittest.html: Added.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.335.2.35 +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.335.2.34
  retrieving revision 1.335.2.35
  diff -u -r1.335.2.34 -r1.335.2.35
  --- ChangeLog	28 Nov 2005 18:49:10 -0000	1.335.2.34
  +++ ChangeLog	30 Nov 2005 22:15:32 -0000	1.335.2.35
  @@ -1,3 +1,18 @@
  +2005-11-29  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-1-3-branch
  +
  +    2005-11-29  Vicki Murley  <vicki at apple.com>
  +
  +        Changes by Mitz Pettel, reviewed by Maciej.
  +
  +        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5829 (REGRESSION: cursor tracking and hit 
  +        testing in scrollable block don't take borders into account)
  +
  +        * khtml/rendering/render_layer.cpp:
  +          (khtml::RenderLayer::hitTestLayer): don't add left and bottom borders when hit testing
  +        * manual-tests/scrollbar-hittest.html: Added.
  +
   2005-11-28  Timothy Hatcher  <timothy at apple.com>
   
           Merged fix from TOT to Safari-1-3-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.94.4.5  +4 -4      WebCore/khtml/rendering/render_layer.cpp
  
  Index: render_layer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.cpp,v
  retrieving revision 1.94.4.4
  retrieving revision 1.94.4.5
  diff -u -r1.94.4.4 -r1.94.4.5
  --- render_layer.cpp	19 Nov 2005 00:19:44 -0000	1.94.4.4
  +++ render_layer.cpp	30 Nov 2005 22:15:43 -0000	1.94.4.5
  @@ -1151,8 +1151,8 @@
       // Next we want to see if the mouse pos is inside the child RenderObjects of the layer.
       if (containsPoint(xMousePos, yMousePos, fgRect) && 
           renderer()->hitTest(info, xMousePos, yMousePos,
  -                            layerBounds.x() - renderer()->xPos() + m_object->borderLeft(),
  -                            layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra() - m_object->borderBottom(), HitTestDescendants)) {
  +                            layerBounds.x() - renderer()->xPos(),
  +                            layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra(), HitTestDescendants)) {
           // for positioned generated content, we might still not have a
           // node by the time we get to the layer level, since none of
           // the content in the layer has an element. So just walk up
  @@ -1191,8 +1191,8 @@
       // Next we want to see if the mouse pos is inside this layer but not any of its children.
       if (containsPoint(xMousePos, yMousePos, bgRect) &&
           renderer()->hitTest(info, xMousePos, yMousePos,
  -                            layerBounds.x() - renderer()->xPos() + m_object->borderLeft(),
  -                            layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra() - m_object->borderBottom(),
  +                            layerBounds.x() - renderer()->xPos(),
  +                            layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra(),
                               HitTestSelf))
           return this;