[ScreenOrientation] Fire pending lock request when we found it has failed.

content/browser/screen_orientation/screen_orientation_provider.cc

 // Copyright 2014 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/screen_orientation/screen_orientation_provider.h"
 
 #include "base/callback_helpers.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/navigation_handle.h"
@@ skipping 16 matching lines @@
 ScreenOrientationProvider::~ScreenOrientationProvider() = default;
 
 void ScreenOrientationProvider::LockOrientation(
     blink::WebScreenOrientationLockType orientation,
     const LockOrientationCallback& callback) {
   // Cancel any pending lock request.
   NotifyLockResult(ScreenOrientationLockResult::
                        SCREEN_ORIENTATION_LOCK_RESULT_ERROR_CANCELED);
   // Record new pending lock request.
   pending_callback_ = callback;
+  pending_lock_orientation_ = orientation;
 
   if (!delegate_ || !delegate_->ScreenOrientationProviderSupported()) {
     NotifyLockResult(ScreenOrientationLockResult::
                          SCREEN_ORIENTATION_LOCK_RESULT_ERROR_NOT_AVAILABLE);
     return;
   }
 
   if (delegate_->FullScreenRequired(web_contents())) {
     RenderViewHostImpl* rvhi =
         static_cast<RenderViewHostImpl*>(web_contents()->GetRenderViewHost());
     if (!rvhi) {
       NotifyLockResult(ScreenOrientationLockResult::
                            SCREEN_ORIENTATION_LOCK_RESULT_ERROR_CANCELED);
       return;
     }
     if (!static_cast<WebContentsImpl*>(web_contents())
              ->IsFullscreenForCurrentTab()) {
       NotifyLockResult(
           ScreenOrientationLockResult::
               SCREEN_ORIENTATION_LOCK_RESULT_ERROR_FULLSCREEN_REQUIRED);
       return;
     }
   }
 
   if (orientation == blink::WebScreenOrientationLockNatural) {
     orientation = GetNaturalLockType();
+    pending_lock_orientation_ = orientation;
     if (orientation == blink::WebScreenOrientationLockDefault) {
       // We are in a broken state, let's pretend we got canceled.
       NotifyLockResult(ScreenOrientationLockResult::
                            SCREEN_ORIENTATION_LOCK_RESULT_ERROR_CANCELED);
       return;
     }
   }
 
   lock_applied_ = true;
   delegate_->Lock(web_contents(), orientation);
 
   // If the orientation we are locking to matches the current orientation, we
   // should succeed immediately.
   if (LockMatchesCurrentOrientation(orientation)) {
     NotifyLockResult(
         ScreenOrientationLockResult::SCREEN_ORIENTATION_LOCK_RESULT_SUCCESS);
     return;
   }
-
-  pending_lock_orientation_ = orientation;
+// After delegate_ calls Lock() above, on Android we expect the actual
+// orientation value be returned asynchronous from OnOrientationChange() being
+// called later, but on other platforms we do expect current orientation has
+// changed to the value we wanted to lock to, otherwise let's pretend the lock
+// got cancelled to resolve the promise in blink side.
+#if !defined(OS_ANDROID)
+  else {
+    NotifyLockResult(ScreenOrientationLockResult::
+                         SCREEN_ORIENTATION_LOCK_RESULT_ERROR_CANCELED);
+    return;
+  }
+#endif
 }
 
 void ScreenOrientationProvider::UnlockOrientation() {
   // Cancel any pending lock request.
   NotifyLockResult(ScreenOrientationLockResult::
                        SCREEN_ORIENTATION_LOCK_RESULT_ERROR_CANCELED);
 
   if (!lock_applied_ || !delegate_)
     return;
 
   delegate_->Unlock(web_contents());
 
   lock_applied_ = false;
 }
 
+#if defined(OS_ANDROID)
 void ScreenOrientationProvider::OnOrientationChange() {
   if (!pending_lock_orientation_.has_value())
     return;
 
+  DCHECK(!pending_callback_.is_null());
   if (LockMatchesCurrentOrientation(pending_lock_orientation_.value())) {
-    DCHECK(!pending_callback_.is_null());
     NotifyLockResult(
         ScreenOrientationLockResult::SCREEN_ORIENTATION_LOCK_RESULT_SUCCESS);
+  } else {
+    // Screen orientation changed to a value not matching with current pending
+    // lock request, let's pretend it's cancelled to resolve the promise in
+    // blink side.
+    NotifyLockResult(ScreenOrientationLockResult::
+                         SCREEN_ORIENTATION_LOCK_RESULT_ERROR_CANCELED);
   }
 }
+#endif
 
 void ScreenOrientationProvider::NotifyLockResult(
     ScreenOrientationLockResult result) {
   if (!pending_callback_.is_null())
     base::ResetAndReturn(&pending_callback_).Run(result);
 
   pending_lock_orientation_.reset();
 }
 
 void ScreenOrientationProvider::SetDelegate(
@@ skipping 95 matching lines @@
     case blink::WebScreenOrientationLockDefault:
       NOTREACHED();
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 }  // namespace content