Support !ENABLE(VIDEO) builds with horizontally layed out video controls.
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Jun 2012 17:52:57 +0000 (17:52 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Jun 2012 17:52:57 +0000 (17:52 +0000)
https://bugs.webkit.org/show_bug.cgi?id=88881

Patch by Silvia Pfeiffer <silviapf@chromium.org> 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/html/shadow/SliderThumbElement.cpp

index 20e044a..3ed059b 100644 (file)
@@ -1,3 +1,17 @@
+2012-06-12  Silvia Pfeiffer  <silviapf@chromium.org>
+
+        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  <pfeldman@chromium.org>
 
         Web Inspector: allow clearing revision history.
index aa750ca..83775a2 100644 (file)
@@ -62,10 +62,15 @@ inline static bool hasVerticalAppearance(HTMLInputElement* input)
 {
     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)