Merge lp:~osomon/oxide/reset-touch-selection-state-when-navigating into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Reset the touch selection state when navigating to a different page.

[lp:~osomon/oxide/reset-touch-selection-state-when-navigating]

1369. By Olivier Tilloy on 2016-03-10

Call TouchSelectionChanged() in a number of places instead of in DidNavigateMainFrame().

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'shared/browser/oxide_web_contents_view.cc'
--- shared/browser/oxide_web_contents_view.cc	2016-03-01 18:44:48 +0000
+++ shared/browser/oxide_web_contents_view.cc	2016-03-10 17:24:23 +0000
@@ -391,6 +391,7 @@
   }
 
   EditingCapabilitiesChanged();
+  TouchSelectionChanged();
 }
 
 void WebContentsView::DidNavigateMainFrame(
@@ -416,6 +417,8 @@
   static_cast<RenderWidgetHostView*>(rwh->GetView())->SetContainer(this);
 
   web_contents()->GetRenderWidgetHostView()->Hide();
+
+  TouchSelectionChanged();
 }
 
 void WebContentsView::DidDestroyFullscreenWidget(int routing_id) {
@@ -441,6 +444,8 @@
   } else {
     orig_rwhv->Blur();
   }
+
+  TouchSelectionChanged();
 }
 
 void WebContentsView::DidAttachInterstitialPage() {
@@ -450,6 +455,8 @@
   RenderWidgetHostView* rwhv = GetRenderWidgetHostView();
   rwhv->SetContainer(this);
   interstitial_rwh_id_ = rwhv->GetRenderWidgetHost();
+
+  TouchSelectionChanged();
 }
 
 void WebContentsView::DidDetachInterstitialPage() {
@@ -464,6 +471,8 @@
   }
 
   static_cast<RenderWidgetHostView*>(rwh->GetView())->SetContainer(nullptr);
+
+  TouchSelectionChanged();
 }
 
 void WebContentsView::CompositorSwapFrame(CompositorFrameHandle* handle) {