Fix: nwjs/nw.js#6985

ffanny · Feb 26, 2019 · d84ac1a · d84ac1a
1 parent d576c14
commit d84ac1a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1081,8 +1081,13 @@ void RenderWidgetHostImpl::SetPageFocus(bool focused) {
     if (IsKeyboardLocked())
       UnlockKeyboard();
 
-    if (auto* touch_emulator = GetExistingTouchEmulator())
-      touch_emulator->CancelTouch();
+    if (auto* touch_emulator = GetExistingTouchEmulator()) {
+      if (touch_emulator->rfh_limit()) {
+        if (touch_emulator->rfh_limit()->GetView() == GetView())
+          touch_emulator->CancelTouch();
+      } else
+        touch_emulator->CancelTouch();
+    }
   } else if (keyboard_lock_allowed_) {
     LockKeyboard();
   }