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

[Timothy]

thatcher    05/11/30 14:14:44

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/rendering Tag: Safari-2-0-branch render_layer.cpp
  Log:
          Merged fix from TOT to Safari-2-0-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.1.2.78  +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.77
  retrieving revision 1.1.2.78
  diff -u -r1.1.2.77 -r1.1.2.78
  --- ChangeLog	19 Nov 2005 03:51:23 -0000	1.1.2.77
  +++ ChangeLog	30 Nov 2005 22:14:33 -0000	1.1.2.78
  @@ -1,3 +1,18 @@
  +2005-11-29  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-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.
  +
   === WebCore-417.7 ===
   
   2005-11-18  Timothy Hatcher  <timothy at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.94.6.6  +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.6.5
  retrieving revision 1.94.6.6
  diff -u -r1.94.6.5 -r1.94.6.6
  --- render_layer.cpp	18 Nov 2005 22:41:51 -0000	1.94.6.5
  +++ render_layer.cpp	30 Nov 2005 22:14:43 -0000	1.94.6.6
  @@ -1152,8 +1152,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
  @@ -1192,8 +1192,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;