Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegate.cpp

Issue 2556573003: Media: lock orientation when <video> goes fullscreen. (Closed)
Patch Set: with unit tests Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegate.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegate.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegate.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..418c4b9e0aa80634a3c177f0f9d15d3d5d0944c3
--- /dev/null
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegate.cpp
@@ -0,0 +1,147 @@
+// 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 "MediaControlsOrientationLockDelegate.h"
+
+#include "core/events/Event.h"
+#include "core/frame/FrameHost.h"
+#include "core/frame/ScreenOrientationController.h"
+#include "core/html/HTMLVideoElement.h"
+#include "core/page/ChromeClient.h"
+#include "public/platform/WebScreenInfo.h"
+#include "public/platform/modules/screen_orientation/WebLockOrientationCallback.h"
+
+namespace blink {
+
+namespace {
+
+// WebLockOrientationCallback implementation that will not react to a success
+// nor a failure.
+class DummyScreenOrientationCallback : public WebLockOrientationCallback {
+ public:
+ void onSuccess() override {}
+ void onError(WebLockOrientationError) override {}
+};
+
+} // anonymous namespace
+
+MediaControlsOrientationLockDelegate::MediaControlsOrientationLockDelegate(
+ MediaControls* mediaControls)
+ : EventListener(CPPEventListenerType), m_mediaControls(mediaControls) {
+ DCHECK(m_mediaControls->mediaElement().isHTMLVideoElement());
+
+ document().addEventListener(EventTypeNames::fullscreenchange, this, false);
+ document().addEventListener(EventTypeNames::webkitfullscreenchange, this,
foolip 2016/12/12 23:16:05 Because webkitfullscreenchange targets and element
mlamouri (slow - plz ping) 2016/12/13 10:25:17 Is your point that HTMLMediaElement is always noti
foolip 2016/12/13 10:35:39 It would be nice to not have a separate mechanism,
mlamouri (slow - plz ping) 2016/12/13 21:15:16 Listening to `fullscreenchange` on document and `w
+ false);
+
+ videoElement().addEventListener(EventTypeNames::loadedmetadata, this, false);
Zhiqiang Zhang (Slow) 2016/12/13 11:53:28 nit: Wouldn't this listen to loadedmetadata too of
mlamouri (slow - plz ping) 2016/12/13 21:15:16 loadedmetadata is generally called once. The overh
+}
+
+bool MediaControlsOrientationLockDelegate::operator==(
+ const EventListener& other) const {
+ return this == &other;
+}
+
+void MediaControlsOrientationLockDelegate::maybeLockOrientation() {
+ DCHECK(m_state != State::MaybeLockedFullscreen);
+
+ if (videoElement().getReadyState() == HTMLMediaElement::kHaveNothing) {
+ m_state = State::PendingMetadata;
+ return;
+ }
+
+ m_state = State::MaybeLockedFullscreen;
+
+ auto controller = ScreenOrientationController::from(*document().frame());
foolip 2016/12/12 23:16:05 Is it impossible for document().frame() to be null
mlamouri (slow - plz ping) 2016/12/13 21:15:16 Fixed.
+ if (controller->maybeHasActiveLock())
+ return;
+
+ controller->lock(computeOrientationLock(),
+ WTF::wrapUnique(new DummyScreenOrientationCallback));
+ m_shouldUnlockOrientation = true;
+}
+
+void MediaControlsOrientationLockDelegate::maybeUnlockOrientation() {
+ DCHECK(m_state != State::PendingFullscreen);
+
+ m_state = State::PendingFullscreen;
+
+ if (!m_shouldUnlockOrientation)
+ return;
+
+ ScreenOrientationController::from(*document().frame())->unlock();
+ m_shouldUnlockOrientation = false;
+}
+
+HTMLVideoElement& MediaControlsOrientationLockDelegate::videoElement() const {
+ return toHTMLVideoElement(m_mediaControls->mediaElement());
+}
+
+Document& MediaControlsOrientationLockDelegate::document() const {
+ return videoElement().document();
+}
+
+void MediaControlsOrientationLockDelegate::handleEvent(
+ ExecutionContext* executionContext,
+ Event* event) {
+ if (event->type() == EventTypeNames::fullscreenchange ||
+ event->type() == EventTypeNames::webkitfullscreenchange) {
+ if (videoElement().isFullscreen()) {
+ if (m_state == State::PendingFullscreen)
+ maybeLockOrientation();
+ } else {
+ if (m_state != State::PendingFullscreen)
+ maybeUnlockOrientation();
+ }
+
+ return;
+ }
+
+ if (event->type() == EventTypeNames::loadedmetadata) {
+ if (m_state == State::PendingMetadata)
+ maybeLockOrientation();
+
+ return;
+ }
+
+ NOTREACHED();
+}
+
+WebScreenOrientationLockType
+MediaControlsOrientationLockDelegate::computeOrientationLock() const {
DaleCurtis 2016/12/12 23:25:13 Doesn't this need to know the current rotation? Th
mlamouri (slow - plz ping) 2016/12/13 10:25:17 I was planning to handle this as a follow-up. I ha
+ const unsigned width = videoElement().videoWidth();
foolip 2016/12/12 23:16:05 DCHECK something about readyState?
mlamouri (slow - plz ping) 2016/12/13 21:15:16 Done.
+ const unsigned height = videoElement().videoHeight();
+
+ if (width > height)
+ return WebScreenOrientationLockLandscape;
+
+ if (height > width)
+ return WebScreenOrientationLockPortrait;
+
+ // For square videos, try to lock to the current screen orientation for
+ // consistency. Use WebScreenOrientationLockLandscape as a fallback value.
+ // TODO(mlamouri): we could improve this by having direct access to
+ // `window.screen.orientation.type`.
+ Frame* frame = document().frame();
+ if (!frame || !frame->host())
+ return WebScreenOrientationLockLandscape;
+
+ switch (frame->host()->chromeClient().screenInfo().orientationType) {
foolip 2016/12/12 23:16:05 If you use frame->chromeClient() you can skip the
mlamouri (slow - plz ping) 2016/12/13 21:15:16 Done.
+ case WebScreenOrientationPortraitPrimary:
+ case WebScreenOrientationPortraitSecondary:
+ return WebScreenOrientationLockPortrait;
+ case WebScreenOrientationLandscapePrimary:
+ case WebScreenOrientationLandscapeSecondary:
+ return WebScreenOrientationLockLandscape;
+ case WebScreenOrientationUndefined:
+ return WebScreenOrientationLockLandscape;
+ }
+}
+
+DEFINE_TRACE(MediaControlsOrientationLockDelegate) {
+ EventListener::trace(visitor);
+ visitor->trace(m_mediaControls);
+}
+
+} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698