Changeset 88726 in webkit

Timestamp:

Jun 13, 2011 3:50:53 PM (13 years ago)

Author:

crogers@google.com

Message:

2011-06-13 Chris Rogers <​crogers@google.com>

Reviewed by Dirk Pranke.

Add Web Audio support to chromium DRT
​https://bugs.webkit.org/show_bug.cgi?id=62306

• DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::LayoutTestController): (LayoutTestController::reset): (LayoutTestController::setEncodedAudioData):
• DumpRenderTree/chromium/LayoutTestController.h: (LayoutTestController::encodedAudioData): (LayoutTestController::shouldDumpAsAudio): (LayoutTestController::setShouldDumpAsAudio):
• DumpRenderTree/chromium/TestEventPrinter.cpp: (DRTPrinter::handleAudioHeader): (TestShellPrinter::handleAudioHeader):
• DumpRenderTree/chromium/TestEventPrinter.h:
• DumpRenderTree/chromium/TestShell.cpp: (TestShell::TestShell): (TestShell::dump):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/LayoutTestController.cpp (modified) (3 diffs)
• DumpRenderTree/chromium/LayoutTestController.h (modified) (4 diffs)
• DumpRenderTree/chromium/TestEventPrinter.cpp (modified) (4 diffs)
• DumpRenderTree/chromium/TestEventPrinter.h (modified) (1 diff)
• DumpRenderTree/chromium/TestShell.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-13  Chris Rogers  <crogers@google.com>
+
+        Reviewed by Dirk Pranke.
+
+        Add Web Audio support to chromium DRT
+        https://bugs.webkit.org/show_bug.cgi?id=62306
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::reset):
+        (LayoutTestController::setEncodedAudioData):
+        * DumpRenderTree/chromium/LayoutTestController.h:
+        (LayoutTestController::encodedAudioData):
+        (LayoutTestController::shouldDumpAsAudio):
+        (LayoutTestController::setShouldDumpAsAudio):
+        * DumpRenderTree/chromium/TestEventPrinter.cpp:
+        (DRTPrinter::handleAudioHeader):
+        (TestShellPrinter::handleAudioHeader):
+        * DumpRenderTree/chromium/TestEventPrinter.h:
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::TestShell):
+        (TestShell::dump):
+
 2011-06-13  Jaehun Lim  <ljaehun.lim@samsung.com>
 

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@ -157 +157 @@
     bindMethod("setDomainRelaxationForbiddenForURLScheme", &LayoutTestController::setDomainRelaxationForbiddenForURLScheme);
     bindMethod("setEditingBehavior", &LayoutTestController::setEditingBehavior);
+    bindMethod("setEncodedAudioData", &LayoutTestController::setEncodedAudioData);
     bindMethod("setGeolocationPermission", &LayoutTestController::setGeolocationPermission);
     bindMethod("setIconDatabaseEnabled", &LayoutTestController::setIconDatabaseEnabled);
@@ -574 +575 @@
     }
     m_dumpAsText = false;
+    m_dumpAsAudio = false;
     m_dumpEditingCallbacks = false;
     m_dumpFrameLoadCallbacks = false;
@@ -1923 +1925 @@
     m_shell->webView()->setTextDirection(direction);
 }
+
+void LayoutTestController::setEncodedAudioData(const CppArgumentList& arguments, CppVariant* result)
+{
+    result->setNull();
+    if (arguments.size() < 1 || !arguments[0].isString())
+        return;
+
+    m_encodedAudioData = arguments[0].toString();
+    setShouldDumpAsAudio(true);
+}

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

@@ -250 +250 @@
     void setEditingBehavior(const CppArgumentList&, CppVariant*);
 
+    // Deals with Web Audio base64 encoded WAVE file data.
+    void setEncodedAudioData(const CppArgumentList&, CppVariant*);
+    const std::string& encodedAudioData() const { return m_encodedAudioData; } 
+
     // The following are only stubs.
     // FIXME: Implement any of these that are needed to pass the layout tests.
@@ -399 +403 @@
 
     WebKit::WebSpeechInputController* speechInputController(WebKit::WebSpeechInputListener*);
+    bool shouldDumpAsAudio() const { return m_dumpAsAudio; } 
+    void setShouldDumpAsAudio(bool dumpAsAudio) { m_dumpAsAudio = dumpAsAudio; } 
     bool shouldDumpAsText() { return m_dumpAsText; }
     void setShouldDumpAsText(bool value) { m_dumpAsText = value; }
@@ -519 +525 @@
     bool m_dumpAsText;
 
+    // If true, the test_shell will output a base64 encoded WAVE file.
+    bool m_dumpAsAudio;
+
     // If true, the test_shell will write a descriptive line for each editing
     // command.
@@ -618 +627 @@
 
     OwnPtr<WebKit::WebSpeechInputControllerMock> m_speechInputControllerMock;
+
+    // base64 encoded WAV audio data is stored here.
+    std::string m_encodedAudioData;
 };
 

trunk/Tools/DumpRenderTree/chromium/TestEventPrinter.cpp

@@ -43 +43 @@
     void handleTextHeader() const;
     void handleTextFooter() const;
+    void handleAudioHeader() const;
     void handleImage(const char* actualHash, const char* expectedHash, const unsigned char* imageData, size_t imageSize, const char* fileName) const;
     void handleImageFooter() const;
@@ -55 +56 @@
     void handleTextHeader() const;
     void handleTextFooter() const;
+    void handleAudioHeader() const;
     void handleImage(const char* actualHash, const char* expectedHash, const unsigned char* imageData, size_t imageSize, const char* fileName) const;
     void handleImageFooter() const;
@@ -94 +96 @@
 {
     printf("#EOF\n");
+}
+
+void DRTPrinter::handleAudioHeader() const
+{
+    printf("Content-Type: audio/wav\n");
+    printf("Content-Transfer-Encoding: base64\n");            
 }
 
@@ -142 +150 @@
 }
 
+void TestShellPrinter::handleAudioHeader() const
+{
+    printf("Content-Type: audio/wav\n");
+    printf("Content-Transfer-Encoding: base64\n");
+}
+
 void TestShellPrinter::handleImage(const char* actualHash, const char*, const unsigned char* imageData, size_t imageSize, const char* fileName) const
 {

trunk/Tools/DumpRenderTree/chromium/TestEventPrinter.h

@@ -44 +44 @@
     virtual void handleTextHeader() const = 0;
     virtual void handleTextFooter() const = 0;
+    virtual void handleAudioHeader() const = 0;
     virtual void handleImage(const char* actualHash, const char* expectedHash, const unsigned char* imageData, size_t imageSize, const char* fileName) const = 0;
     virtual void handleImageFooter() const = 0;

trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

@@ -116 +116 @@
     WebRuntimeFeatures::enableFileSystem(true);
     WebRuntimeFeatures::enableJavaScriptI18NAPI(true);
+    WebRuntimeFeatures::enableWebAudio(true);
+
     m_webPermissions = adoptPtr(new WebPermissions());
     m_accessibilityController = adoptPtr(new AccessibilityController(this));
@@ -462 +464 @@
         return;
     bool shouldDumpAsText = m_layoutTestController->shouldDumpAsText();
+    bool shouldDumpAsAudio = m_layoutTestController->shouldDumpAsAudio();
     bool shouldGeneratePixelResults = m_layoutTestController->shouldGeneratePixelResults();
     bool dumpedAnything = false;
+
+    if (shouldDumpAsAudio) {
+        m_printer->handleAudioHeader();
+
+        const string& encodedAudioData = m_layoutTestController->encodedAudioData();
+        if (fwrite(encodedAudioData.c_str(), 1, encodedAudioData.size(), stdout) != encodedAudioData.size())
+            FATAL("Short write to stdout, disk full?\n");
+        printf("\n");
+
+        m_printer->handleTestFooter(true);
+        fflush(stdout);
+        fflush(stderr);
+        return;
+    }
+
     if (m_params.dumpTree) {
         dumpedAnything = true;