Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev

1 files changed, 96 insertions, 3 deletions

diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index 2e0323f6d..4241a11c2 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -1020,12 +1020,14 @@ static ui::DomKey getDomKeyFromQKeyEvent(QKeyEvent *ev)
     }
 }
 
-static inline double currentTimeForEvent(const QInputEvent* event)
+static inline double currentTimeForEvent(const QEvent *event)
 {
     Q_ASSERT(event);
 
-    if (event->timestamp())
-        return static_cast<double>(event->timestamp()) / 1000;
+    if (const QInputEvent *inputEvent = static_cast<const QInputEvent *>(event)) {
+        if (inputEvent->timestamp())
+            return static_cast<double>(inputEvent->timestamp()) / 1000;
+    }
 
     static QElapsedTimer timer;
     if (!timer.isValid())
@@ -1209,6 +1211,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QMouseEvent *ev, double dpiScale)
 
     webKitEvent.button = mouseButtonForEvent<QMouseEvent>(ev);
     webKitEvent.click_count = 0;
+    webKitEvent.pointer_type = WebPointerProperties::PointerType::kMouse;
 
     return webKitEvent;
 }
@@ -1223,6 +1226,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev, double dpiScale)
     webKitEvent.SetPositionInWidget(ev->pos().x() / dpiScale, ev->pos().y() / dpiScale);
     webKitEvent.movement_x = ev->pos().x() - ev->oldPos().x();
     webKitEvent.movement_y = ev->pos().y() - ev->oldPos().y();
+    webKitEvent.pointer_type = WebPointerProperties::PointerType::kMouse;
 
     return webKitEvent;
 }
@@ -1246,7 +1250,16 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QTabletEvent *ev, double dpiScale
 
     webKitEvent.button = mouseButtonForEvent<QTabletEvent>(ev);
     webKitEvent.click_count = 0;
+    return webKitEvent;
+}
+
+WebMouseEvent WebEventFactory::toWebMouseEvent(QEvent *ev)
+{
+    Q_ASSERT(ev->type() == QEvent::Leave || ev->type() == QEvent::HoverLeave);
 
+    WebMouseEvent webKitEvent;
+    webKitEvent.SetTimeStampSeconds(currentTimeForEvent(ev));
+    webKitEvent.SetType(WebInputEvent::kMouseLeave);
     return webKitEvent;
 }
 
@@ -1370,3 +1383,83 @@ content::NativeWebKeyboardEvent WebEventFactory::toWebKeyboardEvent(QKeyEvent *e
 
     return webKitEvent;
 }
+
+bool WebEventFactory::getEditCommand(QKeyEvent *event, std::string *editCommand)
+{
+    // Assign Qt standard key bindings to blink editor commands. Editor command names
+    // come from chromium/third_party/WebKit/Source/editing/commands/EditorCommandNames.h
+    static struct {
+        QKeySequence::StandardKey standardKey;
+        std::string name;
+    } editCommands[] = {
+        { QKeySequence::Delete, "Delete" },
+        { QKeySequence::Cut, "Cut" },
+        { QKeySequence::Copy, "Copy" },
+        { QKeySequence::Paste, "Paste" },
+        { QKeySequence::Undo, "Undo" },
+        { QKeySequence::Redo, "Redo" },
+        { QKeySequence::SelectAll, "SelectAll" },
+        { QKeySequence::Bold, "Bold" },
+        { QKeySequence::Italic, "Italic" },
+        { QKeySequence::Underline, "Underline" },
+
+        { QKeySequence::MoveToNextChar, "MoveRight" },
+        { QKeySequence::MoveToPreviousChar, "MoveLeft" },
+        { QKeySequence::MoveToNextWord, "MoveWordForward" },
+        { QKeySequence::MoveToPreviousWord, "MoveWordBackward" },
+        { QKeySequence::MoveToNextLine, "MoveDown" },
+        { QKeySequence::MoveToPreviousLine, "MoveUp" },
+        { QKeySequence::MoveToNextPage, "MovePageDown" },
+        { QKeySequence::MoveToPreviousPage, "MovePageUp" },
+        { QKeySequence::MoveToStartOfLine, "MoveToBeginningOfLine" },
+        { QKeySequence::MoveToEndOfLine, "MoveToEndOfLine" },
+        { QKeySequence::MoveToStartOfBlock, "MoveToBeginningOfParagraph" },
+        { QKeySequence::MoveToEndOfBlock, "MoveToEndOfParagraph" },
+        { QKeySequence::MoveToStartOfDocument, "MoveToBeginningOfDocument" },
+        { QKeySequence::MoveToEndOfDocument, "MoveToEndOfDocument" },
+
+        { QKeySequence::SelectNextChar, "MoveRightAndModifySelection" },
+        { QKeySequence::SelectPreviousChar, "MoveLeftAndModifySelection" },
+        { QKeySequence::SelectNextWord, "MoveWordForwardAndModifySelection" },
+        { QKeySequence::SelectPreviousWord, "MoveWordBackwardAndModifySelection" },
+        { QKeySequence::SelectNextLine, "MoveDownAndModifySelection" },
+        { QKeySequence::SelectPreviousLine, "MoveUpAndModifySelection" },
+        { QKeySequence::SelectNextPage, "MovePageDownAndModifySelection" },
+        { QKeySequence::SelectPreviousPage, "MovePageUpAndModifySelection" },
+        { QKeySequence::SelectStartOfLine, "MoveToBeginningOfLineAndModifySelection" },
+        { QKeySequence::SelectEndOfLine, "MoveToEndOfLineAndModifySelection" },
+        { QKeySequence::SelectStartOfBlock, "MoveToBeginningOfParagraphAndModifySelection" },
+        { QKeySequence::SelectEndOfBlock, "MoveToEndOfParagraphAndModifySelection" },
+        { QKeySequence::SelectStartOfDocument, "MoveToBeginningOfDocumentAndModifySelection" },
+        { QKeySequence::SelectEndOfDocument, "MoveToEndOfDocumentAndModifySelection" },
+
+        { QKeySequence::DeleteStartOfWord, "DeleteWordBackward" },
+        { QKeySequence::DeleteEndOfWord, "DeleteWordForward" },
+        { QKeySequence::DeleteEndOfLine, "DeleteToEndOfLine" },
+        { QKeySequence::Deselect, "Unselect" },
+        { QKeySequence::Backspace, "BackwardDelete" },
+
+        { QKeySequence::UnknownKey, "" }
+    };
+
+    for (int i = 0; editCommands[i].standardKey != QKeySequence::UnknownKey; ++i) {
+        if (event == editCommands[i].standardKey) {
+            *editCommand = editCommands[i].name;
+            return true;
+        }
+    }
+
+#ifdef Q_OS_MACOS
+    Qt::KeyboardModifier cmdKey = qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta) ?
+                Qt::MetaModifier :
+                Qt::ControlModifier;
+    if ((event->modifiers() & ~Qt::ShiftModifier) == cmdKey) {
+        if (event->key() == Qt::Key_Backspace) {
+            *editCommand = "DeleteToBeginningOfLine";
+            return true;
+        }
+    }
+#endif
+
+    return false;
+}