Changeset 87322 in webkit

Timestamp:

May 25, 2011 2:38:31 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-05-25 Jer Noble <​jer.noble@apple.com>

Reviewed by Darin Adler.

REGRESSION: Fullscreen button on embedded Vimeo videos does nothing
​https://bugs.webkit.org/show_bug.cgi?id=61461

• fullscreen/full-screen-iframe-legacy-expected.txt: Added.
• fullscreen/full-screen-iframe-legacy.html: Added.
• fullscreen/resources/legacy.html: Added.

2011-05-25 Jer Noble <​jer.noble@apple.com>

Reviewed by Darin Adler.

REGRESSION: Fullscreen button on embedded Vimeo videos does nothing
​https://bugs.webkit.org/show_bug.cgi?id=61461

Tests: fullscreen/full-screen-iframe-legacy.html

Allow calls from the legacy full-screen API to bypass the iframe
"webkitallowfullscreen" requirement by adding a parameter to
Document::webkitRequestFullScreenForElement specifying the strictness
of that check. Specify this new parameter everywhere that function is
called, including in the default controls' full-screen button handler.

• dom/Document.cpp: (WebCore::Document::webkitRequestFullScreenForElement):
• dom/Document.h:
• dom/Element.cpp: (WebCore::Element::requestFullScreen): Renamed from webkitRequestFullScreen.
• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::enterFullscreen):
• html/shadow/MediaControlElements.cpp: (WebCore::MediaControlFullscreenButtonElement::defaultEventHandler):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-iframe-legacy-expected.txt (added)
• LayoutTests/fullscreen/full-screen-iframe-legacy.html (added)
• LayoutTests/fullscreen/resources/legacy.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/dom/Document.h (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• Source/WebCore/html/shadow/MediaControlElements.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-25  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION: Fullscreen button on embedded Vimeo videos does nothing
+        https://bugs.webkit.org/show_bug.cgi?id=61461
+
+        * fullscreen/full-screen-iframe-legacy-expected.txt: Added.
+        * fullscreen/full-screen-iframe-legacy.html: Added.
+        * fullscreen/resources/legacy.html: Added.
+
 2011-05-25  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-25  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION: Fullscreen button on embedded Vimeo videos does nothing
+        https://bugs.webkit.org/show_bug.cgi?id=61461
+
+        Tests: fullscreen/full-screen-iframe-legacy.html
+
+        Allow calls from the legacy full-screen API to bypass the iframe
+        "webkitallowfullscreen" requirement by adding a parameter to 
+        Document::webkitRequestFullScreenForElement specifying the strictness
+        of that check.  Specify this new parameter everywhere that function is 
+        called, including in the default controls' full-screen button handler.
+
+        * dom/Document.cpp:
+        (WebCore::Document::webkitRequestFullScreenForElement):
+        * dom/Document.h:
+        * dom/Element.cpp:
+        (WebCore::Element::requestFullScreen): Renamed from webkitRequestFullScreen.
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::enterFullscreen):
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlFullscreenButtonElement::defaultEventHandler):
+
 2011-05-25  Kulanthaivel Palanichamy  <kulanthaivel@codeaurora.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4835 +4835 @@
 }
 
-void Document::webkitRequestFullScreenForElement(Element* element, unsigned short flags)
+void Document::requestFullScreenForElement(Element* element, unsigned short flags, FullScreenCheckType checkType)
 {
     if (!page() || !page()->settings()->fullScreenEnabled())
@@ -4843 +4843 @@
         element = documentElement();
     
-    if (!fullScreenIsAllowedForElement(element))
+    if (checkType == EnforceIFrameAllowFulScreenRequirement && !fullScreenIsAllowedForElement(element))
         return;
     

trunk/Source/WebCore/dom/Document.h

@@ -1056 +1056 @@
     bool webkitFullScreenKeyboardInputAllowed() const { return m_fullScreenElement.get() && m_areKeysEnabledInFullScreen; }
     Element* webkitCurrentFullScreenElement() const { return m_fullScreenElement.get(); }
-    void webkitRequestFullScreenForElement(Element*, unsigned short flags);
+    
+    enum FullScreenCheckType {
+        EnforceIFrameAllowFulScreenRequirement,
+        ExemptIFrameAllowFulScreenRequirement,
+    };
+
+    void requestFullScreenForElement(Element*, unsigned short flags, FullScreenCheckType);
     void webkitCancelFullScreen();
     

trunk/Source/WebCore/dom/Element.cpp

@@ -1890 +1890 @@
 void Element::webkitRequestFullScreen(unsigned short flags)
 {
-    document()->webkitRequestFullScreenForElement(this, flags);
+    document()->requestFullScreenForElement(this, flags, Document::EnforceIFrameAllowFulScreenRequirement);
 }
 #endif    

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2532 +2532 @@
 #if ENABLE(FULLSCREEN_API)
     if (document() && document()->settings() && document()->settings()->fullScreenEnabled()) {
-        webkitRequestFullScreen(0);
+        document()->requestFullScreenForElement(this, 0, Document::ExemptIFrameAllowFulScreenRequirement);
         return;
     }

trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

@@ -794 +794 @@
                 m_controls->exitedFullscreen();
             } else {
-                mediaElement()->webkitRequestFullScreen(0);
+                document()->requestFullScreenForElement(mediaElement(), 0, Document::ExemptIFrameAllowFulScreenRequirement);
                 m_controls->enteredFullscreen();
             }