Changeset 138993 in webkit

Timestamp:

Jan 7, 2013 2:52:17 PM (11 years ago)

Author:

jochen@chromium.org

Message:

[chromium] move web audio related methods to testrunner library
​https://bugs.webkit.org/show_bug.cgi?id=106211

Reviewed by Adam Barth.

• DumpRenderTree/chromium/DRTTestRunner.cpp:

(DRTTestRunner::DRTTestRunner):
(DRTTestRunner::reset):

• DumpRenderTree/chromium/DRTTestRunner.h:

(DRTTestRunner):

• DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h:

(WebKit):
(WebTestRunner::WebTestRunner::shouldDumpAsAudio):
(WebTestRunner::WebTestRunner::audioData):

• DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:

(WebTestRunner::TestRunner::TestRunner):
(WebTestRunner::TestRunner::reset):
(WebTestRunner::TestRunner::shouldDumpAsAudio):
(WebTestRunner):
(WebTestRunner::TestRunner::audioData):
(WebTestRunner::TestRunner::setAudioData):

• DumpRenderTree/chromium/TestRunner/src/TestRunner.h:

(TestRunner):

• DumpRenderTree/chromium/TestShell.cpp:

(TestShell::dump):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/DRTTestRunner.cpp (modified) (3 diffs)
• DumpRenderTree/chromium/DRTTestRunner.h (modified) (4 diffs)
• DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h (modified) (2 diffs)
• DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (modified) (4 diffs)
• DumpRenderTree/chromium/TestRunner/src/TestRunner.h (modified) (4 diffs)
• DumpRenderTree/chromium/TestShell.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-07  Jochen Eisinger  <jochen@chromium.org>
+
+        [chromium] move web audio related methods to testrunner library
+        https://bugs.webkit.org/show_bug.cgi?id=106211
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/DRTTestRunner.cpp:
+        (DRTTestRunner::DRTTestRunner):
+        (DRTTestRunner::reset):
+        * DumpRenderTree/chromium/DRTTestRunner.h:
+        (DRTTestRunner):
+        * DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h:
+        (WebKit):
+        (WebTestRunner::WebTestRunner::shouldDumpAsAudio):
+        (WebTestRunner::WebTestRunner::audioData):
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+        (WebTestRunner::TestRunner::TestRunner):
+        (WebTestRunner::TestRunner::reset):
+        (WebTestRunner::TestRunner::shouldDumpAsAudio):
+        (WebTestRunner):
+        (WebTestRunner::TestRunner::audioData):
+        (WebTestRunner::TestRunner::setAudioData):
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+        (TestRunner):
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::dump):
+
 2013-01-07  Mike West  <mkwst@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp

@@ -154 +154 @@
     bindMethod("setDatabaseQuota", &DRTTestRunner::setDatabaseQuota);
     bindMethod("setDeferMainResourceDataLoad", &DRTTestRunner::setDeferMainResourceDataLoad);
-    bindMethod("setAudioData", &DRTTestRunner::setAudioData);
     bindMethod("setGeolocationPermission", &DRTTestRunner::setGeolocationPermission);
     bindMethod("setMockDeviceOrientation", &DRTTestRunner::setMockDeviceOrientation);
@@ -497 +496 @@
     if (m_shell)
         m_shell->webViewHost()->setDeviceScaleFactor(1);
-    m_dumpAsAudio = false;
     m_dumpCreateView = false;
     m_dumpFrameLoadCallbacks = false;
@@ -1040 +1038 @@
 }
 
-void DRTTestRunner::setAudioData(const CppArgumentList& arguments, CppVariant* result)
-{
-    result->setNull();
-
-    if (arguments.size() < 1 || !arguments[0].isObject())
-        return;
-
-    // Check that passed-in object is, in fact, an ArrayBufferView.
-    NPObject* npobject = NPVARIANT_TO_OBJECT(arguments[0]);
-    if (!npobject)
-        return;
-    if (!WebBindings::getArrayBufferView(npobject, &m_audioData))
-        return;
-
-    setShouldDumpAsAudio(true);
-}
-
 #if ENABLE(POINTER_LOCK)
 void DRTTestRunner::didAcquirePointerLock(const CppArgumentList&, CppVariant* result)

trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h

@@ -193 +193 @@
     void setDeferMainResourceDataLoad(const CppArgumentList&, CppVariant*);
 
-    // Deals with Web Audio WAV file data.
-    void setAudioData(const CppArgumentList&, CppVariant*);
-    const WebKit::WebArrayBufferView& audioData() const { return m_audioData; } 
-
     void dumpTitleChanges(const CppArgumentList&, CppVariant*);
     void display(const CppArgumentList&, CppVariant*);
@@ -267 +263 @@
     void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }
 
-    bool shouldDumpAsAudio() const { return m_dumpAsAudio; } 
-    void setShouldDumpAsAudio(bool dumpAsAudio) { m_dumpAsAudio = dumpAsAudio; } 
     bool shouldDumpFrameLoadCallbacks() { return m_dumpFrameLoadCallbacks; }
     void setShouldDumpFrameLoadCallbacks(bool value) { m_dumpFrameLoadCallbacks = value; }
@@ -377 +371 @@
     TestShell* m_shell;
 
-    // If true, the test_shell will output a base64 encoded WAVE file.
-    bool m_dumpAsAudio;
-
     // If true, the test_shell will draw the bounds of the current selection rect
     // taking possible transforms of the selection rect into account.
@@ -470 +461 @@
     CppVariant m_interceptPostMessage;
 
-    // WAV audio data is stored here.
-    WebKit::WebArrayBufferView m_audioData;
-
     bool m_shouldStayOnPageAfterHandlingBeforeUnload;
 };

trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h

@@ -32 +32 @@
 #define WebTestRunner_h
 
+namespace WebKit {
+class WebArrayBufferView;
+}
+
 namespace WebTestRunner {
 
@@ -45 +49 @@
     virtual bool shouldDumpChildFrameScrollPositions() const { return false; }
     virtual bool shouldDumpChildFramesAsText() const { return false; }
+    virtual bool shouldDumpAsAudio() const { return false; }
+    virtual const WebKit::WebArrayBufferView* audioData() const { return 0; }
 };
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp

@@ -137 +137 @@
     bindMethod("dumpChildFramesAsText", &TestRunner::dumpChildFramesAsText);
     bindMethod("dumpChildFrameScrollPositions", &TestRunner::dumpChildFrameScrollPositions);
+    bindMethod("setAudioData", &TestRunner::setAudioData);
 
     // The following methods interact with the WebTestProxy.
@@ -206 +207 @@
     m_dumpChildFrameScrollPositions = false;
     m_dumpChildFramesAsText = false;
+    m_dumpAsAudio = false;
 
     m_globalFlag.set(false);
@@ -246 +248 @@
 {
     return m_dumpChildFramesAsText;
+}
+
+bool TestRunner::shouldDumpAsAudio() const
+{
+    return m_dumpAsAudio;
+}
+
+const WebArrayBufferView* TestRunner::audioData() const
+{
+    return &m_audioData;
 }
 
@@ -972 +984 @@
 }
 
+void TestRunner::setAudioData(const CppArgumentList& arguments, CppVariant* result)
+{
+    result->setNull();
+
+    if (arguments.size() < 1 || !arguments[0].isObject())
+        return;
+
+    // Check that passed-in object is, in fact, an ArrayBufferView.
+    NPObject* npobject = NPVARIANT_TO_OBJECT(arguments[0]);
+    if (!npobject)
+        return;
+    if (!WebBindings::getArrayBufferView(npobject, &m_audioData))
+        return;
+
+    m_dumpAsAudio = true;
+}
+
 void TestRunner::workerThreadCount(CppVariant* result)
 {

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h

@@ -36 +36 @@
 #include "WebDeliveredIntentClient.h"
 #include "WebTestRunner.h"
+#include "platform/WebArrayBufferView.h"
 #include "platform/WebURL.h"
 
@@ -66 +67 @@
     virtual bool shouldDumpChildFrameScrollPositions() const OVERRIDE;
     virtual bool shouldDumpChildFramesAsText() const OVERRIDE;
+    virtual bool shouldDumpAsAudio() const OVERRIDE;
+    virtual const WebKit::WebArrayBufferView* audioData() const OVERRIDE;
 
 protected:
@@ -205 +208 @@
     void dumpChildFramesAsText(const CppArgumentList&, CppVariant*);
 
+    // Deals with Web Audio WAV file data.
+    void setAudioData(const CppArgumentList&, CppVariant*);
+
     ///////////////////////////////////////////////////////////////////////////
     // Methods interacting with the WebTestProxy
@@ -266 +272 @@
     bool m_dumpChildFrameScrollPositions;
 
+    // If true, the test_shell will output a base64 encoded WAVE file.
+    bool m_dumpAsAudio;
+
+    // WAV audio data is stored here.
+    WebKit::WebArrayBufferView m_audioData;
+
     WebTestDelegate* m_delegate;
     WebKit::WebView* m_webView;

trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

@@ -580 +580 @@
 
     if (shouldDumpAsAudio) {
-        const WebKit::WebArrayBufferView& webArrayBufferView = m_testRunner->audioData();
-        m_printer.handleAudio(webArrayBufferView.baseAddress(), webArrayBufferView.byteLength());
+        const WebKit::WebArrayBufferView* webArrayBufferView = m_testRunner->audioData();
+        m_printer.handleAudio(webArrayBufferView->baseAddress(), webArrayBufferView->byteLength());
         m_printer.handleAudioFooter();
         m_printer.handleTestFooter(true);