From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- Source/WebCore/rendering/RenderSlider.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/rendering/RenderSlider.h') diff --git a/Source/WebCore/rendering/RenderSlider.h b/Source/WebCore/rendering/RenderSlider.h index 0162b71..4e17f30 100644 --- a/Source/WebCore/rendering/RenderSlider.h +++ b/Source/WebCore/rendering/RenderSlider.h @@ -46,8 +46,8 @@ namespace WebCore { virtual void layout(); // 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; + // SliderThumbElement and accessing shadowSliderThumb should not be necessary in this class. + SliderThumbElement* shadowSliderThumb() const; virtual bool requiresForcedStyleRecalcPropagation() const { return true; } }; -- cgit v1.1