diff options
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/shadow/SliderThumbElement.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp index 0402e89..d598da9 100644 --- a/Source/WebCore/html/shadow/SliderThumbElement.cpp +++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp @@ -86,17 +86,12 @@ RenderObject* SliderThumbElement::createRenderer(RenderArena* arena, RenderStyle void SliderThumbElement::defaultEventHandler(Event* event) { -<<<<<<< HEAD if (!event->isMouseEvent() #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) && !event->isTouchEvent() #endif ) { - ShadowBlockElement::defaultEventHandler(event); -======= - if (!event->isMouseEvent()) { HTMLDivElement::defaultEventHandler(event); ->>>>>>> WebKit.org @ r75993 return; } |