diff options
| author | Steve Block <steveblock@google.com> | 2010-02-05 14:27:46 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 10:49:50 +0000 |
| commit | 5e2bc6953fe6923165b8a5d7679939693a1d58d6 (patch) | |
| tree | 6ccb8c24bc2bf5e8f413e6cfae250b729b426631 /WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm | |
| parent | 4a00f4fccc3cb7e9996749a05631f5d7b9de756e (diff) | |
| download | external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.zip external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.gz external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.bz2 | |
Merge webkit.org at r54340 : Initial merge by git
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
Diffstat (limited to 'WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm')
| -rw-r--r-- | WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm index 82cb1bf..83e2d09 100644 --- a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm +++ b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm @@ -578,13 +578,15 @@ static NSTextField *createTimeTextField(NSRect frame) - (void)setPlaying:(BOOL)playing { - if (![_delegate mediaElement]) + HTMLMediaElement* mediaElement = [_delegate mediaElement]; + + if (!mediaElement) return; if (playing) - [_delegate mediaElement]->play(); + mediaElement->play(mediaElement->processingUserGesture()); else - [_delegate mediaElement]->pause(); + mediaElement->pause(mediaElement->processingUserGesture()); } static NSString *timeToString(double time) |