Changeset 83654 in webkit

Timestamp:

Apr 12, 2011 3:46:01 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

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

Reviewed by Simon Fraser.

REGRESSION: Vimeo fullscreen video displays incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=58291

• fullscreen/video-specified-size-expected.txt: Added.
• fullscreen/video-specified-size.html: Added.
• fullscreen/full-screen-test.js:
• fullscreen/full-screen-zIndex-expected.txt: Added.
• fullscreen/full-screen-zIndex.html: Added.
• platform/mac/fullscreen/full-screen-zIndex-expected.checksum: Added.
• platform/mac/fullscreen/full-screen-zIndex-expected.png: Added.

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

Reviewed by Simon Fraser.

REGRESSION: Vimeo fullscreen video displays incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=58291

Set the RenderFullScreen's zIndex to the max. And make sure to override
a video element's specified width and height by making its full screen rules
important. Also, always show the controls when a media element is in full
screen mode.

Test: fullscreen/video-specified-size.html
Test: fullscreen/full-screen-zIndex.html

• css/fullscreen.css: (video:-webkit-full-screen):
• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::controls): Always show controls in full screen mode. (WebCore::HTMLMediaElement::preDispatchEventHandler): Added. Handle the fullscreen

change event and hide or show the controls accordingly.

• html/HTMLMediaElement.h:
• rendering/RenderFullScreen.cpp: (RenderFullScreen::createFullScreenStyle): Set the zIndex to INT_MAX and use a

vertical flexbox instead of a horizontal one.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-test.js (modified) (2 diffs)
• LayoutTests/fullscreen/full-screen-zIndex-expected.txt (added)
• LayoutTests/fullscreen/full-screen-zIndex.html (added)
• LayoutTests/fullscreen/video-specified-size-expected.txt (added)
• LayoutTests/fullscreen/video-specified-size.html (added)
• LayoutTests/platform/mac/fullscreen (added)
• LayoutTests/platform/mac/fullscreen/full-screen-zIndex-expected.checksum (added)
• LayoutTests/platform/mac/fullscreen/full-screen-zIndex-expected.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/fullscreen.css (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (1 diff)
• Source/WebCore/rendering/RenderFullScreen.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-11  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION: Vimeo fullscreen video displays incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=58291
+
+        * fullscreen/video-specified-size-expected.txt: Added.
+        * fullscreen/video-specified-size.html: Added.
+        * fullscreen/full-screen-test.js:
+        * fullscreen/full-screen-zIndex-expected.txt: Added.
+        * fullscreen/full-screen-zIndex.html: Added.
+        * platform/mac/fullscreen/full-screen-zIndex-expected.checksum: Added.
+        * platform/mac/fullscreen/full-screen-zIndex-expected.png: Added.
+
 2011-04-12  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/LayoutTests/fullscreen/full-screen-test.js

@@ -1 +1 @@
 var console = null;
 var printFullTestDetails = true; // This is optionaly switched of by test whose tested values can differ. (see disableFullTestDetailsPrinting())
+var runPixelTests;
 
 logConsole();
 
-if (window.layoutTestController) {
+if (!runPixelTests && window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
@@ -81 +82 @@
 }
 
-function waitForEventAndEnd(eventName, funcString)
+function waitForEventAndEnd(element, eventName, funcString)
 {
-    waitForEvent(eventName, funcString, true)
+    waitForEvent(element, eventName, funcString, true)
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-11  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION: Vimeo fullscreen video displays incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=58291
+
+        Set the RenderFullScreen's zIndex to the max.  And make sure to override
+        a video element's specified width and height by making its full screen rules
+        important.  Also, always show the controls when a media element is in full
+        screen mode.
+
+        Test: fullscreen/video-specified-size.html
+        Test: fullscreen/full-screen-zIndex.html
+
+        * css/fullscreen.css:
+        (video:-webkit-full-screen): 
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::controls): Always show controls in full screen mode.
+        (WebCore::HTMLMediaElement::preDispatchEventHandler): Added. Handle the fullscreen
+            change event and hide or show the controls accordingly.
+        * html/HTMLMediaElement.h:
+        * rendering/RenderFullScreen.cpp:
+        (RenderFullScreen::createFullScreenStyle): Set the zIndex to INT_MAX and use a 
+            vertical flexbox instead of a horizontal one.
+
 2011-04-12  Chris Marrin  <cmarrin@apple.com>
 

trunk/Source/WebCore/css/fullscreen.css

@@ -8 +8 @@
 
 video:-webkit-full-screen {
-    background-color: black;
-    width: auto;   
-    height: 100%;
-    max-width: 100%;
+    background-color: black !important;
+    position: static !important;
+    margin: 0 !important;
+    height: 100% !important;
+    width: 100% !important;
+    -webkit-box-flex: 1 !important;
+    display: block !important;
 }
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1493 +1493 @@
         return true;
 
+    // Always show controls when in full screen mode.
+    if (isFullscreen())
+        return true;
+
     return hasAttribute(controlsAttr);
 }
@@ -2652 +2656 @@
 }
 
-}
-
-#endif
+void* HTMLMediaElement::preDispatchEventHandler(Event* event) 
+{
+    if (event && event->type() == eventNames().webkitfullscreenchangeEvent) {
+        if (controls()) {
+            if (!hasMediaControls()) {
+                ensureMediaControls();
+                mediaControls()->reset();
+            }
+            mediaControls()->show();
+        } else if (hasMediaControls())
+            mediaControls()->hide();
+    }
+    return 0;
+}
+
+
+}
+
+#endif

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -327 +327 @@
     void ensureMediaControls();
 
+    virtual void* preDispatchEventHandler(Event*);
+
     Timer<HTMLMediaElement> m_loadTimer;
     Timer<HTMLMediaElement> m_asyncEventTimer;

trunk/Source/WebCore/rendering/RenderFullScreen.cpp

@@ -47 +47 @@
 
     // Create a stacking context:
-    fullscreenStyle->setZIndex(0);
+    fullscreenStyle->setZIndex(INT_MAX);
 
     fullscreenStyle->setFontDescription(FontDescription());
@@ -55 +55 @@
     fullscreenStyle->setBoxPack(BCENTER);
     fullscreenStyle->setBoxAlign(BCENTER);
-    fullscreenStyle->setBoxOrient(HORIZONTAL);
+    fullscreenStyle->setBoxOrient(VERTICAL);
     
     fullscreenStyle->setPosition(FixedPosition);