<!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>[192631] trunk</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/192631">192631</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-19 09:45:02 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/192622">r192622</a>.
https://bugs.webkit.org/show_bug.cgi?id=151446
This test is failing on multiple mac testers (Requested by
ryanhaddad on #webkit).
Reverted changeset:
"Add a test for media control dropoff"
https://bugs.webkit.org/show_bug.cgi?id=151287
http://trac.webkit.org/changeset/192622</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediacontrolscontrolstesthelpersjs">trunk/LayoutTests/media/controls/controls-test-helpers.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupportcpp">trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediacontrolsinlineelementsdropofforderexpectedtxt">trunk/LayoutTests/media/controls/inline-elements-dropoff-order-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediacontrolsinlineelementsdropofforderhtml">trunk/LayoutTests/media/controls/inline-elements-dropoff-order.html</a></li>
<li>trunk/LayoutTests/platform/mac-mavericks/media/controls/</li>
<li>trunk/LayoutTests/platform/mac-yosemite/media/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/LayoutTests/ChangeLog 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-11-19 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192622.
+ https://bugs.webkit.org/show_bug.cgi?id=151446
+
+ This test is failing on multiple mac testers (Requested by
+ ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "Add a test for media control dropoff"
+ https://bugs.webkit.org/show_bug.cgi?id=151287
+ http://trac.webkit.org/changeset/192622
+
</ins><span class="cx"> 2015-11-19 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip more mediastream tests that crash when painting a mock video source.
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolscontrolstesthelpersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/controls/controls-test-helpers.js (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/controls-test-helpers.js 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/LayoutTests/media/controls/controls-test-helpers.js 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -87,15 +87,15 @@
</span><span class="cx">
</span><span class="cx"> setup()
</span><span class="cx"> {
</span><del>- this.console = document.createElement("div");
- this.console.className = "console";
- document.body.appendChild(this.console);
-
</del><span class="cx"> if (!window.testRunner) {
</span><span class="cx"> this.logFailure("Test requires DRT.");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ this.console = document.createElement("div");
+ this.console.className = "console";
+ document.body.appendChild(this.console);
+
</ins><span class="cx"> this.media = document.querySelector("video");
</span><span class="cx">
</span><span class="cx"> if (!this.media) {
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolsinlineelementsdropofforderexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/controls/inline-elements-dropoff-order-expected.txt (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/inline-elements-dropoff-order-expected.txt 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/LayoutTests/media/controls/inline-elements-dropoff-order-expected.txt 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -1,148 +0,0 @@
</span><del>-This tests that elements in the inline controls drop off when width is restricted, and are in the right place. It also tests that the wireless picker is hidden when no routes are available.
-
-This test only runs in run-webkit-tests!
-
-
-EVENT: canplaythrough
-PASS: We are using the apple idiom
-
-
-Without wireless target availability
-
-
-Testing video at width 310px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is visible
-PASS: Mute Box is visible
-PASS: AppleTV Device Picker is hidden
-PASS: Captions Button is visible
-PASS: Fullscreen Button is visible
-
-Testing video at width 160px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is dropped
-PASS: Mute Box is visible
-PASS: AppleTV Device Picker is hidden
-PASS: Captions Button is visible
-PASS: Fullscreen Button is visible
-
-Testing video at width 130px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is dropped
-PASS: Mute Box is visible
-PASS: AppleTV Device Picker is hidden
-PASS: Captions Button is dropped
-PASS: Fullscreen Button is visible
-
-Testing video at width 100px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is dropped
-PASS: Mute Box is dropped
-PASS: AppleTV Device Picker is hidden
-PASS: Captions Button is dropped
-PASS: Fullscreen Button is visible
-
-Testing video at width 70px
-
-PASS: Play Button is visible
-PASS: Rewind Button is dropped
-PASS: Timeline Box is dropped
-PASS: Mute Box is dropped
-PASS: AppleTV Device Picker is hidden
-PASS: Captions Button is dropped
-PASS: Fullscreen Button is visible
-
-Testing video at width 30px
-
-PASS: Play Button is visible
-PASS: Rewind Button is dropped
-PASS: Timeline Box is dropped
-PASS: Mute Box is dropped
-PASS: AppleTV Device Picker is hidden
-PASS: Captions Button is dropped
-PASS: Fullscreen Button is dropped
-
-
-With wireless target availability
-
-
-Testing video at width 350px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is visible
-PASS: Mute Box is visible
-PASS: AppleTV Device Picker is visible
-PASS: Captions Button is visible
-PASS: Fullscreen Button is visible
-
-Testing video at width 200px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is dropped
-PASS: Mute Box is visible
-PASS: AppleTV Device Picker is visible
-PASS: Captions Button is visible
-PASS: Fullscreen Button is visible
-
-Testing video at width 160px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is dropped
-PASS: Mute Box is visible
-PASS: AppleTV Device Picker is dropped
-PASS: Captions Button is visible
-PASS: Fullscreen Button is visible
-
-Testing video at width 130px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is dropped
-PASS: Mute Box is visible
-PASS: AppleTV Device Picker is dropped
-PASS: Captions Button is dropped
-PASS: Fullscreen Button is visible
-
-Testing video at width 100px
-
-PASS: Play Button is visible
-PASS: Rewind Button is visible
-PASS: Timeline Box is dropped
-PASS: Mute Box is dropped
-PASS: AppleTV Device Picker is dropped
-PASS: Captions Button is dropped
-PASS: Fullscreen Button is visible
-
-Testing video at width 70px
-
-PASS: Play Button is visible
-PASS: Rewind Button is dropped
-PASS: Timeline Box is dropped
-PASS: Mute Box is dropped
-PASS: AppleTV Device Picker is dropped
-PASS: Captions Button is dropped
-PASS: Fullscreen Button is visible
-
-Testing video at width 30px
-
-PASS: Play Button is visible
-PASS: Rewind Button is dropped
-PASS: Timeline Box is dropped
-PASS: Mute Box is dropped
-PASS: AppleTV Device Picker is dropped
-PASS: Captions Button is dropped
-PASS: Fullscreen Button is dropped
-
-Testing finished.
-
</del></span></pre></div>
<a id="trunkLayoutTestsmediacontrolsinlineelementsdropofforderhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/controls/inline-elements-dropoff-order.html (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/inline-elements-dropoff-order.html 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/LayoutTests/media/controls/inline-elements-dropoff-order.html 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -1,184 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
- <head>
- <script src="../media-file.js"></script>
- <script src="controls-test-helpers.js"></script>
- <script>
- var tester = new ControlsTest("../content/audio-describes-video")
- .whenReady(setup)
- .start();
- var supportsWirelessTargets = !!internals.setMockMediaPlaybackTargetPickerEnabled;
- var runNextStep, currentState, elementNames, testWidthsAndExpectedToBeDropped, testsFinished;
-
- function setup()
- {
- currentState = tester.currentState;
- tester.test("We are using the apple idiom")
- .value(currentState.idiom)
- .isEqualTo("apple");
-
- if (supportsWirelessTargets)
- internals.setMockMediaPlaybackTargetPickerState("Wireless playback target", "DeviceNotAvailable");
-
- runNextStep = runNoAirPlayTests;
-
- tester.media.addEventListener('webkitplaybacktargetavailabilitychanged', function() {
- setTimeout(runNextStep, 0);
- });
-
- elementNames = ["Play Button", "Rewind Button", "Timeline Box", "Mute Box", "AppleTV Device Picker", "Captions Button", "Fullscreen Button"];
-
- if (!supportsWirelessTargets)
- setTimeout(runNextStep, 0);
- }
-
- function runNoAirPlayTests() {
- tester.logBlankLine();
- tester.startNewSection("Without wireless target availability");
- testWidthsAndExpectedToBeDropped = [
- {
- width: 310,
- expectedToBeDropped: [],
- expectedToBeHidden: ["AppleTV Device Picker"]
- },
- {
- width: 160,
- expectedToBeDropped: ["Timeline Box"],
- expectedToBeHidden: ["AppleTV Device Picker"]
- },
- {
- width: 130,
- expectedToBeDropped: ["Timeline Box", "Captions Button"],
- expectedToBeHidden: ["AppleTV Device Picker"]
- },
- {
- width: 100,
- expectedToBeDropped: ["Timeline Box", "Captions Button", "Mute Box"],
- expectedToBeHidden: ["AppleTV Device Picker"]
- },
- {
- width: 70,
- expectedToBeDropped: ["Timeline Box", "Captions Button", "Mute Box", "Rewind Button"],
- expectedToBeHidden: ["AppleTV Device Picker"]
- },
- {
- width: 30,
- expectedToBeDropped: ["Timeline Box", "Captions Button", "Mute Box", "Rewind Button", "Fullscreen Button"],
- expectedToBeHidden: ["AppleTV Device Picker"]
- },
- ];
- testsFinished = function() {
- if (supportsWirelessTargets)
- runAirPlayTests();
- else
- tester.end();
- };
- setTimeout(runNextTest, 0);
- }
-
- function runAirPlayTests() {
- tester.logBlankLine();
- tester.startNewSection("With wireless target availability");
-
- testWidthsAndExpectedToBeDropped = [
- {
- width: 350,
- expectedToBeDropped: [],
- expectedToBeHidden: []
- },
- {
- width: 200,
- expectedToBeDropped: ["Timeline Box"],
- expectedToBeHidden: []
- },
- {
- width: 160,
- expectedToBeDropped: ["Timeline Box", "AppleTV Device Picker"],
- expectedToBeHidden: []
- },
- {
- width: 130,
- expectedToBeDropped: ["Timeline Box", "AppleTV Device Picker", "Captions Button"],
- expectedToBeHidden: []
- },
- {
- width: 100,
- expectedToBeDropped: ["Timeline Box", "AppleTV Device Picker", "Captions Button", "Mute Box"],
- expectedToBeHidden: []
- },
- {
- width: 70,
- expectedToBeDropped: ["Timeline Box", "AppleTV Device Picker", "Captions Button", "Mute Box", "Rewind Button"],
- expectedToBeHidden: []
- },
- {
- width: 30,
- expectedToBeDropped: ["Timeline Box", "AppleTV Device Picker", "Captions Button", "Mute Box", "Rewind Button", "Fullscreen Button"],
- expectedToBeHidden: []
- },
- ];
-
- internals.setMockMediaPlaybackTargetPickerState("Wireless playback target", "DeviceAvailable");
- // Start running the tests after we are told availability has changed.
- runNextStep = runNextTest;
-
- testsFinished = function() {
- tester.end();
- };
- }
-
- function runNextTest() {
- if (!testWidthsAndExpectedToBeDropped.length) {
- testsFinished();
- return;
- }
-
- nextTest = testWidthsAndExpectedToBeDropped.shift();
- tester.media.style.width = nextTest.width + "px";
- setTimeout(testDroppedInlineElements, 0);
- }
-
- function testDroppedInlineElements() {
- tester.startNewSection(`Testing video at width ${tester.media.style.width}`);
- currentState = tester.currentState;
- elementNames.forEach(function (name) {
- var elementState = tester.stateForControlsElement(name);
-
- function isElementInArray(elementName) {
- return elementName == name;
- }
-
- var isDropped = elementState.className.indexOf("dropped") > -1;
- var isHidden = elementState.className.indexOf("hidden") > -1;
- var expectedToBeDropped = nextTest.expectedToBeDropped.find(isElementInArray);
- var expectedToBeHidden = nextTest.expectedToBeHidden.find(isElementInArray);
- if (expectedToBeHidden) {
- tester.test(`${name} is hidden`)
- .value(isHidden)
- .isTrue();
- } else if (expectedToBeDropped) {
- tester.test(`${name} is dropped`)
- .value(isDropped)
- .isTrue();
- } else {
- tester.test(`${name} is visible`)
- .value(isDropped)
- .isFalse();
- }
- });
-
- setTimeout(runNextTest, 0);
- }
-
- </script>
- <style>
- body { margin-left: 0; }
- video { width: 310px; height: 80px; }
- </style>
- </head>
- <body>
- <p>This tests that elements in the inline controls drop off when width is restricted, and are in the right place. It also tests that the wireless picker is hidden when no routes are available.</p>
- <p>This test only runs in run-webkit-tests!</p>
- <video controls></video>
- </body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/Source/WebCore/ChangeLog 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-11-19 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192622.
+ https://bugs.webkit.org/show_bug.cgi?id=151446
+
+ This test is failing on multiple mac testers (Requested by
+ ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "Add a test for media control dropoff"
+ https://bugs.webkit.org/show_bug.cgi?id=151287
+ http://trac.webkit.org/changeset/192622
+
</ins><span class="cx"> 2015-11-19 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Fix -Winconsistent-missing-override clang warnings
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -619,11 +619,6 @@
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-timeline-container.dropped,
-audio::-webkit-media-controls-timeline-container.dropped {
- display: -webkit-flex !important;
-}
-
</del><span class="cx"> video::-webkit-media-controls-panel .thumbnail-track,
</span><span class="cx"> audio::-webkit-media-controls-panel .thumbnail-track {
</span><span class="cx"> position: relative;
</span><span class="lines">@@ -662,7 +657,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-panel.hidden,
</span><del>-audio::-webkit-media-controls-panel.hidden,
</del><ins>+audio::-webkit-media-controls-panel.hidden {
+ display: none;
+}
+
</ins><span class="cx"> video::-webkit-media-controls-panel .hidden,
</span><span class="cx"> audio::-webkit-media-controls-panel .hidden,
</span><span class="cx"> video::-webkit-media-controls-panel .dropped,
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -1501,7 +1501,6 @@
</span><span class="cx">
</span><span class="cx"> // Check if there is enough room for the scrubber.
</span><span class="cx"> var shouldDropTimeline = (visibleWidth - visibleButtonWidth) < this.MinimumTimelineWidth;
</span><del>- this.controls.timelineBox.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
</del><span class="cx"> this.controls.timeline.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
</span><span class="cx"> this.controls.currentTime.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
</span><span class="cx"> this.controls.thumbnailTrack.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
</span><span class="lines">@@ -2133,10 +2132,6 @@
</span><span class="cx"> object: this.controls.muteBox
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- name: "Captions Button",
- object: this.controls.captionButton
- },
- {
</del><span class="cx"> name: "Fullscreen Button",
</span><span class="cx"> object: this.controls.fullscreenButton
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -348,20 +348,22 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::resetToConsistentState(Page& page)
</del><ins>+void Internals::resetToConsistentState(Page* page)
</ins><span class="cx"> {
</span><del>- page.setPageScaleFactor(1, IntPoint(0, 0));
- page.setPagination(Pagination());
</del><ins>+ ASSERT(page);
</ins><span class="cx">
</span><del>- page.setDefersLoading(false);
</del><ins>+ page->setPageScaleFactor(1, IntPoint(0, 0));
+ page->setPagination(Pagination());
+
+ page->setDefersLoading(false);
</ins><span class="cx">
</span><del>- page.mainFrame().setTextZoomFactor(1.0f);
</del><ins>+ page->mainFrame().setTextZoomFactor(1.0f);
</ins><span class="cx">
</span><del>- FrameView* mainFrameView = page.mainFrame().view();
</del><ins>+ FrameView* mainFrameView = page->mainFrame().view();
</ins><span class="cx"> if (mainFrameView) {
</span><span class="cx"> mainFrameView->setHeaderHeight(0);
</span><span class="cx"> mainFrameView->setFooterHeight(0);
</span><del>- page.setTopContentInset(0);
</del><ins>+ page->setTopContentInset(0);
</ins><span class="cx"> mainFrameView->setUseFixedLayout(false);
</span><span class="cx"> mainFrameView->setFixedLayoutSize(IntSize());
</span><span class="cx"> }
</span><span class="lines">@@ -369,16 +371,16 @@
</span><span class="cx"> TextRun::setAllowsRoundingHacks(false);
</span><span class="cx"> WebCore::overrideUserPreferredLanguages(Vector<String>());
</span><span class="cx"> WebCore::Settings::setUsesOverlayScrollbars(false);
</span><del>- page.inspectorController().setProfilerEnabled(false);
</del><ins>+ page->inspectorController().setProfilerEnabled(false);
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- page.group().captionPreferences()->setCaptionsStyleSheetOverride(emptyString());
- page.group().captionPreferences()->setTestingMode(false);
</del><ins>+ page->group().captionPreferences()->setCaptionsStyleSheetOverride(emptyString());
+ page->group().captionPreferences()->setTestingMode(false);
</ins><span class="cx"> #endif
</span><del>- if (!page.mainFrame().editor().isContinuousSpellCheckingEnabled())
- page.mainFrame().editor().toggleContinuousSpellChecking();
- if (page.mainFrame().editor().isOverwriteModeEnabled())
- page.mainFrame().editor().toggleOverwriteModeEnabled();
- page.mainFrame().loader().clearTestingOverrides();
</del><ins>+ if (!page->mainFrame().editor().isContinuousSpellCheckingEnabled())
+ page->mainFrame().editor().toggleContinuousSpellChecking();
+ if (page->mainFrame().editor().isOverwriteModeEnabled())
+ page->mainFrame().editor().toggleOverwriteModeEnabled();
+ page->mainFrame().loader().clearTestingOverrides();
</ins><span class="cx"> ApplicationCacheStorage::singleton().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> PlatformMediaSessionManager::sharedManager().resetRestrictions();
</span><span class="lines">@@ -395,11 +397,7 @@
</span><span class="cx"> MockContentFilterSettings::reset();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- page.setMockMediaPlaybackTargetPickerEnabled(true);
-#endif
-
- page.setShowAllPlugins(false);
</del><ins>+ page->setShowAllPlugins(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Internals::Internals(Document* document)
</span><span class="lines">@@ -2978,8 +2976,6 @@
</span><span class="cx">
</span><span class="cx"> if (equalIgnoringCase(deviceState, "DeviceAvailable"))
</span><span class="cx"> state = MediaPlaybackTargetContext::OutputDeviceAvailable;
</span><del>- else if (equalIgnoringCase(deviceState, "DeviceNotAvailable"))
- state = MediaPlaybackTargetContext::Unavailable;
</del><span class="cx"> else {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/Source/WebCore/testing/Internals.h 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> static Ref<Internals> create(Document*);
</span><span class="cx"> virtual ~Internals();
</span><span class="cx">
</span><del>- static void resetToConsistentState(Page&);
</del><ins>+ static void resetToConsistentState(Page*);
</ins><span class="cx">
</span><span class="cx"> String elementRenderTreeAsText(Element*, ExceptionCode&);
</span><span class="cx"> bool hasPausedImageAnimations(Element*, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp (192630 => 192631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2015-11-19 17:42:19 UTC (rev 192630)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2015-11-19 17:45:02 UTC (rev 192631)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
</span><span class="cx"> ScriptExecutionContext* scriptContext = globalObject->scriptExecutionContext();
</span><span class="cx"> Page* page = downcast<Document>(scriptContext)->frame()->page();
</span><del>- Internals::resetToConsistentState(*page);
</del><ins>+ Internals::resetToConsistentState(page);
</ins><span class="cx"> InternalSettings::from(page)->resetToConsistentState();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>