Merge WebKit at r67178 : Initial merge by git.

Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18

1 files changed, 18 insertions, 4 deletions

diff --git a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
index 8747cea..c988fa1 100644
--- a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
+++ b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
@@ -31,7 +31,8 @@
 #ifndef DRTDevToolsAgent_h
 #define DRTDevToolsAgent_h
 
-#include "base/task.h" // FIXME: remove this
+#include "DRTDevToolsCallArgs.h"
+#include "Task.h"
 #include "public/WebDevToolsAgentClient.h"
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
@@ -46,7 +47,6 @@ struct WebDevToolsMessageData;
 
 } // namespace WebKit
 
-class DRTDevToolsCallArgs;
 class DRTDevToolsClient;
 
 class DRTDevToolsAgent : public WebKit::WebDevToolsAgentClient
@@ -61,7 +61,6 @@ public:
     // WebDevToolsAgentClient implementation.
     virtual void sendMessageToInspectorFrontend(const WebKit::WebString&);
     virtual int hostIdentifier() { return m_routingID; }
-    virtual void forceRepaint();
     virtual void runtimePropertyChanged(const WebKit::WebString& name, const WebKit::WebString& value);
     virtual WebKit::WebCString debuggerScriptSource();
     virtual WebKitClientMessageLoop* createClientMessageLoop();
@@ -74,6 +73,7 @@ public:
 
     bool evaluateInWebInspector(long callID, const std::string& script);
     bool setTimelineProfilingEnabled(bool enable);
+    TaskList* taskList() { return &m_taskList; }
 
 private:
     void call(const DRTDevToolsCallArgs&);
@@ -81,7 +81,21 @@ private:
     static void dispatchMessageLoop();
     WebKit::WebDevToolsAgent* webDevToolsAgent();
 
-    ScopedRunnableMethodFactory<DRTDevToolsAgent> m_callMethodFactory;
+    class AsyncCallTask: public MethodTask<DRTDevToolsAgent> {
+    public:
+        AsyncCallTask(DRTDevToolsAgent* object, const DRTDevToolsCallArgs& args)
+            : MethodTask<DRTDevToolsAgent>(object), m_args(args) {}
+        virtual void runIfValid() { m_object->call(m_args); }
+    private:
+        DRTDevToolsCallArgs m_args;
+    };
+
+    struct DelayedFrontendLoadedTask: public MethodTask<DRTDevToolsAgent> {
+        DelayedFrontendLoadedTask(DRTDevToolsAgent* object) : MethodTask<DRTDevToolsAgent>(object) {}
+        virtual void runIfValid() { m_object->delayedFrontendLoaded(); }
+    };
+
+    TaskList m_taskList;
     DRTDevToolsClient* m_drtDevToolsClient;
     int m_routingID;
     WebKit::WebDevToolsAgent* m_webDevToolsAgent;