Changeset 201001 in webkit

Timestamp:

May 17, 2016 1:46:49 AM (8 years ago)

Author:

bshafiei@apple.com

Message:

Merge r200778. rdar://problem/25840861

Location:

branches/safari-602.1.32-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-main-content-allow.html (modified) (1 diff)
• LayoutTests/media/video-main-content-autoplay-expected.txt (added)
• LayoutTests/media/video-main-content-autoplay.html (added)
• LayoutTests/media/video-main-content-deny-too-small.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/MediaElementSession.cpp (modified) (5 diffs)

branches/safari-602.1.32-branch/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-17  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r200778. rdar://problem/25840861
+
+    2016-05-12  Eric Carlson  <eric.carlson@apple.com>
+
+            Adjust "main content" video heuristic
+            https://bugs.webkit.org/show_bug.cgi?id=157532
+
+            Reviewed by Darin Adler.
+
+            * media/video-main-content-allow.html:
+            * media/video-main-content-autoplay-expected.txt: Added.
+            * media/video-main-content-autoplay.html: Added.
+            * media/video-main-content-deny-too-small.html:
+
 2016-05-09  Simon Fraser  <simon.fraser@apple.com>
 

branches/safari-602.1.32-branch/LayoutTests/media/video-main-content-allow.html

@@ -23 +23 @@
     <style>
     video {
-        width: 600px;
-        height: 400px;
+        width: 270px;
+        height: 480px;
     }
     </style>

branches/safari-602.1.32-branch/LayoutTests/media/video-main-content-deny-too-small.html

@@ -8 +8 @@
     function go() {
         video = document.createElement('video');
+        video.controls = ""
         run('internals.setMediaElementRestrictions(video, "RequireUserGestureForVideoRateChange,OverrideUserGestureRequirementForMainContent")');
         document.body.appendChild(video);
@@ -28 +29 @@
     <style>
     video {
-        width: 200px;
-        height: 100px;
+        width: 400px;
+        height: 299px;
     }
     </style>

branches/safari-602.1.32-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-17  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r200778. rdar://problem/25840861
+
+    2016-05-12  Eric Carlson  <eric.carlson@apple.com>
+
+            Adjust "main content" video heuristic
+            https://bugs.webkit.org/show_bug.cgi?id=157532
+            <rdar://problem/25840861>
+
+            Reviewed by Darin Adler.
+
+            Test: media/video-main-content-autoplay.html, plus existing tests updated.
+
+            * html/MediaElementSession.cpp:
+            (WebCore::MediaElementSession::canControlControlsManager): Use isElementLargeEnoughForMainContent.
+            (WebCore::isMainContent): Ditto.
+            (WebCore::isElementLargeEnoughForMainContent): Check video area and aspect ratio.
+            (WebCore::MediaElementSession::mainContentCheckTimerFired): Call result.setToNonUserAgentShadowAncestor
+              so it doesn't hit test the video controls in the shadow DOM.
+
 2016-05-16  Dean Jackson  <dino@apple.com>
 

branches/safari-602.1.32-branch/Source/WebCore/html/MediaElementSession.cpp

@@ -55 +55 @@
 namespace WebCore {
 
-static const int elementMainContentMinimumWidth = 400;
-static const int elementMainContentMinimumHeight = 300;
 static const double elementMainContentCheckInterval = .250;
 
 static bool isMainContent(const HTMLMediaElement&);
+static bool isElementLargeEnoughForMainContent(const HTMLMediaElement&);
 
 #if !LOG_DISABLED
@@ -225 +224 @@
         return false;
 
-    if (element.hasVideo() && renderer->clientWidth() >= elementMainContentMinimumWidth && renderer->clientHeight() >= elementMainContentMinimumHeight)
-            return true;
+    if (isElementLargeEnoughForMainContent(element))
+        return true;
 
     if (ScriptController::processingUserGestureForMedia())
@@ -507 +506 @@
         return false;
 
-    if (renderer->clientWidth() < elementMainContentMinimumWidth
-        || renderer->clientHeight() < elementMainContentMinimumHeight)
+    if (!isElementLargeEnoughForMainContent(element))
         return false;
 
@@ -536 +534 @@
     // Elements which are obscured by other elements cannot be main content.
     mainRenderView.hitTest(request, result);
+    result.setToNonUserAgentShadowAncestor();
     Element* hitElement = result.innerElement();
     if (hitElement != &element)
@@ -543 +542 @@
 }
 
+static bool isElementLargeEnoughForMainContent(const HTMLMediaElement& element)
+{
+    static const double elementMainContentAreaMinimum = 400 * 300;
+    static const double maximumAspectRatio = 1.8; // Slightly larger than 16:9.
+    static const double minimumAspectRatio = .5; // Slightly smaller than 16:9.
+
+    // Elements which have not yet been laid out, or which are not yet in the DOM, cannot be main content.
+    RenderBox* renderer = downcast<RenderBox>(element.renderer());
+    if (!renderer)
+        return false;
+
+    double width = renderer->clientWidth();
+    double height = renderer->clientHeight();
+    double area = width * height;
+    double aspectRatio = width / height;
+    return area >= elementMainContentAreaMinimum && aspectRatio >= minimumAspectRatio && aspectRatio <= maximumAspectRatio;
+}
+
 void MediaElementSession::mainContentCheckTimerFired()
 {