Refactored WDEventDispatcher

Author: Andrii Moroz

inc/extension_qt/wd_event_dispatcher.h

@@ -15,6 +15,7 @@ class WDEventDispatcher
     static WDEventDispatcher *getInstance();
     void add(EventDispatcher *dispatcher);
     QVector<EventDispatcher*>& getDispatchers();
+    bool dispatch(QEvent *event);
 
 private:
     static WDEventDispatcher *_instance;

src/webdriver/extension_qt/wd_event_dispatcher.cc

@@ -30,3 +30,15 @@ QVector<EventDispatcher*>& WDEventDispatcher::getDispatchers()
 {
     return _dispatchers;
 }
+
+bool WDEventDispatcher::dispatch(QEvent *event)
+{
+    bool consumed = false;
+    QVector<EventDispatcher*> dispatchers = WDEventDispatcher::getInstance()->getDispatchers();
+    foreach (EventDispatcher* item, dispatchers)
+    {
+        consumed |= item->dispatch(event, consumed);
+    }
+
+    return consumed;
+}

src/webdriver/extension_qt/web_view_executor.cc

@@ -330,14 +330,8 @@ void QWebViewCmdExecutor::SendKeys(const ElementId& element, const string16& key
     std::vector<QKeyEvent>::iterator it = key_events.begin();
     while (it != key_events.end()) {
 
-        //////////////////////
-        bool consumed = false;
-        QVector<EventDispatcher*> dispatchers = WDEventDispatcher::getInstance()->getDispatchers();
-        foreach (EventDispatcher* item, dispatchers)
-        {
-            consumed |= item->dispatch(&(*it), consumed);
-        }
-        //////////////////////
+        bool consumed = WDEventDispatcher::getInstance()->dispatch(&(*it));
+
         if (!consumed)
             qApp->sendEvent(view, &(*it));
         ++it;

src/webdriver/extension_qt/widget_view_executor.cc

@@ -168,14 +168,7 @@ void QWidgetViewCmdExecutor::SendKeys(const ElementId& element, const string16&
     std::vector<QKeyEvent>::iterator it = key_events.begin();
     while (it != key_events.end()) {
 
-        //////////////////////
-        bool consumed = false;
-        QVector<EventDispatcher*> dispatchers = WDEventDispatcher::getInstance()->getDispatchers();
-        foreach (EventDispatcher* item, dispatchers)
-        {
-            consumed |= item->dispatch(&(*it), consumed);
-        }
-        //////////////////////
+        bool consumed = WDEventDispatcher::getInstance()->dispatch(&(*it));
 
         if (!consumed)
             qApp->sendEvent(pWidget, &(*it));