Merge webkit.org at R49305 : Automatic merge by git.

Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7

1 files changed, 1 insertions, 19 deletions

diff --git a/WebCore/accessibility/AccessibilitySlider.cpp b/WebCore/accessibility/AccessibilitySlider.cpp
index e3a654b..5aca672 100644
--- a/WebCore/accessibility/AccessibilitySlider.cpp
+++ b/WebCore/accessibility/AccessibilitySlider.cpp
@@ -75,6 +75,7 @@ AccessibilityOrientation AccessibilitySlider::orientation() const
         
         case SliderThumbVerticalPart: 
         case SliderVerticalPart:
+        case MediaVolumeSliderPart:
             return AccessibilityOrientationVertical;
             
         default:
@@ -113,15 +114,6 @@ float AccessibilitySlider::minValueForRange() const
     return getAttribute(minAttr).toFloat();
 }
 
-void AccessibilitySlider::changeValue(float percentChange)
-{
-    float range = maxValueForRange() - minValueForRange();
-    float value = valueForRange();
-    
-    value += range * (percentChange / 100);
-    setValue(String::number(value));
-}
-
 void AccessibilitySlider::setValue(const String& value)
 {
     HTMLInputElement* input = element();
@@ -135,16 +127,6 @@ void AccessibilitySlider::setValue(const String& value)
     input->dispatchFormControlChangeEvent();
 }
 
-void AccessibilitySlider::increment()
-{
-    return changeValue(5);
-}
-
-void AccessibilitySlider::decrement()
-{
-    return changeValue(-5);
-}
-
 HTMLInputElement* AccessibilitySlider::element() const
 {
     return static_cast<HTMLInputElement*>(m_renderer->node());