Title: [206448] branches/safari-602-branch/Source/WebCore
Revision
206448
Author
bshaf...@apple.com
Date
2016-09-27 11:10:56 -0700 (Tue, 27 Sep 2016)

Log Message

Merge r206415. rdar://problem/28484047

Modified Paths

Diff

Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (206447 => 206448)


--- branches/safari-602-branch/Source/WebCore/ChangeLog	2016-09-27 18:10:49 UTC (rev 206447)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog	2016-09-27 18:10:56 UTC (rev 206448)
@@ -1,5 +1,27 @@
 2016-09-27  Babak Shafiei  <bshaf...@apple.com>
 
+        Merge r206415. rdar://problem/28484047
+
+    2016-09-26  Wenson Hsieh  <wenson_hs...@apple.com>
+
+            If you play a youtube video from now playing after it finished in Safari, controls disappear
+            https://bugs.webkit.org/show_bug.cgi?id=162589
+            <rdar://problem/28484047>
+
+            Reviewed by Jer Noble.
+
+            Tweaks the main content heuristic slightly to remove the "mostly in mainframe" requirement in the case of Now
+            Playing. This was added in the case of the controls manager as an additional way to identify video elements that
+            should not show controls, since we relax audio and video constraints for showing videos in the controls manager,
+            so that a video element is prevented from showing controls on grounds of lacking audio only if it has never had
+            audio before. In the case of Now Playing, we have stricter requirements for videos, which must have audio, which
+            makes the mainframe heuristic not necessary.
+
+            * html/MediaElementSession.cpp:
+            (WebCore::MediaElementSession::canShowControlsManager):
+
+2016-09-27  Babak Shafiei  <bshaf...@apple.com>
+
         Merge r206399. rdar://problem/28457219
 
     2016-09-26  Wenson Hsieh  <wenson_hs...@apple.com>

Modified: branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp (206447 => 206448)


--- branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp	2016-09-27 18:10:49 UTC (rev 206447)
+++ branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp	2016-09-27 18:10:56 UTC (rev 206448)
@@ -228,7 +228,7 @@
         return true;
     }
 
-    if (!isElementRectMostlyInMainFrame(m_element)) {
+    if (purpose == PlaybackControlsPurpose::ControlsManager && !isElementRectMostlyInMainFrame(m_element)) {
         LOG(Media, "MediaElementSession::canShowControlsManager - returning FALSE: Not in main frame");
         return false;
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to