Diff
Modified: trunk/LayoutTests/ChangeLog (149267 => 149268)
--- trunk/LayoutTests/ChangeLog 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/LayoutTests/ChangeLog 2013-04-29 06:17:52 UTC (rev 149268)
@@ -1,3 +1,19 @@
+2013-04-28 Zan Dobersek <[email protected]>
+
+ Rename TestRunner's setAudioData to setAudioResult
+ https://bugs.webkit.org/show_bug.cgi?id=115326
+
+ Reviewed by Darin Adler.
+
+ Adjust the testRunner.setAudioData references/callsites, the method is now named setAudioResult.
+
+ * platform/efl-wk1/TestExpectations:
+ * webaudio/resources/audio-codec-test.js:
+ (finishedLoading):
+ * webaudio/resources/audio-testing.js:
+ (finishAudioTest):
+ * webaudio/test-basic.html:
+
2013-04-28 Seokju Kwon <[email protected]>
Get rid of a duplicate file from LayoutTests/TestExpectations
Modified: trunk/LayoutTests/platform/efl-wk1/TestExpectations (149267 => 149268)
--- trunk/LayoutTests/platform/efl-wk1/TestExpectations 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/LayoutTests/platform/efl-wk1/TestExpectations 2013-04-29 06:17:52 UTC (rev 149268)
@@ -359,7 +359,7 @@
Bug(EFL) http/tests/websocket/tests/hybi/workers/close-in-onmessage-crash.html [ Timeout ]
Bug(EFL) http/tests/websocket/tests/hybi/workers/multiple-subprotocols.html [ Timeout Pass ]
-# DRT does not implement setAudioData
+# DRT does not implement setAudioResult
webkit.org/b/105881 webaudio/audiobuffersource-loop-points.html [ Skip ]
webkit.org/b/105881 webaudio/audiobuffersource-multi-channels.html [ Skip ]
webkit.org/b/105881 webaudio/audiobuffersource-playbackrate.html [ Skip ]
Modified: trunk/LayoutTests/webaudio/resources/audio-codec-test.js (149267 => 149268)
--- trunk/LayoutTests/webaudio/resources/audio-codec-test.js 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/LayoutTests/webaudio/resources/audio-codec-test.js 2013-04-29 06:17:52 UTC (rev 149268)
@@ -28,7 +28,7 @@
function finishedLoading(bufferList)
{
- testRunner.setAudioData(createAudioData(bufferList[0]));
+ testRunner.setAudioResult(createAudioData(bufferList[0]));
testRunner.notifyDone();
}
Modified: trunk/LayoutTests/webaudio/resources/audio-testing.js (149267 => 149268)
--- trunk/LayoutTests/webaudio/resources/audio-testing.js 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/LayoutTests/webaudio/resources/audio-testing.js 2013-04-29 06:17:52 UTC (rev 149268)
@@ -97,7 +97,7 @@
function finishAudioTest(event) {
var audioData = createAudioData(event.renderedBuffer);
- testRunner.setAudioData(audioData);
+ testRunner.setAudioResult(audioData);
testRunner.notifyDone();
}
Modified: trunk/LayoutTests/webaudio/test-basic.html (149267 => 149268)
--- trunk/LayoutTests/webaudio/test-basic.html 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/LayoutTests/webaudio/test-basic.html 2013-04-29 06:17:52 UTC (rev 149268)
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
-This is a very basic test to make sure testRunner.setAudioData() works correctly.
+This is a very basic test to make sure testRunner.setAudioResult() works correctly.
It generates a 2 seconds long stereo result @44.1KHz
The left channel will be a 880Hz tone, while the right will be 440Hz.
-->
@@ -18,7 +18,7 @@
<div id="console"></div>
<script>
-description("Tests basic audio test infrastructure: specifically testRunner.setAudioData()");
+description("Tests basic audio test infrastructure: specifically testRunner.setAudioResult()");
var sampleRate = 44100.0;
var lengthInSeconds = 2;
@@ -45,7 +45,7 @@
generateSinWave(audioBuffer);
var audioData = createAudioData(audioBuffer);
- testRunner.setAudioData(audioData);
+ testRunner.setAudioResult(audioData);
testRunner.notifyDone();
}
Modified: trunk/Tools/ChangeLog (149267 => 149268)
--- trunk/Tools/ChangeLog 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/Tools/ChangeLog 2013-04-29 06:17:52 UTC (rev 149268)
@@ -1,5 +1,26 @@
2013-04-28 Zan Dobersek <[email protected]>
+ Rename TestRunner's setAudioData to setAudioResult
+ https://bugs.webkit.org/show_bug.cgi?id=115326
+
+ Reviewed by Darin Adler.
+
+ Rename the TestRunner's setAudioData method to setAudioResult. The new name better conveys the method's purpose
+ than the previous one. The change is a simple rename, there's no change in the method's functionality. The
+ affected tests are adjusted accordingly.
+
+ * DumpRenderTree/qt/TestRunnerQt.cpp:
+ (TestRunnerQt::setAudioResult):
+ * DumpRenderTree/qt/TestRunnerQt.h:
+ (TestRunnerQt):
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::setAudioResult):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ (TestRunner):
+
+2013-04-28 Zan Dobersek <[email protected]>
+
[WKTR] Tests dumping audio data shouldn't dump pixels
https://bugs.webkit.org/show_bug.cgi?id=115270
Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp (149267 => 149268)
--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp 2013-04-29 06:17:52 UTC (rev 149268)
@@ -768,7 +768,7 @@
globalSettings->setThirdPartyCookiePolicy(QWebSettings::AlwaysAllowThirdPartyCookies);
}
-void TestRunnerQt::setAudioData(const QByteArray& audioData)
+void TestRunnerQt::setAudioResult(const QByteArray& audioData)
{
m_audioData = audioData;
m_audioDump = true;
Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h (149267 => 149268)
--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h 2013-04-29 06:17:52 UTC (rev 149268)
@@ -187,7 +187,7 @@
void setAlwaysAcceptCookies(bool);
void setAlwaysBlockCookies(bool);
- void setAudioData(const QByteArray&);
+ void setAudioResult(const QByteArray&);
private Q_SLOTS:
void processWork();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (149267 => 149268)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2013-04-29 06:17:52 UTC (rev 149268)
@@ -168,7 +168,7 @@
void setMockGeolocationPositionUnavailableError(in DOMString errorMessage);
// Audio testing.
- [PassContext] void setAudioData(in object data);
+ [PassContext] void setAudioResult(in object data);
boolean callShouldCloseOnWebView();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (149267 => 149268)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2013-04-29 06:17:52 UTC (rev 149268)
@@ -375,7 +375,7 @@
WKBundleNodeHandleSetHTMLInputElementValueForUser(nodeHandle.get(), toWK(value).get());
}
-void TestRunner::setAudioData(JSContextRef context, JSValueRef data)
+void TestRunner::setAudioResult(JSContextRef context, JSValueRef data)
{
WKRetainPtr<WKDataRef> audioData(AdoptWK, WKBundleCreateWKDataFromUInt8Array(InjectedBundle::shared().bundle(), context, data));
InjectedBundle::shared().setAudioResult(audioData.get());
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (149267 => 149268)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2013-04-29 05:04:48 UTC (rev 149267)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2013-04-29 06:17:52 UTC (rev 149268)
@@ -161,7 +161,7 @@
void setValueForUser(JSContextRef, JSValueRef element, JSStringRef value);
// Audio testing.
- void setAudioData(JSContextRef, JSValueRef data);
+ void setAudioResult(JSContextRef, JSValueRef data);
enum WhatToDump { RenderTree, MainFrameText, AllFramesText, Audio };
WhatToDump whatToDump() const { return m_whatToDump; }
