merge mozilla-inbound to mozilla-central. r=merge a=merge

MozReview-Commit-ID: JhesEg4Bxjy
2017-08-04 19:28:27 +02:00
parent 0dd3c3f0ba 675d9062ed
commit a8245ca35f
124 changed files with 2033 additions and 780 deletions
--- a/dom/html/nsTextEditorState.cpp
+++ b/dom/html/nsTextEditorState.cpp
@@ -356,7 +356,9 @@ nsTextInputSelectionImpl::nsTextInputSelectionImpl(nsFrameSelection *aSel,
  {
    mFrameSelection = aSel;//we are the owner now!
    mLimiter = aLimiter;
-    mFrameSelection->Init(aShell, mLimiter);
+    bool accessibleCaretEnabled =
+      PresShell::AccessibleCaretEnabled(aLimiter->OwnerDoc()->GetDocShell());
+    mFrameSelection->Init(aShell, mLimiter, accessibleCaretEnabled);
    mPresShellWeak = do_GetWeakReference(aShell);
  }
 }