Changeset 150310 in webkit

Timestamp:

May 17, 2013, 5:05:10 PM (12 years ago)

Author:

ap@apple.com

Message:

<rdar://problem/13819878> Disable SharedWorker when in multiple web process model
​https://bugs.webkit.org/show_bug.cgi?id=116359

Reviewed by Anders Carlsson.

This feature was already RuntimeEnabled. Call through layers to get the answer from
a platform strategy.

• workers/DefaultSharedWorkerRepository.cpp: (WebCore::DefaultSharedWorkerRepository::isAvailable):
• workers/DefaultSharedWorkerRepository.h:
• workers/SharedWorkerRepository.cpp: (WebCore::SharedWorkerRepository::isAvailable):
• workers/SharedWorkerStrategy.h: (WebCore::SharedWorkerStrategy::isAvailable):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/workers/DefaultSharedWorkerRepository.cpp (modified) (3 diffs)
• WebCore/workers/DefaultSharedWorkerRepository.h (modified) (1 diff)
• WebCore/workers/SharedWorkerRepository.cpp (modified) (1 diff)
• WebCore/workers/SharedWorkerStrategy.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2013-05-17  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/13819878> Disable SharedWorker when in multiple web process model
+        https://bugs.webkit.org/show_bug.cgi?id=116359
+
+        Reviewed by Anders Carlsson.
+
+        This feature was already RuntimeEnabled. Call through layers to get the answer from
+        a platform strategy.
+
+        * workers/DefaultSharedWorkerRepository.cpp:
+        (WebCore::DefaultSharedWorkerRepository::isAvailable):
+        * workers/DefaultSharedWorkerRepository.h:
+        * workers/SharedWorkerRepository.cpp:
+        (WebCore::SharedWorkerRepository::isAvailable):
+        * workers/SharedWorkerStrategy.h:
+        (WebCore::SharedWorkerStrategy::isAvailable):
+
 2013-05-17  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp ¶

@@ -44 +44 @@
 #include "NotImplemented.h"
 #include "PageGroup.h"
+#include "PlatformStrategies.h"
 #include "ScriptCallStack.h"
 #include "SecurityOrigin.h"
@@ -50 +51 @@
 #include "SharedWorkerContext.h"
 #include "SharedWorkerRepository.h"
+#include "SharedWorkerStrategy.h"
 #include "SharedWorkerThread.h"
 #include "WorkerLoaderProxy.h"
@@ -352 +354 @@
 }
 
+bool DefaultSharedWorkerRepository::isAvailable()
+{
+    return platformStrategies()->sharedWorkerStrategy()->isAvailable();
+}
+
 void DefaultSharedWorkerRepository::workerScriptLoaded(SharedWorkerProxy& proxy, const String& userAgent, const String& workerScript, PassOwnPtr<MessagePortChannel> port, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
 {

trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.h ¶

@@ -59 +59 @@
         WTF_MAKE_NONCOPYABLE(DefaultSharedWorkerRepository); WTF_MAKE_FAST_ALLOCATED;
     public:
+        // Returns true if the platform supports SharedWorkers, otherwise false.
+        static bool isAvailable();
+
         // Invoked once the worker script has been loaded to fire up the worker thread.
         void workerScriptLoaded(SharedWorkerProxy&, const String& userAgent, const String& workerScript, PassOwnPtr<MessagePortChannel>, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);

trunk/Source/WebCore/workers/SharedWorkerRepository.cpp ¶

@@ -39 +39 @@
 bool SharedWorkerRepository::isAvailable()
 {
-    // SharedWorkers are enabled on the default WebKit platform.
-    return true;
+    return DefaultSharedWorkerRepository::instance().isAvailable();
 }
 

trunk/Source/WebCore/workers/SharedWorkerStrategy.h ¶

@@ -31 +31 @@
 class SharedWorkerStrategy {
 public:
+    virtual bool isAvailable() const { return true; }
+
 protected:
     virtual ~SharedWorkerStrategy()

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2013-05-17  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/13819878> Disable SharedWorker when in multiple web process model
+        https://bugs.webkit.org/show_bug.cgi?id=116359
+
+        Reviewed by Anders Carlsson.
+
+        Implement SharedWorkerStrategy::isAvailable.
+
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebKit::WebPlatformStrategies::isAvailable):
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
 2013-05-17  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp ¶

@@ -305 +305 @@
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 
+// SharedWorkerStrategy.
+
+bool WebPlatformStrategies::isAvailable() const
+{
+    // Shared workers do not work across multiple processes, and using network process is tied to multiple secondary process model.
+#if ENABLE(NETWORK_PROCESS)
+    return WebProcess::shared().usesNetworkProcess();
+#else
+    return true;
+#endif
+}
+
 // StorageStrategy
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h ¶

@@ -82 +82 @@
     virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) OVERRIDE;
 
+    // WebCore::SharedWorkerStrategy.
+    virtual bool isAvailable() const OVERRIDE;
+
     // WebCore::StorageStrategy.
     virtual PassRefPtr<WebCore::StorageNamespace> localStorageNamespace(WebCore::PageGroup*) OVERRIDE;