Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / fileapi / FileReaderSync.cpp

diff --git a/src/third_party/WebKit/Source/core/fileapi/FileReaderSync.cpp b/src/third_party/WebKit/Source/core/fileapi/FileReaderSync.cpp
index 80222cf..1b9788a 100644 (file)
--- a/src/third_party/WebKit/Source/core/fileapi/FileReaderSync.cpp
+++ b/src/third_party/WebKit/Source/core/fileapi/FileReaderSync.cpp
@@ -31,77 +31,76 @@
 #include "config.h"
 #include "core/fileapi/FileReaderSync.h"
 
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionState.h"
+#include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/FileError.h"
 #include "core/fileapi/FileReaderLoader.h"
-#include "wtf/ArrayBuffer.h"
 #include "wtf/PassRefPtr.h"
 
-namespace WebCore {
+namespace blink {
 
 FileReaderSync::FileReaderSync()
 {
-    ScriptWrappable::init(this);
 }
 
-PassRefPtr<ArrayBuffer> FileReaderSync::readAsArrayBuffer(ExecutionContext* executionContext, Blob* blob, ExceptionState& es)
+PassRefPtr<DOMArrayBuffer> FileReaderSync::readAsArrayBuffer(ExecutionContext* executionContext, Blob* blob, ExceptionState& exceptionState)
 {
     if (!blob) {
-        es.throwDOMException(NotFoundError, FileError::notFoundErrorMessage);
-        return 0;
+        exceptionState.throwDOMException(NotFoundError, FileError::notFoundErrorMessage);
+        return nullptr;
     }
 
     FileReaderLoader loader(FileReaderLoader::ReadAsArrayBuffer, 0);
-    startLoading(executionContext, loader, *blob, es);
+    startLoading(executionContext, loader, *blob, exceptionState);
 
-    return loader.arrayBufferResult();
+    return DOMArrayBuffer::create(loader.arrayBufferResult());
 }
 
-String FileReaderSync::readAsBinaryString(ExecutionContext* executionContext, Blob* blob, ExceptionState& es)
+String FileReaderSync::readAsBinaryString(ExecutionContext* executionContext, Blob* blob, ExceptionState& exceptionState)
 {
     if (!blob) {
-        es.throwDOMException(NotFoundError, FileError::notFoundErrorMessage);
+        exceptionState.throwDOMException(NotFoundError, FileError::notFoundErrorMessage);
         return String();
     }
 
     FileReaderLoader loader(FileReaderLoader::ReadAsBinaryString, 0);
-    startLoading(executionContext, loader, *blob, es);
+    startLoading(executionContext, loader, *blob, exceptionState);
     return loader.stringResult();
 }
 
-String FileReaderSync::readAsText(ExecutionContext* executionContext, Blob* blob, const String& encoding, ExceptionState& es)
+String FileReaderSync::readAsText(ExecutionContext* executionContext, Blob* blob, const String& encoding, ExceptionState& exceptionState)
 {
     if (!blob) {
-        es.throwDOMException(NotFoundError, FileError::notFoundErrorMessage);
+        exceptionState.throwDOMException(NotFoundError, FileError::notFoundErrorMessage);
         return String();
     }
 
     FileReaderLoader loader(FileReaderLoader::ReadAsText, 0);
     loader.setEncoding(encoding);
-    startLoading(executionContext, loader, *blob, es);
+    startLoading(executionContext, loader, *blob, exceptionState);
     return loader.stringResult();
 }
 
-String FileReaderSync::readAsDataURL(ExecutionContext* executionContext, Blob* blob, ExceptionState& es)
+String FileReaderSync::readAsDataURL(ExecutionContext* executionContext, Blob* blob, ExceptionState& exceptionState)
 {
     if (!blob) {
-        es.throwDOMException(NotFoundError, FileError::notFoundErrorMessage);
+        exceptionState.throwDOMException(NotFoundError, FileError::notFoundErrorMessage);
         return String();
     }
 
     FileReaderLoader loader(FileReaderLoader::ReadAsDataURL, 0);
     loader.setDataType(blob->type());
-    startLoading(executionContext, loader, *blob, es);
+    startLoading(executionContext, loader, *blob, exceptionState);
     return loader.stringResult();
 }
 
-void FileReaderSync::startLoading(ExecutionContext* executionContext, FileReaderLoader& loader, const Blob& blob, ExceptionState& es)
+void FileReaderSync::startLoading(ExecutionContext* executionContext, FileReaderLoader& loader, const Blob& blob, ExceptionState& exceptionState)
 {
     loader.start(executionContext, blob.blobDataHandle());
     if (loader.errorCode())
-        FileError::throwDOMException(es, loader.errorCode());
+        FileError::throwDOMException(exceptionState, loader.errorCode());
 }
 
-} // namespace WebCore
+} // namespace blink