Merge remote-tracking branch 'origin/5.9.0' into 5.9

Change-Id: Iba6114263488d6bf84b255b38182904dc5880386

1 files changed, 45 insertions, 9 deletions

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 6568398a8..cf22273e4 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -97,6 +97,7 @@ enum ImStateFlags {
     TextInputStateUpdated = 1 << 0,
     TextSelectionUpdated = 1 << 1,
     TextSelectionBoundsUpdated = 1 << 2,
+    TextSelectionFlags = TextSelectionUpdated | TextSelectionBoundsUpdated,
     AllFlags = TextInputStateUpdated | TextSelectionUpdated | TextSelectionBoundsUpdated
 };
 
@@ -237,6 +238,19 @@ private:
     float dpiScale;
 };
 
+bool isAccessibilityEnabled() {
+    // On Linux accessibility is disabled by default due to performance issues,
+    // and can be re-enabled by setting the QTWEBENGINE_ENABLE_LINUX_ACCESSIBILITY environment
+    // variable. For details, see QTBUG-59922.
+#ifdef Q_OS_LINUX
+    static bool accessibility_enabled
+            = qEnvironmentVariableIsSet("QTWEBENGINE_ENABLE_LINUX_ACCESSIBILITY");
+#else
+    const bool accessibility_enabled = true;
+#endif
+    return accessibility_enabled;
+}
+
 RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget)
     : m_host(content::RenderWidgetHostImpl::From(widget))
     , m_gestureProvider(QtGestureProviderConfig(), this)
@@ -253,16 +267,18 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget
     , m_needsBeginFrames(false)
     , m_addedFrameObserver(false)
     , m_imState(0)
-    , m_anchorPositionWithinSelection(0)
-    , m_cursorPositionWithinSelection(0)
+    , m_anchorPositionWithinSelection(-1)
+    , m_cursorPositionWithinSelection(-1)
     , m_cursorPosition(0)
     , m_emptyPreviousSelection(true)
 {
     m_host->SetView(this);
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessible::installActivationObserver(this);
-    if (QAccessible::isActive())
-        content::BrowserAccessibilityStateImpl::GetInstance()->EnableAccessibility();
+    if (isAccessibilityEnabled()) {
+        QAccessible::installActivationObserver(this);
+        if (QAccessible::isActive())
+            content::BrowserAccessibilityStateImpl::GetInstance()->EnableAccessibility();
+    }
 #endif // QT_NO_ACCESSIBILITY
     auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
     m_beginFrameSource.reset(new cc::DelayBasedBeginFrameSource(
@@ -761,8 +777,10 @@ void RenderWidgetHostViewQt::OnSelectionBoundsChanged(content::TextInputManager
     Q_UNUSED(updated_view);
 
     m_imState |= ImStateFlags::TextSelectionBoundsUpdated;
-    if (m_imState == ImStateFlags::AllFlags)
+    if (m_imState == ImStateFlags::AllFlags
+            || (m_imState == ImStateFlags::TextSelectionFlags && getTextInputType() == ui::TEXT_INPUT_TYPE_NONE)) {
         selectionChanged();
+    }
 }
 
 void RenderWidgetHostViewQt::OnTextSelectionChanged(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view)
@@ -779,8 +797,10 @@ void RenderWidgetHostViewQt::OnTextSelectionChanged(content::TextInputManager *t
 #endif // defined(USE_X11)
 
     m_imState |= ImStateFlags::TextSelectionUpdated;
-    if (m_imState == ImStateFlags::AllFlags)
+    if (m_imState == ImStateFlags::AllFlags
+            || (m_imState == ImStateFlags::TextSelectionFlags && getTextInputType() == ui::TEXT_INPUT_TYPE_NONE)) {
         selectionChanged();
+    }
 }
 
 void RenderWidgetHostViewQt::selectionChanged()
@@ -788,6 +808,22 @@ void RenderWidgetHostViewQt::selectionChanged()
     // Reset input manager state
     m_imState = 0;
 
+    // Handle text selection out of an input field
+    if (getTextInputType() == ui::TEXT_INPUT_TYPE_NONE) {
+        if (GetSelectedText().empty() && m_emptyPreviousSelection)
+            return;
+
+        // Reset position values to emit selectionChanged signal when clearing text selection
+        // by clicking into an input field. These values are intended to be used by inputMethodQuery
+        // so they are not expected to be valid when selection is out of an input field.
+        m_anchorPositionWithinSelection = -1;
+        m_cursorPositionWithinSelection = -1;
+
+        m_emptyPreviousSelection = GetSelectedText().empty();
+        m_adapterClient->selectionChanged();
+        return;
+    }
+
     const content::TextInputManager::TextSelection *selection = text_input_manager_->GetTextSelection();
     if (!selection)
         return;
@@ -802,8 +838,8 @@ void RenderWidgetHostViewQt::selectionChanged()
         return;
     }
 
-    uint newAnchorPositionWithinSelection = 0;
-    uint newCursorPositionWithinSelection = 0;
+    int newAnchorPositionWithinSelection = 0;
+    int newCursorPositionWithinSelection = 0;
 
     if (text_input_manager_->GetSelectionRegion()->anchor.type() == gfx::SelectionBound::RIGHT) {
         newAnchorPositionWithinSelection = selection->range.GetMax() - selection->offset;