Changeset 83208 in webkit

Timestamp:

Apr 7, 2011 2:11:42 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-04-07 Jer Noble <​jer.noble@apple.com>

Reviewed by Eric Carlson.

HTMLVideoElement::webkitEnterFullscreen does not use new Full Screen API when available.
​https://bugs.webkit.org/show_bug.cgi?id=58070

Make the HTMLMediaElement full screen functions call into the new Full Screen API when
FULLSCREEN_API is enabled.

• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::enterFullscreen): (WebCore::HTMLMediaElement::exitFullscreen):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-07  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Eric Carlson.
+
+        HTMLVideoElement::webkitEnterFullscreen does not use new Full Screen API when available.
+        https://bugs.webkit.org/show_bug.cgi?id=58070
+
+        Make the HTMLMediaElement full screen functions call into the new Full Screen API when
+        FULLSCREEN_API is enabled.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::enterFullscreen):
+        (WebCore::HTMLMediaElement::exitFullscreen):
+
 2011-04-07  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2449 +2449 @@
 {
     LOG(Media, "HTMLMediaElement::enterFullscreen");
-
+#if ENABLE(FULLSCREEN_API)
+    if (document()->settings() && document()->settings()->fullScreenEnabled()) {
+        webkitRequestFullScreen(0);
+        return;
+    }
+#endif
     ASSERT(!m_isFullscreen);
     m_isFullscreen = true;
@@ -2461 +2466 @@
 {
     LOG(Media, "HTMLMediaElement::exitFullscreen");
-
+#if ENABLE(FULLSCREEN_API)
+    if (document()->settings() && document()->settings()->fullScreenEnabled() 
+        && document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == this) {
+        document()->webkitCancelFullScreen();
+        return;
+    }
+#endif
     ASSERT(m_isFullscreen);
     m_isFullscreen = false;