diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-26 22:16:56 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-26 19:57:12 +0000 |
commit | aa80d42eb3696071da31827ff27b3963eda59ac0 (patch) | |
tree | 9b8460aa5aa4b06eb22ff6a8881d0a1fce9e2c0f /Source/WebCore/platform | |
parent | f5345badaeefac7c03c8a26dea6b89706871c3fe (diff) | |
download | qtwebkit-aa80d42eb3696071da31827ff27b3963eda59ac0.tar.gz |
Import WebKit commit 3d58c4e1c3d584799c4aa9a14d14e266695ee335
Change-Id: I1069f65fada85860f5c3da6c37a5ab5a8daecd51
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/platform')
-rw-r--r-- | Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp | 15 | ||||
-rw-r--r-- | Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp index 0610c85b6..98f2ec964 100644 --- a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp +++ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp @@ -542,6 +542,16 @@ bool MediaPlayerPrivateMediaFoundation::endGetEvent(IMFAsyncResult* asyncResult) break; } + case MESessionStarted: { + auto weakPtr = m_weakPtrFactory.createWeakPtr(); + callOnMainThread([weakPtr] { + if (!weakPtr) + return; + weakPtr->onSessionStarted(); + }); + break; + } + case MEBufferingStarted: { auto weakPtr = m_weakPtrFactory.createWeakPtr(); callOnMainThread([weakPtr] { @@ -940,6 +950,11 @@ void MediaPlayerPrivateMediaFoundation::onBufferingStopped() updateReadyState(); } +void MediaPlayerPrivateMediaFoundation::onSessionStarted() +{ + updateReadyState(); +} + void MediaPlayerPrivateMediaFoundation::onSessionEnded() { m_networkState = MediaPlayer::Loaded; diff --git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h index c3303cf7b..0fe07fa13 100644 --- a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h +++ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h @@ -152,6 +152,7 @@ private: void onTopologySet(); void onBufferingStarted(); void onBufferingStopped(); + void onSessionStarted(); void onSessionEnded(); LPCWSTR registerVideoWindowClass(); |