Delete Android content detectors.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 697 matching lines @@
 
   // Special handling for slow-path fling gestures.
   switch (event.type()) {
     case WebInputEvent::GestureFlingStart: {
       if (mainFrameImpl()
               ->frame()
               ->eventHandler()
               .isScrollbarHandlingGestures())
         break;
       endActiveFlingAnimation();
-      m_client->cancelScheduledContentIntents();
       m_positionOnFlingStart = WebPoint(event.x, event.y);
       m_globalPositionOnFlingStart = WebPoint(event.globalX, event.globalY);
       m_flingModifier = event.modifiers();
       m_flingSourceDevice = event.sourceDevice;
       DCHECK_NE(m_flingSourceDevice, WebGestureDeviceUninitialized);
       std::unique_ptr<WebGestureCurve> flingCurve =
           WTF::wrapUnique(Platform::current()->createFlingAnimationCurve(
               event.sourceDevice,
               WebFloatPoint(event.data.flingStart.velocityX,
                             event.data.flingStart.velocityY),
@@ skipping 28 matching lines @@
 
   WebGestureEvent scaledEvent =
       TransformWebGestureEvent(mainFrameImpl()->frameView(), event);
 
   // Special handling for double tap and scroll events as we don't want to
   // hit test for them.
   switch (event.type()) {
     case WebInputEvent::GestureDoubleTap:
       if (m_webSettings->doubleTapToZoomEnabled() &&
           minimumPageScaleFactor() != maximumPageScaleFactor()) {
-        m_client->cancelScheduledContentIntents();
         animateDoubleTapZoom(
             flooredIntPoint(scaledEvent.positionInRootFrame()));
       }
       // GestureDoubleTap is currently only used by Android for zooming. For
       // WebCore, GestureTap with tap count = 2 is used instead. So we drop
       // GestureDoubleTap here.
       eventResult = WebInputEventResult::HandledSystem;
       m_client->didHandleGestureEvent(event, eventCancelled);
       return eventResult;
     case WebInputEvent::GestureScrollBegin:
-      m_client->cancelScheduledContentIntents();
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureScrollUpdate:
     case WebInputEvent::GestureFlingStart:
       // Scrolling-related gesture events invoke EventHandler recursively for
       // each frame down the chain, doing a single-frame hit-test per frame.
       // This matches handleWheelEvent.  Perhaps we could simplify things by
       // rewriting scroll handling to work inner frame out, and then unify with
       // other gesture events.
       eventResult =
           mainFrameImpl()->frame()->eventHandler().handleGestureScrollEvent(
@@ skipping 26 matching lines @@
     case WebInputEvent::GestureLongPress:
       for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->startHighlightAnimationIfNeeded();
       break;
     default:
       break;
   }
 
   switch (event.type()) {
     case WebInputEvent::GestureTap: {
-      m_client->cancelScheduledContentIntents();
-      if (detectContentOnTouch(targetedEvent)) {
-        eventResult = WebInputEventResult::HandledSystem;
-        break;
-      }
-
       // Don't trigger a disambiguation popup on sites designed for mobile
       // devices.  Instead, assume that the page has been designed with big
       // enough buttons and links.  Don't trigger a disambiguation popup when
       // screencasting, since it's implemented outside of compositor pipeline
       // and is not being screencasted itself. This leads to bad user
       // experience.
       WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl();
       VisualViewport& visualViewport = page()->visualViewport();
       bool screencastEnabled = devTools && devTools->screencastEnabled();
       if (event.data.tap.width > 0 &&
@@ skipping 46 matching lines @@
       }
       m_lastHiddenPagePopup = nullptr;
       break;
     }
     case WebInputEvent::GestureTwoFingerTap:
     case WebInputEvent::GestureLongPress:
     case WebInputEvent::GestureLongTap: {
       if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         break;
 
-      m_client->cancelScheduledContentIntents();
       m_page->contextMenuController().clearContextMenu();
       {
         ContextMenuAllowedScope scope;
         eventResult =
             mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
                 targetedEvent);
       }
 
       break;
     }
@@ skipping 11 matching lines @@
           targetedEvent);
       break;
     }
     case WebInputEvent::GestureTapCancel: {
       m_lastHiddenPagePopup = nullptr;
       eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
           targetedEvent);
       break;
     }
     case WebInputEvent::GestureShowPress: {
-      m_client->cancelScheduledContentIntents();
       eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
           targetedEvent);
       break;
     }
     case WebInputEvent::GestureTapUnconfirmed: {
       eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
           targetedEvent);
       break;
     }
     default: { NOTREACHED(); }
@@ skipping 3163 matching lines @@
   if (!m_visualViewportContainerLayer)
     return;
 
   // When the device emulation transform is updated, to avoid incorrect
   // scales and fuzzy raster from the compositor, force all content to
   // pick ideal raster scales.
   m_visualViewportContainerLayer->setTransform(m_deviceEmulationTransform);
   m_layerTreeView->forceRecalculateRasterScales();
 }
 
-bool WebViewImpl::detectContentOnTouch(
-    const GestureEventWithHitTestResults& targetedEvent) {
-  if (!m_page->mainFrame()->isLocalFrame())
-    return false;
-
-  // Need a local copy of the hit test as
-  // setToShadowHostIfInUserAgentShadowRoot() will modify it.
-  HitTestResult touchHit = targetedEvent.hitTestResult();
-  touchHit.setToShadowHostIfInRestrictedShadowRoot();
-
-  if (touchHit.isContentEditable())
-    return false;
-
-  Node* node = touchHit.innerNode();
-  if (!node || !node->isTextNode())
-    return false;
-
-  // Ignore when tapping on links or nodes listening to click events, unless
-  // the click event is on the body element, in which case it's unlikely that
-  // the original node itself was intended to be clickable.
-  for (; node && !isHTMLBodyElement(*node);
-       node = LayoutTreeBuilderTraversal::parent(*node)) {
-    if (node->isLink() || node->willRespondToTouchEvents() ||
-        node->willRespondToMouseClickEvents())
-      return false;
-  }
-
-  WebURL intent = m_client->detectContentIntentAt(touchHit);
-  if (!intent.isValid())
-    return false;
-
-  // This code is called directly after hit test code, with no user code
-  // running in between, thus it is assumed that the frame pointer is non-null.
-  bool isMainFrame = node ? node->document().frame()->isMainFrame() : true;
-  m_client->scheduleContentIntent(intent, isMainFrame);
-  return true;
-}
-
 WebViewScheduler* WebViewImpl::scheduler() const {
   return m_scheduler.get();
 }
 
 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState,
                                      bool isInitialState) {
   DCHECK(visibilityState == WebPageVisibilityStateVisible ||
          visibilityState == WebPageVisibilityStateHidden ||
          visibilityState == WebPageVisibilityStatePrerender);
 
@@ skipping 72 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink