Changeset 75711 in webkit

Timestamp:

Jan 13, 2011 7:12:08 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-13 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Eric Seidel.

[Qt] Use a big central media play control button for video element
​https://bugs.webkit.org/show_bug.cgi?id=52315

When ChromeClient::requiresFullscreenForVideoPlayback() returns true,
all other control buttons for the video element are hidden, except
a big centralized play button.

No new tests because no client implements requiresFullscreenForVideoPlayback yet.

• WebCore.pri:
• css/mediaControlsQtFullscreen.css: Added. (audio): (audio::-webkit-media-controls-panel): (video::-webkit-media-controls-panel): (video:-webkit-full-page-media::-webkit-media-controls-panel): (audio::-webkit-media-controls-mute-button): (video::-webkit-media-controls-mute-button): (audio::-webkit-media-controls-play-button): (video::-webkit-media-controls-play-button): (audio::-webkit-media-controls-timeline-container): (video::-webkit-media-controls-timeline-container): (audio::-webkit-media-controls-current-time-display): (video::-webkit-media-controls-current-time-display): (audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display): (audio::-webkit-media-controls-timeline): (video::-webkit-media-controls-timeline): (audio::-webkit-media-controls-volume-slider-container): (video::-webkit-media-controls-volume-slider-container): (audio::-webkit-media-controls-volume-slider): (video::-webkit-media-controls-volume-slider): (audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button): (audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button): (audio::-webkit-media-controls-fullscreen-button): (video::-webkit-media-controls-fullscreen-button): (audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button): (audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button): (audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button):
• platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::extraMediaControlsStyleSheet):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pri (modified) (1 diff)
• css/mediaControlsQtFullscreen.css (added)
• platform/qt/RenderThemeQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-13  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Use a big central media play control button for video element 
+        https://bugs.webkit.org/show_bug.cgi?id=52315
+
+        When ChromeClient::requiresFullscreenForVideoPlayback() returns true,
+        all other control buttons for the video element are hidden, except 
+        a big centralized play button.
+
+        No new tests because no client implements requiresFullscreenForVideoPlayback yet.
+
+        * WebCore.pri:
+        * css/mediaControlsQtFullscreen.css: Added.
+        (audio):
+        (audio::-webkit-media-controls-panel):
+        (video::-webkit-media-controls-panel):
+        (video:-webkit-full-page-media::-webkit-media-controls-panel):
+        (audio::-webkit-media-controls-mute-button):
+        (video::-webkit-media-controls-mute-button):
+        (audio::-webkit-media-controls-play-button):
+        (video::-webkit-media-controls-play-button):
+        (audio::-webkit-media-controls-timeline-container):
+        (video::-webkit-media-controls-timeline-container):
+        (audio::-webkit-media-controls-current-time-display):
+        (video::-webkit-media-controls-current-time-display):
+        (audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display):
+        (audio::-webkit-media-controls-timeline):
+        (video::-webkit-media-controls-timeline):
+        (audio::-webkit-media-controls-volume-slider-container):
+        (video::-webkit-media-controls-volume-slider-container):
+        (audio::-webkit-media-controls-volume-slider):
+        (video::-webkit-media-controls-volume-slider):
+        (audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button):
+        (audio::-webkit-media-controls-seek-forward-button, video::-webkit-media-controls-seek-forward-button):
+        (audio::-webkit-media-controls-fullscreen-button):
+        (video::-webkit-media-controls-fullscreen-button):
+        (audio::-webkit-media-controls-rewind-button, video::-webkit-media-controls-rewind-button):
+        (audio::-webkit-media-controls-return-to-realtime-button, video::-webkit-media-controls-return-to-realtime-button):
+        (audio::-webkit-media-controls-toggle-closed-captions-button, video::-webkit-media-controls-toggle-closed-captions-button):
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::extraMediaControlsStyleSheet):
+
 2011-01-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/WebCore.pri

@@ -61 +61 @@
     $$PWD/css/mediaControls.css \
     $$PWD/css/mediaControlsQt.css \
+    $$PWD/css/mediaControlsQtFullscreen.css \
     $$PWD/css/themeQtNoListboxes.css \
     $$PWD/css/themeQtMobile.css

trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

@@ -1114 +1114 @@
 String RenderThemeQt::extraMediaControlsStyleSheet()
 {
-    return String(mediaControlsQtUserAgentStyleSheet, sizeof(mediaControlsQtUserAgentStyleSheet));
+    String result = String(mediaControlsQtUserAgentStyleSheet, sizeof(mediaControlsQtUserAgentStyleSheet));
+
+    if (m_page && m_page->chrome()->requiresFullscreenForVideoPlayback())
+        result += String(mediaControlsQtFullscreenUserAgentStyleSheet, sizeof(mediaControlsQtFullscreenUserAgentStyleSheet));
+
+    return result;
 }