Changeset 83332 in webkit

Timestamp:

Apr 8, 2011 1:11:32 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

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

Reviewed by Eric Carlson.

Logic error in HTMLMediaElement::exitFullscreen()
​https://bugs.webkit.org/show_bug.cgi?id=58085

The new full screen API case could fall through to the legacy API case
unintentionally if a script calls exitFullscreen on an element which is
not the current full screen element.

• 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.
+
+        Logic error in HTMLMediaElement::exitFullscreen()
+        https://bugs.webkit.org/show_bug.cgi?id=58085
+
+        The new full screen API case could fall through to the legacy API case
+        unintentionally if a script calls exitFullscreen on an element which is
+        not the current full screen element.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::enterFullscreen):
+        (WebCore::HTMLMediaElement::exitFullscreen):
+
 2011-04-08  Mike Reed  <reed@google.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2450 +2450 @@
     LOG(Media, "HTMLMediaElement::enterFullscreen");
 #if ENABLE(FULLSCREEN_API)
-    if (document()->settings() && document()->settings()->fullScreenEnabled()) {
+    if (document() && document()->settings() && document()->settings()->fullScreenEnabled()) {
         webkitRequestFullScreen(0);
         return;
@@ -2467 +2467 @@
     LOG(Media, "HTMLMediaElement::exitFullscreen");
 #if ENABLE(FULLSCREEN_API)
-    if (document()->settings() && document()->settings()->fullScreenEnabled() 
-        && document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == this) {
-        document()->webkitCancelFullScreen();
+    if (document() && document()->settings() && document()->settings()->fullScreenEnabled()) {
+        if (document()->webkitIsFullScreen() && document()->webkitCurrentFullScreenElement() == this)
+            document()->webkitCancelFullScreen();
         return;
     }