[Media Controls] Prevent fullscreen orientation lock rotate glitch

third_party/WebKit/Source/modules/media_controls/MediaControlsOrientationLockDelegate.cpp

 // Copyright 2016 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 "modules/media_controls/MediaControlsOrientationLockDelegate.h"
 
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/events/Event.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/Screen.h"
 #include "core/frame/ScreenOrientationController.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/page/ChromeClient.h"
 #include "modules/device_orientation/DeviceOrientationData.h"
 #include "modules/device_orientation/DeviceOrientationEvent.h"
 #include "modules/screen_orientation/ScreenOrientation.h"
 #include "modules/screen_orientation/ScreenScreenOrientation.h"
@@ skipping 144 matching lines @@
     return;
 
   monitor_.reset();  // Cancel any GotIsAutoRotateEnabledByUser Mojo callback.
   if (LocalDOMWindow* dom_window = GetDocument().domWindow()) {
     dom_window->removeEventListener(EventTypeNames::deviceorientation, this,
                                     false);
   }
 
   ScreenOrientationController::From(*GetDocument().GetFrame())->unlock();
   locked_orientation_ = kWebScreenOrientationLockDefault /* unlocked */;
+
+  unlock_task_.Cancel();
 }
 
 void MediaControlsOrientationLockDelegate::MaybeListenToDeviceOrientation() {
   DCHECK_EQ(state_, State::kMaybeLockedFullscreen);
   DCHECK_NE(locked_orientation_, kWebScreenOrientationLockDefault);
 
   // If the rotate-to-fullscreen feature is also enabled, then start listening
   // to deviceorientation events so the orientation can be unlocked once the
   // user rotates the device to match the video's orientation (allowing the user
   // to then exit fullscreen by rotating their device back to the opposite
@@ skipping 215 matching lines @@
 
   DeviceOrientationType video_orientation =
       locked_orientation_ == kWebScreenOrientationLockPortrait
           ? DeviceOrientationType::kPortrait
           : DeviceOrientationType::kLandscape;
 
   if (device_orientation != video_orientation)
     return;
 
   // Job done: the user rotated their device to match the orientation of the
-  // video that we locked to, so now we can unlock (and stop listening).
-  MaybeUnlockOrientation();
+  // video that we locked to, so now we can stop listening and unlock.
+  if (LocalDOMWindow* dom_window = GetDocument().domWindow()) {
+    dom_window->removeEventListener(EventTypeNames::deviceorientation, this,
+                                    false);
+  }
+  // Delay before unlocking, as a workaround for the case where the device is
+  // initially portrait-primary, then fullscreen orientation lock locks it to
+  // landscape and the screen orientation changes to landscape-primary, but the
+  // user actually rotates the device to landscape-secondary. In that case, if
+  // this delegate unlocks the orientation before Android has detected the
+  // rotation to landscape-secondary (which is slow due to low-pass filtering),
+  // Android would change the screen orientation back to portrait-primary. This
+  // is avoided by delaying unlocking long enough to ensure that Android has
+  // detected the orientation change.
+  unlock_task_ =
+      TaskRunnerHelper::Get(TaskType::kMediaElementEvent, &GetDocument())
+          ->PostDelayedCancellableTask(
+              BLINK_FROM_HERE,
+              WTF::Bind(
+                  &MediaControlsOrientationLockDelegate::MaybeUnlockOrientation,
+                  WrapPersistent(this)),
+              TimeDelta::FromMilliseconds(kUnlockDelayMs));
 }
 
 DEFINE_TRACE(MediaControlsOrientationLockDelegate) {
   EventListener::Trace(visitor);
   visitor->Trace(video_element_);
 }
 
 }  // namespace blink