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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
49 static PassRefPtr<DirectoryReader> create(PassRefPtr<DOMFileSystemBase> file System, const String& fullPath) | 49 static PassRefPtr<DirectoryReader> create(PassRefPtr<DOMFileSystemBase> file System, const String& fullPath) |
50 { | 50 { |
51 return adoptRef(new DirectoryReader(fileSystem, fullPath)); | 51 return adoptRef(new DirectoryReader(fileSystem, fullPath)); |
52 } | 52 } |
53 | 53 |
54 void readEntries(PassOwnPtr<EntriesCallback>, PassOwnPtr<ErrorCallback> = nu llptr); | 54 void readEntries(PassOwnPtr<EntriesCallback>, PassOwnPtr<ErrorCallback> = nu llptr); |
55 | 55 |
56 DOMFileSystem* filesystem() const { return static_cast<DOMFileSystem*>(m_fil eSystem.get()); } | 56 DOMFileSystem* filesystem() const { return static_cast<DOMFileSystem*>(m_fil eSystem.get()); } |
57 | 57 |
58 private: | 58 private: |
59 class EntriesCallbackHelper; | |
60 class ErrorCallbackHelper; | |
61 | |
59 DirectoryReader(PassRefPtr<DOMFileSystemBase>, const String& fullPath); | 62 DirectoryReader(PassRefPtr<DOMFileSystemBase>, const String& fullPath); |
63 | |
64 void addEntries(const Vector<RefPtr<Entry> >& entries); | |
65 | |
66 void onError(FileError*); | |
67 | |
68 bool m_isReading; | |
69 Vector<RefPtr<Entry> > m_entries; | |
70 RefPtr<FileError> m_error; | |
haraken
2014/03/10 03:54:12
Since FileError is on the oilpan heap, this should
hashimoto
2014/03/10 04:46:15
Thank you for the fix!
It seems that what I shoul
| |
71 OwnPtr<EntriesCallback> m_entriesCallback; | |
72 OwnPtr<ErrorCallback> m_errorCallback; | |
60 }; | 73 }; |
61 | 74 |
62 } | 75 } |
63 | 76 |
64 #endif // DirectoryReader_h | 77 #endif // DirectoryReader_h |
OLD | NEW |