Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e

1 files changed, 3 insertions, 3 deletions

diff --git a/WebCore/fileapi/DirectoryReaderBase.h b/WebCore/fileapi/DirectoryReaderBase.h
index 5a2c048..4096fe8 100644
--- a/WebCore/fileapi/DirectoryReaderBase.h
+++ b/WebCore/fileapi/DirectoryReaderBase.h
@@ -42,18 +42,18 @@ namespace WebCore {
 
 class DirectoryReaderBase : public RefCounted<DirectoryReaderBase> {
 public:
-    DOMFileSystemBase* filesystem() const { return m_fileSystem; }
+    DOMFileSystemBase* filesystem() const { return m_fileSystem.get(); }
     void setHasMoreEntries(bool hasMoreEntries) { m_hasMoreEntries = hasMoreEntries; }
 
 protected:
-    DirectoryReaderBase(DOMFileSystemBase* fileSystem, const String& fullPath)
+    DirectoryReaderBase(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
         : m_fileSystem(fileSystem)
         , m_fullPath(fullPath)
         , m_hasMoreEntries(true)
     {
     }
 
-    DOMFileSystemBase* m_fileSystem;
+    RefPtr<DOMFileSystemBase> m_fileSystem;
 
     // This is a virtual path.
     String m_fullPath;