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

WebCore/fileapi/FileReaderLoader.cpp

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 #include "config.h"
 
 #if ENABLE(BLOB)
 
 #include "FileReaderLoader.h"
 
 #include "Blob.h"
 #include "BlobURL.h"
+#include "BlobRegistry.h"
 #include "FileReaderLoaderClient.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "ScriptExecutionContext.h"
 #include "TextResourceDecoder.h"
-#include "ThreadableBlobRegistry.h"
 #include "ThreadableLoader.h"
 #include <wtf/ArrayBuffer.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/Base64.h>
 #include <wtf/text/StringBuilder.h>
 
 using namespace std;
 
 namespace WebCore {
 
 FileReaderLoader::FileReaderLoader(ReadType readType, FileReaderLoaderClient* client)
     : m_readType(readType)
     , m_client(client)
     , m_isRawDataConverted(false)
     , m_stringResult("")
     , m_bytesLoaded(0)
     , m_totalBytes(0)
     , m_errorCode(0)
 {
 }
 
 FileReaderLoader::~FileReaderLoader()
 {
     terminate();
     if (!m_urlForReading.isEmpty())
-        ThreadableBlobRegistry::unregisterBlobURL(m_urlForReading);
+        blobRegistry().revokePublicBlobURL(m_urlForReading);
 }
 
 void FileReaderLoader::start(ScriptExecutionContext* scriptExecutionContext, Blob* blob)
 {
+    ASSERT(m_urlForReading.isEmpty()); // Instances can not be reused.
+
     // The blob is read by routing through the request handling layer given a temporary public url.
     m_urlForReading = BlobURL::createPublicURL(scriptExecutionContext->securityOrigin());
     if (m_urlForReading.isEmpty()) {
         failed(FileError::SECURITY_ERR);
         return;
     }
-    ThreadableBlobRegistry::registerBlobURL(scriptExecutionContext->securityOrigin(), m_urlForReading, blob->url());
+    blobRegistry().registerPublicBlobURL(scriptExecutionContext->securityOrigin(), m_urlForReading, blob->blobDataHandle());
 
     // Construct and load the request.
     ResourceRequest request(m_urlForReading);
     request.setHTTPMethod("GET");
 
     ThreadableLoaderOptions options;
     options.sendLoadCallbacks = SendCallbacks;
     options.sniffContent = DoNotSniffContent;
     options.preflightPolicy = ConsiderPreflight;
     options.allowCredentials = AllowStoredCredentials;
@@ skipping 222 matching lines @@
 
 void FileReaderLoader::setEncoding(const String& encoding)
 {
     if (!encoding.isEmpty())
         m_encoding = TextEncoding(encoding);
 }
 
 } // namespace WebCore
  
 #endif // ENABLE(BLOB)