From 6f3aaacaecf4e4a5f55849e567f05323bb7f5b76 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Sat, 22 Dec 2018 08:18:10 +0000
Subject: [PATCH] Bug 1515740 - Restore two flags passed to GetFrameForPoint()
 in SelectWordOrShortcut() on Android. r=emilio,botond

Differential Revision: https://phabricator.services.mozilla.com/D15226

--HG--
extra : moz-landing-system : lando
---
 layout/base/AccessibleCaretManager.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/layout/base/AccessibleCaretManager.cpp b/layout/base/AccessibleCaretManager.cpp
index 782062f5b4cb..cdbf755ed5fc 100644
--- a/layout/base/AccessibleCaretManager.cpp
+++ b/layout/base/AccessibleCaretManager.cpp
@@ -502,9 +502,7 @@ nsresult AccessibleCaretManager::SelectWordOrShortcut(const nsPoint& aPoint) {
 #ifdef MOZ_WIDGET_ANDROID
   // On Android, we need IgnoreRootScrollFrame for correct hit testing when
   // zoomed in or out.
-  //
-  // FIXME(emilio): But do we really want to override the other two flags?
-  options = nsLayoutUtils::FrameForPointOption::IgnoreRootScrollFrame;
+  options += nsLayoutUtils::FrameForPointOption::IgnoreRootScrollFrame;
 #endif
 
   AutoWeakFrame ptFrame =