Adds link disambiguation popup support to Windows.

content/browser/web_contents/web_contents_view_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/download/drag_download_util.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
+#include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/browser/web_contents/aura/gesture_nav_simple.h"
 #include "content/browser/web_contents/aura/image_window_delegate.h"
 #include "content/browser/web_contents/aura/overscroll_navigation_overlay.h"
 #include "content/browser/web_contents/aura/shadow_layer_delegate.h"
 #include "content/browser/web_contents/aura/window_slider.h"
 #include "content/browser/web_contents/touch_editable_impl_aura.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 772 matching lines @@
     return;
   }
   view->overscroll_controller()->set_delegate(this);
   if (!navigation_overlay_)
     navigation_overlay_.reset(new OverscrollNavigationOverlay(web_contents_));
 }
 
 void WebContentsViewAura::PrepareOverscrollWindow() {
   // If there is an existing |overscroll_window_| which is in the middle of an
   // animation, then destroying the window here causes the animation to be
-  // completed immidiately, which triggers |OnImplicitAnimationsCompleted()|
+  // completed immediately, which triggers |OnImplicitAnimationsCompleted()|
   // callback, and that tries to reset |overscroll_window_| again, causing a
   // double-free. So use a temporary variable here.
   if (overscroll_window_) {
     base::AutoReset<OverscrollMode> reset_state(&current_overscroll_gesture_,
                                                 current_overscroll_gesture_);
     scoped_ptr<aura::Window> reset_window(overscroll_window_.release());
   }
 
   OverscrollWindowDelegate* overscroll_delegate = new OverscrollWindowDelegate(
       web_contents_,
@@ skipping 157 matching lines @@
   RenderWidgetHostViewAura* rwhva = ToRenderWidgetHostViewAura(
       web_contents_->GetRenderWidgetHostView());
   touch_editable_->AttachToView(rwhva);
 }
 
 void WebContentsViewAura::OverscrollUpdateForWebContentsDelegate(int delta_y) {
   if (web_contents_->GetDelegate() && IsScrollEndEffectEnabled())
     web_contents_->GetDelegate()->OverscrollUpdate(delta_y);
 }
 
+#if defined(OS_WIN)

[sky, 2014/08/04 20:05:20]

No ifdefs here.

[luken, 2014/09/11 01:07:28]

Done.

+void WebContentsViewAura::ProcessLinkDisambiguationGesture(
+    ui::GestureEvent* event) {
+  blink::WebGestureEvent web_gesture = content::MakeWebGestureEvent(event);
+  // If we fail to make a WebGestureEvent that is a Tap from the provided event,
+  // don't forward it to Blink.
+  if (web_gesture.type < blink::WebInputEvent::Type::GestureTap ||
+      web_gesture.type > blink::WebInputEvent::Type::GestureTapCancel)
+    return;
+
+  RenderWidgetHostViewAura* rwhva =
+      ToRenderWidgetHostViewAura(web_contents_->GetRenderWidgetHostView());
+  RenderWidgetHostImpl* host =
+      RenderWidgetHostImpl::From(rwhva->GetRenderWidgetHost());
+  host->ForwardGestureEvent(web_gesture);
+}
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, WebContentsView implementation:
 
 gfx::NativeView WebContentsViewAura::GetNativeView() const {
   return window_.get();
 }
 
 gfx::NativeView WebContentsViewAura::GetContentNativeView() const {
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   return rwhv ? rwhv->GetNativeView() : NULL;
@@ skipping 261 matching lines @@
 }
 
 void WebContentsViewAura::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       !web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse) &&
       delegate_.get()) {
     delegate_->TakeFocus(reverse);
   }
 }
 
+#if defined(OS_WIN)

[sky, 2014/08/04 20:05:20]

No ifdefs here.

[luken, 2014/09/11 01:07:27]

Done.

+void WebContentsViewAura::ShowDisambiguationPopup(
+    const gfx::Rect& target_rect,
+    const SkBitmap& zoomed_bitmap) {
+  if (delegate_) {
+    delegate_->ShowDisambiguationPopup(
+        target_rect,
+        zoomed_bitmap,
+        window_.get(),
+        base::Bind(&WebContentsViewAura::ProcessLinkDisambiguationGesture,
+                   base::Unretained(this)));
+  }
+}
+
+void WebContentsViewAura::HideDisambiguationPopup() {
+  if (delegate_)
+    delegate_->HideDisambiguationPopup();
+}
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, OverscrollControllerDelegate implementation:
 
 gfx::Rect WebContentsViewAura::GetVisibleBounds() const {
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (!rwhv || !rwhv->IsShowing())
     return gfx::Rect();
 
   return rwhv->GetViewBounds();
 }
@@ skipping 334 matching lines @@
   if (visible) {
     if (!web_contents_->should_normally_be_visible())
       web_contents_->WasShown();
   } else {
     if (web_contents_->should_normally_be_visible())
       web_contents_->WasHidden();
   }
 }
 
 }  // namespace content