Changeset 138712 in webkit

Timestamp:

Jan 3, 2013 9:32:28 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Update BB10 media render theme.
​https://bugs.webkit.org/show_bug.cgi?id=105728

Patch by Tiancheng Jiang <​tijiang@rim.com> on 2013-01-03
Reviewed by Yong Li.

Internally Reviewed by John Griggs.

Update GL friendly render method for audio volume.
Change the background color for embedded media player to semi-transparent.
Change remaining time font color to grey to match full screen video.
Change media slider thumb color to blue when pressed.

• css/mediaControlsBlackBerry.css:

(audio):
(audio::-webkit-media-controls-embedded-panel, video::-webkit-media-controls-embedded-panel):
(video::-webkit-media-controls-time-display-container, audio::-webkit-media-controls-time-display-container):
(video::-webkit-media-controls-timeline-container, audio::-webkit-media-controls-timeline-container):
(audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display):
(video::-webkit-media-controls-time-remaining-display, audio::-webkit-media-controls-time-remaining-display):
(audio::-webkit-media-controls-volume-slider-container):

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore::RenderThemeBlackBerry::paintMediaSliderThumb):
(WebCore::RenderThemeBlackBerry::paintMediaVolumeSliderTrack):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/mediaControlsBlackBerry.css (modified) (7 diffs)
• platform/blackberry/RenderThemeBlackBerry.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-03  Tiancheng Jiang  <tijiang@rim.com>
+
+        Update BB10 media render theme.
+        https://bugs.webkit.org/show_bug.cgi?id=105728
+
+        Reviewed by Yong Li.
+
+        Internally Reviewed by John Griggs.
+
+        Update GL friendly render method for audio volume.
+        Change the background color for embedded media player to semi-transparent.
+        Change remaining time font color to grey to match full screen video.
+        Change media slider thumb color to blue when pressed.
+
+        * css/mediaControlsBlackBerry.css:
+        (audio):
+        (audio::-webkit-media-controls-embedded-panel, video::-webkit-media-controls-embedded-panel):
+        (video::-webkit-media-controls-time-display-container, audio::-webkit-media-controls-time-display-container):
+        (video::-webkit-media-controls-timeline-container, audio::-webkit-media-controls-timeline-container):
+        (audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display):
+        (video::-webkit-media-controls-time-remaining-display, audio::-webkit-media-controls-time-remaining-display):
+        (audio::-webkit-media-controls-volume-slider-container):
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::RenderThemeBlackBerry::paintMediaSliderThumb):
+        (WebCore::RenderThemeBlackBerry::paintMediaVolumeSliderTrack):
+
 2013-01-03  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/css/mediaControlsBlackBerry.css

@@ -29 +29 @@
 
 audio {
-    background-color: rgb(0, 0, 0);
+    background-color: rgba(38, 38, 38, 0.8);
     width: 300px;
     height: 32px;
@@ -42 +42 @@
     width: 100%;
     height: auto;
-    background-color: rgb(0, 0, 0);
+    background-color: rgba(38, 38, 38, 0.8);
 }
 
@@ -64 +64 @@
     -webkit-box-pack: justify;
     -webkit-box-flex: 1;
-    background-color: rgb(0, 0, 0);
 }
 
@@ -89 +88 @@
     height: auto;
     width: 100%;
-    background-color: rgb(0, 0, 0);
 }
 
@@ -103 +101 @@
     -webkit-box-pack: end;
     -webkit-box-flex: 0;
-    background-color: rgb(0, 0, 0);
     color: #fafafa;
 }
@@ -118 +115 @@
     -webkit-box-pack: end;
     -webkit-box-flex: 0;
-    background-color: rgb(0, 0, 0);
-    color: #fafafa;
+    color: rgb(125, 125, 125);
 }
 
@@ -166 +162 @@
     left: 0px;
     right: 0px;
-    background-color: rgb(0,0,0);
+    background-color: rgba(38, 38, 38, 0.8);
 }
 

trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp

@@ -1084 +1084 @@
     return true;
 #else // GL renderer
+    static Image* disabledMediaSliderThumb = Image::loadPlatformResource("core_slider_handle_disabled").leakRef();
+    static Image* pressedMediaSliderThumb = Image::loadPlatformResource("core_slider_handle_pressed").leakRef();
     static Image* mediaSliderThumb = Image::loadPlatformResource("core_media_handle").leakRef();
 
+    if (!isEnabled(object))
+        return paintMediaButton(paintInfo.context, rect, disabledMediaSliderThumb);
+    if (isPressed(object) || isHovered(object) || isFocused(object))
+        return paintMediaButton(paintInfo.context, rect, pressedMediaSliderThumb);
     return paintMediaButton(paintInfo.context, rect, mediaSliderThumb);
 #endif // USE(SKIA)
@@ -1114 +1120 @@
     IntRect volumeRect(x, y, ceil(w * volume), h);
 
+#if USE(SKIA)
     // This is to paint main volume slider bar.
     bool result = paintSliderTrackRect(object, paintInfo, rect2, Color(mediaSliderTrackOutline).rgb(), Color(mediaSliderTrackOutline).rgb(), rangeSliderRegularTop, rangeSliderRegularTop);
@@ -1119 +1126 @@
     if (volume > 0) {
         // This is to paint volume bar (left of volume slider thumb) using selection color.
-        paintSliderTrackRect(object, paintInfo, volumeRect, Color(mediaSliderTrackOutline).rgb(), Color(mediaSliderTrackOutline).rgb(), selection, selection);
-    }
+        result |= paintSliderTrackRect(object, paintInfo, volumeRect, Color(mediaSliderTrackOutline).rgb(), Color(mediaSliderTrackOutline).rgb(), selection, selection);
+    }
+#else // GL renderer
+    static Image* volumeBackground = Image::loadPlatformResource("core_slider_video_bg").leakRef();
+    static Image* volumeBar = Image::loadPlatformResource("core_slider_played_bg").leakRef();
+
+    // This is to paint main volume slider bar.
+    bool result = paintSliderTrackRect(object, paintInfo, rect2, volumeBackground);
+
+    if (volume > 0) {
+        // This is to paint volume bar (left of volume slider thumb) using selection color.
+        result |= paintSliderTrackRect(object, paintInfo, volumeRect, volumeBar);
+    }
+#endif // USE(SKIA)
     return result;
 #else