| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 #include "bindings/core/v8/ActiveScriptWrappable.h" | 34 #include "bindings/core/v8/ActiveScriptWrappable.h" |
| 35 #include "core/CoreExport.h" | 35 #include "core/CoreExport.h" |
| 36 #include "core/dom/ActiveDOMObject.h" | 36 #include "core/dom/ActiveDOMObject.h" |
| 37 #include "core/events/EventTarget.h" | 37 #include "core/events/EventTarget.h" |
| 38 #include "core/fileapi/FileError.h" | 38 #include "core/fileapi/FileError.h" |
| 39 #include "core/fileapi/FileReaderLoader.h" | 39 #include "core/fileapi/FileReaderLoader.h" |
| 40 #include "core/fileapi/FileReaderLoaderClient.h" | 40 #include "core/fileapi/FileReaderLoaderClient.h" |
| 41 #include "platform/heap/Handle.h" | 41 #include "platform/heap/Handle.h" |
| 42 #include "wtf/Forward.h" | 42 #include "wtf/Forward.h" |
| 43 #include <memory> |
| 43 | 44 |
| 44 namespace blink { | 45 namespace blink { |
| 45 | 46 |
| 46 class Blob; | 47 class Blob; |
| 47 class ExceptionState; | 48 class ExceptionState; |
| 48 class ExecutionContext; | 49 class ExecutionContext; |
| 49 class StringOrArrayBuffer; | 50 class StringOrArrayBuffer; |
| 50 | 51 |
| 51 class CORE_EXPORT FileReader final : public EventTargetWithInlineData, public Ac
tiveScriptWrappable, public ActiveDOMObject, public FileReaderLoaderClient { | 52 class CORE_EXPORT FileReader final : public EventTargetWithInlineData, public Ac
tiveScriptWrappable, public ActiveDOMObject, public FileReaderLoaderClient { |
| 52 DEFINE_WRAPPERTYPEINFO(); | 53 DEFINE_WRAPPERTYPEINFO(); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 LoadingStateLoading, | 122 LoadingStateLoading, |
| 122 LoadingStateAborted | 123 LoadingStateAborted |
| 123 }; | 124 }; |
| 124 LoadingState m_loadingState; | 125 LoadingState m_loadingState; |
| 125 | 126 |
| 126 String m_blobType; | 127 String m_blobType; |
| 127 RefPtr<BlobDataHandle> m_blobDataHandle; | 128 RefPtr<BlobDataHandle> m_blobDataHandle; |
| 128 FileReaderLoader::ReadType m_readType; | 129 FileReaderLoader::ReadType m_readType; |
| 129 String m_encoding; | 130 String m_encoding; |
| 130 | 131 |
| 131 OwnPtr<FileReaderLoader> m_loader; | 132 std::unique_ptr<FileReaderLoader> m_loader; |
| 132 Member<FileError> m_error; | 133 Member<FileError> m_error; |
| 133 double m_lastProgressNotificationTimeMS; | 134 double m_lastProgressNotificationTimeMS; |
| 134 }; | 135 }; |
| 135 | 136 |
| 136 } // namespace blink | 137 } // namespace blink |
| 137 | 138 |
| 138 #endif // FileReader_h | 139 #endif // FileReader_h |
| OLD | NEW |