Changeset 106871 in webkit

Timestamp:

Feb 6, 2012, 4:30:52 PM (15 years ago)

Author:

crogers@google.com

Message:

Merge 106864 - zvmul incorrectly multiplies complex arrays on Windows.
​https://bugs.webkit.org/show_bug.cgi?id=77900

TBR=​crogers@google.com
Review URL: ​https://chromiumcodereview.appspot.com/9350003

Location:

branches/chromium/1025

Files:

• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/platform/audio/VectorMath.cpp (modified) (1 diff)

branches/chromium/1025/LayoutTests/platform/chromium/test_expectations.txt

@@ -3799 +3799 @@
 BUGWK75932 : fast/js/mozilla/strict/15.4.4.6.html = TEXT
 
-BUGWK75933 WIN : webaudio/convolution-mono-mono.html = TEXT
-
 BUGWK76280 : media/W3C/video/networkState/networkState_during_progress.html = PASS TEXT
 BUGV81900 SLOW LINUX DEBUG : inspector/debugger/watch-expressions-panel-switch.html = PASS CRASH

branches/chromium/1025/Source/WebCore/platform/audio/VectorMath.cpp

@@ -419 +419 @@
 #endif
     for (; i < framesToProcess; ++i) {
-        realDestP[i] = real1P[i] * real2P[i] - imag1P[i] * imag2P[i];
-        imagDestP[i] = real1P[i] * imag2P[i] + imag1P[i] * real2P[i];
+        // Read and compute result before storing them, in case the
+        // destination is the same as one of the sources.
+        float realResult = real1P[i] * real2P[i] - imag1P[i] * imag2P[i];
+        float imagResult = real1P[i] * imag2P[i] + imag1P[i] * real2P[i];
+
+        realDestP[i] = realResult;
+        imagDestP[i] = imagResult;
     }
 }