Changeset 192631 in webkit

Timestamp:

Nov 19, 2015 9:45:02 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/controls/controls-test-helpers.js (modified) (1 diff)
• LayoutTests/media/controls/inline-elements-dropoff-order-expected.txt (deleted)
• LayoutTests/media/controls/inline-elements-dropoff-order.html (deleted)
• LayoutTests/platform/mac-mavericks/media/controls (deleted)
• LayoutTests/platform/mac-yosemite/media (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (modified) (2 diffs)
• Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (4 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/js/WebCoreTestSupport.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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
+
 2015-11-19  David Kilzer  <ddkilzer@apple.com>
 

trunk/LayoutTests/media/controls/controls-test-helpers.js

@@ -88 +88 @@
     setup()
     {
+        if (!window.testRunner) {
+            this.logFailure("Test requires DRT.");
+            return false;
+        }
+
         this.console = document.createElement("div");
         this.console.className = "console";
         document.body.appendChild(this.console);
-
-        if (!window.testRunner) {
-            this.logFailure("Test requires DRT.");
-            return false;
-        }
 
         this.media = document.querySelector("video");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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
+
 2015-11-19  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css

@@ -620 +620 @@
 }
 
-video::-webkit-media-controls-timeline-container.dropped,
-audio::-webkit-media-controls-timeline-container.dropped {
-    display: -webkit-flex !important;
-}
-
 video::-webkit-media-controls-panel .thumbnail-track,
 audio::-webkit-media-controls-panel .thumbnail-track {
@@ -663 +658 @@
 
 video::-webkit-media-controls-panel.hidden,
-audio::-webkit-media-controls-panel.hidden,
+audio::-webkit-media-controls-panel.hidden {
+    display: none;
+}
+
 video::-webkit-media-controls-panel .hidden,
 audio::-webkit-media-controls-panel .hidden,

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js

@@ -1502 +1502 @@
         // Check if there is enough room for the scrubber.
         var shouldDropTimeline = (visibleWidth - visibleButtonWidth) < this.MinimumTimelineWidth;
-        this.controls.timelineBox.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
         this.controls.timeline.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
         this.controls.currentTime.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
@@ -2134 +2133 @@
             },
             {
-                name: "Captions Button",
-                object: this.controls.captionButton
-            },
-            {
                 name: "Fullscreen Button",
                 object: this.controls.fullscreenButton

trunk/Source/WebCore/testing/Internals.cpp

@@ -349 +349 @@
 }
 
-void Internals::resetToConsistentState(Page& page)
-{
-    page.setPageScaleFactor(1, IntPoint(0, 0));
-    page.setPagination(Pagination());
-
-    page.setDefersLoading(false);
+void Internals::resetToConsistentState(Page* page)
+{
+    ASSERT(page);
+
+    page->setPageScaleFactor(1, IntPoint(0, 0));
+    page->setPagination(Pagination());
+
+    page->setDefersLoading(false);
     
-    page.mainFrame().setTextZoomFactor(1.0f);
+    page->mainFrame().setTextZoomFactor(1.0f);
     
-    FrameView* mainFrameView = page.mainFrame().view();
+    FrameView* mainFrameView = page->mainFrame().view();
     if (mainFrameView) {
         mainFrameView->setHeaderHeight(0);
         mainFrameView->setFooterHeight(0);
-        page.setTopContentInset(0);
+        page->setTopContentInset(0);
         mainFrameView->setUseFixedLayout(false);
         mainFrameView->setFixedLayoutSize(IntSize());
@@ -370 +372 @@
     WebCore::overrideUserPreferredLanguages(Vector<String>());
     WebCore::Settings::setUsesOverlayScrollbars(false);
-    page.inspectorController().setProfilerEnabled(false);
+    page->inspectorController().setProfilerEnabled(false);
 #if ENABLE(VIDEO_TRACK)
-    page.group().captionPreferences()->setCaptionsStyleSheetOverride(emptyString());
-    page.group().captionPreferences()->setTestingMode(false);
-#endif
-    if (!page.mainFrame().editor().isContinuousSpellCheckingEnabled())
-        page.mainFrame().editor().toggleContinuousSpellChecking();
-    if (page.mainFrame().editor().isOverwriteModeEnabled())
-        page.mainFrame().editor().toggleOverwriteModeEnabled();
-    page.mainFrame().loader().clearTestingOverrides();
+    page->group().captionPreferences()->setCaptionsStyleSheetOverride(emptyString());
+    page->group().captionPreferences()->setTestingMode(false);
+#endif
+    if (!page->mainFrame().editor().isContinuousSpellCheckingEnabled())
+        page->mainFrame().editor().toggleContinuousSpellChecking();
+    if (page->mainFrame().editor().isOverwriteModeEnabled())
+        page->mainFrame().editor().toggleOverwriteModeEnabled();
+    page->mainFrame().loader().clearTestingOverrides();
     ApplicationCacheStorage::singleton().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
 #if ENABLE(VIDEO)
@@ -396 +398 @@
 #endif
 
-#if ENABLE(WIRELESS_PLAYBACK_TARGET)
-    page.setMockMediaPlaybackTargetPickerEnabled(true);
-#endif
-
-    page.setShowAllPlugins(false);
+    page->setShowAllPlugins(false);
 }
 
@@ -2979 +2977 @@
     if (equalIgnoringCase(deviceState, "DeviceAvailable"))
         state = MediaPlaybackTargetContext::OutputDeviceAvailable;
-    else if (equalIgnoringCase(deviceState, "DeviceNotAvailable"))
-        state = MediaPlaybackTargetContext::Unavailable;
     else {
         ec = INVALID_ACCESS_ERR;

trunk/Source/WebCore/testing/Internals.h

@@ -82 +82 @@
     virtual ~Internals();
 
-    static void resetToConsistentState(Page&);
+    static void resetToConsistentState(Page*);
 
     String elementRenderTreeAsText(Element*, ExceptionCode&);

trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp

@@ -62 +62 @@
     ScriptExecutionContext* scriptContext = globalObject->scriptExecutionContext();
     Page* page = downcast<Document>(scriptContext)->frame()->page();
-    Internals::resetToConsistentState(*page);
+    Internals::resetToConsistentState(page);
     InternalSettings::from(page)->resetToConsistentState();
 }