| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 ErrorCallbackBase::trace(visitor); | 85 ErrorCallbackBase::trace(visitor); |
| 86 } | 86 } |
| 87 | 87 |
| 88 private: | 88 private: |
| 89 Member<DirectoryReaderSync> m_reader; | 89 Member<DirectoryReaderSync> m_reader; |
| 90 }; | 90 }; |
| 91 | 91 |
| 92 DirectoryReaderSync::DirectoryReaderSync(DOMFileSystemBase* fileSystem, const St
ring& fullPath) | 92 DirectoryReaderSync::DirectoryReaderSync(DOMFileSystemBase* fileSystem, const St
ring& fullPath) |
| 93 : DirectoryReaderBase(fileSystem, fullPath) | 93 : DirectoryReaderBase(fileSystem, fullPath) |
| 94 , m_callbacksId(0) | 94 , m_callbacksId(0) |
| 95 , m_errorCode(FileError::OK) | 95 , m_errorCode(FileError::kOK) |
| 96 { | 96 { |
| 97 } | 97 } |
| 98 | 98 |
| 99 DirectoryReaderSync::~DirectoryReaderSync() | 99 DirectoryReaderSync::~DirectoryReaderSync() |
| 100 { | 100 { |
| 101 } | 101 } |
| 102 | 102 |
| 103 EntrySyncHeapVector DirectoryReaderSync::readEntries(ExceptionState& exceptionSt
ate) | 103 EntrySyncHeapVector DirectoryReaderSync::readEntries(ExceptionState& exceptionSt
ate) |
| 104 { | 104 { |
| 105 if (!m_callbacksId) { | 105 if (!m_callbacksId) { |
| 106 m_callbacksId = filesystem()->readDirectory(this, m_fullPath, new Entrie
sCallbackHelper(this), new ErrorCallbackHelper(this), DOMFileSystemBase::Synchro
nous); | 106 m_callbacksId = filesystem()->readDirectory(this, m_fullPath, new Entrie
sCallbackHelper(this), new ErrorCallbackHelper(this), DOMFileSystemBase::Synchro
nous); |
| 107 } | 107 } |
| 108 | 108 |
| 109 if (m_errorCode == FileError::OK && m_hasMoreEntries && m_entries.isEmpty()) | 109 if (m_errorCode == FileError::kOK && m_hasMoreEntries && m_entries.isEmpty()
) |
| 110 m_fileSystem->waitForAdditionalResult(m_callbacksId); | 110 m_fileSystem->waitForAdditionalResult(m_callbacksId); |
| 111 | 111 |
| 112 if (m_errorCode != FileError::OK) { | 112 if (m_errorCode != FileError::kOK) { |
| 113 FileError::throwDOMException(exceptionState, m_errorCode); | 113 FileError::throwDOMException(exceptionState, m_errorCode); |
| 114 return EntrySyncHeapVector(); | 114 return EntrySyncHeapVector(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 EntrySyncHeapVector result; | 117 EntrySyncHeapVector result; |
| 118 result.swap(m_entries); | 118 result.swap(m_entries); |
| 119 return result; | 119 return result; |
| 120 } | 120 } |
| 121 | 121 |
| 122 DEFINE_TRACE(DirectoryReaderSync) | 122 DEFINE_TRACE(DirectoryReaderSync) |
| 123 { | 123 { |
| 124 visitor->trace(m_entries); | 124 visitor->trace(m_entries); |
| 125 DirectoryReaderBase::trace(visitor); | 125 DirectoryReaderBase::trace(visitor); |
| 126 } | 126 } |
| 127 | 127 |
| 128 } // namespace blink | 128 } // namespace blink |
| OLD | NEW |