Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 14 insertions, 2 deletions

diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp b/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp
index 632d9664b..9a86953c3 100644
--- a/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp
+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestInterfaces.cpp
@@ -63,10 +63,12 @@ public:
     virtual void setEditCommand(const std::string& name, const std::string& value);
     virtual WebContextMenuData* lastContextMenuData() const;
     virtual void setGamepadData(const WebGamepads&);
-    virtual void printMessage(const std::string& message) const;
+    virtual void printMessage(const std::string& message);
     virtual void postTask(WebTask*);
     virtual void postDelayedTask(WebTask*, long long ms);
     virtual WebString registerIsolatedFileSystem(const WebVector<WebString>& absoluteFilenames);
+    virtual long long getCurrentTimeInMillisecond();
+    virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path(const std::string& path);
 
 private:
     TestInterfaces m_interfaces;
@@ -127,7 +129,7 @@ void WebTestInterfaces::Internal::setGamepadData(const WebGamepads& pads)
     m_delegate->setGamepadData(pads);
 }
 
-void WebTestInterfaces::Internal::printMessage(const std::string& message) const
+void WebTestInterfaces::Internal::printMessage(const std::string& message)
 {
     m_delegate->printMessage(message);
 }
@@ -147,6 +149,16 @@ WebString WebTestInterfaces::Internal::registerIsolatedFileSystem(const WebVecto
     return m_delegate->registerIsolatedFileSystem(absoluteFilenames);
 }
 
+long long WebTestInterfaces::Internal::getCurrentTimeInMillisecond()
+{
+    return m_delegate->getCurrentTimeInMillisecond();
+}
+
+WebKit::WebString WebTestInterfaces::Internal::getAbsoluteWebStringFromUTF8Path(const std::string& path)
+{
+    return m_delegate->getAbsoluteWebStringFromUTF8Path(path);
+}
+
 WebTestInterfaces::WebTestInterfaces()
 {
     m_internal = new Internal;