Title: [146801] trunk
- Revision
- 146801
- Author
- eric.carl...@apple.com
- Date
- 2013-03-25 13:10:12 -0700 (Mon, 25 Mar 2013)
Log Message
REGRESSION(r146380): media/track/track-user-preferences.html
https://bugs.webkit.org/show_bug.cgi?id=113083
Reviewed by Jer Noble.
Source/WebCore:
Ignore track change notifications triggered by automatic track selection so the
configuration is not changed.
No new tests, this fixes an existing test.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::configureTextTrackGroup): Clear m_processingPreferenceChange after all
track configuration is finished.
(WebCore::HTMLMediaElement::configureTextTrackDisplay): Do nothing if m_processingPreferenceChange
is true.
LayoutTests:
* platform/mac/TestExpectations: Remove test from expectations.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (146800 => 146801)
--- trunk/LayoutTests/ChangeLog 2013-03-25 20:06:06 UTC (rev 146800)
+++ trunk/LayoutTests/ChangeLog 2013-03-25 20:10:12 UTC (rev 146801)
@@ -1,3 +1,12 @@
+2013-03-25 Eric Carlson <eric.carl...@apple.com>
+
+ REGRESSION(r146380): media/track/track-user-preferences.html
+ https://bugs.webkit.org/show_bug.cgi?id=113083
+
+ Reviewed by Jer Noble.
+
+ * platform/mac/TestExpectations: Remove test from expectations.
+
2013-03-25 Ryosuke Niwa <rn...@webkit.org>
Windows rebaseline after r146779.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (146800 => 146801)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-03-25 20:06:06 UTC (rev 146800)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-03-25 20:10:12 UTC (rev 146801)
@@ -1473,8 +1473,6 @@
# Snapshotted plugins not enabled on WK1
plugins/snapshotting [ Skip ]
-webkit.org/b/113083 media/track/track-user-preferences.html [ Failure ]
-
webkit.org/b/113094 editing/pasteboard/can-read-in-copy-and-cut-events.html [ Failure ]
webkit.org/b/113094 editing/pasteboard/can-read-in-dragstart-event.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (146800 => 146801)
--- trunk/Source/WebCore/ChangeLog 2013-03-25 20:06:06 UTC (rev 146800)
+++ trunk/Source/WebCore/ChangeLog 2013-03-25 20:10:12 UTC (rev 146801)
@@ -1,3 +1,21 @@
+2013-03-25 Eric Carlson <eric.carl...@apple.com>
+
+ REGRESSION(r146380): media/track/track-user-preferences.html
+ https://bugs.webkit.org/show_bug.cgi?id=113083
+
+ Reviewed by Jer Noble.
+
+ Ignore track change notifications triggered by automatic track selection so the
+ configuration is not changed.
+
+ No new tests, this fixes an existing test.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::configureTextTrackGroup): Clear m_processingPreferenceChange after all
+ track configuration is finished.
+ (WebCore::HTMLMediaElement::configureTextTrackDisplay): Do nothing if m_processingPreferenceChange
+ is true.
+
2013-03-25 Martin Robinson <mrobin...@igalia.com>
[GTK] [gyp] Build the final piece of WebCore
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (146800 => 146801)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-03-25 20:06:06 UTC (rev 146800)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-03-25 20:10:12 UTC (rev 146801)
@@ -3135,7 +3135,6 @@
trackToEnable = fallbackTrack;
if (currentlyEnabledTracks.size()) {
- m_processingPreferenceChange = false;
for (size_t i = 0; i < currentlyEnabledTracks.size(); ++i) {
RefPtr<TextTrack> textTrack = currentlyEnabledTracks[i];
if (textTrack != trackToEnable)
@@ -3145,6 +3144,8 @@
if (trackToEnable)
trackToEnable->setMode(TextTrack::showingKeyword());
+
+ m_processingPreferenceChange = false;
}
void HTMLMediaElement::setSelectedTextTrack(TextTrack* trackToSelect)
@@ -4463,6 +4464,9 @@
{
ASSERT(m_textTracks);
+ if (m_processingPreferenceChange)
+ return;
+
bool haveVisibleTextTrack = false;
for (unsigned i = 0; i < m_textTracks->length(); ++i) {
if (m_textTracks->item(i)->mode() == TextTrack::showingKeyword()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
