[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b6a8de86c5dbb3d59d82a6e2c47d134c60da1904
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 23:43:20 2010 +0000

    2010-02-04  Drew Wilson  <atwilson at chromium.org>
    
            Reviewed by David Levin.
    
            WorkerContext.close() does not work in the chromium port
            https://bugs.webkit.org/show_bug.cgi?id=34551
    
            Test: Adding new downstream test.
    
            * src/WebWorkerBase.cpp:
            (WebKit::WebWorkerBase::workerContextClosedTask):
            Now shuts down the worker thread when WorkerContext::close() is invoked.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54380 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 68b7a2c..0d65d80 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-04  Drew Wilson  <atwilson at chromium.org>
+
+        Reviewed by David Levin.
+
+        WorkerContext.close() does not work in the chromium port
+        https://bugs.webkit.org/show_bug.cgi?id=34551
+
+        Test: Adding new downstream test.
+
+        * src/WebWorkerBase.cpp:
+        (WebKit::WebWorkerBase::workerContextClosedTask):
+        Now shuts down the worker thread when WorkerContext::close() is invoked.
+
 2010-02-04  Chris Guillory  <chris.guillory at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebWorkerBase.cpp b/WebKit/chromium/src/WebWorkerBase.cpp
index 7fd3749..40019e8 100644
--- a/WebKit/chromium/src/WebWorkerBase.cpp
+++ b/WebKit/chromium/src/WebWorkerBase.cpp
@@ -271,6 +271,8 @@ void WebWorkerBase::workerContextClosedTask(ScriptExecutionContext* context,
 {
     if (thisPtr->commonClient())
         thisPtr->commonClient()->workerContextClosed();
+
+    thisPtr->stopWorkerThread();
 }
 
 void WebWorkerBase::workerContextDestroyed()

-- 
WebKit Debian packaging