********** WebCore blob hacking

WebCore/page/SecurityOrigin.cpp

 /*
  * Copyright (C) 2007 Apple 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
@@ skipping 12 matching lines @@
  * 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 "config.h"
 #include "SecurityOrigin.h"
 
 #include "BlobURL.h"
+#include "BlobRegistry.h"
 #include "Document.h"
 #include "FileSystem.h"
 #include "KURL.h"
 #include "SchemeRegistry.h"
 #include "SecurityPolicy.h"
-#include "ThreadableBlobRegistry.h"
 #include <wtf/MainThread.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
 
 const int InvalidPort = 0;
 const int MaxAllowedPort = 65535;
 
 static bool schemeRequiresAuthority(const KURL& url)
@@ skipping 27 matching lines @@
         return *url.innerURL();
     // FIXME: Update this callsite to use the innerURL member function when
     // we finish implementing it.
     return KURL(ParsedURLString, decodeURLEscapeSequences(url.path()));
 }
 
 static PassRefPtr<SecurityOrigin> getCachedOrigin(const KURL& url)
 {
 #if ENABLE(BLOB)
     if (url.protocolIs("blob"))
-        return ThreadableBlobRegistry::getCachedOrigin(url);
+        return blobRegistry().cachedUniqueOrigin(url);
 #endif
     return 0;
 }
 
 static bool shouldTreatAsUniqueOrigin(const KURL& url)
 {
     if (!url.isValid())
         return true;
 
     // FIXME: Do we need to unwrap the URL further?
@@ skipping 473 matching lines @@
     if (m_port != other->m_port)
         return false;
 
     if (isLocal() && !passesFileCheck(other))
         return false;
 
     return true;
 }
 
 } // namespace WebCore