summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/html/HTMLVideoElement.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/html/HTMLVideoElement.cpp')
-rw-r--r--Source/WebCore/html/HTMLVideoElement.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/html/HTMLVideoElement.cpp b/Source/WebCore/html/HTMLVideoElement.cpp
index 2004e48..4ddcdfe 100644
--- a/Source/WebCore/html/HTMLVideoElement.cpp
+++ b/Source/WebCore/html/HTMLVideoElement.cpp
@@ -232,7 +232,7 @@ void HTMLVideoElement::webkitEnterFullscreen(bool isUserGesture, ExceptionCode&
// Generate an exception if this isn't called in response to a user gesture, or if the
// element does not support fullscreen.
- if (!isUserGesture || !supportsFullscreen()) {
+ if ((requireUserGestureForFullScreen() && !isUserGesture) || !supportsFullscreen()) {
ec = INVALID_STATE_ERR;
return;
}
@@ -264,20 +264,20 @@ void HTMLVideoElement::willMoveToNewOwnerDocument()
}
#if ENABLE(MEDIA_STATISTICS)
-unsigned long HTMLVideoElement::webkitDecodedFrames() const
+unsigned HTMLVideoElement::webkitDecodedFrameCount() const
{
if (!player())
return 0;
- return player()->decodedFrames();
+ return player()->decodedFrameCount();
}
-unsigned long HTMLVideoElement::webkitDroppedFrames() const
+unsigned HTMLVideoElement::webkitDroppedFrameCount() const
{
if (!player())
return 0;
- return player()->droppedFrames();
+ return player()->droppedFrameCount();
}
#endif