<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209417] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209417">209417</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-12-06 13:52:18 -0800 (Tue, 06 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: media/track LayoutTests are flaky failures
https://bugs.webkit.org/show_bug.cgi?id=165432
Reviewed by Antoine Quint.
RenderThemeMac was caching the media controls script / style sheets
and not being invalidated when the RuntimeEnabledFeatures changed. So,
we can just cache both.
* bindings/generic/RuntimeEnabledFeatures.h:
Initialize m_areModernMediaControlsEnabled to false.
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::mediaControlsStyleSheet):
(WebCore::RenderThemeMac::mediaControlsScript):
Have separate caches for the modern and legacy media control scripts/style sheets.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturesh">trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMach">trunk/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209416 => 209417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-06 21:45:00 UTC (rev 209416)
+++ trunk/Source/WebCore/ChangeLog 2016-12-06 21:52:18 UTC (rev 209417)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-12-06 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><ins>+ REGRESSION: media/track LayoutTests are flaky failures
+ https://bugs.webkit.org/show_bug.cgi?id=165432
+
+ Reviewed by Antoine Quint.
+
+ RenderThemeMac was caching the media controls script / style sheets
+ and not being invalidated when the RuntimeEnabledFeatures changed. So,
+ we can just cache both.
+
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ Initialize m_areModernMediaControlsEnabled to false.
+
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::mediaControlsStyleSheet):
+ (WebCore::RenderThemeMac::mediaControlsScript):
+ Have separate caches for the modern and legacy media control scripts/style sheets.
+
+2016-12-06 Sam Weinig <sam@webkit.org>
+
</ins><span class="cx"> DumpRenderTree crashed in com.apple.WebCore: WebCore::MockMediaEndpoint::generateDtlsInfo const + 23
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165486
</span><span class="cx"> <rdar://problem/29149588>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (209416 => 209417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2016-12-06 21:45:00 UTC (rev 209416)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2016-12-06 21:52:18 UTC (rev 209417)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> // Never instantiate.
</span><span class="cx"> RuntimeEnabledFeatures();
</span><span class="cx">
</span><del>- bool m_areModernMediaControlsEnabled;
</del><ins>+ bool m_areModernMediaControlsEnabled { false };
</ins><span class="cx"> bool m_isLocalStorageEnabled;
</span><span class="cx"> bool m_isSessionStorageEnabled;
</span><span class="cx"> bool m_isWebkitNotificationsEnabled;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (209416 => 209417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2016-12-06 21:45:00 UTC (rev 209416)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2016-12-06 21:52:18 UTC (rev 209417)
</span><span class="lines">@@ -245,7 +245,9 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<WebCoreRenderThemeNotificationObserver> m_notificationObserver;
</span><span class="cx">
</span><ins>+ String m_legacyMediaControlsScript;
</ins><span class="cx"> String m_mediaControlsScript;
</span><ins>+ String m_legacyMediaControlsStyleSheet;
</ins><span class="cx"> String m_mediaControlsStyleSheet;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (209416 => 209417)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-12-06 21:45:00 UTC (rev 209416)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-12-06 21:52:18 UTC (rev 209417)
</span><span class="lines">@@ -232,15 +232,15 @@
</span><span class="cx"> String RenderThemeMac::mediaControlsStyleSheet()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><del>- if (m_mediaControlsStyleSheet.isEmpty()) {
- StringBuilder styleSheetBuilder;
- if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled())
- styleSheetBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"modern-media-controls" ofType:@"css" inDirectory:@"modern-media-controls"] encoding:NSUTF8StringEncoding error:nil]);
- else
- styleSheetBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]);
- m_mediaControlsStyleSheet = styleSheetBuilder.toString();
</del><ins>+ if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled()) {
+ if (m_mediaControlsStyleSheet.isEmpty())
+ m_mediaControlsStyleSheet = [NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"modern-media-controls" ofType:@"css" inDirectory:@"modern-media-controls"] encoding:NSUTF8StringEncoding error:nil];
+ return m_mediaControlsStyleSheet;
</ins><span class="cx"> }
</span><del>- return m_mediaControlsStyleSheet;
</del><ins>+
+ if (m_legacyMediaControlsStyleSheet.isEmpty())
+ m_legacyMediaControlsStyleSheet = [NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil];
+ return m_legacyMediaControlsStyleSheet;
</ins><span class="cx"> #else
</span><span class="cx"> return emptyString();
</span><span class="cx"> #endif
</span><span class="lines">@@ -249,19 +249,28 @@
</span><span class="cx"> String RenderThemeMac::mediaControlsScript()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><del>- if (m_mediaControlsScript.isEmpty()) {
- StringBuilder scriptBuilder;
- NSBundle *bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
- if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled()) {
</del><ins>+ if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled()) {
+ if (m_mediaControlsScript.isEmpty()) {
+ NSBundle *bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
+
+ StringBuilder scriptBuilder;
</ins><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"modern-media-controls-localized-strings.js" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</span><span class="cx"> scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"modern-media-controls" ofType:@"js" inDirectory:@"modern-media-controls"] encoding:NSUTF8StringEncoding error:nil]);
</span><del>- } else {
- scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
- scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
</del><ins>+ m_mediaControlsScript = scriptBuilder.toString();
</ins><span class="cx"> }
</span><del>- m_mediaControlsScript = scriptBuilder.toString();
</del><ins>+ return m_mediaControlsScript;
</ins><span class="cx"> }
</span><del>- return m_mediaControlsScript;
</del><ins>+
+ if (m_legacyMediaControlsScript.isEmpty()) {
+ NSBundle *bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
+
+ StringBuilder scriptBuilder;
+ scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
+ scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
+
+ m_legacyMediaControlsScript = scriptBuilder.toString();
+ }
+ return m_legacyMediaControlsScript;
</ins><span class="cx"> #else
</span><span class="cx"> return emptyString();
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>