MCL/sf/mw/web: comparison webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp

equal deleted inserted replaced

-:a359256acfc6
+:c8a366e56285
 static const int KMinScrollAndTapInterval = 200000;				// 200 ms
 static const int KDoubleTapMinActivationInterval = 100000;     // 100 ms
 static const int KDoubleTapMaxActivationInterval = 500000;     // 500 ms
 static const int KDoubleTapIdleInterval = 700000;			// 700 ms, to prevent triple-tap effects
+#define IS_NAVIGATION_NONE      (m_webview->brCtl()->settings()->getNavigationType() == SettingsContainer::NavigationTypeNone)
+#define IS_TABBED_NAVIGATION    (m_webview->brCtl()->settings()->getNavigationType() == SettingsContainer::NavigationTypeTabbed)
 //-----------------------------------------------------------------------------
 // WebPointerEventHandler::NewL
 //-----------------------------------------------------------------------------
 WebPointerEventHandler* WebPointerEventHandler::NewL(WebView* view)
 case EGestureSwipeRight:
 case EGestureSwipeUp:
 case EGestureSwipeDown:
 {
 m_ignoreTap = false;
+if (!IS_NAVIGATION_NONE) {
 handleTouchUp(aEvent);
+}
+else {
+Frame* frm = m_webview->page()->focusController()->focusedOrMainFrame();
+m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Up, m_highlightPos, frm);
+}
 break;
 }
 // sent on move
 case EGestureDrag:
 {
 PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler();
 PluginSkin* pluginToActivate = pluginHandler->pluginToActivate();
 m_buttonDownEvent = m_currentEvent;
 m_highlightPos = aEvent.CurrentPos();
-if ( !m_buttonDownTimer.isActive() && !m_webview->inPageViewMode() &&
+if ( !m_buttonDownTimer.isActive() && !m_webview->inPageViewMode()){
-!pluginToActivate ){
 m_buttonDownTimer.startOneShot(0.1f);
 }
+if (!IS_NAVIGATION_NONE) {
 m_webview->pageScrollHandler()->handleTouchDownGH(aEvent);
+}
 if ( TBrCtlDefs::EElementActivatedObjectBox == elType) {
 PluginSkin* plugin = m_webview->mainFrame()->focusedPlugin();
 if (plugin && plugin->pluginWin()) {
 if (!plugin->getClipRect().Contains(m_buttonDownEvent.iPosition)) {
 else {
 plugin->pluginWin()->HandlePointerEventL(m_buttonDownEvent);
 }
 }
 }
-if (pluginToActivate) {
-Frame* coreFrame = core(m_webview->mainFrame());
-coreFrame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(m_buttonDownEvent));
-}
 /*
 * After introducing "link selection" pointer down action is done in
 * buttondown timer callback. When "down" gesture event is arrived we start
 * timer end exit, so gesture helper is ready to deliver next gesture event.
 * Meanwhile the processing of the first gesture event hasn't been finished yet.
 {
 m_highlightPos = TPoint(-1,-1);
 m_highlightedNode = NULL;
 PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler();
 pluginHandler->setPluginToActivate(NULL);
+if (!IS_NAVIGATION_NONE) {
 m_webview->pageScrollHandler()->handleTouchUpGH(aEvent);
+}
 }
 // ======================================================================
 // WebPointerEventHandler::handleMoveL
 // ======================================================================
 TBrCtlDefs::TBrCtlElementType elType = m_webview->focusedElementType();
 TPoint curPos = aEvent.CurrentPos();
 PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler();
 pluginHandler->setPluginToActivate(NULL);
 m_buttonDownTimer.stop();
+if (IS_NAVIGATION_NONE) {
+Frame* frm = m_webview->page()->focusController()->focusedOrMainFrame();
+m_webview->sendMouseEventToEngine(TPointerEvent::EMove, curPos, frm);
+}
+else {
 HandleHighlightChange(curPos);
 m_webview->pageScrollHandler()->handleScrollingGH(aEvent);
+}
 }
 // ======================================================================
 // WebPointerEventHandler::HandlePointerEventL
 m_webview->GetContainerWindow().EnablePointerMoveBuffer();
 }
 else if (aPointerEvent.iType == TPointerEvent::EButton1Up) {
 m_webview->GetContainerWindow().DisablePointerMoveBuffer();
 }
-if (m_webview->brCtl()->settings()->getNavigationType() == SettingsContainer::NavigationTypeNone) {
-TPointerEvent event;
+}
-event.iPosition = aPointerEvent.iPosition;
-event.iModifiers = 0;
-event.iType = aPointerEvent.iType;
-if (event.iType == TPointerEvent::EDrag) event.iType = TPointerEvent::EMove;
-m_webview->sendMouseEventToEngine(event.iType, event.iPosition, core(m_webview->mainFrame()));
-return;
-}
-}
 if (m_webview->brCtl()->settings()->getNavigationType() == SettingsContainer::NavigationTypeTabbed) {
 m_webview->tabbedNavigation()->updateCursorPosition(aPointerEvent.iPosition);
 }
 TRect elRect;
 TBrCtlDefs::TBrCtlElementType elType = TBrCtlDefs::EElementNone;
 Frame* coreFrame = core(m_webview->mainFrame());
 WebCursor* cursor = StaticObjectsContainer::instance()->webCursor();
 m_webview->page()->chrome()->client()->setElementVisibilityChanged(false);
-HitTestResult htresult(cursor->position());
 TPointerEvent event;
 TPoint pos = cursor->position();
-event.iPosition = pos;
+IntPoint point(pos.iX, pos.iY);
-event.iModifiers = 0;
+HitTestResult htresult = coreFrame->eventHandler()->hitTestResultAtPoint(point, true);
-event.iType = TPointerEvent::EMove;
+Node* eventNode = htresult.innerNode();
-coreFrame->eventHandler()->handleMouseMoveEvent(PlatformMouseEvent(event),&htresult);
+Frame* frm = eventNode->document()->frame();
-WebFrame* frm = cursor->getFrameUnderCursor();
+WebFrame* wfrm = kit(frm);
-TPoint pt(frm->frameView()->viewCoordsInFrameCoords(pos));
+TPoint pt(wfrm->frameView()->viewCoordsInFrameCoords(pos));
 TPoint nodePoint;
 m_highlightedNode = NULL;
-cursor->navigableNodeUnderCursor(*(frm), pt, elType, elRect);
+frm->bridge()->getTypeFromElement(eventNode, elType, elRect);
 if (elType == TBrCtlDefs::EElementNone) {
-Node* n = frm->getClosestAnchorElement(cursor->position(), pos);
+Node* n = wfrm->getClosestAnchorElement(cursor->position(), pos);
 if (n) {
-htresult = HitTestResult(pos);
+point.setX(pos.iX);
-event.iPosition = pos;
+point.setY(pos.iY);
-coreFrame->eventHandler()->handleMouseMoveEvent(PlatformMouseEvent(event),&htresult);
+htresult = coreFrame->eventHandler()->hitTestResultAtPoint(point, true);
-coreFrame->bridge()->getTypeFromElement(htresult.innerNode(), elType, elRect);
+eventNode = htresult.innerNode();
+frm = eventNode->document()->frame();
+frm->bridge()->getTypeFromElement(eventNode, elType, elRect);
 TPoint nodePoint = n->getRect().Rect().Center();
 m_offset = (pt.iX- nodePoint.iX)*(pt.iX- nodePoint.iX) +
 (pt.iY- nodePoint.iY)*(pt.iY- nodePoint.iY);
 }
 }
-m_highlightedNode = htresult.innerNode();
+m_highlightedNode = eventNode;
 if (m_highlightedNode) {
 m_highlightPos = pos;
 m_buttonDownEvent.iPosition = m_highlightPos;
 }
 m_webview->setFocusedElementType(elType);
 // We assume that if element visibility has been changed
 // between "up" and "down" that means that some node event
 // listener (onMouseOver etc) handling happened and we don't
 // want to send a click (mouse press + mouse release) event.
-if (m_webview->page()->chrome()->client()->elementVisibilityChanged()) {
+if (!IS_NAVIGATION_NONE &&
+m_webview->page()->chrome()->client()->elementVisibilityChanged()) {
 return;
 }
 m_lastTapEvent.iPosition = m_buttonDownEvent.iPosition;
 m_lastTapEvent.iType = TPointerEvent::EButton1Up;
 m_lastTapEvent.iModifiers = 0;
 // don't pass the event if the text input is not in valid format
 if (isHighlitableElement(elType) || m_webview->fepTextEditor()->validateTextFormat()) {
 // because of scrolling we delay sending EButton1Down till we get EButton1Up event and if the content is not scrolling
-coreFrame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(m_buttonDownEvent));
 coreFrame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(m_lastTapEvent));
 }
 // special handling for broken image (why is this here??)
 if (m_webview->focusedElementType() == TBrCtlDefs::EElementBrokenImage) {
 {
 // send dehighlight event to engine by passing -1, -1
 // sending any other pointer value may result in highligh of other links
 m_highlightPos = TPoint(-1, -1);
 m_isHighlighted = EFalse;
-TPointerEvent event;
-event.iType = TPointerEvent::EMove;
-event.iPosition = m_highlightPos;
-event.iModifiers = 0;
-Frame* coreFrame = core(m_webview->mainFrame());
 Frame* frm = m_webview->page()->focusController()->focusedOrMainFrame();
-frm->eventHandler()->handleMouseMoveEvent(PlatformMouseEvent(event));
+m_webview->sendMouseEventToEngine(TPointerEvent::EMove, m_highlightPos, frm);
 m_highlightedNode = NULL;
 m_webview->syncRepaint();
 //-----------------------------------------------------------------------------
 void WebPointerEventHandler::buttonDownTimerCB(Timer<WebPointerEventHandler>* t)
 {
 m_buttonDownTimer.stop();
-WebCursor*  cursor = StaticObjectsContainer::instance()->webCursor();
 Frame* coreFrame = core(m_webview->mainFrame());
 TPointerEvent event;
 TBrCtlDefs::TBrCtlElementType elType = highlitableElement();
 if (!isHighlitableElement(elType)) {
 elType = TBrCtlDefs::EElementNone;
 }
 m_isHighlighted = (m_highlightedNode != NULL) && (elType != TBrCtlDefs::EElementNone) ;
-event.iPosition = m_highlightPos;
+m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Down, m_highlightPos, coreFrame);
-event.iModifiers = 0;
-event.iType = TPointerEvent::EMove;
+m_webview->sendMouseEventToEngine(TPointerEvent::EMove, m_highlightPos, coreFrame);
-coreFrame->eventHandler()->handleMouseMoveEvent(PlatformMouseEvent(event));
 m_waiter->AsyncStop();
 }
 //-----------------------------------------------------------------------------

changeset 11	c8a366e56285
parent 5	10e98eab6f85
child 15	60c5402cb945