Chromium Code Reviews| 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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 328 DVLOG(1) << "aborting"; | 328 DVLOG(1) << "aborting"; |
| 329 | 329 |
| 330 if (m_loadingState != LoadingStateLoading | 330 if (m_loadingState != LoadingStateLoading |
| 331 && m_loadingState != LoadingStatePending) { | 331 && m_loadingState != LoadingStatePending) { |
| 332 return; | 332 return; |
| 333 } | 333 } |
| 334 m_loadingState = LoadingStateAborted; | 334 m_loadingState = LoadingStateAborted; |
| 335 | 335 |
| 336 // Schedule to have the abort done later since abort() might be called from the event handler and we do not want the resource loading code to be in the stac k. | 336 // Schedule to have the abort done later since abort() might be called from the event handler and we do not want the resource loading code to be in the stac k. |
| 337 getExecutionContext()->postTask( | 337 getExecutionContext()->postTask( |
| 338 BLINK_FROM_HERE, createSameThreadTask(&delayedAbort, this)); | 338 BLINK_FROM_HERE, createSameThreadTask(&delayedAbort, wrapCrossThreadPers istent(this))); |
|
haraken
2016/06/22 06:27:43
Ditto.
tzik
2016/06/22 08:26:04
Done.
| |
| 339 } | 339 } |
| 340 | 340 |
| 341 void FileReader::doAbort() | 341 void FileReader::doAbort() |
| 342 { | 342 { |
| 343 ASSERT(m_state != DONE); | 343 ASSERT(m_state != DONE); |
| 344 | 344 |
| 345 terminate(); | 345 terminate(); |
| 346 | 346 |
| 347 m_error = FileError::create(FileError::ABORT_ERR); | 347 m_error = FileError::create(FileError::ABORT_ERR); |
| 348 | 348 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 458 } | 458 } |
| 459 | 459 |
| 460 DEFINE_TRACE(FileReader) | 460 DEFINE_TRACE(FileReader) |
| 461 { | 461 { |
| 462 visitor->trace(m_error); | 462 visitor->trace(m_error); |
| 463 EventTargetWithInlineData::trace(visitor); | 463 EventTargetWithInlineData::trace(visitor); |
| 464 ActiveDOMObject::trace(visitor); | 464 ActiveDOMObject::trace(visitor); |
| 465 } | 465 } |
| 466 | 466 |
| 467 } // namespace blink | 467 } // namespace blink |
| OLD | NEW |