[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
mitz at apple.com
mitz at apple.com
Thu Dec 3 13:31:14 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit ddcb02d5a03b6ace737b302ba8002ee8e4a3f529
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 10 20:06:36 2009 +0000
WebCore: WebCore part of making full-screen video pause during scrubbing.
Reviewed by Eric Carlson and Darin Adler.
* WebCore.Video.exp: Sorted and added HTMLMediaElement::beginScrubbing()
and HTMLMediaElement::endScrubbing().
WebKit/mac: WebKit part of making full-screen video pause during scrubbing.
Reviewed by Eric Carlson and Darin Adler.
* WebView/WebVideoFullscreenHUDWindowController.h: Added _isScrubbing
ivar.
* WebView/WebVideoFullscreenHUDWindowController.mm:
(-[WebVideoFullscreenHUDWindowController dealloc]): Assert that
_isScrubbing is NO.
(-[WebVideoFullscreenHUDWindowController endScrubbing]): Call
HTMLMediaElement::endScrubbing().
(-[WebVideoFullscreenHUDWindowController timelinePositionChanged:]):
If scrubbing has just begun, call HTMLMediaElement::beginScrubbing()
and schedule -endScrubbing to be called when mouse tracking ends.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50753 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f46b9a4..09e7ec8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-10 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Eric Carlson and Darin Adler.
+
+ WebCore part of making full-screen video pause during scrubbing.
+
+ * WebCore.Video.exp: Sorted and added HTMLMediaElement::beginScrubbing()
+ and HTMLMediaElement::endScrubbing().
+
2009-11-10 Anton Muhin <antonm at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/WebCore.Video.exp b/WebCore/WebCore.Video.exp
index 5d35698..57619b4 100644
--- a/WebCore/WebCore.Video.exp
+++ b/WebCore/WebCore.Video.exp
@@ -1,14 +1,16 @@
+__ZN7WebCore16HTMLMediaElement10screenRectEv
+__ZN7WebCore16HTMLMediaElement12endScrubbingEv
+__ZN7WebCore16HTMLMediaElement14beginScrubbingEv
+__ZN7WebCore16HTMLMediaElement14exitFullscreenEv
+__ZN7WebCore16HTMLMediaElement14setCurrentTimeEfRi
__ZN7WebCore16HTMLMediaElement4playEv
__ZN7WebCore16HTMLMediaElement5pauseEv
-__ZNK7WebCore16HTMLMediaElement6volumeEv
-__ZNK7WebCore16HTMLMediaElement7canPlayEv
-__ZNK7WebCore16HTMLMediaElement8durationEv
-__ZNK7WebCore16HTMLMediaElement5mutedEv
+__ZN7WebCore16HTMLMediaElement6rewindEf
__ZN7WebCore16HTMLMediaElement8setMutedEb
__ZN7WebCore16HTMLMediaElement9setVolumeEfRi
-__ZN7WebCore16HTMLMediaElement6rewindEf
-__ZN7WebCore16HTMLMediaElement10screenRectEv
__ZNK7WebCore16HTMLMediaElement11currentTimeEv
__ZNK7WebCore16HTMLMediaElement13platformMediaEv
-__ZN7WebCore16HTMLMediaElement14setCurrentTimeEfRi
-__ZN7WebCore16HTMLMediaElement14exitFullscreenEv
+__ZNK7WebCore16HTMLMediaElement5mutedEv
+__ZNK7WebCore16HTMLMediaElement6volumeEv
+__ZNK7WebCore16HTMLMediaElement7canPlayEv
+__ZNK7WebCore16HTMLMediaElement8durationEv
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 93f88cd..2f69c18 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,20 @@
+2009-11-10 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Eric Carlson and Darin Adler.
+
+ WebKit part of making full-screen video pause during scrubbing.
+
+ * WebView/WebVideoFullscreenHUDWindowController.h: Added _isScrubbing
+ ivar.
+ * WebView/WebVideoFullscreenHUDWindowController.mm:
+ (-[WebVideoFullscreenHUDWindowController dealloc]): Assert that
+ _isScrubbing is NO.
+ (-[WebVideoFullscreenHUDWindowController endScrubbing]): Call
+ HTMLMediaElement::endScrubbing().
+ (-[WebVideoFullscreenHUDWindowController timelinePositionChanged:]):
+ If scrubbing has just begun, call HTMLMediaElement::beginScrubbing()
+ and schedule -endScrubbing to be called when mouse tracking ends.
+
2009-11-09 Mark Mentovai <mark at chromium.org>
Reviewed by Dan Bernstein.
diff --git a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.h b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.h
index 15f8282..a3d74d2 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.h
+++ b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.h
@@ -40,6 +40,7 @@ namespace WebCore {
#endif
BOOL _mouseIsInHUD;
BOOL _isEndingFullscreen;
+ BOOL _isScrubbing;
NSControl *_timeline;
NSTextField *_remainingTimeText;
diff --git a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
index 539a7eb..82cb1bf 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm
@@ -165,6 +165,7 @@ static const NSTimeInterval HUDWindowFadeOutDelay = 3;
#if !defined(BUILDING_ON_TIGER)
ASSERT(!_area);
#endif
+ ASSERT(!_isScrubbing);
[_timeline release];
[_remainingTimeText release];
[_elapsedTimeText release];
@@ -447,9 +448,25 @@ static NSTextField *createTimeTextField(NSRect frame)
[_elapsedTimeText setStringValue:[self elapsedTimeText]];
}
+- (void)endScrubbing
+{
+ ASSERT(_isScrubbing);
+ _isScrubbing = NO;
+ if (HTMLMediaElement* mediaElement = [_delegate mediaElement])
+ mediaElement->endScrubbing();
+}
+
- (void)timelinePositionChanged:(id)sender
{
[self setCurrentTime:[_timeline floatValue]];
+ if (!_isScrubbing) {
+ _isScrubbing = YES;
+ if (HTMLMediaElement* mediaElement = [_delegate mediaElement])
+ mediaElement->beginScrubbing();
+ static NSArray *endScrubbingModes = [[NSArray alloc] initWithObjects:NSDefaultRunLoopMode, NSModalPanelRunLoopMode, nil];
+ // Schedule -endScrubbing for when leaving mouse tracking mode.
+ [[NSRunLoop currentRunLoop] performSelector:@selector(endScrubbing) target:self argument:nil order:0 modes:endScrubbingModes];
+ }
}
- (float)currentTime
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list