diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebKit/mac/WebView/WebVideoFullscreenController.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebKit/mac/WebView/WebVideoFullscreenController.h')
| -rw-r--r-- | WebKit/mac/WebView/WebVideoFullscreenController.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/mac/WebView/WebVideoFullscreenController.h b/WebKit/mac/WebView/WebVideoFullscreenController.h index 3e7b6cf..69ba9f4 100644 --- a/WebKit/mac/WebView/WebVideoFullscreenController.h +++ b/WebKit/mac/WebView/WebVideoFullscreenController.h @@ -49,7 +49,8 @@ namespace WebCore { BOOL _isWindowLoaded; BOOL _forceDisableAnimation; uint32_t _idleDisplaySleepAssertion; - uint32_t _idleSystemSleepAssertion; + uint32_t _idleSystemSleepAssertion; + NSTimer *_tickleTimer; SystemUIMode _savedUIMode; SystemUIOptions _savedUIOptions; } |