Title: [203219] trunk
- Revision
- 203219
- Author
- [email protected]
- Date
- 2016-07-14 00:54:21 -0700 (Thu, 14 Jul 2016)
Log Message
REGRESSION (r202918): LayoutTest media/video-main-content-allow-then-deny.html is flaky, failing almost every time on El Capitan
https://bugs.webkit.org/show_bug.cgi?id=159533
Reviewed by Eric Carlson.
Source/WebCore:
Move the contents of mainContentCheckTimerFired() into updateIsMainContent() so that the
results of changing the m_isMainContent ivar are acted upon no matter why m_isMainContent
changes.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::mainContentCheckTimerFired):
(WebCore::MediaElementSession::updateIsMainContent):
LayoutTests:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (203218 => 203219)
--- trunk/LayoutTests/ChangeLog 2016-07-14 07:29:29 UTC (rev 203218)
+++ trunk/LayoutTests/ChangeLog 2016-07-14 07:54:21 UTC (rev 203219)
@@ -1,3 +1,12 @@
+2016-07-14 Jer Noble <[email protected]>
+
+ REGRESSION (r202918): LayoutTest media/video-main-content-allow-then-deny.html is flaky, failing almost every time on El Capitan
+ https://bugs.webkit.org/show_bug.cgi?id=159533
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+
2016-07-14 Alex Christensen <[email protected]>
Rebaseline test after r203204 and r203207.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (203218 => 203219)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-07-14 07:29:29 UTC (rev 203218)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-07-14 07:54:21 UTC (rev 203219)
@@ -1438,8 +1438,6 @@
# rdar://problem/27187013
[ Sierra+ ] fast/block/float/overhanging-tall-block.html [ Failure ]
-webkit.org/b/159533 [ ElCapitan+ ] media/video-main-content-allow-then-deny.html [ Failure ]
-
webkit.org/b/151287 [ ElCapitan ] media/controls/inline-elements-dropoff-order.html [ Failure ]
webkit.org/b/159683 imported/w3c/web-platform-tests/fetch/api/request/request-cache.html [ Pass Failure ]
Modified: trunk/Source/WebCore/ChangeLog (203218 => 203219)
--- trunk/Source/WebCore/ChangeLog 2016-07-14 07:29:29 UTC (rev 203218)
+++ trunk/Source/WebCore/ChangeLog 2016-07-14 07:54:21 UTC (rev 203219)
@@ -1,3 +1,18 @@
+2016-07-14 Jer Noble <[email protected]>
+
+ REGRESSION (r202918): LayoutTest media/video-main-content-allow-then-deny.html is flaky, failing almost every time on El Capitan
+ https://bugs.webkit.org/show_bug.cgi?id=159533
+
+ Reviewed by Eric Carlson.
+
+ Move the contents of mainContentCheckTimerFired() into updateIsMainContent() so that the
+ results of changing the m_isMainContent ivar are acted upon no matter why m_isMainContent
+ changes.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::mainContentCheckTimerFired):
+ (WebCore::MediaElementSession::updateIsMainContent):
+
2016-07-13 Alex Christensen <[email protected]>
Modernize WebSocket handle
Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (203218 => 203219)
--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-07-14 07:29:29 UTC (rev 203218)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-07-14 07:54:21 UTC (rev 203219)
@@ -604,16 +604,18 @@
if (!hasBehaviorRestriction(OverrideUserGestureRequirementForMainContent))
return;
+ updateIsMainContent();
+}
+
+bool MediaElementSession::updateIsMainContent() const
+{
bool wasMainContent = m_isMainContent;
m_isMainContent = isMainContent(m_element);
if (m_isMainContent != wasMainContent)
m_element.updateShouldPlay();
-}
-bool MediaElementSession::updateIsMainContent() const
-{
- return m_isMainContent = isMainContent(m_element);
+ return m_isMainContent;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
