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

[Vicki]

vicki       06/01/02 16:13:35

  Modified:    .        ChangeLog
               khtml    khtmlview.cpp
  Log:
          Reviewed by Maciej.
  
  	- fix for <rdar://problem/4389622> *Pan EU2* iframe swallows events for overlapping elements (part 2)
  
  	We originally added a call to passSubframeEventToSubframe here to fix the hand cursor updating problem
  	reported in <rdar://problem/4316201> REGRESSION: cursor and text in status bar is not updated when
  	mousing over links in a frame (5509). However, when we return early after passSubframeEventToSubframe,
  	we fail to fire onmouseout events.  Since the call to passSubframeEventToSubframe was originally added
  	to fix the hand cursor updating problem, remove the early return and make cursor updating conditional
  	on passSubframeEventToSubframe.
  
          * khtml/khtmlview.cpp:
          (KHTMLView::viewportMouseMoveEvent):
  
  Revision  Changes    Path
  1.72      +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- ChangeLog	31 Dec 2005 00:14:19 -0000	1.71
  +++ ChangeLog	3 Jan 2006 00:13:34 -0000	1.72
  @@ -1,3 +1,19 @@
  +2006-01-02  Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by Maciej.
  + 
  +	- fix for <rdar://problem/4389622> *Pan EU2* iframe swallows events for overlapping elements (part 2)
  +
  +	We originally added a call to passSubframeEventToSubframe here to fix the hand cursor updating problem
  +	reported in <rdar://problem/4316201> REGRESSION: cursor and text in status bar is not updated when 
  +	mousing over links in a frame (5509). However, when we return early after passSubframeEventToSubframe,
  +	we fail to fire onmouseout events.  Since the call to passSubframeEventToSubframe was originally added
  +	to fix the hand cursor updating problem, remove the early return and make cursor updating conditional
  +	on passSubframeEventToSubframe.
  +
  +        * khtml/khtmlview.cpp:
  +        (KHTMLView::viewportMouseMoveEvent):
  +
   2005-12-30  Darin Adler  <darin at apple.com>
   
           Reviewed by Maciej.
  
  
  
  1.160     +3 -5      WebCore/khtml/khtmlview.cpp
  
  Index: khtmlview.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
  retrieving revision 1.159
  retrieving revision 1.160
  diff -u -r1.159 -r1.160
  --- khtmlview.cpp	15 Dec 2005 22:31:29 -0000	1.159
  +++ khtmlview.cpp	3 Jan 2006 00:13:35 -0000	1.160
  @@ -669,18 +669,16 @@
       // was pressed, rather than updating for nodes the mouse moves over as you hold the mouse down.
       NodeImpl::MouseEvent mev( _mouse->stateAfter(), NodeImpl::MouseMove );
       m_part->xmlDocImpl()->prepareMouseEvent(d->mousePressed && m_part->mouseDownMayStartSelect(), d->mousePressed, xm, ym, &mev );
  -    if (KWQ(m_part)->passSubframeEventToSubframe(mev))
  -        return;
   
  +    if (!KWQ(m_part)->passSubframeEventToSubframe(mev))
  +        viewport()->setCursor(selectCursor(mev, m_part, d->mousePressed));
  +        
       bool swallowEvent = dispatchMouseEvent(mousemoveEvent,mev.innerNode.get(),false,
                                              0,_mouse,true,NodeImpl::MouseMove);
   
  -
       // execute the scheduled script. This is to make sure the mouseover events come after the mouseout events
       m_part->executeScheduledScript();
   
  -    viewport()->setCursor(selectCursor(mev, m_part, d->mousePressed));
  -
       d->prevMouseX = xm;
       d->prevMouseY = ym;