Chrome-branded builds on Windows and Linux should now use the MKL port of the FFTFrame class. The hacks in WebCore.gyp to enable linking against both the MKL and FFTW need to be removed.
We might want to consider keeping the FFTW path, even though it is not actually used, if it doesn't complicate WebCore.gyp too much
OK, I'll leave the FFTW path in WebCore.gyp.
Created attachment 89633 [details] Patch
Note that one more change in the Chromium workspace (in features_override.gypi) is needed in order for this patch to have any effect on Windows or Linux. Currently ENABLE_WEBAUDIO=0 on those platforms.
Comment on attachment 89633 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89633&action=review > Source/WebCore/platform/audio/fftw/FFTFrameFFTW.cpp:30 > +#if ENABLE(WEB_AUDIO) && !OS(DARWIN) && USE(WEBAUDIO_FFTW) Can you separate the additional conditionals into a separate define? > Source/WebCore/platform/audio/mkl/FFTFrameMKL.cpp:31 > +#if ENABLE(WEB_AUDIO) && !OS(DARWIN) && USE(WEBAUDIO_MKL) Ditto.
(In reply to comment #5) > (From update of attachment 89633 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=89633&action=review > > > Source/WebCore/platform/audio/fftw/FFTFrameFFTW.cpp:30 > > +#if ENABLE(WEB_AUDIO) && !OS(DARWIN) && USE(WEBAUDIO_FFTW) > > Can you separate the additional conditionals into a separate define? > > > Source/WebCore/platform/audio/mkl/FFTFrameMKL.cpp:31 > > +#if ENABLE(WEB_AUDIO) && !OS(DARWIN) && USE(WEBAUDIO_MKL) > > Ditto. Yes, will do. Thanks.
Committed r83893: <http://trac.webkit.org/changeset/83893>