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

@@ -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 =