| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| index af4a62bc27f0802ac68cfe87e78fb7519f221230..86b1242e1100b01b2cfcece47e134c62f4fdc2f7 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -227,6 +227,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() OVERRIDE;
|
| virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible()
|
| OVERRIDE;
|
| + virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
|
| + const SkBitmap& zoomed_bitmap) OVERRIDE;
|
| virtual bool LockMouse() OVERRIDE;
|
| virtual void UnlockMouse() OVERRIDE;
|
| virtual void OnSwapCompositorFrame(
|
| @@ -337,6 +339,14 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| void OnLegacyWindowDestroyed();
|
| #endif
|
|
|
| + void DisambiguationPopupRendered(bool success, const SkBitmap& result);
|
| +
|
| + void HideDisambiguationPopup();
|
| +
|
| + void ProcessDisambiguationGesture(ui::GestureEvent* event);
|
| +
|
| + void ProcessDisambiguationMouse(ui::MouseEvent* event);
|
| +
|
| // Method to indicate if this instance is shutting down or closing.
|
| // TODO(shrikant): Discuss around to see if it makes sense to add this method
|
| // as part of RenderWidgetHostView.
|
| @@ -552,7 +562,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| gfx::Point unlocked_global_mouse_position_;
|
| // Last cursor position relative to screen. Used to compute movementX/Y.
|
| gfx::Point global_mouse_position_;
|
| - // In mouse locked mode, we syntheticaly move the mouse cursor to the center
|
| + // In mouse locked mode, we synthetically move the mouse cursor to the center
|
| // of the window when it reaches the window borders to avoid it going outside.
|
| // This flag is used to differentiate between these synthetic mouse move
|
| // events vs. normal mouse move events.
|
| @@ -578,7 +588,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
|
|
| typedef std::map<HWND, WebPluginGeometry> PluginWindowMoves;
|
| // Contains information about each windowed plugin's clip and cutout rects (
|
| - // from the renderer). This is needed because when the transient windoiws
|
| + // from the renderer). This is needed because when the transient windows
|
| // over this view changes, we need this information in order to create a new
|
| // region for the HWND.
|
| PluginWindowMoves plugin_window_moves_;
|
| @@ -617,6 +627,13 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
|
|
| base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
|
|
|
| + gfx::Rect disambiguation_target_rect_;
|
| +
|
| + // The last scroll offset when we start to render the link disambiguation
|
| + // view, so we can ensure the window hasn't moved between copying from the
|
| + // compositing surface and showing the disambiguation popup.
|
| + gfx::Vector2dF disambiguation_scroll_offset_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
|
| };
|
|
|
|
|