[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

eric at webkit.org eric at webkit.org
Wed Apr 7 23:32:02 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit fa7e7b38464eef2f47ff9c7a20a278606723744c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 21:23:01 2009 +0000

    2009-11-11  Drew Wilson  <atwilson at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            SharedWorkerRepository.connect() does not call WebSharedWorkerRepository
            https://bugs.webkit.org/show_bug.cgi?id=31371
    
            Test: Unit tests can be enabled downstream when this lands.
    
            * src/SharedWorkerRepository.cpp:
            (WebCore::SharedWorkerRepository::connect):
            Added missing call to WebSharedWorkerRepository.addSharedWorker().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 8cf5c4e..2a48317 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-11  Drew Wilson  <atwilson at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        SharedWorkerRepository.connect() does not call WebSharedWorkerRepository
+        https://bugs.webkit.org/show_bug.cgi?id=31371
+
+        Test: Unit tests can be enabled downstream when this lands.
+
+        * src/SharedWorkerRepository.cpp:
+        (WebCore::SharedWorkerRepository::connect):
+        Added missing call to WebSharedWorkerRepository.addSharedWorker().
+
 2009-11-11  Yaar Schnitman  <yaar at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/SharedWorkerRepository.cpp b/WebKit/chromium/src/SharedWorkerRepository.cpp
index f67a7dd..5e5bc46 100644
--- a/WebKit/chromium/src/SharedWorkerRepository.cpp
+++ b/WebKit/chromium/src/SharedWorkerRepository.cpp
@@ -171,6 +171,9 @@ void SharedWorkerRepository::connect(PassRefPtr<SharedWorker> worker, PassOwnPtr
         return;
     }
 
+    WebKit::webKitClient()->sharedWorkerRepository()->addSharedWorker(
+        webWorker.get(), getId(document));
+
     // The loader object manages its own lifecycle (and the lifecycles of the two worker objects).
     // It will free itself once loading is completed.
     SharedWorkerScriptLoader* loader = new SharedWorkerScriptLoader(worker, url, name, port.release(), webWorker.release());

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list