Changeset 91066 in webkit

Timestamp:

Jul 15, 2011 7:02:17 AM (13 years ago)

Author:

jeffm@apple.com

Message:

Fullscreen content doesn't use fullscreen controller on Windows
​https://bugs.webkit.org/show_bug.cgi?id=64540
<rdar://problem/9510455>

Source/WebCore:

Reviewed by Darin Adler.

RenderThemeWin needs to override extraFullScreenStyleSheet() to return
the fullscreenQuickTime stylesheet.

Test added to fullscreen/video-controls-override.html.

• rendering/RenderThemeWin.cpp:

(WebCore::RenderThemeWin::extraFullScreenStyleSheet): Added.

• rendering/RenderThemeWin.h: Override extraFullScreenStyleSheet().

LayoutTests:

Reviewed by Darin Adler.

Add another test to video-controls-override.html to verify that
we're using the correct fullscreen controller by checking the
height of the controller panel, which is taller than the non-fullscreen
version. Unfortunately, the fullscreen tests don't work on Windows
yet, but I verified this would have caught this issue by simulating
the bug on the Mac.

• fullscreen/video-controls-override-expected.txt: Add new test to check the height of the panel.

• fullscreen/video-controls-override.html: Add new test to check the height of the panel, and

log errors if window.internals or window.layoutTestController are undefined.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fullscreen/video-controls-override-expected.txt (modified) (1 diff)
• LayoutTests/fullscreen/video-controls-override.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeWin.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderThemeWin.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-15  Jeff Miller  <jeffm@apple.com>
+
+        Fullscreen content doesn't use fullscreen controller on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=64540
+        <rdar://problem/9510455>
+
+        Reviewed by Darin Adler.
+        
+        Add another test to video-controls-override.html to verify that
+        we're using the correct fullscreen controller by checking the
+        height of the controller panel, which is taller than the non-fullscreen
+        version. Unfortunately, the fullscreen tests don't work on Windows
+        yet, but I verified this would have caught this issue by simulating
+        the bug on the Mac.
+
+        * fullscreen/video-controls-override-expected.txt: Add new test to check the height of the panel.
+
+        * fullscreen/video-controls-override.html: Add new test to check the height of the panel, and
+        log errors if window.internals or window.layoutTestController are undefined.
+
 2011-07-15  Mike West  <mkwst@chromium.org>
 

trunk/LayoutTests/fullscreen/video-controls-override-expected.txt

@@ -6 +6 @@
 EXPECTED (internals.shadowPseudoId(panel) == '-webkit-media-controls-panel') OK
 EXPECTED (document.defaultView.getComputedStyle(panel)['display'] != 'none') OK
+EXPECTED (document.defaultView.getComputedStyle(panel)['height'] == '48px') OK
 EVENT(webkitfullscreenchange)
 EXPECTED (document.defaultView.getComputedStyle(panel)['display'] == 'none') OK

trunk/LayoutTests/fullscreen/video-controls-override.html

@@ -23 +23 @@
                 testExpected("internals.shadowPseudoId(panel)", "-webkit-media-controls-panel");
                 testExpected("document.defaultView.getComputedStyle(panel)['display']", 'none', "!=");
+                testExpected("document.defaultView.getComputedStyle(panel)['height']", '48px');
             }
+            else
+                logResult(false, "window.internals == undefined");
+            
             callback = cancelledFullScreen;
             document.webkitCancelFullScreen();
@@ -31 +35 @@
             if (window.layoutTestController)
                 testExpected("document.defaultView.getComputedStyle(panel)['display']", 'none');
+            else
+                logResult(false, "window.layoutTestController == undefined");
+
             endTest();
         };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-15  Jeff Miller  <jeffm@apple.com>
+
+        Fullscreen content doesn't use fullscreen controller on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=64540
+        <rdar://problem/9510455>
+
+        Reviewed by Darin Adler.
+
+        RenderThemeWin needs to override extraFullScreenStyleSheet() to return
+        the fullscreenQuickTime stylesheet.
+
+        Test added to fullscreen/video-controls-override.html.
+
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::RenderThemeWin::extraFullScreenStyleSheet): Added.
+        * rendering/RenderThemeWin.h: Override extraFullScreenStyleSheet().
+
 2011-07-15  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/rendering/RenderThemeWin.cpp

@@ -1036 +1036 @@
 }
 
+#if ENABLE(FULLSCREEN_API)
+String RenderThemeWin::extraFullScreenStyleSheet()
+{
+    return String(fullscreenQuickTimeUserAgentStyleSheet, sizeof(fullscreenQuickTimeUserAgentStyleSheet));
+}
+#endif
+
 bool RenderThemeWin::supportsClosedCaptioning() const
 {

trunk/Source/WebCore/rendering/RenderThemeWin.h

@@ -125 +125 @@
 #if ENABLE(VIDEO)
     virtual String extraMediaControlsStyleSheet();
+#if ENABLE(FULLSCREEN_API)
+    virtual String extraFullScreenStyleSheet();
+#endif
     virtual bool supportsClosedCaptioning() const;
     virtual bool paintMediaControlsBackground(RenderObject*, const PaintInfo&, const IntRect&);