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

[Vicki]

vicki       05/12/05 09:40:58

  Modified:    .        ChangeLog
               kwq      WebCoreBridge.mm
  Log:
          Reviewed by John.
  
  	- fix <rdar://problem/4363132> Regression: status bar shows wrong text when mousing over links
  	in wacky frameset at directory.apple.com
  
          * kwq/WebCoreBridge.mm:
          (-[WebCoreBridge elementAtPoint:]): reuse point to work with nested frames; add the overflow clip to
  	accommodate any scrolling
  
  Revision  Changes    Path
  1.473     +11 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.472
  retrieving revision 1.473
  diff -u -r1.472 -r1.473
  --- ChangeLog	4 Dec 2005 23:14:22 -0000	1.472
  +++ ChangeLog	5 Dec 2005 17:40:53 -0000	1.473
  @@ -1,3 +1,14 @@
  +2005-12-05  Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by John.
  + 
  +	- fix <rdar://problem/4363132> Regression: status bar shows wrong text when mousing over links 
  +	in wacky frameset at directory.apple.com
  +
  +        * kwq/WebCoreBridge.mm:
  +        (-[WebCoreBridge elementAtPoint:]): reuse point to work with nested frames; add the overflow clip to 
  +	accommodate any scrolling
  +
   2005-12-04  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by ggaren.
  
  
  
  1.437     +8 -5      WebCore/kwq/WebCoreBridge.mm
  
  Index: WebCoreBridge.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
  retrieving revision 1.436
  retrieving revision 1.437
  diff -u -r1.436 -r1.437
  --- WebCoreBridge.mm	1 Dec 2005 10:32:32 -0000	1.436
  +++ WebCoreBridge.mm	5 Dec 2005 17:40:57 -0000	1.437
  @@ -1032,6 +1032,7 @@
   
       NodeImpl *n;
       QWidget *widget = 0;
  +    QPoint widgetPoint(point);
       
       while (true) {
           n = nodeInfo.innerNode();
  @@ -1043,12 +1044,14 @@
           KHTMLPart *kpart = static_cast<DOM::HTMLFrameElementImpl *>(n)->contentPart();
           if (!kpart || !static_cast<KWQKHTMLPart *>(kpart)->renderer())
               break;
  -        int _x, _y;
  -        n->renderer()->absolutePosition(_x, _y, true);
  -        _x = (int)point.x - _x;
  -        _y = (int)point.y - _y;
  +        int absX, absY;
  +        n->renderer()->absolutePosition(absX, absY, true);
  +        KHTMLView *view = static_cast<KHTMLView *>(widget);
  +        widgetPoint.setX(widgetPoint.x() - absX + view->contentsX());
  +        widgetPoint.setY(widgetPoint.y() - absY + view->contentsY());
  +
           RenderObject::NodeInfo widgetNodeInfo(true, true);
  -        static_cast<KWQKHTMLPart *>(kpart)->renderer()->layer()->hitTest(widgetNodeInfo, _x, _y);
  +        static_cast<KWQKHTMLPart *>(kpart)->renderer()->layer()->hitTest(widgetNodeInfo, widgetPoint.x(), widgetPoint.y());
           nodeInfo = widgetNodeInfo;
       }