Diff
Modified: trunk/Source/WebCore/ChangeLog (236520 => 236521)
--- trunk/Source/WebCore/ChangeLog 2018-09-26 20:04:27 UTC (rev 236520)
+++ trunk/Source/WebCore/ChangeLog 2018-09-26 20:31:29 UTC (rev 236521)
@@ -1,3 +1,18 @@
+2018-09-26 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r236511.
+ https://bugs.webkit.org/show_bug.cgi?id=190008
+
+ It is breaking some WebRTC tests (Requested by youenn on
+ #webkit).
+
+ Reverted changeset:
+
+ "[MediaStream] Clean up RealtimeMediaSource settings change
+ handling"
+ https://bugs.webkit.org/show_bug.cgi?id=189998
+ https://trac.webkit.org/changeset/236511
+
2018-09-26 Ryosuke Niwa <[email protected]>
Selection should work across shadow boundary when initiated by a mouse drag
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (236520 => 236521)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2018-09-26 20:04:27 UTC (rev 236520)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2018-09-26 20:31:29 UTC (rev 236521)
@@ -133,10 +133,6 @@
void RealtimeMediaSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
{
-}
-
-void RealtimeMediaSource::notifySettingsDidChangeObservers(OptionSet<RealtimeMediaSourceSettings::Flag> flags)
-{
ASSERT(isMainThread());
if (m_pendingSettingsDidChangeNotification)
@@ -143,8 +139,6 @@
return;
m_pendingSettingsDidChangeNotification = true;
- settingsDidChange(flags);
-
scheduleDeferredTask([this] {
m_pendingSettingsDidChangeNotification = false;
forEachObserver([](auto& observer) {
@@ -870,7 +864,7 @@
changed.add(RealtimeMediaSourceSettings::Flag::Height);
m_size = size;
- notifySettingsDidChangeObservers(changed);
+ settingsDidChange(changed);
}
void RealtimeMediaSource::setFrameRate(double rate)
@@ -879,7 +873,7 @@
return;
m_frameRate = rate;
- notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::FrameRate);
+ settingsDidChange(RealtimeMediaSourceSettings::Flag::FrameRate);
}
void RealtimeMediaSource::setAspectRatio(double ratio)
@@ -889,7 +883,7 @@
m_aspectRatio = ratio;
m_size.setHeight(m_size.width() / ratio);
- notifySettingsDidChangeObservers({ RealtimeMediaSourceSettings::Flag::AspectRatio, RealtimeMediaSourceSettings::Flag::Height });
+ settingsDidChange({ RealtimeMediaSourceSettings::Flag::AspectRatio, RealtimeMediaSourceSettings::Flag::Height });
}
void RealtimeMediaSource::setFacingMode(RealtimeMediaSourceSettings::VideoFacingMode mode)
@@ -898,7 +892,7 @@
return;
m_facingMode = mode;
- notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::FacingMode);
+ settingsDidChange(RealtimeMediaSourceSettings::Flag::FacingMode);
}
void RealtimeMediaSource::setVolume(double volume)
@@ -907,7 +901,7 @@
return;
m_volume = volume;
- notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::Volume);
+ settingsDidChange(RealtimeMediaSourceSettings::Flag::Volume);
}
void RealtimeMediaSource::setSampleRate(int rate)
@@ -916,7 +910,7 @@
return;
m_sampleRate = rate;
- notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::SampleRate);
+ settingsDidChange(RealtimeMediaSourceSettings::Flag::SampleRate);
}
std::optional<Vector<int>> RealtimeMediaSource::discreteSampleRates() const
@@ -930,7 +924,7 @@
return;
m_sampleSize = size;
- notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::SampleSize);
+ settingsDidChange(RealtimeMediaSourceSettings::Flag::SampleSize);
}
std::optional<Vector<int>> RealtimeMediaSource::discreteSampleSizes() const
@@ -944,7 +938,7 @@
return;
m_echoCancellation = echoCancellation;
- notifySettingsDidChangeObservers(RealtimeMediaSourceSettings::Flag::EchoCancellation);
+ settingsDidChange(RealtimeMediaSourceSettings::Flag::EchoCancellation);
}
void RealtimeMediaSource::scheduleDeferredTask(WTF::Function<void()>&& function)
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (236520 => 236521)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2018-09-26 20:04:27 UTC (rev 236520)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2018-09-26 20:31:29 UTC (rev 236521)
@@ -247,8 +247,6 @@
virtual void startProducingData() { }
virtual void stopProducingData() { }
- void notifySettingsDidChangeObservers(OptionSet<RealtimeMediaSourceSettings::Flag>);
-
void forEachObserver(const WTF::Function<void(Observer&)>&) const;
bool m_muted { false };
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (236520 => 236521)
--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2018-09-26 20:04:27 UTC (rev 236520)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2018-09-26 20:31:29 UTC (rev 236521)
@@ -229,9 +229,10 @@
[m_session commitConfiguration];
}
-void AVVideoCaptureSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
+void AVVideoCaptureSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag> settings)
{
m_currentSettings = std::nullopt;
+ RealtimeMediaSource::settingsDidChange(settings);
}
const RealtimeMediaSourceSettings& AVVideoCaptureSource::settings()
Modified: trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp (236520 => 236521)
--- trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp 2018-09-26 20:04:27 UTC (rev 236520)
+++ trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp 2018-09-26 20:31:29 UTC (rev 236521)
@@ -888,6 +888,7 @@
}
m_currentSettings = std::nullopt;
+ RealtimeMediaSource::settingsDidChange(settings);
}
void CoreAudioCaptureSource::scheduleReconfiguration()
Modified: trunk/Source/WebCore/platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp (236520 => 236521)
--- trunk/Source/WebCore/platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp 2018-09-26 20:04:27 UTC (rev 236520)
+++ trunk/Source/WebCore/platform/mediastream/mac/DisplayCaptureSourceCocoa.cpp 2018-09-26 20:31:29 UTC (rev 236521)
@@ -117,6 +117,8 @@
}
m_currentSettings = { };
+
+ RealtimeMediaSource::settingsDidChange(settings);
}
void DisplayCaptureSourceCocoa::startProducingData()
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp (236520 => 236521)
--- trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp 2018-09-26 20:04:27 UTC (rev 236520)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp 2018-09-26 20:31:29 UTC (rev 236521)
@@ -134,9 +134,10 @@
return m_capabilities.value();
}
-void MockRealtimeAudioSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>)
+void MockRealtimeAudioSource::settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag> settings)
{
m_currentSettings = std::nullopt;
+ RealtimeMediaSource::settingsDidChange(settings);
}
void MockRealtimeAudioSource::startProducingData()
Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (236520 => 236521)
--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2018-09-26 20:04:27 UTC (rev 236520)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2018-09-26 20:31:29 UTC (rev 236521)
@@ -229,6 +229,8 @@
m_statsFontSize = m_baseFontSize * .5;
m_imageBuffer = nullptr;
}
+
+ RealtimeVideoSource::settingsDidChange(settings);
}
void MockRealtimeVideoSource::startCaptureTimer()
