Changeset 47756 in webkit

Timestamp:

Aug 25, 2009 1:40:16 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-25 Alpha Lam <​hclam@chromium.org>

Reviewed by David Levin.

[chromium] Implement media volume slider for chromium
​https://bugs.webkit.org/show_bug.cgi?id=28715

Provided the implementation of the volume slider and its container for
chromium port. With this change there will be a usable volume control
slider for chromium theme.

No new tests since this is covered by existing media layout tests.

• css/mediaControlsChromium.css: CSS style for the volume slider.
• rendering/RenderThemeChromiumSkia.cpp: (WebCore::mediaSliderThumbImage): Returns the image for slider thumb. (WebCore::mediaVolumeSliderThumbImage): Returns the image for volume slider thumb. (WebCore::RenderThemeChromiumSkia::paintMediaVolumeSliderTrack): Paints the track with one vertical white line. (WebCore::RenderThemeChromiumSkia::adjustSliderThumbSize): Adjusts thumb sizes according to the images. (WebCore::RenderThemeChromiumSkia::paintMediaSliderThumb): Paints slider thumb image. (WebCore::RenderThemeChromiumSkia::paintMediaVolumeSliderThumb): Paints volume slider thumb image.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/mediaControlsChromium.css (modified) (3 diffs)
• rendering/RenderThemeChromiumSkia.cpp (modified) (2 diffs)
• rendering/RenderThemeChromiumSkia.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-25  Alpha Lam  <hclam@chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] Implement media volume slider for chromium
+        https://bugs.webkit.org/show_bug.cgi?id=28715
+
+        Provided the implementation of the volume slider and its container for
+        chromium port. With this change there will be a usable volume control
+        slider for chromium theme.
+
+        No new tests since this is covered by existing media layout tests.
+
+        * css/mediaControlsChromium.css: CSS style for the volume slider.
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::mediaSliderThumbImage): Returns the image for slider thumb.
+        (WebCore::mediaVolumeSliderThumbImage): Returns the image for volume slider thumb.
+        (WebCore::RenderThemeChromiumSkia::paintMediaVolumeSliderTrack): Paints the track with one vertical white line.
+        (WebCore::RenderThemeChromiumSkia::adjustSliderThumbSize): Adjusts thumb sizes according to the images.
+        (WebCore::RenderThemeChromiumSkia::paintMediaSliderThumb): Paints slider thumb image.
+        (WebCore::RenderThemeChromiumSkia::paintMediaVolumeSliderThumb): Paints volume slider thumb image.
+
 2009-08-25  Chris Marrin  <cmarrin@apple.com>
 

trunk/WebCore/css/mediaControlsChromium.css

@@ -34 +34 @@
     -webkit-user-select: none;
     position: absolute;
+    overflow: visible;
     bottom: 0;
     width: 100%;
@@ -47 +48 @@
 audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
     -webkit-appearance: media-mute-button;
-
     position: absolute;
     top: auto;
@@ -168 +168 @@
     display: none;
 }
+
+audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
+    -webkit-appearance: media-volume-slider-container;
+    position: absolute;
+
+    width: 34px;
+    height: 100px;
+
+    background-color: rgba(0, 0, 0, 0.6);
+}
+
+audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider {
+    -webkit-appearance: media-volume-slider;
+    display: inline;
+    position: absolute;
+
+    top: 10px;
+    left: 12px;
+
+    width: 10px;
+    height: 80px;
+}

trunk/WebCore/rendering/RenderThemeChromiumSkia.cpp

@@ -572 +572 @@
 }
 
-void RenderThemeChromiumSkia::adjustSliderThumbSize(RenderObject* object) const {
-#if ENABLE(VIDEO)
-    if (object->style()->appearance() == MediaSliderThumbPart) {
-        static Image* mediaSliderThumb = Image::loadPlatformResource("mediaSliderThumb").releaseRef();
-
-        object->style()->setWidth(Length(mediaSliderThumb->width(), Fixed));
-        object->style()->setHeight(Length(mediaSliderThumb->height(), Fixed));
-    }
+bool RenderThemeChromiumSkia::paintMediaVolumeSliderTrack(RenderObject* object, const RenderObject::PaintInfo& paintInfo, const IntRect& rect)
+{
+#if ENABLE(VIDEO)
+    HTMLMediaElement* mediaElement = mediaElementParent(object->node());
+    if (!mediaElement)
+        return false;
+
+    SkCanvas* canvas = paintInfo.context->platformContext()->canvas();
+    SkPaint paint;
+    paint.setARGB(0xff, 0xff, 0xff, 0xff);
+
+    int x = rect.x() + rect.width() / 2;
+    canvas->drawLine(x, rect.y(), x, rect.y() + rect.height(), paint);
+    return true;
 #else
     UNUSED_PARAM(object);
+    UNUSED_PARAM(paintInfo);
+    UNUSED_PARAM(rect);
+    return false;
+#endif
+}
+
+static Image* mediaSliderThumbImage()
+{
+    static Image* mediaSliderThumb = Image::loadPlatformResource("mediaSliderThumb").releaseRef();
+    return mediaSliderThumb;
+}
+
+static Image* mediaVolumeSliderThumbImage()
+{
+    static Image* mediaVolumeSliderThumb = Image::loadPlatformResource("mediaVolumeSliderThumb").releaseRef();
+    return mediaVolumeSliderThumb;
+}
+
+void RenderThemeChromiumSkia::adjustSliderThumbSize(RenderObject* object) const
+{
+#if ENABLE(VIDEO)
+    Image* thumbImage = 0;
+    if (object->style()->appearance() == MediaSliderThumbPart)
+        thumbImage = mediaSliderThumbImage();
+    else if (object->style()->appearance() == MediaVolumeSliderThumbPart)
+        thumbImage = mediaVolumeSliderThumbImage();
+
+    ASSERT(thumbImage);
+    object->style()->setWidth(Length(thumbImage->width(), Fixed));
+    object->style()->setHeight(Length(thumbImage->height(), Fixed));
+#else
+    UNUSED_PARAM(object);
 #endif
 }
@@ -591 +629 @@
         return false;
 
-    static Image* mediaSliderThumb = Image::loadPlatformResource("mediaSliderThumb").releaseRef();
-
-    return paintMediaButtonInternal(paintInfo.context, rect, mediaSliderThumb);
+    return paintMediaButtonInternal(paintInfo.context, rect, mediaSliderThumbImage());
+#else
+    UNUSED_PARAM(object);
+    UNUSED_PARAM(paintInfo);
+    UNUSED_PARAM(rect);
+    return false;
+#endif
+}
+
+bool RenderThemeChromiumSkia::paintMediaVolumeSliderThumb(RenderObject* object, const RenderObject::PaintInfo& paintInfo, const IntRect& rect)
+{
+#if ENABLE(VIDEO)
+    if (!object->parent()->isSlider())
+        return false;
+
+    return paintMediaButtonInternal(paintInfo.context, rect, mediaVolumeSliderThumbImage());
 #else
     UNUSED_PARAM(object);

trunk/WebCore/rendering/RenderThemeChromiumSkia.h

@@ -92 +92 @@
         virtual bool paintMediaControlsBackground(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
         virtual bool paintMediaSliderTrack(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+        virtual bool paintMediaVolumeSliderTrack(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
         virtual void adjustSliderThumbSize(RenderObject*) const;
         virtual bool paintMediaSliderThumb(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+        virtual bool paintMediaVolumeSliderThumb(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
         virtual bool paintMediaPlayButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
         virtual bool paintMediaMuteButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);