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

[Adele]

adele       05/08/08 18:20:35

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml    Tag: Safari-2-0-branch khtmlview.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-08-03  Vicki Murley  <vicki at apple.com>
  
          Reviewed by Beth and Hyatt.
  
         <rdar://problem/4196646> target returns text node when it should return the parent node
  
          Test cases added: manual-tests/mouseevents-on-textnodes.html
  
          * khtml/khtmlview.cpp:
          (KHTMLView::dispatchMouseEvent): if the targetNode is a text node, set the
         targetNode to the parent node
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.98 +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.97
  retrieving revision 1.4104.2.98
  diff -u -r1.4104.2.97 -r1.4104.2.98
  --- ChangeLog	6 Aug 2005 01:36:52 -0000	1.4104.2.97
  +++ ChangeLog	9 Aug 2005 01:20:27 -0000	1.4104.2.98
  @@ -1,3 +1,19 @@
  +2005-08-08  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-08-03  Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by Beth and Hyatt.
  +
  +       <rdar://problem/4196646> target returns text node when it should return the parent node
  +
  +        Test cases added: manual-tests/mouseevents-on-textnodes.html
  +
  +        * khtml/khtmlview.cpp:
  +        (KHTMLView::dispatchMouseEvent): if the targetNode is a text node, set the
  +       targetNode to the parent node
  +
   === Safari-416 ===
   
   2005-08-05  Adele Peterson  <adele at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.128.8.2 +3 -0      WebCore/khtml/khtmlview.cpp
  
  Index: khtmlview.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
  retrieving revision 1.128.8.1
  retrieving revision 1.128.8.2
  diff -u -r1.128.8.1 -r1.128.8.2
  --- khtmlview.cpp	27 Apr 2005 00:58:14 -0000	1.128.8.1
  +++ khtmlview.cpp	9 Aug 2005 01:20:34 -0000	1.128.8.2
  @@ -1787,6 +1787,9 @@
   				   int detail,QMouseEvent *_mouse, bool setUnder,
   				   int mouseEventType)
   {
  +    // if the target node is a text node, dispatch on the parent node - rdar://4196646
  +    if (targetNode->isTextNode())
  +        targetNode = targetNode->parentNode();
       if (d->underMouse)
   	d->underMouse->deref();
       d->underMouse = targetNode;