[Media controls] Integrate rotate-to-fullscreen with orientation lock

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

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 295 matching lines @@
   resize_observer_->observe(&media_element);
 }
 
 MediaControlsImpl* MediaControlsImpl::Create(HTMLMediaElement& media_element,
                                              ShadowRoot& shadow_root) {
   MediaControlsImpl* controls = new MediaControlsImpl(media_element);
   controls->SetShadowPseudoId(AtomicString("-webkit-media-controls"));
   controls->InitializeControls();
   controls->Reset();
 
-  // RotateToFullscreen and FullscreenOrientationLock are not yet compatible
-  // so enabling RotateToFullscreen disables FullscreenOrientationLock.
-  // TODO(johnme): Make it possible to use both features simultaneously.
+  if (RuntimeEnabledFeatures::videoFullscreenOrientationLockEnabled() &&
+      media_element.IsHTMLVideoElement()) {
+    // Initialize the orientation lock when going fullscreen feature.
+    controls->orientation_lock_delegate_ =
+        new MediaControlsOrientationLockDelegate(
+            toHTMLVideoElement(media_element));
+  }
   if (RuntimeEnabledFeatures::videoRotateToFullscreenEnabled() &&
       media_element.IsHTMLVideoElement()) {
     // Initialize the rotate-to-fullscreen feature.
     controls->rotate_to_fullscreen_delegate_ =
         new MediaControlsRotateToFullscreenDelegate(
             toHTMLVideoElement(media_element));
-  } else if (RuntimeEnabledFeatures::videoFullscreenOrientationLockEnabled() &&
-             media_element.IsHTMLVideoElement()) {
-    // Initialize the orientation lock when going fullscreen feature.
-    controls->orientation_lock_delegate_ =
-        new MediaControlsOrientationLockDelegate(
-            toHTMLVideoElement(media_element));
   }
 
   shadow_root.AppendChild(controls);
   return controls;
 }
 
 // The media controls DOM structure looks like:
 //
 // MediaControlsImpl
 //     (-webkit-media-controls)
@@ skipping 876 matching lines @@
   visitor->Trace(overlay_cast_button_);
   visitor->Trace(media_event_listener_);
   visitor->Trace(window_event_listener_);
   visitor->Trace(orientation_lock_delegate_);
   visitor->Trace(rotate_to_fullscreen_delegate_);
   MediaControls::Trace(visitor);
   HTMLDivElement::Trace(visitor);
 }
 
 }  // namespace blink