Commit 07d08035 authored by vicki's avatar vicki

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):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@11848 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7baeccde
2006-01-02 Vicki Murley <vicki@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@apple.com>
Reviewed by Maciej.
......
......@@ -669,18 +669,16 @@ void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
// 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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment