From 15f1859ccdb0b25adc4607224a80c99b686fe0bb Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 18 May 2011 16:43:59 +0100 Subject: Merge WebKit at r78450: Fix conflicts in media controls Conflict due to Android modifications to handle touch events. See http://trac.webkit.org/changeset/76950 Change-Id: I499d66319614af4bc23f1c0f89f072b814503703 --- Source/WebCore/html/shadow/MediaControls.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Source/WebCore/html/shadow/MediaControls.h') diff --git a/Source/WebCore/html/shadow/MediaControls.h b/Source/WebCore/html/shadow/MediaControls.h index 98e017f..a4fbbd6 100644 --- a/Source/WebCore/html/shadow/MediaControls.h +++ b/Source/WebCore/html/shadow/MediaControls.h @@ -73,6 +73,10 @@ public: // Once shadow DOM refactoring is complete, the tweaking will be in MediaControlsShadowRoot and this accessor will no longer be necessary. RenderBox* renderBox(); +#if PLATFORM(ANDROID) + void updateLastTouch(); +#endif + private: void createControlsShadowRoot(); void destroyControlsShadowRoot(); @@ -132,6 +136,10 @@ private: float m_opacityAnimationTo; bool m_mouseOver; + +#if PLATFORM(ANDROID) + double m_lastTouch; +#endif }; -- cgit v1.1