[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit b4ca328af113573244fc4765250b16c0d6fcf143
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 13:22:31 2010 +0000

    2010-08-06  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            [DRT/Chromium] Should revoke scheduled tasks
            https://bugs.webkit.org/show_bug.cgi?id=43560
    
            * DumpRenderTree/chromium/DRTDevToolsAgent.cpp:
            (DRTDevToolsAgent::reset): Calls RevokeAll().
            * DumpRenderTree/chromium/DRTDevToolsAgent.h:
            * DumpRenderTree/chromium/DRTDevToolsClient.cpp:
            (DRTDevToolsClient::reset): Calls RevokeAll().
            * DumpRenderTree/chromium/DRTDevToolsClient.h:
            * DumpRenderTree/chromium/EventSender.cpp:
            (EventSender::reset): Calls RevokeAll().
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (LayoutTestController::reset): Calls RevokeAll().
            * DumpRenderTree/chromium/TestShell.cpp:
            (TestShell::resetTestController): Calls DRTDevToolsAgent::reset() and DRTDevToolsClient::reset().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 70004b0..04d5fb2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-08-06  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [DRT/Chromium] Should revoke scheduled tasks
+        https://bugs.webkit.org/show_bug.cgi?id=43560
+
+        * DumpRenderTree/chromium/DRTDevToolsAgent.cpp:
+        (DRTDevToolsAgent::reset): Calls RevokeAll().
+        * DumpRenderTree/chromium/DRTDevToolsAgent.h:
+        * DumpRenderTree/chromium/DRTDevToolsClient.cpp:
+        (DRTDevToolsClient::reset): Calls RevokeAll().
+        * DumpRenderTree/chromium/DRTDevToolsClient.h:
+        * DumpRenderTree/chromium/EventSender.cpp:
+        (EventSender::reset): Calls RevokeAll().
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::reset): Calls RevokeAll().
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::resetTestController): Calls DRTDevToolsAgent::reset() and DRTDevToolsClient::reset().
+
 2010-08-06  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp
index d1d2e16..b05fe21 100644
--- a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp
@@ -54,6 +54,11 @@ DRTDevToolsAgent::DRTDevToolsAgent()
         WebDevToolsAgent::setMessageLoopDispatchHandler(&DRTDevToolsAgent::dispatchMessageLoop);
 }
 
+void DRTDevToolsAgent::reset()
+{
+    m_callMethodFactory.RevokeAll();
+}
+
 void DRTDevToolsAgent::setWebView(WebView* webView)
 {
     m_webView = webView;
diff --git a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
index a2826d0..df52866 100644
--- a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
+++ b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
@@ -52,6 +52,7 @@ class DRTDevToolsAgent : public WebKit::WebDevToolsAgentClient
 public:
     DRTDevToolsAgent();
     virtual ~DRTDevToolsAgent() {}
+    void reset();
 
     void setWebView(WebKit::WebView*);
 
diff --git a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.cpp b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.cpp
index c5eeff9..42f3724 100644
--- a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.cpp
@@ -64,6 +64,11 @@ DRTDevToolsClient::~DRTDevToolsClient()
         m_drtDevToolsAgent->detach();
 }
 
+void DRTDevToolsClient::reset()
+{
+    m_callMethodFactory.RevokeAll();
+}
+
 void DRTDevToolsClient::sendFrontendLoaded() {
     if (m_drtDevToolsAgent)
         m_drtDevToolsAgent->frontendLoaded();
diff --git a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.h b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.h
index 07a6187..37b1e9d 100644
--- a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.h
+++ b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsClient.h
@@ -53,6 +53,7 @@ class DRTDevToolsClient : public WebKit::WebDevToolsFrontendClient
 public:
     DRTDevToolsClient(DRTDevToolsAgent*, WebKit::WebView*);
     virtual ~DRTDevToolsClient();
+    void reset();
 
     // WebDevToolsFrontendClient implementation
     virtual void sendFrontendLoaded();
diff --git a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
index 4c5520a..bb3c07f 100644
--- a/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/EventSender.cpp
@@ -323,6 +323,7 @@ void EventSender::reset()
     timeOffsetMs = 0;
     touchModifiers = 0;
     touchPoints.clear();
+    m_methodFactory.RevokeAll();
 }
 
 WebView* EventSender::webview()
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index ac76516..e82a65e 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -514,6 +514,7 @@ void LayoutTestController::reset()
     else
         m_closeRemainingWindows = true;
     m_workQueue.reset();
+    m_timeoutFactory.RevokeAll();
 }
 
 void LayoutTestController::locationChangeDone()
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index 3ee703e..64c20b0 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -278,6 +278,9 @@ void TestShell::resetTestController()
     m_eventSender->reset();
     m_webViewHost->reset();
     m_notificationPresenter->reset();
+    m_drtDevToolsAgent->reset();
+    if (m_drtDevToolsClient)
+        m_drtDevToolsClient->reset();
 }
 
 void TestShell::loadURL(const WebURL& url)

-- 
WebKit Debian packaging