| 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "FileReader.h" | 33 #include "FileReader.h" |
| 34 | 34 |
| 35 #include "CrossThreadTask.h" | |
| 36 #include "ExceptionCode.h" | |
| 37 #include "File.h" | 35 #include "File.h" |
| 38 #include "ProgressEvent.h" | 36 #include "core/dom/CrossThreadTask.h" |
| 39 #include "ScriptExecutionContext.h" | 37 #include "core/dom/ExceptionCode.h" |
| 38 #include "core/dom/ProgressEvent.h" |
| 39 #include "core/dom/ScriptExecutionContext.h" |
| 40 #include "core/platform/Logging.h" | 40 #include "core/platform/Logging.h" |
| 41 #include <wtf/ArrayBuffer.h> | 41 #include <wtf/ArrayBuffer.h> |
| 42 #include <wtf/CurrentTime.h> | 42 #include <wtf/CurrentTime.h> |
| 43 #include <wtf/text/CString.h> | 43 #include <wtf/text/CString.h> |
| 44 | 44 |
| 45 namespace WebCore { | 45 namespace WebCore { |
| 46 | 46 |
| 47 static const double progressNotificationIntervalMS = 50; | 47 static const double progressNotificationIntervalMS = 50; |
| 48 | 48 |
| 49 PassRefPtr<FileReader> FileReader::create(ScriptExecutionContext* context) | 49 PassRefPtr<FileReader> FileReader::create(ScriptExecutionContext* context) |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 } | 257 } |
| 258 | 258 |
| 259 String FileReader::stringResult() | 259 String FileReader::stringResult() |
| 260 { | 260 { |
| 261 if (!m_loader || m_error) | 261 if (!m_loader || m_error) |
| 262 return String(); | 262 return String(); |
| 263 return m_loader->stringResult(); | 263 return m_loader->stringResult(); |
| 264 } | 264 } |
| 265 | 265 |
| 266 } // namespace WebCore | 266 } // namespace WebCore |
| OLD | NEW |