Title: [120092] trunk/Source/WebCore
- Revision
- 120092
- Author
- [email protected]
- Date
- 2012-06-12 10:52:57 -0700 (Tue, 12 Jun 2012)
Log Message
Support !ENABLE(VIDEO) builds with horizontally layed out video controls.
https://bugs.webkit.org/show_bug.cgi?id=88881
Patch by Silvia Pfeiffer <[email protected]> on 2012-06-12
Reviewed by Csaba Osztrogonác.
No new tests as this is a regression from WK87835.
* html/shadow/SliderThumbElement.cpp:
(WebCore::hasVerticalAppearance):
Ifdef out video related functionality, since usesVerticalVolumeSlider
does not exist in that case.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120091 => 120092)
--- trunk/Source/WebCore/ChangeLog 2012-06-12 17:28:59 UTC (rev 120091)
+++ trunk/Source/WebCore/ChangeLog 2012-06-12 17:52:57 UTC (rev 120092)
@@ -1,3 +1,17 @@
+2012-06-12 Silvia Pfeiffer <[email protected]>
+
+ Support !ENABLE(VIDEO) builds with horizontally layed out video controls.
+ https://bugs.webkit.org/show_bug.cgi?id=88881
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests as this is a regression from WK87835.
+
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::hasVerticalAppearance):
+ Ifdef out video related functionality, since usesVerticalVolumeSlider
+ does not exist in that case.
+
2012-06-12 Pavel Feldman <[email protected]>
Web Inspector: allow clearing revision history.
Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (120091 => 120092)
--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-06-12 17:28:59 UTC (rev 120091)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-06-12 17:52:57 UTC (rev 120092)
@@ -62,10 +62,15 @@
{
ASSERT(input->renderer());
RenderStyle* sliderStyle = input->renderer()->style();
+
+#if ENABLE(VIDEO)
RenderTheme* sliderTheme = input->renderer()->theme();
return sliderStyle->appearance() == SliderVerticalPart
|| (sliderStyle->appearance() == MediaVolumeSliderPart && sliderTheme->usesVerticalVolumeSlider());
+#else
+ return sliderStyle->appearance() == SliderVerticalPart;
+#endif
}
SliderThumbElement* sliderThumbElementOf(Node* node)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
