webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 26 deletions

diff --git a/Source/WebCore/fileapi/FileReaderSync.h b/Source/WebCore/fileapi/FileReaderSync.h
index 50140efcd..9e25cda8b 100644
--- a/Source/WebCore/fileapi/FileReaderSync.h
+++ b/Source/WebCore/fileapi/FileReaderSync.h
@@ -28,14 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef FileReaderSync_h
-#define FileReaderSync_h
+#pragma once
 
-#if ENABLE(BLOB)
-
-#include <wtf/Forward.h>
-#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
+#include "ExceptionOr.h"
 
 namespace JSC {
 class ArrayBuffer;
@@ -47,34 +42,23 @@ class Blob;
 class FileReaderLoader;
 class ScriptExecutionContext;
 
-typedef int ExceptionCode;
-
 class FileReaderSync : public RefCounted<FileReaderSync> {
 public:
-    static PassRefPtr<FileReaderSync> create()
+    static Ref<FileReaderSync> create()
     {
-        return adoptRef(new FileReaderSync());
+        return adoptRef(*new FileReaderSync);
     }
 
-    virtual ~FileReaderSync() { }
-
-    PassRefPtr<JSC::ArrayBuffer> readAsArrayBuffer(ScriptExecutionContext*, Blob*, ExceptionCode&);
-    String readAsBinaryString(ScriptExecutionContext*, Blob*, ExceptionCode&);
-    String readAsText(ScriptExecutionContext* scriptExecutionContext, Blob* blob, ExceptionCode& ec)
-    {
-        return readAsText(scriptExecutionContext, blob, "", ec);
-    }
-    String readAsText(ScriptExecutionContext*, Blob*, const String& encoding, ExceptionCode&);
-    String readAsDataURL(ScriptExecutionContext*, Blob*, ExceptionCode&);
+    ExceptionOr<RefPtr<JSC::ArrayBuffer>> readAsArrayBuffer(ScriptExecutionContext&, Blob&);
+    ExceptionOr<String> readAsBinaryString(ScriptExecutionContext&, Blob&);
+    ExceptionOr<String> readAsText(ScriptExecutionContext&, Blob&, const String& encoding);
+    ExceptionOr<String> readAsDataURL(ScriptExecutionContext&, Blob&);
 
 private:
     FileReaderSync();
 
-    void startLoading(ScriptExecutionContext*, FileReaderLoader&, Blob*, ExceptionCode&);
+    ExceptionOr<void> startLoading(ScriptExecutionContext&, FileReaderLoader&, Blob&);
+    ExceptionOr<String> startLoadingString(ScriptExecutionContext&, FileReaderLoader&, Blob&);
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(BLOB)
-
-#endif // FileReaderSync_h