Title: [91066] trunk
- Revision
- 91066
- Author
- [email protected]
- Date
- 2011-07-15 07:02:17 -0700 (Fri, 15 Jul 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (91065 => 91066)
--- trunk/LayoutTests/ChangeLog 2011-07-15 13:10:48 UTC (rev 91065)
+++ trunk/LayoutTests/ChangeLog 2011-07-15 14:02:17 UTC (rev 91066)
@@ -1,3 +1,23 @@
+2011-07-15 Jeff Miller <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: Rename console.markTimeline() to console.timeStamp() for Firebug compatibility.
Modified: trunk/LayoutTests/fullscreen/video-controls-override-expected.txt (91065 => 91066)
--- trunk/LayoutTests/fullscreen/video-controls-override-expected.txt 2011-07-15 13:10:48 UTC (rev 91065)
+++ trunk/LayoutTests/fullscreen/video-controls-override-expected.txt 2011-07-15 14:02:17 UTC (rev 91066)
@@ -5,6 +5,7 @@
EXPECTED (panel = shadowRoot.firstChild.firstChild != 'null') OK
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
END OF TEST
Modified: trunk/LayoutTests/fullscreen/video-controls-override.html (91065 => 91066)
--- trunk/LayoutTests/fullscreen/video-controls-override.html 2011-07-15 13:10:48 UTC (rev 91065)
+++ trunk/LayoutTests/fullscreen/video-controls-override.html 2011-07-15 14:02:17 UTC (rev 91066)
@@ -22,7 +22,11 @@
testExpected("panel = shadowRoot.firstChild.firstChild", null, "!=");
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();
};
@@ -30,6 +34,9 @@
var cancelledFullScreen = function() {
if (window.layoutTestController)
testExpected("document.defaultView.getComputedStyle(panel)['display']", 'none');
+ else
+ logResult(false, "window.layoutTestController == undefined");
+
endTest();
};
Modified: trunk/Source/WebCore/ChangeLog (91065 => 91066)
--- trunk/Source/WebCore/ChangeLog 2011-07-15 13:10:48 UTC (rev 91065)
+++ trunk/Source/WebCore/ChangeLog 2011-07-15 14:02:17 UTC (rev 91066)
@@ -1,3 +1,20 @@
+2011-07-15 Jeff Miller <[email protected]>
+
+ 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 <[email protected]>
Not reviewed. Fix build failure introduced in r91061.
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (91065 => 91066)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2011-07-15 13:10:48 UTC (rev 91065)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2011-07-15 14:02:17 UTC (rev 91066)
@@ -1035,6 +1035,13 @@
return String(mediaControlsQuickTimeUserAgentStyleSheet, sizeof(mediaControlsQuickTimeUserAgentStyleSheet));
}
+#if ENABLE(FULLSCREEN_API)
+String RenderThemeWin::extraFullScreenStyleSheet()
+{
+ return String(fullscreenQuickTimeUserAgentStyleSheet, sizeof(fullscreenQuickTimeUserAgentStyleSheet));
+}
+#endif
+
bool RenderThemeWin::supportsClosedCaptioning() const
{
// We rely on QuickTime to render captions so only enable the button for a video element.
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (91065 => 91066)
--- trunk/Source/WebCore/rendering/RenderThemeWin.h 2011-07-15 13:10:48 UTC (rev 91065)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h 2011-07-15 14:02:17 UTC (rev 91066)
@@ -124,6 +124,9 @@
#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&);
virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
