Changeset 86737 in webkit

Timestamp:

May 17, 2011 11:12:12 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-05-17 Jeremy Noble <​jer.noble@apple.com>

Reviewed by Darin Adler.

Removing a full-screen element or ancestor from the DOM should trigger exiting full-screen mode.
​https://bugs.webkit.org/show_bug.cgi?id=60997

Updated the following tests with the new expectation that removing an element from the DOM will trigger
full screen mode to exit.

• fullscreen/full-screen-remove-ancestor-expected.txt:
• fullscreen/full-screen-remove-ancestor.html:
• fullscreen/full-screen-remove-children-expected.txt:
• fullscreen/full-screen-remove-children.html:
• fullscreen/full-screen-remove-expected.txt:
• fullscreen/full-screen-remove.html:

2011-05-17 Jeremy Noble <​jer.noble@apple.com>

Reviewed by Darin Adler.

Removing a full-screen element or ancestor from the DOM should trigger exiting full-screen mode.
​https://bugs.webkit.org/show_bug.cgi?id=60997

Tests: fullscreen/full-screen-remove-ancestor.html

fullscreen/full-screen-remove-children.html
fullscreen/full-screen-remove.html

• dom/Document.cpp: (WebCore::Document::fullScreenChangeDelayTimerFired): If the target node was removed from the document

make sure to message the documentElement() as well.

(WebCore::Document::fullScreenElementRemoved): Cancel full screen mode.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-remove-ancestor-expected.txt (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-remove-ancestor.html (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-remove-children-expected.txt (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-remove-children.html (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-remove-expected.txt (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-remove.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-17  Jeremy Noble  <jer.noble@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Removing a full-screen element or ancestor from the DOM should trigger exiting full-screen mode.
+        https://bugs.webkit.org/show_bug.cgi?id=60997
+
+        Updated the following tests with the new expectation that removing an element from the DOM will trigger
+        full screen mode to exit.
+
+        * fullscreen/full-screen-remove-ancestor-expected.txt:
+        * fullscreen/full-screen-remove-ancestor.html:
+        * fullscreen/full-screen-remove-children-expected.txt:
+        * fullscreen/full-screen-remove-children.html:
+        * fullscreen/full-screen-remove-expected.txt:
+        * fullscreen/full-screen-remove.html:
+
 2011-05-17  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/fullscreen/full-screen-remove-ancestor-expected.txt

@@ -2 +2 @@
 EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLElement]') OK
 EVENT(webkitfullscreenchange)
-EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
+EXPECTED (document.webkitCurrentFullScreenElement == 'null') OK
 END OF TEST
 

trunk/LayoutTests/fullscreen/full-screen-remove-ancestor.html

@@ -20 +20 @@
 
         var spanEnteredFullScreen = function(event) {
-            callback = documentEnteredFullScreen;
+            callback = spanExitedFullScreen;
             testExpected("document.webkitCurrentFullScreenElement", span);
             document.body.removeChild(div);
         };
 
-        var documentEnteredFullScreen = function(event) {
+        var spanExitedFullScreen = function(event) {
             callback = null;
-            testExpected("document.webkitCurrentFullScreenElement", document.documentElement);
+            testExpected("document.webkitCurrentFullScreenElement", null);
             endTest();
         };

trunk/LayoutTests/fullscreen/full-screen-remove-children-expected.txt

@@ -2 +2 @@
 EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLElement]') OK
 EVENT(webkitfullscreenchange)
-EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
+EXPECTED (document.webkitCurrentFullScreenElement == 'null') OK
 END OF TEST
 

trunk/LayoutTests/fullscreen/full-screen-remove-children.html

@@ -20 +20 @@
 
         var spanEnteredFullScreen = function(event) {
-            callback = documentEnteredFullScreen;
+            callback = spanExitedFullScreen;
             testExpected("document.webkitCurrentFullScreenElement", span);
             div.innerHTML = "";
         };
 
-        var documentEnteredFullScreen = function(event) {
+        var spanExitedFullScreen = function(event) {
             callback = null;
-            testExpected("document.webkitCurrentFullScreenElement", document.documentElement);
+            testExpected("document.webkitCurrentFullScreenElement", null);
             endTest();
         };

trunk/LayoutTests/fullscreen/full-screen-remove-expected.txt

@@ -2 +2 @@
 EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLElement]') OK
 EVENT(webkitfullscreenchange)
-EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLHtmlElement]') OK
+EXPECTED (document.webkitCurrentFullScreenElement == 'null') OK
 END OF TEST
 

trunk/LayoutTests/fullscreen/full-screen-remove.html

@@ -19 +19 @@
     
         var spanEnteredFullScreen = function(event) {
-            callback = documentEnteredFullScreen;
+            callback = spanExitedFullScreen;
             testExpected("document.webkitCurrentFullScreenElement", span);
             span.parentNode.removeChild(span);
         };
     
-        var documentEnteredFullScreen = function(event) {
+        var spanExitedFullScreen = function(event) {
             callback = null;
-            testExpected("document.webkitCurrentFullScreenElement", document.documentElement);
+            testExpected("document.webkitCurrentFullScreenElement", null);
             endTest();
         };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-17  Jeremy Noble  <jer.noble@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Removing a full-screen element or ancestor from the DOM should trigger exiting full-screen mode.
+        https://bugs.webkit.org/show_bug.cgi?id=60997
+
+        Tests: fullscreen/full-screen-remove-ancestor.html
+               fullscreen/full-screen-remove-children.html
+               fullscreen/full-screen-remove.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::fullScreenChangeDelayTimerFired): If the target node was removed from the document
+            make sure to message the documentElement() as well.
+        (WebCore::Document::fullScreenElementRemoved): Cancel full screen mode.
+
 2011-05-17  Yuta Kitamura  <yutak@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4988 +4988 @@
         
         element->dispatchEvent(Event::create(eventNames().webkitfullscreenchangeEvent, true, false));
+
+        // If the element was removed from our tree, also message the documentElement.
+        if (!contains(element.get()))
+            m_fullScreenChangeEventTargetQueue.append(documentElement());
     }
 }
@@ -4993 +4997 @@
 void Document::fullScreenElementRemoved()
 {
-    // If the current full screen element or any of its ancestors is removed, set the current
-    // full screen element to the document root, and fire a fullscreenchange event to inform 
-    // clients of the DOM.
-    if (m_fullScreenRenderer)
-        m_fullScreenRenderer->remove();
-    setFullScreenRenderer(0);
-
-    m_fullScreenChangeEventTargetQueue.append(m_fullScreenElement.release());
-    m_fullScreenElement = documentElement();
-    recalcStyle(Force);
-    
-    // Dispatch this event manually, before the element is actually removed from the DOM
-    // so that the message cascades as expected.
-    fullScreenChangeDelayTimerFired(&m_fullScreenChangeDelayTimer);
-    m_fullScreenChangeDelayTimer.stop();
+    webkitCancelFullScreen();
 }