diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 16:43:59 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:47 +0100 |
| commit | 15f1859ccdb0b25adc4607224a80c99b686fe0bb (patch) | |
| tree | 9b24e985a39db7162d91c7ee05cff2462ba306f8 /Source/WebCore/html/shadow/MediaControls.h | |
| parent | a1f6960b1e7568f18887cd35bb3fe6b3b7f69eae (diff) | |
| download | external_webkit-15f1859ccdb0b25adc4607224a80c99b686fe0bb.zip external_webkit-15f1859ccdb0b25adc4607224a80c99b686fe0bb.tar.gz external_webkit-15f1859ccdb0b25adc4607224a80c99b686fe0bb.tar.bz2 | |
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
Diffstat (limited to 'Source/WebCore/html/shadow/MediaControls.h')
| -rw-r--r-- | Source/WebCore/html/shadow/MediaControls.h | 8 |
1 files changed, 8 insertions, 0 deletions
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 }; |