Changeset 248473 in webkit

Timestamp:

Aug 9, 2019 1:55:06 PM (5 years ago)

Author:

youenn@apple.com

Message:

Pass a ScriptExecutionContext as input to register/unregister URLRegistry routines
​https://bugs.webkit.org/show_bug.cgi?id=200571

Reviewed by Darin Adler.

Passing a ScriptExecutionContext to register/unregister routines will allow
to have session ID based handling for blobs, in particular to use session partitioned blob registries.
No change of behavior.

• Modules/mediasource/MediaSourceRegistry.cpp:

(WebCore::MediaSourceRegistry::registerURL):
(WebCore::MediaSourceRegistry::unregisterURL):

• Modules/mediasource/MediaSourceRegistry.h:
• fileapi/Blob.cpp:

(WebCore::BlobURLRegistry::registerURL):
(WebCore::BlobURLRegistry::unregisterURL):

• html/DOMURL.cpp:

(WebCore::DOMURL::createPublicURL):

• html/PublicURLManager.cpp:

(WebCore::PublicURLManager::registerURL):
(WebCore::PublicURLManager::revoke):
(WebCore::PublicURLManager::stop):

• html/PublicURLManager.h:
• html/URLRegistry.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediasource/MediaSourceRegistry.cpp (modified) (2 diffs)
• Modules/mediasource/MediaSourceRegistry.h (modified) (1 diff)
• fileapi/Blob.cpp (modified) (2 diffs)
• html/DOMURL.cpp (modified) (1 diff)
• html/PublicURLManager.cpp (modified) (4 diffs)
• html/PublicURLManager.h (modified) (2 diffs)
• html/URLRegistry.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-09  Youenn Fablet  <youenn@apple.com>
+
+        Pass a ScriptExecutionContext as input to register/unregister URLRegistry routines
+        https://bugs.webkit.org/show_bug.cgi?id=200571
+
+        Reviewed by Darin Adler.
+
+        Passing a ScriptExecutionContext to register/unregister routines will allow
+        to have session ID based handling for blobs, in particular to use session partitioned blob registries.
+        No change of behavior.
+
+        * Modules/mediasource/MediaSourceRegistry.cpp:
+        (WebCore::MediaSourceRegistry::registerURL):
+        (WebCore::MediaSourceRegistry::unregisterURL):
+        * Modules/mediasource/MediaSourceRegistry.h:
+        * fileapi/Blob.cpp:
+        (WebCore::BlobURLRegistry::registerURL):
+        (WebCore::BlobURLRegistry::unregisterURL):
+        * html/DOMURL.cpp:
+        (WebCore::DOMURL::createPublicURL):
+        * html/PublicURLManager.cpp:
+        (WebCore::PublicURLManager::registerURL):
+        (WebCore::PublicURLManager::revoke):
+        (WebCore::PublicURLManager::stop):
+        * html/PublicURLManager.h:
+        * html/URLRegistry.h:
+
 2019-08-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp

@@ -49 +49 @@
 }
 
-void MediaSourceRegistry::registerURL(SecurityOrigin*, const URL& url, URLRegistrable& registrable)
+void MediaSourceRegistry::registerURL(ScriptExecutionContext&, const URL& url, URLRegistrable& registrable)
 {
     ASSERT(&registrable.registry() == this);
@@ -59 +59 @@
 }
 
-void MediaSourceRegistry::unregisterURL(const URL& url)
+void MediaSourceRegistry::unregisterURL(ScriptExecutionContext&, const URL& url)
 {
     ASSERT(isMainThread());

trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.h

@@ -48 +48 @@
 
     // Registers a blob URL referring to the specified media source.
-    void registerURL(SecurityOrigin*, const URL&, URLRegistrable&) override;
-    void unregisterURL(const URL&) override;
-    URLRegistrable* lookup(const String&) const override;
+    void registerURL(ScriptExecutionContext&, const URL&, URLRegistrable&)final;
+    void unregisterURL(ScriptExecutionContext&, const URL&) final;
+    URLRegistrable* lookup(const String&) const final;
 
 private:

trunk/Source/WebCore/fileapi/Blob.cpp

@@ -49 +49 @@
 class BlobURLRegistry final : public URLRegistry {
 public:
-    void registerURL(SecurityOrigin*, const URL&, URLRegistrable&) override;
-    void unregisterURL(const URL&) override;
+    void registerURL(ScriptExecutionContext&, const URL&, URLRegistrable&) final;
+    void unregisterURL(ScriptExecutionContext&, const URL&) final;
 
     static URLRegistry& registry();
@@ -56 +56 @@
 
 
-void BlobURLRegistry::registerURL(SecurityOrigin* origin, const URL& publicURL, URLRegistrable& blob)
+void BlobURLRegistry::registerURL(ScriptExecutionContext& context, const URL& publicURL, URLRegistrable& blob)
 {
     ASSERT(&blob.registry() == this);
-    ThreadableBlobRegistry::registerBlobURL(origin, publicURL, static_cast<Blob&>(blob).url());
-}
-
-void BlobURLRegistry::unregisterURL(const URL& url)
+    ThreadableBlobRegistry::registerBlobURL(context.securityOrigin(), publicURL, static_cast<Blob&>(blob).url());
+}
+
+void BlobURLRegistry::unregisterURL(ScriptExecutionContext&, const URL& url)
 {
     ThreadableBlobRegistry::unregisterBlobURL(url);

trunk/Source/WebCore/html/DOMURL.cpp

@@ -104 +104 @@
         return String();
 
-    scriptExecutionContext.publicURLManager().registerURL(scriptExecutionContext.securityOrigin(), publicURL, registrable);
+    scriptExecutionContext.publicURLManager().registerURL(publicURL, registrable);
 
     return publicURL.string();

trunk/Source/WebCore/html/PublicURLManager.cpp

@@ -46 +46 @@
 }
 
-void PublicURLManager::registerURL(SecurityOrigin* origin, const URL& url, URLRegistrable& registrable)
+void PublicURLManager::registerURL(const URL& url, URLRegistrable& registrable)
 {
     if (m_isStopped)
@@ -52 +52 @@
 
     RegistryURLMap::iterator found = m_registryToURL.add(&registrable.registry(), URLSet()).iterator;
-    found->key->registerURL(origin, url, registrable);
+    found->key->registerURL(*scriptExecutionContext(), url, registrable);
     found->value.add(url.string());
 }
@@ -60 +60 @@
     for (auto& registry : m_registryToURL) {
         if (registry.value.contains(url.string())) {
-            registry.key->unregisterURL(url);
+            registry.key->unregisterURL(*scriptExecutionContext(), url);
             registry.value.remove(url.string());
             break;
@@ -75 +75 @@
     for (auto& registry : m_registryToURL) {
         for (auto& url : registry.value)
-            registry.key->unregisterURL(URL({ }, url));
+            registry.key->unregisterURL(*scriptExecutionContext(), URL({ }, url));
     }
 

trunk/Source/WebCore/html/PublicURLManager.h

@@ -34 +34 @@
 namespace WebCore {
 
-class ScriptExecutionContext;
 class SecurityOrigin;
 class URLRegistry;
@@ -46 +45 @@
     static std::unique_ptr<PublicURLManager> create(ScriptExecutionContext*);
 
-    void registerURL(SecurityOrigin*, const URL&, URLRegistrable&);
+    void registerURL(const URL&, URLRegistrable&);
     void revoke(const URL&);
 

trunk/Source/WebCore/html/URLRegistry.h

@@ -35 +35 @@
 namespace WebCore {
 
-class SecurityOrigin;
+class ScriptExecutionContext;
 class URLRegistry;
 
@@ -48 +48 @@
 public:
     virtual ~URLRegistry() = default;
-    virtual void registerURL(SecurityOrigin*, const URL&, URLRegistrable&) = 0;
-    virtual void unregisterURL(const URL&) = 0;
+    virtual void registerURL(ScriptExecutionContext&, const URL&, URLRegistrable&) = 0;
+    virtual void unregisterURL(ScriptExecutionContext&, const URL&) = 0;
 
     // This is an optional API