Implement Blob.close().

Source/core/html/PublicURLManager.cpp

 /*
  * Copyright (C) 2012 Motorola Mobility Inc.
  * Copyright (C) 2013 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 11 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/PublicURLManager.h"
 
 #include "core/html/URLRegistry.h"
 #include "platform/weborigin/KURL.h"
+#include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 
 namespace WebCore {
 
 PassOwnPtr<PublicURLManager> PublicURLManager::create(ExecutionContext* context)
 {
     OwnPtr<PublicURLManager> publicURLManager(adoptPtr(new PublicURLManager(context)));
     publicURLManager->suspendIfNeeded();
     return publicURLManager.release();
 }
 
 PublicURLManager::PublicURLManager(ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_isStopped(false)
 {
 }
 
-void PublicURLManager::registerURL(SecurityOrigin* origin, const KURL& url, URLRegistrable* registrable)
+void PublicURLManager::registerURL(SecurityOrigin* origin, const KURL& url, URLRegistrable* registrable, const String& uuid)
 {
     if (m_isStopped)
         return;
 
-    RegistryURLMap::iterator found = m_registryToURL.add(&registrable->registry(), URLSet()).iterator;
+    RegistryURLMap::iterator found = m_registryToURL.add(&registrable->registry(), URLMap()).iterator;
     found->key->registerURL(origin, url, registrable);
-    found->value.add(url.string());
+    found->value.add(url.string(), uuid);
 }
 
 void PublicURLManager::revoke(const KURL& url)
 {
     for (RegistryURLMap::iterator i = m_registryToURL.begin(); i != m_registryToURL.end(); ++i) {
         if (i->value.contains(url.string())) {
             i->key->unregisterURL(url);
             i->value.remove(url.string());
             break;
         }
     }
 }
 
+void PublicURLManager::revoke(const String& uuid)
+{
+    // A linear scan; revoking by UUID is assumed rare.
+    Vector<String> removableKeys;
+    for (RegistryURLMap::iterator i = m_registryToURL.begin(); i != m_registryToURL.end(); ++i) {
+        for (URLMap::iterator j = i->value.begin(); j != i->value.end(); ++j) {
+            if (uuid == j->value) {
+                i->key->unregisterURL(KURL(ParsedURLString, j->key));
+                removableKeys.append(j->key);
+            }
+        }
+        if (removableKeys.size()) {
+            for (unsigned j = 0; j < removableKeys.size(); j++)
+                i->value.remove(removableKeys[j]);
+            removableKeys.clear();
+        }

[kinuko, 2014/02/12 06:11:20]

It might be slightly more readable if we just maintain a separate map from uuid
to URLs?

[sof, 2014/02/12 06:56:47]

It would have to be UUID to a set of URLs; would that be cleaner (and worth the
space for what is arguably a rarer thing to do, i.e., revoke a URL by UUID)?

[kinuko, 2014/02/12 12:52:00]

I guessed in general this map'd be relatively small so I wouldn't worry too much
about it, but well having a separate map may make the other revoke() code a bit
complex instead?

This could be preferential, but could we do following for better readability:
- assign i->key and i->value to temp reference variables before nested loop
- remove if (removableKeys.size()) clause on line 82 as it doesn't help much
- I'd probably rename removableKeys to toBeRemoved or something more direct

[sof, 2014/02/13 09:59:57]

Thanks, I've tried to improve readability - please take another look?

Also noticed that this revocation method didn't retire the URLs from the
memory cache(like revoking by URL does), so added that also.

+    }
+}
+
 void PublicURLManager::stop()
 {
     if (m_isStopped)
         return;
 
     m_isStopped = true;
     for (RegistryURLMap::iterator i = m_registryToURL.begin(); i != m_registryToURL.end(); ++i) {
-        for (URLSet::iterator j = i->value.begin(); j != i->value.end(); ++j)
-            i->key->unregisterURL(KURL(ParsedURLString, *j));
+        for (URLMap::iterator j = i->value.begin(); j != i->value.end(); ++j)
+            i->key->unregisterURL(KURL(ParsedURLString, j->key));
     }
 
     m_registryToURL.clear();
 }
 
 }