diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/html/HTMLMediaElement.cpp | 10 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp index 93bd09e..f4f7002 100644 --- a/Source/WebCore/html/HTMLMediaElement.cpp +++ b/Source/WebCore/html/HTMLMediaElement.cpp @@ -1634,13 +1634,12 @@ void HTMLMediaElement::playbackProgressTimerFired(Timer<HTMLMediaElement>*) scheduleTimeupdateEvent(true); if (hasMediaControls()) { - - if (!m_mouseOver && controls() && hasVideo()) { #if PLATFORM(ANDROID) - if (WTF::currentTime() - m_lastTouch > TOUCH_DELAY) + m_mouseOver = WTF::currentTime() - m_lastTouch <= TOUCH_DELAY; #endif + if (!m_mouseOver && controls() && hasVideo()) mediaControls()->makeTransparent(); - } + mediaControls()->playbackProgressed(); } // FIXME: deal with cue ranges here @@ -2374,6 +2373,9 @@ void HTMLMediaElement::defaultEventHandler(Event* event) widget->handleEvent(event); #else if (event->isMouseEvent()) { +#if PLATFORM(ANDROID) + m_lastTouch = WTF::currentTime(); +#endif MouseEvent* mouseEvent = static_cast<MouseEvent*>(event); if (mouseEvent->relatedTarget() != this) { if (event->type() == eventNames().mouseoverEvent) { diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index e600b04..aa4fcd2 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -253,11 +253,11 @@ void GLWebViewState::drawFocusRing(IntRect& srcRect) // TODO: use a 9-patch texture to draw the focus ring // instead of plain colors const float alpha = 0.3; - float borderAlpha = 0.40; + float borderAlpha = 0.4; - const int r = 104; - const int g = 153; - const int b = 255; + const int r = 51; + const int g = 181; + const int b = 229; int padding = 4; int border = 1; |