projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
modules
/
filesystem
/
DirectoryReader.cpp
diff --git
a/src/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp
b/src/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp
index
706c7b9
..
f3d524b
100644
(file)
--- a/
src/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp
+++ b/
src/third_party/WebKit/Source/modules/filesystem/DirectoryReader.cpp
@@
-38,19
+38,19
@@
namespace blink {
namespace blink {
-class DirectoryReader::EntriesCallbackHelper
FINAL
: public EntriesCallback {
+class DirectoryReader::EntriesCallbackHelper
final
: public EntriesCallback {
public:
explicit EntriesCallbackHelper(DirectoryReader* reader)
: m_reader(reader)
{
}
public:
explicit EntriesCallbackHelper(DirectoryReader* reader)
: m_reader(reader)
{
}
- virtual void handleEvent(const EntryHeapVector& entries)
OVERRIDE
+ virtual void handleEvent(const EntryHeapVector& entries)
override
{
m_reader->addEntries(entries);
}
{
m_reader->addEntries(entries);
}
- virtual void trace(Visitor* visitor)
OVERRIDE
+ virtual void trace(Visitor* visitor)
override
{
visitor->trace(m_reader);
EntriesCallback::trace(visitor);
{
visitor->trace(m_reader);
EntriesCallback::trace(visitor);
@@
-61,19
+61,19
@@
private:
Member<DirectoryReader> m_reader;
};
Member<DirectoryReader> m_reader;
};
-class DirectoryReader::ErrorCallbackHelper
FINAL
: public ErrorCallback {
+class DirectoryReader::ErrorCallbackHelper
final
: public ErrorCallback {
public:
explicit ErrorCallbackHelper(DirectoryReader* reader)
: m_reader(reader)
{
}
public:
explicit ErrorCallbackHelper(DirectoryReader* reader)
: m_reader(reader)
{
}
- virtual void handleEvent(FileError* error)
OVERRIDE
+ virtual void handleEvent(FileError* error)
override
{
m_reader->onError(error);
}
{
m_reader->onError(error);
}
- virtual void trace(Visitor* visitor)
OVERRIDE
+ virtual void trace(Visitor* visitor)
override
{
visitor->trace(m_reader);
ErrorCallback::trace(visitor);
{
visitor->trace(m_reader);
ErrorCallback::trace(visitor);
@@
-101,7
+101,7
@@
void DirectoryReader::readEntries(EntriesCallback* entriesCallback, ErrorCallbac
}
if (m_error) {
}
if (m_error) {
- filesystem()->scheduleCallback(errorCallback,
PassRefPtrWillBeRawPtr<FileError>(m_error.get())
);
+ filesystem()->scheduleCallback(errorCallback,
m_error
);
return;
}
return;
}