Diff
Modified: trunk/LayoutTests/ChangeLog (266894 => 266895)
--- trunk/LayoutTests/ChangeLog 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/LayoutTests/ChangeLog 2020-09-10 22:57:50 UTC (rev 266895)
@@ -1,3 +1,19 @@
+2020-09-10 Chris Dumez <[email protected]>
+
+ Unreviewed, reverting r266842 and r266883.
+
+ Causes some assertions to be hit in debug builds
+
+ Reverted changesets:
+
+ "Some WebAudio tests give different output on different
+ machines"
+ https://bugs.webkit.org/show_bug.cgi?id=216371
+ https://trac.webkit.org/changeset/266842
+
+ "Unreviewed Windows build fix after r266842."
+ https://trac.webkit.org/changeset/266883
+
2020-09-10 Zalan Bujtas <[email protected]>
[LFC][IFC] Construct LineBox::InlineBoxes for nested inline level boxes when they overlap multiple lines
Modified: trunk/LayoutTests/TestExpectations (266894 => 266895)
--- trunk/LayoutTests/TestExpectations 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/LayoutTests/TestExpectations 2020-09-10 22:57:50 UTC (rev 266895)
@@ -321,6 +321,7 @@
imported/w3c/web-platform-tests/webaudio/the-audio-api/the-mediastreamaudiosourcenode-interface/mediastreamaudiosourcenode-routing.html [ Skip ]
# Test prints out sample rate, which appears to be hardware-specific.
+imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html [ Pass Failure ]
imported/w3c/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html [ Pass Failure ]
imported/w3c/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-getFrequencyResponse.html [ Pass Failure ]
imported/w3c/web-platform-tests/webaudio/the-audio-api/the-gainnode-interface/no-dezippering.html [ Pass Failure ]
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (266894 => 266895)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-09-10 22:57:50 UTC (rev 266895)
@@ -1,5 +1,21 @@
2020-09-10 Chris Dumez <[email protected]>
+ Unreviewed, reverting r266842 and r266883.
+
+ Causes some assertions to be hit in debug builds
+
+ Reverted changesets:
+
+ "Some WebAudio tests give different output on different
+ machines"
+ https://bugs.webkit.org/show_bug.cgi?id=216371
+ https://trac.webkit.org/changeset/266842
+
+ "Unreviewed Windows build fix after r266842."
+ https://trac.webkit.org/changeset/266883
+
+2020-09-10 Chris Dumez <[email protected]>
+
Unreviewed, rebaseline a couple of flaky WebAudio WPT tests.
* web-platform-tests/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv-expected.txt:
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions-expected.txt (266894 => 266895)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions-expected.txt 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions-expected.txt 2020-09-10 22:57:50 UTC (rev 266895)
@@ -6,24 +6,24 @@
PASS Audit report
PASS > [test-audiocontextoptions-latencyHint-basic] Test creating contexts with basic latencyHint types.
PASS context = new AudioContext() did not throw an exception.
-PASS context.sampleRate (44100 Hz) is greater than 0.
+PASS context.sampleRate (48000 Hz) is greater than 0.
PASS default baseLatency is greater than or equal to 0.
PASS context = new AudioContext({'latencyHint': 'interactive'}) did not throw an exception.
-PASS interactive baseLatency is equal to 0.0029024943310657597.
+PASS interactive baseLatency is equal to 0.0026666666666666666.
PASS context = new AudioContext({'latencyHint': 'balanced'}) did not throw an exception.
-PASS balanced baseLatency is greater than or equal to 0.0029024943310657597.
+PASS balanced baseLatency is greater than or equal to 0.0026666666666666666.
PASS context = new AudioContext({'latencyHint': 'playback'}) did not throw an exception.
-PASS playback baseLatency is greater than or equal to 0.0029024943310657597.
+PASS playback baseLatency is greater than or equal to 0.0026666666666666666.
PASS < [test-audiocontextoptions-latencyHint-basic] All assertions passed. (total 9 assertions)
PASS > [test-audiocontextoptions-latencyHint-double] Test creating contexts with explicit latencyHint values.
PASS context = new AudioContext({'latencyHint': interactiveLatency/2}) did not throw an exception.
-PASS double-constructor baseLatency small is less than or equal to 0.0029024943310657597.
+PASS double-constructor baseLatency small is less than or equal to 0.0026666666666666666.
PASS context = new AudioContext({'latencyHint': validLatency}) did not throw an exception.
-PASS double-constructor baseLatency inrange 1 is greater than or equal to 0.0029024943310657597.
-PASS double-constructor baseLatency inrange 2 is less than or equal to 0.0029024943310657597.
+PASS double-constructor baseLatency inrange 1 is greater than or equal to 0.0026666666666666666.
+PASS double-constructor baseLatency inrange 2 is less than or equal to 0.0026666666666666666.
PASS creating two high latency contexts did not throw an exception.
-PASS high latency context baseLatency is equal to 0.0029024943310657597.
-PASS high latency context baseLatency is greater than or equal to 0.0029024943310657597.
+PASS high latency context baseLatency is equal to 0.0026666666666666666.
+PASS high latency context baseLatency is greater than or equal to 0.0026666666666666666.
PASS context = new AudioContext({'latencyHint': 'foo'}) threw TypeError: "Type error".
PASS context = new AudioContext('latencyHint') threw TypeError: "Type error".
PASS < [test-audiocontextoptions-latencyHint-double] All assertions passed. (total 10 assertions)
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-stereo-panner-expected.txt (266894 => 266895)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-stereo-panner-expected.txt 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/k-rate-stereo-panner-expected.txt 2020-09-10 22:57:50 UTC (rev 266895)
@@ -10,7 +10,7 @@
PASS StereoPannerNode: a-rate node:pan.linearRampToValueAtTime(0.5,1) did not throw an exception.
PASS StereoPannerNode: Output of k-rate StereoPannerNode is identical to the array [0,0.23952384293079376,0.4507266879081726,0.6086364388465881,0.6945818662643433,0.6984009146690369,0.6196421384811401,0.46761801838874817,0.26030319929122925,0.022210577502846718,-0.2185080647468567,-0.4333907663822174,-0.597029983997345,-0.6900772452354431,-0.701530933380127,-0.6300365328788757...].
PASS StereoPannerNode: Output of a-rate StereoPannerNode is identical to the array [0,0.23952384293079376,0.4507266879081726,0.6086364388465881,0.6945818662643433,0.6984008550643921,0.6196421384811401,0.4676179885864258,0.26030316948890686,0.02221057564020157,-0.2185080349445343,-0.43339070677757263,-0.5970298647880554,-0.6900770664215088,-0.7015307545661926,-0.6300363540649414...].
-PASS StereoPannerNode: Difference between a-rate and k-rate StereoPannerNode is not constantly 0 (contains 7957 different values).
+PASS StereoPannerNode: Difference between a-rate and k-rate StereoPannerNode is not constantly 0 (contains 7958 different values).
PASS < [Test k-rate StereoPannerNode] All assertions passed. (total 8 assertions)
PASS # AUDIT TASK RUNNER FINISHED: 1 tasks ran successfully.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-getFrequencyResponse-expected.txt (266894 => 266895)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-getFrequencyResponse-expected.txt 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-biquadfilternode-interface/biquad-getFrequencyResponse-expected.txt 2020-09-10 22:57:50 UTC (rev 266895)
@@ -16,8 +16,8 @@
PASS lowpass: Number of non-finite values in the expected magnitude response is equal to 0.
PASS lowpass: Number of non-finite values in expected phase response is equal to 0.
PASS lowpass: Actual and expected results contained only finite values is true.
-PASS lowpass: Max error (-74.12964393692768 dB) of magnitude response at frequency 22027.94921875 Hz is less than or equal to -73.01779999999998.
-PASS lowpass: Max error (0.00000925724159344549 deg) in phase response at frequency 1477.3499755859375 Hz is less than or equal to 0.000460864332091429.
+PASS lowpass: Max error (-73.01781972755178 dB) of magnitude response at frequency 23952 Hz is less than or equal to -73.01779999999998.
+PASS lowpass: Max error (0.000008043596428984033 deg) in phase response at frequency 1992 Hz is less than or equal to 0.000460864332091429.
PASS < [lowpass] All assertions passed. (total 7 assertions)
PASS > [highpass] Frequency response
PASS highpass: Number of non-finite values in magnitude response is equal to 0.
@@ -25,8 +25,8 @@
PASS highpass: Number of non-finite values in the expected magnitude response is equal to 0.
PASS highpass: Number of non-finite values in expected phase response is equal to 0.
PASS highpass: Actual and expected results contained only finite values is true.
-PASS highpass: Max error (-121.35728191866156 dB) of magnitude response at frequency 418.95001220703125 Hz is less than or equal to -117.5461.
-PASS highpass: Max error (0.000006632961778326638 deg) in phase response at frequency 132.3000030517578 Hz is less than or equal to 0.00039930001700462205.
+PASS highpass: Max error (-117.54613270502502 dB) of magnitude response at frequency 408 Hz is less than or equal to -117.5461.
+PASS highpass: Max error (0.000006969012786694054 deg) in phase response at frequency 912 Hz is less than or equal to 0.00039930001700462205.
PASS < [highpass] All assertions passed. (total 7 assertions)
PASS > [bandpass] Frequency response
PASS bandpass: Number of non-finite values in magnitude response is equal to 0.
@@ -34,8 +34,8 @@
PASS bandpass: Number of non-finite values in the expected magnitude response is equal to 0.
PASS bandpass: Number of non-finite values in expected phase response is equal to 0.
PASS bandpass: Actual and expected results contained only finite values is true.
-PASS bandpass: Max error (-80.14384658243245 dB) of magnitude response at frequency 22027.94921875 Hz is less than or equal to -79.01389999999999.
-PASS bandpass: Max error (0.000004663540170181627 deg) in phase response at frequency 1455.300048828125 Hz is less than or equal to 0.0002828749930340387.
+PASS bandpass: Max error (-79.01394922508145 dB) of magnitude response at frequency 23952 Hz is less than or equal to -79.01389999999999.
+PASS bandpass: Max error (0.000004937042988127661 deg) in phase response at frequency 816 Hz is less than or equal to 0.0002828749930340387.
PASS < [bandpass] All assertions passed. (total 7 assertions)
PASS > [lowshelf] Frequency response
PASS lowshelf: Number of non-finite values in magnitude response is equal to 0.
@@ -43,8 +43,8 @@
PASS lowshelf: Number of non-finite values in the expected magnitude response is equal to 0.
PASS lowshelf: Number of non-finite values in expected phase response is equal to 0.
PASS lowshelf: Actual and expected results contained only finite values is true.
-PASS lowshelf: Max error (-125.26371834201264 dB) of magnitude response at frequency 1653.75 Hz is less than or equal to -120.4038.
-PASS lowshelf: Max error (0.0000013776021539855112 deg) in phase response at frequency 749.7000122070312 Hz is less than or equal to 0.00023333133248907645.
+PASS lowshelf: Max error (-125.72006443816068 dB) of magnitude response at frequency 9048 Hz is less than or equal to -120.4038.
+PASS lowshelf: Max error (0.0000010998019550260546 deg) in phase response at frequency 1176 Hz is less than or equal to 0.00023333133248907645.
PASS < [lowshelf] All assertions passed. (total 7 assertions)
PASS > [highshelf] Frequency response
PASS highshelf: Number of non-finite values in magnitude response is equal to 0.
@@ -52,8 +52,8 @@
PASS highshelf: Number of non-finite values in the expected magnitude response is equal to 0.
PASS highshelf: Number of non-finite values in expected phase response is equal to 0.
PASS highshelf: Actual and expected results contained only finite values is true.
-PASS highshelf: Max error (-125.22346912810059 dB) of magnitude response at frequency 992.25 Hz is less than or equal to -119.99999999999999.
-PASS highshelf: Max error (0.0000013776027010409165 deg) in phase response at frequency 749.7000122070312 Hz is less than or equal to 0.00023333133248907645.
+PASS highshelf: Max error (-125.38513197921183 dB) of magnitude response at frequency 864 Hz is less than or equal to -119.99999999999999.
+PASS highshelf: Max error (0.000001099801293470681 deg) in phase response at frequency 1176 Hz is less than or equal to 0.00023333133248907645.
PASS < [highshelf] All assertions passed. (total 7 assertions)
PASS > [peaking] Frequency response
PASS peaking: Number of non-finite values in magnitude response is equal to 0.
@@ -61,8 +61,8 @@
PASS peaking: Number of non-finite values in the expected magnitude response is equal to 0.
PASS peaking: Number of non-finite values in expected phase response is equal to 0.
PASS peaking: Actual and expected results contained only finite values is true.
-PASS peaking: Max error (-125.41901251646009 dB) of magnitude response at frequency 1411.199951171875 Hz is less than or equal to -119.11759999999998.
-PASS peaking: Max error (0.000002668179955442939 deg) in phase response at frequency 992.25 Hz is less than or equal to 0.0000037084120332047404.
+PASS peaking: Max error (-124.9664097542858 dB) of magnitude response at frequency 1992 Hz is less than or equal to -119.11759999999998.
+PASS peaking: Max error (0.0000022600132665057376 deg) in phase response at frequency 1080 Hz is less than or equal to 0.0000037084120332047404.
PASS < [peaking] All assertions passed. (total 7 assertions)
PASS > [notch] Frequency response
PASS notch: Number of non-finite values in magnitude response is equal to 0.
@@ -70,8 +70,8 @@
PASS notch: Number of non-finite values in the expected magnitude response is equal to 0.
PASS notch: Number of non-finite values in expected phase response is equal to 0.
PASS notch: Actual and expected results contained only finite values is true.
-PASS notch: Max error (-87.0808201946387 dB) of magnitude response at frequency 992.25 Hz is less than or equal to -87.08079999999998.
-PASS notch: Max error (0.000007963823283129813 deg) in phase response at frequency 992.25 Hz is less than or equal to 0.0003798710181717358.
+PASS notch: Max error (-96.65213672776751 dB) of magnitude response at frequency 1008 Hz is less than or equal to -87.08079999999998.
+PASS notch: Max error (0.0000066299355314361 deg) in phase response at frequency 1080 Hz is less than or equal to 0.0003798710181717358.
PASS < [notch] All assertions passed. (total 7 assertions)
PASS > [allpass] Frequency response
PASS allpass: Number of non-finite values in magnitude response is equal to 0.
@@ -79,8 +79,8 @@
PASS allpass: Number of non-finite values in the expected magnitude response is equal to 0.
PASS allpass: Number of non-finite values in expected phase response is equal to 0.
PASS allpass: Actual and expected results contained only finite values is true.
-PASS allpass: Max error (-265.35174872440564 dB) of magnitude response at frequency 1146.5999755859375 Hz is less than or equal to -265.35169999999994.
-PASS allpass: Max error (0.000015927642291594136 deg) in phase response at frequency 992.25 Hz is less than or equal to 0.0007597420363434716.
+PASS allpass: Max error (-266.8735521058153 dB) of magnitude response at frequency 1056 Hz is less than or equal to -265.35169999999994.
+PASS allpass: Max error (0.000013259871597205388 deg) in phase response at frequency 1080 Hz is less than or equal to 0.0007597420363434716.
PASS < [allpass] All assertions passed. (total 7 assertions)
PASS > [getFrequencyResponse] Test out-of-bounds frequency values
PASS Magnitude response at frequency -1 is NaN.
Modified: trunk/Source/WebCore/ChangeLog (266894 => 266895)
--- trunk/Source/WebCore/ChangeLog 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebCore/ChangeLog 2020-09-10 22:57:50 UTC (rev 266895)
@@ -1,3 +1,19 @@
+2020-09-10 Chris Dumez <[email protected]>
+
+ Unreviewed, reverting r266842 and r266883.
+
+ Causes some assertions to be hit in debug builds
+
+ Reverted changesets:
+
+ "Some WebAudio tests give different output on different
+ machines"
+ https://bugs.webkit.org/show_bug.cgi?id=216371
+ https://trac.webkit.org/changeset/266842
+
+ "Unreviewed Windows build fix after r266842."
+ https://trac.webkit.org/changeset/266883
+
2020-09-10 Zalan Bujtas <[email protected]>
[LFC][IFC] Construct LineBox::InlineBoxes for nested inline level boxes when they overlap multiple lines
Modified: trunk/Source/WebCore/platform/audio/AudioDestination.h (266894 => 266895)
--- trunk/Source/WebCore/platform/audio/AudioDestination.h 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebCore/platform/audio/AudioDestination.h 2020-09-10 22:57:50 UTC (rev 266895)
@@ -56,7 +56,6 @@
// Sample-rate conversion may happen in AudioDestination to the hardware sample-rate
virtual float sampleRate() const = 0;
static float hardwareSampleRate();
- WEBCORE_EXPORT static void setHardwareSampleRateOverride(Optional<float>);
virtual unsigned framesPerBuffer() const = 0;
Modified: trunk/Source/WebCore/platform/audio/cocoa/AudioDestinationCocoa.cpp (266894 => 266895)
--- trunk/Source/WebCore/platform/audio/cocoa/AudioDestinationCocoa.cpp 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebCore/platform/audio/cocoa/AudioDestinationCocoa.cpp 2020-09-10 22:57:50 UTC (rev 266895)
@@ -37,12 +37,6 @@
const int kRenderBufferSize = 128;
-static Optional<float>& hardwareSampleRateOverride()
-{
- static NeverDestroyed<Optional<float>> sampleRate;
- return sampleRate.get();
-}
-
CreateAudioDestinationCocoaOverride AudioDestinationCocoa::createOverride = nullptr;
std::unique_ptr<AudioDestination> AudioDestination::create(AudioIOCallback& callback, const String&, unsigned numberOfInputChannels, unsigned numberOfOutputChannels, float sampleRate)
@@ -66,16 +60,9 @@
float AudioDestination::hardwareSampleRate()
{
- if (auto sampleRate = hardwareSampleRateOverride())
- return *sampleRate;
return AudioSession::sharedSession().sampleRate();
}
-void AudioDestination::setHardwareSampleRateOverride(Optional<float> sampleRate)
-{
- hardwareSampleRateOverride() = sampleRate;
-}
-
unsigned long AudioDestination::maxChannelCount()
{
return AudioSession::sharedSession().maximumNumberOfOutputChannels();
@@ -99,7 +86,7 @@
unsigned AudioDestinationCocoa::framesPerBuffer() const
{
- return kRenderBufferSize;
+ return m_renderBus->length();
}
void AudioDestinationCocoa::start()
Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp (266894 => 266895)
--- trunk/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2020-09-10 22:57:50 UTC (rev 266895)
@@ -39,12 +39,6 @@
// needs to handle this number of frames per cycle as well.
const unsigned framesToPull = 128;
-static Optional<float>& hardwareSampleRateOverride()
-{
- static NeverDestroyed<Optional<float>> sampleRate;
- return sampleRate.get();
-}
-
gboolean messageCallback(GstBus*, GstMessage* message, AudioDestinationGStreamer* destination)
{
return destination->handleMessage(message);
@@ -73,16 +67,9 @@
float AudioDestination::hardwareSampleRate()
{
- if (auto sampleRate = hardwareSampleRateOverride())
- return *sampleRate;
return 44100;
}
-void AudioDestination::setHardwareSampleRateOverride(Optional<float> sampleRate)
-{
- hardwareSampleRateOverride() = sampleRate;
-}
-
unsigned long AudioDestination::maxChannelCount()
{
// FIXME: query the default audio hardware device to return the actual number
Modified: trunk/Source/WebKit/ChangeLog (266894 => 266895)
--- trunk/Source/WebKit/ChangeLog 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebKit/ChangeLog 2020-09-10 22:57:50 UTC (rev 266895)
@@ -1,3 +1,19 @@
+2020-09-10 Chris Dumez <[email protected]>
+
+ Unreviewed, reverting r266842 and r266883.
+
+ Causes some assertions to be hit in debug builds
+
+ Reverted changesets:
+
+ "Some WebAudio tests give different output on different
+ machines"
+ https://bugs.webkit.org/show_bug.cgi?id=216371
+ https://trac.webkit.org/changeset/266842
+
+ "Unreviewed Windows build fix after r266842."
+ https://trac.webkit.org/changeset/266883
+
2020-09-09 Brian Burg <[email protected]>
Web Inspector: _WKInspectorDelegate should be attached to _WKInspector not WKWebView
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp (266894 => 266895)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2020-09-10 22:57:50 UTC (rev 266895)
@@ -189,11 +189,6 @@
WebKit::toImpl(bundleRef)->resetOriginAccessAllowLists();
}
-void WKBundleSetHardwareSampleRateOverride(WKBundleRef bundleRef, float sample)
-{
- WebKit::toImpl(bundleRef)->setHardwareSampleRateOverride(sample ? makeOptional(sample) : WTF::nullopt);
-}
-
void WKBundleSetAsynchronousSpellCheckingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
{
WebKit::toImpl(bundleRef)->setAsynchronousSpellCheckingEnabled(WebKit::toImpl(pageGroupRef), enabled);
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (266894 => 266895)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2020-09-10 22:57:50 UTC (rev 266895)
@@ -56,7 +56,6 @@
WK_EXPORT void WKBundleAddOriginAccessAllowListEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
WK_EXPORT void WKBundleRemoveOriginAccessAllowListEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
WK_EXPORT void WKBundleResetOriginAccessAllowLists(WKBundleRef bundle);
-WK_EXPORT void WKBundleSetHardwareSampleRateOverride(WKBundleRef, float);
WK_EXPORT int WKBundleNumberOfPages(WKBundleRef bundle, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels);
WK_EXPORT int WKBundlePageNumberForElementById(WKBundleRef bundle, WKBundleFrameRef frameRef, WKStringRef idRef, double pageWidthInPixels, double pageHeightInPixels);
WK_EXPORT WKStringRef WKBundlePageSizeAndMarginsInPixels(WKBundleRef bundle, WKBundleFrameRef frameRef, int, int, int, int, int, int, int);
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (266894 => 266895)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2020-09-10 22:57:50 UTC (rev 266895)
@@ -86,10 +86,6 @@
#include "WebNotificationManager.h"
#endif
-#if ENABLE(WEB_AUDIO)
-#include <WebCore/AudioDestination.h>
-#endif
-
namespace WebKit {
using namespace WebCore;
using namespace JSC;
@@ -401,15 +397,6 @@
WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::ResetOriginAccessAllowLists { }, 0);
}
-void InjectedBundle::setHardwareSampleRateOverride(Optional<float> sampleRate)
-{
-#if ENABLE(WEB_AUDIO)
- AudioDestination::setHardwareSampleRateOverride(sampleRate);
-#else
- UNUSED_PARAM(sampleRate);
-#endif
-}
-
void InjectedBundle::setAsynchronousSpellCheckingEnabled(WebPageGroupProxy* pageGroup, bool enabled)
{
const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h (266894 => 266895)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h 2020-09-10 22:57:50 UTC (rev 266895)
@@ -110,7 +110,6 @@
void addOriginAccessAllowListEntry(const String&, const String&, const String&, bool);
void removeOriginAccessAllowListEntry(const String&, const String&, const String&, bool);
void resetOriginAccessAllowLists();
- void setHardwareSampleRateOverride(Optional<float>);
void setAsynchronousSpellCheckingEnabled(WebPageGroupProxy*, bool);
int numberOfPages(WebFrame*, double, double);
int pageNumberForElementById(WebFrame*, const String&, double, double);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (266894 => 266895)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-09-10 22:57:50 UTC (rev 266895)
@@ -1,5 +1,21 @@
2020-09-10 Chris Dumez <[email protected]>
+ Unreviewed, reverting r266842 and r266883.
+
+ Causes some assertions to be hit in debug builds
+
+ Reverted changesets:
+
+ "Some WebAudio tests give different output on different
+ machines"
+ https://bugs.webkit.org/show_bug.cgi?id=216371
+ https://trac.webkit.org/changeset/266842
+
+ "Unreviewed Windows build fix after r266842."
+ https://trac.webkit.org/changeset/266883
+
+2020-09-10 Chris Dumez <[email protected]>
+
Some WebAudio tests give different output on different machines
https://bugs.webkit.org/show_bug.cgi?id=216371
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (266894 => 266895)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-09-10 22:57:50 UTC (rev 266895)
@@ -130,7 +130,6 @@
#import <_javascript_Core/JSValueRef.h>
#import <WebCore/AlternativeTextUIController.h>
#import <WebCore/ApplicationCacheStorage.h>
-#import <WebCore/AudioDestination.h>
#import <WebCore/BackForwardCache.h>
#import <WebCore/BackForwardController.h>
#import <WebCore/CSSAnimationController.h>
@@ -2307,11 +2306,6 @@
WebCore::FontCascade::setCodePath(f ? WebCore::FontCascade::Complex : WebCore::FontCascade::Auto);
}
-+ (void)_setHardwareSampleRateOverride:(float)sampleRate
-{
- WebCore::AudioDestination::setHardwareSampleRateOverride(sampleRate ? makeOptional(sampleRate) : WTF::nullopt);
-}
-
+ (BOOL)canCloseAllWebViews
{
return WebCore::DOMWindow::dispatchAllPendingBeforeUnloadEvents();
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h (266894 => 266895)
--- trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h 2020-09-10 22:57:50 UTC (rev 266895)
@@ -554,8 +554,6 @@
+ (void)_setAlwaysUsesComplexTextCodePath:(BOOL)f;
-+ (void)_setHardwareSampleRateOverride:(float)sampleRate;
-
#if !TARGET_OS_IPHONE
- (NSCachedURLResponse *)_cachedResponseForURL:(NSURL *)URL;
#endif
Modified: trunk/Tools/ChangeLog (266894 => 266895)
--- trunk/Tools/ChangeLog 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Tools/ChangeLog 2020-09-10 22:57:50 UTC (rev 266895)
@@ -1,3 +1,19 @@
+2020-09-10 Chris Dumez <[email protected]>
+
+ Unreviewed, reverting r266842 and r266883.
+
+ Causes some assertions to be hit in debug builds
+
+ Reverted changesets:
+
+ "Some WebAudio tests give different output on different
+ machines"
+ https://bugs.webkit.org/show_bug.cgi?id=216371
+ https://trac.webkit.org/changeset/266842
+
+ "Unreviewed Windows build fix after r266842."
+ https://trac.webkit.org/changeset/266883
+
2020-09-09 Brian Burg <[email protected]>
Web Inspector: _WKInspectorDelegate should be attached to _WKInspector not WKWebView
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (266894 => 266895)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2020-09-10 22:57:50 UTC (rev 266895)
@@ -682,10 +682,6 @@
[WebView registerURLSchemeAsLocal:@"feeds"];
[WebView registerURLSchemeAsLocal:@"feedsearch"];
- // Don't use the actual hardware sample rate during testing or audio tests may have
- // different output on different hardware.
- [WebView _setHardwareSampleRateOverride:44100];
-
[[webView preferences] _setMediaRecorderEnabled:YES];
#if PLATFORM(MAC)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (266894 => 266895)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2020-09-10 22:26:00 UTC (rev 266894)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2020-09-10 22:57:50 UTC (rev 266895)
@@ -597,10 +597,6 @@
WKBundleSetPopupBlockingEnabled(m_bundle, m_pageGroup, false);
WKBundleSetAllowStorageAccessFromFileURLS(m_bundle, m_pageGroup, false);
- // Don't use the actual hardware sample rate during testing or audio tests may have
- // different output on different hardware.
- WKBundleSetHardwareSampleRateOverride(m_bundle, 44100);
-
#if PLATFORM(IOS_FAMILY)
WKBundlePageSetUseTestingViewportConfiguration(page()->page(), !booleanForKey(settings, "UseFlexibleViewport"));
#endif
