blob hacking webcore style

Source/core/fileapi/FileReader.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 28 matching lines @@
 #include "core/fileapi/File.h"
 #include "platform/Logging.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/text/CString.h"
 
 namespace WebCore {
 
 namespace {
 
-const CString utf8BlobURL(Blob* blob)
+const CString utf8BlobUUID(Blob* blob)
 {
-    return blob->url().string().utf8();
+    return blob->uuid().utf8();
 }
 
 const CString utf8FilePath(Blob* blob)
 {
     return blob->isFile() ? toFile(blob)->path().utf8() : "";
 }
 
 } // namespace
 
 static const double progressNotificationIntervalMS = 50;
@@ skipping 34 matching lines @@
 void FileReader::stop()
 {
     terminate();
 }
 
 void FileReader::readAsArrayBuffer(Blob* blob, ExceptionState& es)
 {
     if (!blob)
         return;
 
-    LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", utf8BlobURL(blob).data(), utf8FilePath(blob).data());
+    LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data());
 
     readInternal(blob, FileReaderLoader::ReadAsArrayBuffer, es);
 }
 
 void FileReader::readAsBinaryString(Blob* blob, ExceptionState& es)
 {
     if (!blob)
         return;
 
-    LOG(FileAPI, "FileReader: reading as binary: %s %s\n", utf8BlobURL(blob).data(), utf8FilePath(blob).data());
+    LOG(FileAPI, "FileReader: reading as binary: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data());
 
     readInternal(blob, FileReaderLoader::ReadAsBinaryString, es);
 }
 
 void FileReader::readAsText(Blob* blob, const String& encoding, ExceptionState& es)
 {
     if (!blob)
         return;
 
-    LOG(FileAPI, "FileReader: reading as text: %s %s\n", utf8BlobURL(blob).data(), utf8FilePath(blob).data());
+    LOG(FileAPI, "FileReader: reading as text: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data());
 
     m_encoding = encoding;
     readInternal(blob, FileReaderLoader::ReadAsText, es);
 }
 
 void FileReader::readAsText(Blob* blob, ExceptionState& es)
 {
     readAsText(blob, String(), es);
 }
 
 void FileReader::readAsDataURL(Blob* blob, ExceptionState& es)
 {
     if (!blob)
         return;
 
-    LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", utf8BlobURL(blob).data(), utf8FilePath(blob).data());
+    LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data());
 
     readInternal(blob, FileReaderLoader::ReadAsDataURL, es);
 }
 
 void FileReader::readInternal(Blob* blob, FileReaderLoader::ReadType type, ExceptionState& es)
 {
     // If multiple concurrent read methods are called on the same FileReader, InvalidStateError should be thrown when the state is LOADING.
     if (m_state == LOADING) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
     setPendingActivity(this);
 
     m_blob = blob;
     m_readType = type;
     m_state = LOADING;
     m_loadingState = LoadingStateLoading;
     m_error = 0;
 
     m_loader = adoptPtr(new FileReaderLoader(m_readType, this));
     m_loader->setEncoding(m_encoding);
     m_loader->setDataType(m_blob->type());
-    m_loader->start(scriptExecutionContext(), *m_blob);
+    m_loader->start(scriptExecutionContext(), m_blob->blobDataHandle());
 }
 
 static void delayedAbort(ScriptExecutionContext*, FileReader* reader)
 {
     reader->doAbort();
 }
 
 void FileReader::abort()
 {
     LOG(FileAPI, "FileReader: aborting\n");
@@ skipping 104 matching lines @@
 }
 
 String FileReader::stringResult()
 {
     if (!m_loader || m_error)
         return String();
     return m_loader->stringResult();
 }
 
 } // namespace WebCore