diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-23 10:25:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-23 10:25:11 +0200 |
| commit | 5ea819f80c6840c492386bfafbffb059c7e2091f (patch) | |
| tree | 42ad0b1d82eff090d14278a088ea0f4840a0f938 /Tools/DumpRenderTree/chromium/DRTTestRunner.cpp | |
| parent | 43a42f108af6bcbd91f2672731c3047c26213af1 (diff) | |
| download | qtwebkit-5ea819f80c6840c492386bfafbffb059c7e2091f.tar.gz | |
Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (http://svn.webkit.org/repository/webkit/trunk@132191)
New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal
Diffstat (limited to 'Tools/DumpRenderTree/chromium/DRTTestRunner.cpp')
| -rw-r--r-- | Tools/DumpRenderTree/chromium/DRTTestRunner.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp b/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp index 082597a11..b31d7da70 100644 --- a/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp +++ b/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp @@ -36,6 +36,7 @@ #include "DRTDevToolsAgent.h" #include "MockWebSpeechInputController.h" #include "MockWebSpeechRecognizer.h" +#include "Task.h" #include "TestShell.h" #include "WebAnimationController.h" #include "WebBindings.h" @@ -83,6 +84,7 @@ using namespace WebCore; using namespace WebKit; +using namespace WebTestRunner; using namespace std; class EmptyWebDeliveredIntentClient : public WebKit::WebDeliveredIntentClient { @@ -2114,10 +2116,10 @@ void DRTTestRunner::setTextSubpixelPositioning(const CppArgumentList& arguments, result->setNull(); } -class InvokeCallbackTask : public MethodTask<DRTTestRunner> { +class InvokeCallbackTask : public WebMethodTask<DRTTestRunner> { public: InvokeCallbackTask(DRTTestRunner* object, PassOwnArrayPtr<CppVariant> callbackArguments, uint32_t numberOfArguments) - : MethodTask<DRTTestRunner>(object) + : WebMethodTask<DRTTestRunner>(object) , m_callbackArguments(callbackArguments) , m_numberOfArguments(numberOfArguments) { |