diff options
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/shadow/MediaControls.cpp | 20 | ||||
| -rw-r--r-- | Source/WebCore/html/shadow/SliderThumbElement.cpp | 8 |
2 files changed, 2 insertions, 26 deletions
diff --git a/Source/WebCore/html/shadow/MediaControls.cpp b/Source/WebCore/html/shadow/MediaControls.cpp index 20f1abb..04bdce4 100644 --- a/Source/WebCore/html/shadow/MediaControls.cpp +++ b/Source/WebCore/html/shadow/MediaControls.cpp @@ -557,24 +557,6 @@ void MediaControls::forwardEvent(Event* event) #endif } -<<<<<<< HEAD -// We want the timeline slider to be at least 100 pixels wide. -static const int minWidthToDisplayTimeDisplays = 16 + 16 + 45 + 100 + 45 + 16 + 1; - -void MediaControls::updateTimeDisplayVisibility() -{ - ASSERT(m_mediaElement->renderer()); - - if (!m_currentTimeDisplay && !m_timeRemainingDisplay) - return; - - int width = m_mediaElement->renderBox()->width(); - bool shouldShowTimeDisplays = width >= minWidthToDisplayTimeDisplays * m_mediaElement->renderer()->style()->effectiveZoom(); - - m_currentTimeDisplay->setVisible(shouldShowTimeDisplays); - m_timeRemainingDisplay->setVisible(shouldShowTimeDisplays); -} - #if PLATFORM(ANDROID) void MediaControls::updateLastTouch() { @@ -582,8 +564,6 @@ void MediaControls::updateLastTouch() } #endif -======= ->>>>>>> webkit.org at r82507 } #endif diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp index d1aa15e..6a6e901 100644 --- a/Source/WebCore/html/shadow/SliderThumbElement.cpp +++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp @@ -224,13 +224,12 @@ void SliderThumbElement::defaultEventHandler(Event* event) #endif ) { if (m_inDragMode) -<<<<<<< HEAD #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) { if (event->isMouseEvent()) { MouseEvent* mouseEvent = static_cast<MouseEvent*>(event); #endif - setPosition(mouseEvent->absoluteLocation()); + setPositionFromPoint(mouseEvent->absoluteLocation()); #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) } else if (event->isTouchEvent()) { TouchEvent* touchEvent = static_cast<TouchEvent*>(event); @@ -238,7 +237,7 @@ void SliderThumbElement::defaultEventHandler(Event* event) IntPoint curPoint; curPoint.setX(touchEvent->touches()->item(0)->pageX()); curPoint.setY(touchEvent->touches()->item(0)->pageY()); - setPosition(curPoint); + setPositionFromPoint(curPoint); // Tell the webview that webkit will handle the following move events event->setDefaultPrevented(true); } @@ -246,9 +245,6 @@ void SliderThumbElement::defaultEventHandler(Event* event) } #endif -======= - setPositionFromPoint(mouseEvent->absoluteLocation()); ->>>>>>> webkit.org at r82507 return; } |