| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 m_reader->addEntries(syncEntries); | 58 m_reader->addEntries(syncEntries); |
| 59 } | 59 } |
| 60 | 60 |
| 61 virtual void trace(Visitor* visitor) OVERRIDE | 61 virtual void trace(Visitor* visitor) OVERRIDE |
| 62 { | 62 { |
| 63 visitor->trace(m_reader); | 63 visitor->trace(m_reader); |
| 64 EntriesCallback::trace(visitor); | 64 EntriesCallback::trace(visitor); |
| 65 } | 65 } |
| 66 | 66 |
| 67 private: | 67 private: |
| 68 PersistentWillBeMember<DirectoryReaderSync> m_reader; | 68 Member<DirectoryReaderSync> m_reader; |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 class DirectoryReaderSync::ErrorCallbackHelper FINAL : public ErrorCallback { | 71 class DirectoryReaderSync::ErrorCallbackHelper FINAL : public ErrorCallback { |
| 72 public: | 72 public: |
| 73 explicit ErrorCallbackHelper(DirectoryReaderSync* reader) | 73 explicit ErrorCallbackHelper(DirectoryReaderSync* reader) |
| 74 : m_reader(reader) | 74 : m_reader(reader) |
| 75 { | 75 { |
| 76 } | 76 } |
| 77 | 77 |
| 78 virtual void handleEvent(FileError* error) OVERRIDE | 78 virtual void handleEvent(FileError* error) OVERRIDE |
| 79 { | 79 { |
| 80 m_reader->setError(error->code()); | 80 m_reader->setError(error->code()); |
| 81 } | 81 } |
| 82 | 82 |
| 83 virtual void trace(Visitor* visitor) OVERRIDE | 83 virtual void trace(Visitor* visitor) OVERRIDE |
| 84 { | 84 { |
| 85 visitor->trace(m_reader); | 85 visitor->trace(m_reader); |
| 86 ErrorCallback::trace(visitor); | 86 ErrorCallback::trace(visitor); |
| 87 } | 87 } |
| 88 | 88 |
| 89 private: | 89 private: |
| 90 PersistentWillBeMember<DirectoryReaderSync> m_reader; | 90 Member<DirectoryReaderSync> m_reader; |
| 91 }; | 91 }; |
| 92 | 92 |
| 93 DirectoryReaderSync::DirectoryReaderSync(DOMFileSystemBase* fileSystem, const St
ring& fullPath) | 93 DirectoryReaderSync::DirectoryReaderSync(DOMFileSystemBase* fileSystem, const St
ring& fullPath) |
| 94 : DirectoryReaderBase(fileSystem, fullPath) | 94 : DirectoryReaderBase(fileSystem, fullPath) |
| 95 , m_callbacksId(0) | 95 , m_callbacksId(0) |
| 96 , m_errorCode(FileError::OK) | 96 , m_errorCode(FileError::OK) |
| 97 { | 97 { |
| 98 } | 98 } |
| 99 | 99 |
| 100 DirectoryReaderSync::~DirectoryReaderSync() | 100 DirectoryReaderSync::~DirectoryReaderSync() |
| 101 { | 101 { |
| 102 } | 102 } |
| 103 | 103 |
| 104 EntrySyncHeapVector DirectoryReaderSync::readEntries(ExceptionState& exceptionSt
ate) | 104 EntrySyncHeapVector DirectoryReaderSync::readEntries(ExceptionState& exceptionSt
ate) |
| 105 { | 105 { |
| 106 if (!m_callbacksId) { | 106 if (!m_callbacksId) { |
| 107 m_callbacksId = filesystem()->readDirectory(this, m_fullPath, adoptPtrWi
llBeNoop(new EntriesCallbackHelper(this)), adoptPtrWillBeNoop(new ErrorCallbackH
elper(this)), DOMFileSystemBase::Synchronous); | 107 m_callbacksId = filesystem()->readDirectory(this, m_fullPath, new Entrie
sCallbackHelper(this), new ErrorCallbackHelper(this), DOMFileSystemBase::Synchro
nous); |
| 108 } | 108 } |
| 109 | 109 |
| 110 if (m_errorCode == FileError::OK && m_hasMoreEntries && m_entries.isEmpty()) | 110 if (m_errorCode == FileError::OK && m_hasMoreEntries && m_entries.isEmpty()) |
| 111 m_fileSystem->waitForAdditionalResult(m_callbacksId); | 111 m_fileSystem->waitForAdditionalResult(m_callbacksId); |
| 112 | 112 |
| 113 if (m_errorCode != FileError::OK) { | 113 if (m_errorCode != FileError::OK) { |
| 114 FileError::throwDOMException(exceptionState, m_errorCode); | 114 FileError::throwDOMException(exceptionState, m_errorCode); |
| 115 return EntrySyncHeapVector(); | 115 return EntrySyncHeapVector(); |
| 116 } | 116 } |
| 117 | 117 |
| 118 EntrySyncHeapVector result; | 118 EntrySyncHeapVector result; |
| 119 result.swap(m_entries); | 119 result.swap(m_entries); |
| 120 return result; | 120 return result; |
| 121 } | 121 } |
| 122 | 122 |
| 123 void DirectoryReaderSync::trace(Visitor* visitor) | 123 void DirectoryReaderSync::trace(Visitor* visitor) |
| 124 { | 124 { |
| 125 visitor->trace(m_entries); | 125 visitor->trace(m_entries); |
| 126 DirectoryReaderBase::trace(visitor); | 126 DirectoryReaderBase::trace(visitor); |
| 127 } | 127 } |
| 128 | 128 |
| 129 } // namespace | 129 } // namespace |
| OLD | NEW |