Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (110748 => 110749)
--- trunk/Source/WebCore/CMakeLists.txt 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-03-14 21:20:51 UTC (rev 110749)
@@ -1667,7 +1667,7 @@
fileapi/DOMFileSystem.idl
fileapi/DOMFileSystemSync.idl
fileapi/DOMWindowFileSystem.idl
- fileapi/EntriesCallback.idl
+ Modules/filesystem/EntriesCallback.idl
fileapi/Entry.idl
fileapi/EntrySync.idl
fileapi/EntryArray.idl
Modified: trunk/Source/WebCore/ChangeLog (110748 => 110749)
--- trunk/Source/WebCore/ChangeLog 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/ChangeLog 2012-03-14 21:20:51 UTC (rev 110749)
@@ -1,3 +1,25 @@
+2012-03-14 Mark Pilgrim <[email protected]>
+
+ Move EntriesCallback to Modules/filesystem/
+ https://bugs.webkit.org/show_bug.cgi?id=81032
+
+ Reviewed by Adam Barth.
+
+ No new tests, all existing tests pass.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * Modules/filesystem/EntriesCallback.h: Copied from Source/WebCore/fileapi/EntriesCallback.h.
+ * Modules/filesystem/EntriesCallback.idl: Copied from Source/WebCore/fileapi/EntriesCallback.idl.
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * fileapi/EntriesCallback.h: Removed.
+ * fileapi/EntriesCallback.idl: Removed.
+
2012-03-14 Tony Chang <[email protected]>
multiline column flexbox with auto height wrap too much
Modified: trunk/Source/WebCore/DerivedSources.make (110748 => 110749)
--- trunk/Source/WebCore/DerivedSources.make 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/DerivedSources.make 2012-03-14 21:20:51 UTC (rev 110749)
@@ -202,7 +202,7 @@
$(WebCore)/Modules/filesystem/DirectoryEntrySync.idl \
$(WebCore)/Modules/filesystem/DirectoryReader.idl \
$(WebCore)/Modules/filesystem/DirectoryReaderSync.idl \
- $(WebCore)/fileapi/EntriesCallback.idl \
+ $(WebCore)/Modules/filesystem/EntriesCallback.idl \
$(WebCore)/fileapi/Entry.idl \
$(WebCore)/fileapi/EntryArray.idl \
$(WebCore)/fileapi/EntryArraySync.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (110748 => 110749)
--- trunk/Source/WebCore/DerivedSources.pri 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-03-14 21:20:51 UTC (rev 110749)
@@ -223,7 +223,7 @@
$$PWD/fileapi/DOMFileSystem.idl \
$$PWD/fileapi/DOMFileSystemSync.idl \
$$PWD/fileapi/DOMWindowFileSystem.idl \
- $$PWD/fileapi/EntriesCallback.idl \
+ $$PWD/Modules/filesystem/EntriesCallback.idl \
$$PWD/fileapi/Entry.idl \
$$PWD/fileapi/EntryArray.idl \
$$PWD/fileapi/EntryArraySync.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (110748 => 110749)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-03-14 21:20:51 UTC (rev 110749)
@@ -2060,7 +2060,7 @@
Source/WebCore/fileapi/DOMFileSystemSync.h \
Source/WebCore/fileapi/DOMWindowFileSystem.cpp \
Source/WebCore/fileapi/DOMWindowFileSystem.h \
- Source/WebCore/fileapi/EntriesCallback.h \
+ Source/WebCore/Modules/filesystem/EntriesCallback.h \
Source/WebCore/fileapi/Entry.cpp \
Source/WebCore/fileapi/Entry.h \
Source/WebCore/fileapi/EntryArray.cpp \
@@ -4879,7 +4879,7 @@
$(WebCore)/Modules/filesystem/DirectoryEntrySync.idl \
$(WebCore)/Modules/filesystem/DirectoryReader.idl \
$(WebCore)/Modules/filesystem/DirectoryReaderSync.idl \
- $(WebCore)/fileapi/EntriesCallback.idl \
+ $(WebCore)/Modules/filesystem/EntriesCallback.idl \
$(WebCore)/fileapi/Entry.idl \
$(WebCore)/fileapi/EntryArray.idl \
$(WebCore)/fileapi/EntryArraySync.idl \
Copied: trunk/Source/WebCore/Modules/filesystem/EntriesCallback.h (from rev 110748, trunk/Source/WebCore/fileapi/EntriesCallback.h) (0 => 110749)
--- trunk/Source/WebCore/Modules/filesystem/EntriesCallback.h (rev 0)
+++ trunk/Source/WebCore/Modules/filesystem/EntriesCallback.h 2012-03-14 21:20:51 UTC (rev 110749)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef EntriesCallback_h
+#define EntriesCallback_h
+
+#if ENABLE(FILE_SYSTEM)
+
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class EntryArray;
+
+class EntriesCallback : public RefCounted<EntriesCallback> {
+public:
+ virtual ~EntriesCallback() { }
+ virtual bool handleEvent(EntryArray*) = 0;
+};
+
+} // namespace
+
+#endif // ENABLE(FILE_SYSTEM)
+
+#endif // EntriesCallback_h
Copied: trunk/Source/WebCore/Modules/filesystem/EntriesCallback.idl (from rev 110748, trunk/Source/WebCore/fileapi/EntriesCallback.idl) (0 => 110749)
--- trunk/Source/WebCore/Modules/filesystem/EntriesCallback.idl (rev 0)
+++ trunk/Source/WebCore/Modules/filesystem/EntriesCallback.idl 2012-03-14 21:20:51 UTC (rev 110749)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+module storage {
+ interface [
+ Conditional=FILE_SYSTEM,
+ Callback
+ ] EntriesCallback {
+ boolean handleEvent(in EntryArray entries);
+ };
+}
Modified: trunk/Source/WebCore/Target.pri (110748 => 110749)
--- trunk/Source/WebCore/Target.pri 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/Target.pri 2012-03-14 21:20:51 UTC (rev 110749)
@@ -3058,11 +3058,11 @@
Modules/filesystem/DirectoryReader.h \
Modules/filesystem/DirectoryReaderBase.h \
Modules/filesystem/DirectoryReaderSync.h \
+ Modules/filesystem/EntriesCallback.h \
fileapi/DOMFilePath.h \
fileapi/DOMFileSystem.h \
fileapi/DOMFileSystemBase.h \
fileapi/DOMFileSystemSync.h \
- fileapi/EntriesCallback.h \
fileapi/Entry.h \
fileapi/EntryArray.h \
fileapi/EntryArraySync.h \
Modified: trunk/Source/WebCore/WebCore.gypi (110748 => 110749)
--- trunk/Source/WebCore/WebCore.gypi 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/WebCore.gypi 2012-03-14 21:20:51 UTC (rev 110749)
@@ -896,7 +896,7 @@
'fileapi/DOMFileSystem.idl',
'fileapi/DOMFileSystemSync.idl',
'fileapi/DOMWindowFileSystem.idl',
- 'fileapi/EntriesCallback.idl',
+ 'Modules/filesystem/EntriesCallback.idl',
'fileapi/Entry.idl',
'fileapi/EntryArray.idl',
'fileapi/EntryArraySync.idl',
@@ -2453,7 +2453,7 @@
'Modules/filesystem/DirectoryReaderBase.h',
'Modules/filesystem/DirectoryReaderSync.cpp',
'Modules/filesystem/DirectoryReaderSync.h',
- 'fileapi/EntriesCallback.h',
+ 'Modules/filesystem/EntriesCallback.h',
'fileapi/Entry.cpp',
'fileapi/Entry.h',
'fileapi/EntryArray.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (110748 => 110749)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-03-14 21:20:51 UTC (rev 110749)
@@ -24092,6 +24092,10 @@
RelativePath="..\Modules\filesystem\DirectoryReaderSync.h"
>
</File>
+ <File
+ RelativePath="..\Modules\filesystem\EntriesCallback.h"
+ >
+ </File>
</Filter>
<Filter
Name="geolocation"
@@ -56946,10 +56950,6 @@
>
</File>
<File
- RelativePath="..\fileapi\EntriesCallback.h"
- >
- </File>
- <File
RelativePath="..\fileapi\Entry.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (110748 => 110749)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-03-14 21:20:51 UTC (rev 110749)
@@ -9830,7 +9830,7 @@
8987853E122CA064003AABDA /* DOMFilePath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFilePath.h; path = fileapi/DOMFilePath.h; sourceTree = "<group>"; };
8987853F122CA064003AABDA /* DOMFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMFileSystem.cpp; path = fileapi/DOMFileSystem.cpp; sourceTree = "<group>"; };
89878540122CA064003AABDA /* DOMFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMFileSystem.h; path = fileapi/DOMFileSystem.h; sourceTree = "<group>"; };
- 89878541122CA064003AABDA /* EntriesCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntriesCallback.h; path = fileapi/EntriesCallback.h; sourceTree = "<group>"; };
+ 89878541122CA064003AABDA /* EntriesCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EntriesCallback.h; path = Modules/filesystem/EntriesCallback.h; sourceTree = "<group>"; };
89878542122CA064003AABDA /* Entry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Entry.cpp; path = fileapi/Entry.cpp; sourceTree = "<group>"; };
89878543122CA064003AABDA /* Entry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Entry.h; path = fileapi/Entry.h; sourceTree = "<group>"; };
89878544122CA064003AABDA /* EntryArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EntryArray.cpp; path = fileapi/EntryArray.cpp; sourceTree = "<group>"; };
Deleted: trunk/Source/WebCore/fileapi/EntriesCallback.h (110748 => 110749)
--- trunk/Source/WebCore/fileapi/EntriesCallback.h 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/fileapi/EntriesCallback.h 2012-03-14 21:20:51 UTC (rev 110749)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef EntriesCallback_h
-#define EntriesCallback_h
-
-#if ENABLE(FILE_SYSTEM)
-
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class EntryArray;
-
-class EntriesCallback : public RefCounted<EntriesCallback> {
-public:
- virtual ~EntriesCallback() { }
- virtual bool handleEvent(EntryArray*) = 0;
-};
-
-} // namespace
-
-#endif // ENABLE(FILE_SYSTEM)
-
-#endif // EntriesCallback_h
Deleted: trunk/Source/WebCore/fileapi/EntriesCallback.idl (110748 => 110749)
--- trunk/Source/WebCore/fileapi/EntriesCallback.idl 2012-03-14 21:14:16 UTC (rev 110748)
+++ trunk/Source/WebCore/fileapi/EntriesCallback.idl 2012-03-14 21:20:51 UTC (rev 110749)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module storage {
- interface [
- Conditional=FILE_SYSTEM,
- Callback
- ] EntriesCallback {
- boolean handleEvent(in EntryArray entries);
- };
-}
