Changeset 138447 in webkit

Timestamp:

Dec 24, 2012 11:37:48 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 2012-12-24
Reviewed by Rob Buis.

Internally reviewed by John Griggs.
Use GL renderer to paint media control.

• css/mediaControlsBlackBerry.css:

(audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore::RenderThemeBlackBerry::paintMediaSliderTrack):
(WebCore::RenderThemeBlackBerry::paintMediaSliderThumb):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-24  Tiancheng Jiang  <tijiang@rim.com>
+
+        Update BB10 media render theme.
+        https://bugs.webkit.org/show_bug.cgi?id=105728
+
+        Reviewed by Rob Buis.
+
+        Internally reviewed by John Griggs.
+        Use GL renderer to paint media control.
+
+        * css/mediaControlsBlackBerry.css:
+        (audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::RenderThemeBlackBerry::paintMediaSliderTrack):
+        (WebCore::RenderThemeBlackBerry::paintMediaSliderThumb):
+
 2012-12-24  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/css/mediaControlsBlackBerry.css

@@ -130 +130 @@
     display: -webkit-box;
     -webkit-box-flex: 1;
+    margin-bottom: 2px;
 }
 

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

@@ -1046 +1046 @@
 
     IntRect played(x, y, wPlayed, h);
-    IntRect buffered(x, ceil(y + mediaSliderOutlineWidth), wLoaded, ceil(h - 2 * mediaSliderOutlineWidth));
-
+    IntRect buffered(x, y, wLoaded, h);
+#if USE(SKIA)
     // This is to paint main slider bar.
     bool result = paintSliderTrackRect(object, paintInfo, rect2);
@@ -1058 +1058 @@
         paintSliderTrackRect(object, paintInfo, played, selection, selection, selection, selection);
     }
+#else // GL renderer
+    static Image* mediaBackground = Image::loadPlatformResource("core_slider_video_bg").leakRef();
+    static Image* mediaPlayer = Image::loadPlatformResource("core_slider_played_bg").leakRef();
+    static Image* mediaCache = Image::loadPlatformResource("core_slider_cache").leakRef();
+
+    bool result = paintSliderTrackRect(object, paintInfo, rect2, mediaBackground);
+
+    if (loaded > 0 || position > 0) {
+        // This is to paint buffered bar.
+        paintSliderTrackRect(object, paintInfo, buffered, mediaCache);
+
+        // This is to paint played part of bar (left of slider thumb) using selection color.
+        paintSliderTrackRect(object, paintInfo, played, mediaPlayer);
+    }
+#endif // USE(SKIA)
     return result;
 #else
@@ -1094 +1109 @@
     return true;
 #else // GL renderer
-    static Image* mediaSliderThumb = Image::loadPlatformResource("core_slider_handle_disabled").leakRef();
+    static Image* mediaSliderThumb = Image::loadPlatformResource("core_media_handle").leakRef();
 
     return paintMediaButton(paintInfo.context, rect, mediaSliderThumb);