summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/html/RangeInputType.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/html/RangeInputType.h')
-rw-r--r--Source/WebCore/html/RangeInputType.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/WebCore/html/RangeInputType.h b/Source/WebCore/html/RangeInputType.h
index ac89d02..b7af291 100644
--- a/Source/WebCore/html/RangeInputType.h
+++ b/Source/WebCore/html/RangeInputType.h
@@ -35,6 +35,8 @@
namespace WebCore {
+class SliderThumbElement;
+
class RangeInputType : public InputType {
public:
static PassOwnPtr<InputType> create(HTMLInputElement*);
@@ -67,9 +69,14 @@ private:
virtual String fallbackValue();
virtual String sanitizeValue(const String& proposedValue);
virtual bool shouldRespectListAttribute();
+<<<<<<< HEAD
#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS)
virtual void handleTouchStartEvent(TouchEvent*);
#endif
+=======
+
+ SliderThumbElement* shadowSliderThumb() const;
+>>>>>>> WebKit.org at r84325
};
} // namespace WebCore