| 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 | 141 |
| 142 LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", utf8BlobURL(blob).d
ata(), utf8FilePath(blob).data()); | 142 LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", utf8BlobURL(blob).d
ata(), utf8FilePath(blob).data()); |
| 143 | 143 |
| 144 readInternal(blob, FileReaderLoader::ReadAsDataURL, es); | 144 readInternal(blob, FileReaderLoader::ReadAsDataURL, es); |
| 145 } | 145 } |
| 146 | 146 |
| 147 void FileReader::readInternal(Blob* blob, FileReaderLoader::ReadType type, Excep
tionState& es) | 147 void FileReader::readInternal(Blob* blob, FileReaderLoader::ReadType type, Excep
tionState& es) |
| 148 { | 148 { |
| 149 // If multiple concurrent read methods are called on the same FileReader, In
validStateError should be thrown when the state is LOADING. | 149 // If multiple concurrent read methods are called on the same FileReader, In
validStateError should be thrown when the state is LOADING. |
| 150 if (m_state == LOADING) { | 150 if (m_state == LOADING) { |
| 151 es.throwDOMException(InvalidStateError); | 151 es.throwUninformativeAndGenericDOMException(InvalidStateError); |
| 152 return; | 152 return; |
| 153 } | 153 } |
| 154 | 154 |
| 155 setPendingActivity(this); | 155 setPendingActivity(this); |
| 156 | 156 |
| 157 m_blob = blob; | 157 m_blob = blob; |
| 158 m_readType = type; | 158 m_readType = type; |
| 159 m_state = LOADING; | 159 m_state = LOADING; |
| 160 m_loadingState = LoadingStateLoading; | 160 m_loadingState = LoadingStateLoading; |
| 161 m_error = 0; | 161 m_error = 0; |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 } | 281 } |
| 282 | 282 |
| 283 String FileReader::stringResult() | 283 String FileReader::stringResult() |
| 284 { | 284 { |
| 285 if (!m_loader || m_error) | 285 if (!m_loader || m_error) |
| 286 return String(); | 286 return String(); |
| 287 return m_loader->stringResult(); | 287 return m_loader->stringResult(); |
| 288 } | 288 } |
| 289 | 289 |
| 290 } // namespace WebCore | 290 } // namespace WebCore |
| OLD | NEW |