Title: [163533] trunk/Source/WebCore
- Revision
- 163533
- Author
- [email protected]
- Date
- 2014-02-06 08:29:52 -0800 (Thu, 06 Feb 2014)
Log Message
No need to enterFullscreen() when already in fullscreen
https://bugs.webkit.org/show_bug.cgi?id=128276
Reviewed by Jer Noble.
No new tests, this is just cleanup.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updatePlayState): Don't call enterFullscreen() if already there.
(WebCore::HTMLMediaElement::enterFullscreen): Return early if m_isFullscreen is already true.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163532 => 163533)
--- trunk/Source/WebCore/ChangeLog 2014-02-06 15:24:52 UTC (rev 163532)
+++ trunk/Source/WebCore/ChangeLog 2014-02-06 16:29:52 UTC (rev 163533)
@@ -1,3 +1,16 @@
+2014-02-06 Eric Carlson <[email protected]>
+
+ No need to enterFullscreen() when already in fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=128276
+
+ Reviewed by Jer Noble.
+
+ No new tests, this is just cleanup.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::updatePlayState): Don't call enterFullscreen() if already there.
+ (WebCore::HTMLMediaElement::enterFullscreen): Return early if m_isFullscreen is already true.
+
2014-02-06 Radu Stavila <[email protected]>
[CSS Regions] Null dereference applying animation with CSS regions
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (163532 => 163533)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-06 15:24:52 UTC (rev 163532)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-02-06 16:29:52 UTC (rev 163533)
@@ -4268,7 +4268,7 @@
invalidateCachedTime();
if (playerPaused) {
- if (m_mediaSession->requiresFullscreenForVideoPlayback(*this))
+ if (m_mediaSession->requiresFullscreenForVideoPlayback(*this) && !isFullscreen())
enterFullscreen();
// Set rate, muted before calling play in case they were set before the media engine was setup.
@@ -4843,6 +4843,8 @@
void HTMLMediaElement::enterFullscreen()
{
LOG(Media, "HTMLMediaElement::enterFullscreen");
+ if (m_isFullscreen)
+ return;
#if ENABLE(FULLSCREEN_API)
if (document().settings() && document().settings()->fullScreenEnabled()) {
@@ -4850,7 +4852,7 @@
return;
}
#endif
- ASSERT(!m_isFullscreen);
+
m_isFullscreen = true;
if (hasMediaControls())
mediaControls()->enteredFullscreen();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
