Rename SecurityOriginCache to URLSecurityOriginMap

third_party/WebKit/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.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * 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 "core/html/PublicURLManager.h"
 
-#include "core/fetch/MemoryCache.h"
 #include "core/html/URLRegistry.h"
+#include "platform/blob/BlobURL.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
+class SecurityOrigin;
+
 PublicURLManager* PublicURLManager::create(ExecutionContext* context)
 {
     PublicURLManager* publicURLManager = new PublicURLManager(context);
     publicURLManager->suspendIfNeeded();
     return publicURLManager;
 }
 
 PublicURLManager::PublicURLManager(ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_isStopped(false)
 {
 }
 
-void PublicURLManager::registerURL(SecurityOrigin* origin, const KURL& url, URLRegistrable* registrable, const String& uuid)
+String PublicURLManager::registerURL(ExecutionContext* context, URLRegistrable* registrable, const String& uuid)
 {
-    if (m_isStopped)
-        return;
+    SecurityOrigin* origin = context->getSecurityOrigin();
+    const KURL& url = BlobURL::createPublicURL(origin);
+    if (url.isEmpty())
+        return String();
 
-    RegistryURLMap::ValueType* found = m_registryToURL.add(&registrable->registry(), URLMap()).storedValue;
-    found->key->registerURL(origin, url, registrable);
-    found->value.add(url.getString(), uuid);
+    const String& urlString = url.getString();
+
+    if (!m_isStopped) {
+        RegistryURLMap::ValueType* found = m_registryToURL.add(&registrable->registry(), URLMap()).storedValue;
+        found->key->registerURL(origin, url, registrable);
+        found->value.add(urlString, uuid);
+    }
+
+    return urlString;
 }
 
 void PublicURLManager::revoke(const KURL& url)
 {
     for (auto& registryUrl : m_registryToURL) {
         if (registryUrl.value.contains(url.getString())) {
             registryUrl.key->unregisterURL(url);
             registryUrl.value.remove(url.getString());
             break;
         }
@@ skipping 34 matching lines @@
 
     m_registryToURL.clear();
 }
 
 DEFINE_TRACE(PublicURLManager)
 {
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink