[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kinuko at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 6bd63d46e58d12398923b05650c05ab11daea6cf
Author: kinuko at chromium.org <kinuko at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 02:19:00 2010 +0000

    2010-09-09  Kinuko Yasuda  <kinuko at chromium.org>
    
            Reviewed by Dumitru Daniliuc.
    
            Add Entry.getMetadata for FileSystem API
            https://bugs.webkit.org/show_bug.cgi?id=45403
    
            Add getMetadata to Entry.idl (I had missed to include this
            in my previous Entry.idl patch.)
    
            Also make some minor cleanups and nits fixes.
    
            No new tests; layout test is going be added later.
    
            * fileapi/DOMFileSystem.cpp: Bug fix.
            * fileapi/MetadataCallback.h: Nits fix.
            * fileapi/Entry.idl: Added getMetadata.
            * fileapi/ErrorCallback.h: Nits fix.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1b3f458..f300af9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-09  Kinuko Yasuda  <kinuko at chromium.org>
+
+        Reviewed by Dumitru Daniliuc.
+
+        Add Entry.getMetadata for FileSystem API
+        https://bugs.webkit.org/show_bug.cgi?id=45403
+
+        Add getMetadata to Entry.idl (I had missed to include this
+        in my previous Entry.idl patch.)
+
+        Also make some minor cleanups and nits fixes.
+
+        No new tests; layout test is going be added later.
+
+        * fileapi/DOMFileSystem.cpp: Bug fix.
+        * fileapi/MetadataCallback.h: Nits fix.
+        * fileapi/Entry.idl: Added getMetadata.
+        * fileapi/ErrorCallback.h: Nits fix.
+
 2010-09-09  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/fileapi/DOMFileSystem.cpp b/WebCore/fileapi/DOMFileSystem.cpp
index f1b9342..a8a7e6b 100644
--- a/WebCore/fileapi/DOMFileSystem.cpp
+++ b/WebCore/fileapi/DOMFileSystem.cpp
@@ -78,6 +78,7 @@ bool DOMFileSystem::hasPendingActivity() const
 void DOMFileSystem::contextDestroyed()
 {
     m_asyncFileSystem->stop();
+    ActiveDOMObject::contextDestroyed();
 }
 
 void DOMFileSystem::getMetadata(const Entry* entry, PassRefPtr<MetadataCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
diff --git a/WebCore/fileapi/Entry.idl b/WebCore/fileapi/Entry.idl
index 7d4ffee..e2c1e12 100644
--- a/WebCore/fileapi/Entry.idl
+++ b/WebCore/fileapi/Entry.idl
@@ -38,10 +38,10 @@ module storage {
         readonly attribute DOMString fullPath;
         readonly attribute DOMFileSystem filesystem;
 
+        void getMetadata(in [Optional, Callback] MetadataCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
         void moveTo(in Entry parent, in [Optional] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
         void copyTo(in Entry parent, in [Optional] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
         void remove(in [Optional, Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
         void getParent(in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        DOMString toURI(in [Optional] DOMString mimeType);
     };
 }
diff --git a/WebCore/fileapi/ErrorCallback.h b/WebCore/fileapi/ErrorCallback.h
index 91143e8..cceb354 100644
--- a/WebCore/fileapi/ErrorCallback.h
+++ b/WebCore/fileapi/ErrorCallback.h
@@ -38,7 +38,6 @@
 namespace WebCore {
 
 class FileError;
-class ScriptExecutionContext;
 
 class ErrorCallback : public RefCounted<ErrorCallback> {
 public:
diff --git a/WebCore/fileapi/MetadataCallback.h b/WebCore/fileapi/MetadataCallback.h
index 3d57400..725a0c1 100644
--- a/WebCore/fileapi/MetadataCallback.h
+++ b/WebCore/fileapi/MetadataCallback.h
@@ -38,7 +38,6 @@
 namespace WebCore {
 
 class Metadata;
-class ScriptExecutionContext;
 
 class MetadataCallback : public RefCounted<MetadataCallback> {
 public:

-- 
WebKit Debian packaging