Silent mouse lock after unlock by target

chrome/browser/ui/fullscreen_controller.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 "chrome/browser/ui/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 45 matching lines @@
     return false;
   DCHECK(tab == browser_->GetSelectedWebContents());
   return true;
 }
 
 bool FullscreenController::IsMouseLockRequested() const {
   return mouse_lock_state_ == MOUSELOCK_REQUESTED;
 }
 
 bool FullscreenController::IsMouseLocked() const {
-  return mouse_lock_state_ == MOUSELOCK_ACCEPTED;
+  return mouse_lock_state_ == MOUSELOCK_ACCEPTED
+      || mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENT;
 }
 
 void FullscreenController::RequestToLockMouse(WebContents* tab,
-                                              bool user_gesture) {
+    bool user_gesture, bool after_unlocked_by_target) {
   DCHECK(!IsMouseLocked());
   NotifyMouseLockChange();
 
   // Must have a user gesture, or we must already be in tab fullscreen.

[scheib, 2012/05/26 01:12:34]

Update comment, e.g.: 
Must have a user gesture to prevent misbehaving sites from constantly re-locking
the mouse. Exceptions are when the page has unlocked (i.e. not the user), or if
we're in tab fullscreen (user gesture required for that).

[dmurph, 2012/05/30 00:17:51]

ok

-  if (!user_gesture && !IsFullscreenForTabOrPending(tab)) {
+  if (!after_unlocked_by_target && !user_gesture
+      && !IsFullscreenForTabOrPending(tab)) {
     tab->GotResponseToLockMouseRequest(false);
     return;
   }
 
   mouse_lock_tab_ = TabContentsWrapper::GetCurrentWrapperForContents(tab);
   FullscreenExitBubbleType bubble_type = GetFullscreenExitBubbleType();
 
   switch (GetMouseLockSetting(tab->GetURL())) {
     case CONTENT_SETTING_ALLOW:
       // If bubble already displaying buttons we must not lock the mouse yet,
       // or it would prevent pressing those buttons. Instead, merge the request.
       if (fullscreen_bubble::ShowButtonsForType(bubble_type)) {
         mouse_lock_state_ = MOUSELOCK_REQUESTED;
       } else {
         // Lock mouse.
         if (tab->GotResponseToLockMouseRequest(true)) {
-          mouse_lock_state_ = MOUSELOCK_ACCEPTED;
+          if (after_unlocked_by_target) {
+            mouse_lock_state_ = MOUSELOCK_ACCEPTED_SILENT;
+          } else {
+            mouse_lock_state_ = MOUSELOCK_ACCEPTED;
+          }
         } else {
           mouse_lock_tab_ = NULL;
           mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
         }
       }
       break;
     case CONTENT_SETTING_BLOCK:
       tab->GotResponseToLockMouseRequest(false);
       mouse_lock_tab_ = NULL;
       mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
@@ skipping 280 matching lines @@
 
 FullscreenExitBubbleType FullscreenController::GetFullscreenExitBubbleType()
     const {
   // In kiosk mode we always want to be fullscreen and do not want to show
   // exit instructions for browser mode fullscreen.
   bool kiosk = false;
 #if !defined(OS_MACOSX)  // Kiosk mode not available on Mac.
   kiosk = CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
 #endif
 
+  if(mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENT) {
+    return FEB_TYPE_NONE;
+  }
+
   if (fullscreened_tab_) {
     if (tab_fullscreen_accepted_) {
       if (IsMouseLocked()) {
         return FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION;
       } else if (IsMouseLockRequested()) {
         return FEB_TYPE_MOUSELOCK_BUTTONS;
       } else {
         return FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION;
       }
     } else {  // Full screen not yet accepted.
@@ skipping 90 matching lines @@
     window_->ExitFullscreen();
     extension_caused_fullscreen_ = GURL();
   }
   UpdateFullscreenExitBubbleContent();
 
   // Once the window has become fullscreen it'll call back to
   // WindowFullscreenStateChanged(). We don't do this immediately as
   // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let
   // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate.
 }