From f486d19d62f1bc33246748b14b14a9dfa617b57f Mon Sep 17 00:00:00 2001
From: Iain Merrick <husky@google.com>
Date: Thu, 19 Aug 2010 17:55:56 +0100
Subject: Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
---
 WebCore/storage/DOMFileSystem.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebCore/storage/DOMFileSystem.h')

diff --git a/WebCore/storage/DOMFileSystem.h b/WebCore/storage/DOMFileSystem.h
index 454205d..b87aaaf 100644
--- a/WebCore/storage/DOMFileSystem.h
+++ b/WebCore/storage/DOMFileSystem.h
@@ -39,7 +39,7 @@
 
 namespace WebCore {
 
-class Entry;
+class DirectoryEntry;
 
 class DOMFileSystem : public RefCounted<DOMFileSystem> {
 public:
@@ -49,7 +49,7 @@ public:
     }
 
     const String& name() const { return m_name; }
-    PassRefPtr<Entry> root();
+    PassRefPtr<DirectoryEntry> root();
 
 private:
     DOMFileSystem(const String& name, const String& rootPath);
-- 
cgit v1.1