Title: [154690] releases/WebKitGTK/webkit-2.2/Source/WebCore
- Revision
- 154690
- Author
- [email protected]
- Date
- 2013-08-27 08:31:33 -0700 (Tue, 27 Aug 2013)
Log Message
Merge r154666 - [GTK] Volume slider shows incorrect track when muted
https://bugs.webkit.org/show_bug.cgi?id=120253
Reviewed by Philippe Normand.
When painting the volume bar, consider that it could be muted even
then volume is different than zero.
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::paintMediaVolumeSliderTrack): Asign
painted volume as 0 when media is muted.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog (154689 => 154690)
--- releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-08-27 15:29:10 UTC (rev 154689)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-08-27 15:31:33 UTC (rev 154690)
@@ -1,3 +1,17 @@
+2013-08-27 Xabier Rodriguez Calvar <[email protected]>
+
+ [GTK] Volume slider shows incorrect track when muted
+ https://bugs.webkit.org/show_bug.cgi?id=120253
+
+ Reviewed by Philippe Normand.
+
+ When painting the volume bar, consider that it could be muted even
+ then volume is different than zero.
+
+ * platform/gtk/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::paintMediaVolumeSliderTrack): Asign
+ painted volume as 0 when media is muted.
+
2013-08-26 Sam Weinig <[email protected]>
EditorInternalCommand should use Frame& where possible
Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (154689 => 154690)
--- releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2013-08-27 15:29:10 UTC (rev 154689)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2013-08-27 15:31:33 UTC (rev 154690)
@@ -604,7 +604,7 @@
if (!mediaElement)
return true;
- float volume = mediaElement->volume();
+ float volume = mediaElement->muted() ? 0.0f : mediaElement->volume();
if (!volume)
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
