Title: [167983] trunk/Source/WebCore
- Revision
- 167983
- Author
- commit-qu...@webkit.org
- Date
- 2014-04-29 22:42:57 -0700 (Tue, 29 Apr 2014)
Log Message
Unreviewed, rolling out r167962 and r167975.
https://bugs.webkit.org/show_bug.cgi?id=132376
Mysteriously broke many tests (Requested by ap on #webkit).
Reverted changesets:
"[Mac, iOS] Support caption activation via JS
webkitHasClosedCaptions method"
https://bugs.webkit.org/show_bug.cgi?id=132320
http://trac.webkit.org/changeset/167962
"Unreviewed test fix after r167962."
http://trac.webkit.org/changeset/167975
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167982 => 167983)
--- trunk/Source/WebCore/ChangeLog 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/ChangeLog 2014-04-30 05:42:57 UTC (rev 167983)
@@ -1,3 +1,20 @@
+2014-04-29 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r167962 and r167975.
+ https://bugs.webkit.org/show_bug.cgi?id=132376
+
+ Mysteriously broke many tests (Requested by ap on #webkit).
+
+ Reverted changesets:
+
+ "[Mac, iOS] Support caption activation via JS
+ webkitHasClosedCaptions method"
+ https://bugs.webkit.org/show_bug.cgi?id=132320
+ http://trac.webkit.org/changeset/167962
+
+ "Unreviewed test fix after r167962."
+ http://trac.webkit.org/changeset/167975
+
2014-04-29 David Hyatt <hy...@apple.com>
[New Multicolumn] Multiple tests assert in RenderGeometryMap
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (167982 => 167983)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-04-30 05:42:57 UTC (rev 167983)
@@ -22,10 +22,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-.hidden {
- display: none;
-}
-
audio {
width: 200px;
height: 25px;
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (167982 => 167983)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-30 05:42:57 UTC (rev 167983)
@@ -3695,64 +3695,9 @@
m_webkitLegacyClosedCaptionOverride = true;
}
- updateCaptionContainer();
-
m_processingPreferenceChange = false;
}
-void HTMLMediaElement::updateCaptionContainer()
-{
- LOG(Media, "HTMLMediaElement::updateCaptionContainer");
-#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- Page* page = document().page();
- if (!page)
- return;
-
- DOMWrapperWorld& world = ensureIsolatedWorld();
-
- if (!ensureMediaControlsInjectedScript())
- return;
-
- ensureUserAgentShadowRoot();
-
- ASSERT(m_mediaControlsHost);
-
- ScriptController& scriptController = page->mainFrame().script();
- JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
- JSC::ExecState* exec = globalObject->globalExec();
- JSC::JSLockHolder lock(exec);
-
- JSC::JSValue controllerValue = m_mediaControlsHost->controllerJSValue();
- if (controllerValue.isUndefinedOrNull() || !controllerValue.isObject())
- return;
-
- JSC::JSObject* controllerObject = controllerValue.toObject(exec);
-
- // The media controls script must provide a method on the Controller object with the following details.
- // Name: updateCaptionContainer
- // Parameters:
- // None
- // Return value:
- // None
- JSC::JSValue methodValue = controllerObject->get(exec, JSC::Identifier(exec, "updateCaptionContainer"));
- if (methodValue.isUndefinedOrNull() || !methodValue.isObject())
- return;
-
- JSC::JSObject* methodObject = methodValue.toObject(exec);
-
- JSC::CallData callData;
- JSC::CallType callType = methodObject->methodTable()->getCallData(methodObject, callData);
- if (callType == JSC::CallTypeNone)
- return;
-
- JSC::MarkedArgumentBuffer noArguments;
- JSC::call(exec, methodObject, callType, callData, controllerObject, noArguments);
-
- if (exec->hadException())
- exec->clearException();
-#endif
-}
-
void HTMLMediaElement::setSelectedTextTrack(TextTrack* trackToSelect)
{
TextTrackList* trackList = textTracks();
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (167982 => 167983)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-04-30 05:42:57 UTC (rev 167983)
@@ -721,8 +721,6 @@
void registerWithDocument(Document&);
void unregisterWithDocument(Document&);
- void updateCaptionContainer();
-
Timer<HTMLMediaElement> m_loadTimer;
Timer<HTMLMediaElement> m_progressEventTimer;
Timer<HTMLMediaElement> m_playbackProgressTimer;
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (167982 => 167983)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-04-30 05:42:57 UTC (rev 167983)
@@ -1500,17 +1500,6 @@
updateSizes();
}
-void MediaControlTextTrackContainerElement::hide()
-{
- classList()->add("hidden", IGNORE_EXCEPTION);
-}
-
-void MediaControlTextTrackContainerElement::show()
-{
- classList()->remove("hidden", IGNORE_EXCEPTION);
-}
-
-
#endif // ENABLE(VIDEO_TRACK)
// ----------------------------
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (167982 => 167983)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-04-30 05:15:34 UTC (rev 167982)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-04-30 05:42:57 UTC (rev 167983)
@@ -476,9 +476,6 @@
void exitedFullscreen();
static const AtomicString& textTrackContainerElementShadowPseudoId();
- virtual void show() override;
- virtual void hide() override;
-
private:
void updateTimerFired(Timer<MediaControlTextTrackContainerElement>&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
