Merge WebKit at r66079 : Initial merge by git

Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7

1 files changed, 9 insertions, 2 deletions

diff --git a/WebCore/platform/network/BlobRegistry.h b/WebCore/platform/network/BlobRegistry.h
index fcd7b1c..7e64233 100644
--- a/WebCore/platform/network/BlobRegistry.h
+++ b/WebCore/platform/network/BlobRegistry.h
@@ -38,6 +38,7 @@
 namespace WebCore {
 
 class BlobData;
+class BlobRegistry;
 class KURL;
 class ResourceError;
 class ResourceHandle;
@@ -45,17 +46,23 @@ class ResourceHandleClient;
 class ResourceRequest;
 class ResourceResponse;
 
+// Returns a single instance of BlobRegistry.
+BlobRegistry& blobRegistry(); 
+
 // BlobRegistry is not thread-safe. It should only be called from main thread.
 class BlobRegistry {
 public:
-    static BlobRegistry& instance();
-
+    // Registers a blob URL referring to the specified blob data.
     virtual void registerBlobURL(const KURL&, PassOwnPtr<BlobData>) = 0;
+    
+    // Registers a blob URL referring to the blob data identified by the specified srcURL.
     virtual void registerBlobURL(const KURL&, const KURL& srcURL) = 0;
+
     virtual void unregisterBlobURL(const KURL&) = 0;
     virtual PassRefPtr<ResourceHandle> createResourceHandle(const ResourceRequest&, ResourceHandleClient*) = 0;
     virtual bool loadResourceSynchronously(const ResourceRequest&, ResourceError&, ResourceResponse&, Vector<char>& data) = 0;
 
+protected:
     virtual ~BlobRegistry() { }
 };