Changeset 128087 in webkit

Timestamp:

Sep 10, 2012 12:07:48 PM (12 years ago)

Author:

pilgrim@chromium.org

Message:

[Chromium] Define new setSharedWorkerRepository function in preparation for removing WebKitPlatformSupport::sharedWorkerRepository()
​https://bugs.webkit.org/show_bug.cgi?id=95861

Reviewed by Adam Barth.

Followup patch to Chromium will call this new function, then we can remove all references to the legacy function on WebKitPlatformSupport.

• public/WebSharedWorkerRepository.h:

(WebKit):

• src/SharedWorkerRepository.cpp:

(WebKit):
(WebKit::setSharedWorkerRepository):
(WebKit::sharedWorkerRepository):
(WebCore::SharedWorkerRepository::isAvailable):
(WebCore::SharedWorkerRepository::connect):
(WebCore::SharedWorkerRepository::documentDetached):
(WebCore::SharedWorkerRepository::hasSharedWorkers):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebSharedWorkerRepository.h (modified) (1 diff)
• src/SharedWorkerRepository.cpp (modified) (6 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-10  Mark Pilgrim  <pilgrim@chromium.org>
+
+        [Chromium] Define new setSharedWorkerRepository function in preparation for removing WebKitPlatformSupport::sharedWorkerRepository()
+        https://bugs.webkit.org/show_bug.cgi?id=95861
+
+        Reviewed by Adam Barth.
+
+        Followup patch to Chromium will call this new function, then we can remove all references to the legacy function on WebKitPlatformSupport.
+
+        * public/WebSharedWorkerRepository.h:
+        (WebKit):
+        * src/SharedWorkerRepository.cpp:
+        (WebKit):
+        (WebKit::setSharedWorkerRepository):
+        (WebKit::sharedWorkerRepository):
+        (WebCore::SharedWorkerRepository::isAvailable):
+        (WebCore::SharedWorkerRepository::connect):
+        (WebCore::SharedWorkerRepository::documentDetached):
+        (WebCore::SharedWorkerRepository::hasSharedWorkers):
+
 2012-09-10  Catalin Badea  <badea@adobe.com>
 

trunk/Source/WebKit/chromium/public/WebSharedWorkerRepository.h

@@ -55 +55 @@
 };
 
+// Initializes shared worker support.
+WEBKIT_EXPORT void setSharedWorkerRepository(WebSharedWorkerRepository*);
+
 } // namespace WebKit
 

trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp

@@ -59 +59 @@
 #include <public/WebURL.h>
 
+namespace WebKit {
+
+WebSharedWorkerRepository* s_sharedWorkerRepository = 0;
+
+void setSharedWorkerRepository(WebSharedWorkerRepository* repository)
+{
+    s_sharedWorkerRepository = repository;
+}
+
+static WebSharedWorkerRepository* sharedWorkerRepository()
+{
+    WebSharedWorkerRepository* repository;
+
+    repository = s_sharedWorkerRepository;
+    if (!repository) {
+        repository = webKitPlatformSupport()->sharedWorkerRepository();
+        setSharedWorkerRepository(repository);
+    }
+
+    return repository;
+}
+
+}
+
 namespace WebCore {
 
@@ -195 +219 @@
 bool SharedWorkerRepository::isAvailable()
 {
-    // Allow the WebKitPlatformSupport to determine if SharedWorkers are available.
-    return WebKit::webKitPlatformSupport()->sharedWorkerRepository();
+    // Allow the WebKitPlatformSupport to determine if SharedWorkers
+    // are available.
+    return WebKit::sharedWorkerRepository();
 }
 
@@ -207 +232 @@
 void SharedWorkerRepository::connect(PassRefPtr<SharedWorker> worker, PassOwnPtr<MessagePortChannel> port, const KURL& url, const String& name, ExceptionCode& ec)
 {
+    WebKit::WebSharedWorkerRepository* repository = WebKit::sharedWorkerRepository();
+
     // This should not be callable unless there's a SharedWorkerRepository for
     // this context (since isAvailable() should have returned null).
-    ASSERT(WebKit::webKitPlatformSupport()->sharedWorkerRepository());
+    ASSERT(repository);
 
     // No nested workers (for now) - connect() should only be called from document context.
@@ -224 +251 @@
     }
 
-    WebKit::webKitPlatformSupport()->sharedWorkerRepository()->addSharedWorker(
-        webWorker.get(), getId(document));
+    repository->addSharedWorker(webWorker.get(), getId(document));
 
     // The loader object manages its own lifecycle (and the lifecycles of the two worker objects).
@@ -235 +261 @@
 void SharedWorkerRepository::documentDetached(Document* document)
 {
-    WebSharedWorkerRepository* repo = WebKit::webKitPlatformSupport()->sharedWorkerRepository();
-    if (repo)
-        repo->documentDetached(getId(document));
+    WebKit::WebSharedWorkerRepository* repository = WebKit::sharedWorkerRepository();
+
+    if (repository)
+        repository->documentDetached(getId(document));
 
     // Stop the creation of any pending SharedWorkers for this context.
@@ -246 +273 @@
 bool SharedWorkerRepository::hasSharedWorkers(Document* document)
 {
-    WebSharedWorkerRepository* repo = WebKit::webKitPlatformSupport()->sharedWorkerRepository();
-    return repo && repo->hasSharedWorkers(getId(document));
-}
-
-
+    WebKit::WebSharedWorkerRepository* repository = WebKit::sharedWorkerRepository();
+
+    return repository && repository->hasSharedWorkers(getId(document));
+}
 
 } // namespace WebCore