Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3

1 files changed, 3 insertions, 7 deletions

diff --git a/Source/WebCore/rendering/RenderSlider.h b/Source/WebCore/rendering/RenderSlider.h
index 03779a3..5fb5921 100644
--- a/Source/WebCore/rendering/RenderSlider.h
+++ b/Source/WebCore/rendering/RenderSlider.h
@@ -45,8 +45,10 @@ namespace WebCore {
         virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
         virtual void computePreferredLogicalWidths();
         virtual void layout();
-        virtual void updateFromElement();
 
+        // FIXME: Eventually, the logic of manipulating slider thumb should move to
+        // SliderThumbElement and accessing sliderThumbElement should not be necessary in this class.
+        SliderThumbElement* sliderThumbElement() const;
         bool mouseEventIsInThumb(MouseEvent*);
         FloatPoint mouseEventOffsetToThumb(MouseEvent*);
 
@@ -56,16 +58,10 @@ namespace WebCore {
 
         int currentPosition();
 
-        virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
-
         virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
 
-        PassRefPtr<RenderStyle> createThumbStyle(const RenderStyle* parentStyle);
-
         int trackSize();
 
-        RefPtr<SliderThumbElement> m_thumb;
-
         friend class SliderThumbElement;
     };