Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (136868 => 136869)
--- trunk/Source/WebCore/CMakeLists.txt 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-12-06 20:11:42 UTC (rev 136869)
@@ -189,7 +189,6 @@
Modules/indexeddb/IDBCursor.idl
Modules/indexeddb/IDBCursorWithValue.idl
Modules/indexeddb/IDBDatabase.idl
- Modules/indexeddb/IDBDatabaseException.idl
Modules/indexeddb/IDBFactory.idl
Modules/indexeddb/IDBIndex.idl
Modules/indexeddb/IDBKey.idl
Modified: trunk/Source/WebCore/ChangeLog (136868 => 136869)
--- trunk/Source/WebCore/ChangeLog 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/ChangeLog 2012-12-06 20:11:42 UTC (rev 136869)
@@ -1,3 +1,32 @@
+2012-12-06 Joshua Bell <[email protected]>
+
+ IndexedDB: Remove IDBDatabaseException.idl
+ https://bugs.webkit.org/show_bug.cgi?id=102961
+
+ Reviewed by Adam Barth.
+
+ Delete the IDL and references to it. No longer needed as a enum member
+ in the autogenerated ExceptionCodeDescription.h so removed from the ".in"
+ file; only direct references are retained in the autogenerated cpp file.
+
+ Ideally the code generator would handle these new-style DOMExceptions,
+ but we don't have any other examples yet to know what pattern to follow.
+
+ No new tests - just removing dead code.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * Modules/indexeddb/IDBDatabaseException.idl: Removed.
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/DOMExceptions.in:
+ * dom/make_dom_exceptions.pl:
+ (generateImplementation):
+
2012-12-06 Andreas Kling <[email protected]>
[Mac] Drain the CSSValuePool on memory pressure.
Modified: trunk/Source/WebCore/DerivedSources.cpp (136868 => 136869)
--- trunk/Source/WebCore/DerivedSources.cpp 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/DerivedSources.cpp 2012-12-06 20:11:42 UTC (rev 136869)
@@ -219,7 +219,6 @@
#include "JSIDBAny.cpp"
#include "JSIDBCursor.cpp"
#include "JSIDBDatabase.cpp"
-#include "JSIDBDatabaseException.cpp"
#include "JSIDBFactory.cpp"
#include "JSIDBIndex.cpp"
#include "JSIDBKey.cpp"
Modified: trunk/Source/WebCore/DerivedSources.make (136868 => 136869)
--- trunk/Source/WebCore/DerivedSources.make 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/DerivedSources.make 2012-12-06 20:11:42 UTC (rev 136869)
@@ -95,7 +95,6 @@
$(WebCore)/Modules/indexeddb/IDBAny.idl \
$(WebCore)/Modules/indexeddb/IDBCursor.idl \
$(WebCore)/Modules/indexeddb/IDBDatabase.idl \
- $(WebCore)/Modules/indexeddb/IDBDatabaseException.idl \
$(WebCore)/Modules/indexeddb/IDBFactory.idl \
$(WebCore)/Modules/indexeddb/IDBIndex.idl \
$(WebCore)/Modules/indexeddb/IDBKey.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (136868 => 136869)
--- trunk/Source/WebCore/DerivedSources.pri 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-12-06 20:11:42 UTC (rev 136869)
@@ -118,7 +118,6 @@
$$PWD/Modules/indexeddb/DOMWindowIndexedDatabase.idl \
$$PWD/Modules/indexeddb/IDBAny.idl \
$$PWD/Modules/indexeddb/IDBCursor.idl \
- $$PWD/Modules/indexeddb/IDBDatabaseException.idl \
$$PWD/Modules/indexeddb/IDBDatabase.idl \
$$PWD/Modules/indexeddb/IDBFactory.idl \
$$PWD/Modules/indexeddb/IDBIndex.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (136868 => 136869)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-12-06 20:11:42 UTC (rev 136869)
@@ -451,8 +451,6 @@
DerivedSources/WebCore/JSIDBCursor.h \
DerivedSources/WebCore/JSIDBCursorWithValue.cpp \
DerivedSources/WebCore/JSIDBCursorWithValue.h \
- DerivedSources/WebCore/JSIDBDatabaseException.cpp \
- DerivedSources/WebCore/JSIDBDatabaseException.h \
DerivedSources/WebCore/JSIDBDatabase.cpp \
DerivedSources/WebCore/JSIDBDatabase.h \
DerivedSources/WebCore/JSIDBFactory.cpp \
@@ -1221,7 +1219,6 @@
$(WebCore)/Modules/indexeddb/IDBAny.idl \
$(WebCore)/Modules/indexeddb/IDBCursor.idl \
$(WebCore)/Modules/indexeddb/IDBCursorWithValue.idl \
- $(WebCore)/Modules/indexeddb/IDBDatabaseException.idl \
$(WebCore)/Modules/indexeddb/IDBDatabase.idl \
$(WebCore)/Modules/indexeddb/IDBFactory.idl \
$(WebCore)/Modules/indexeddb/IDBIndex.idl \
Deleted: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseException.idl (136868 => 136869)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseException.idl 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseException.idl 2012-12-06 20:11:42 UTC (rev 136869)
@@ -1,56 +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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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.
- */
-
-[
- Conditional=INDEXED_DATABASE,
- DoNotCheckConstants,
- JSNoStaticTables
-] exception IDBDatabaseException {
-
- readonly attribute unsigned short code;
- readonly attribute DOMString name;
- readonly attribute DOMString message;
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
- // Override in a Mozilla compatible format
- [NotEnumerable] DOMString toString();
-#endif
-
- const unsigned short NO_ERR = 0;
- const unsigned short UNKNOWN_ERR = 1;
- const unsigned short NON_TRANSIENT_ERR = 2;
- const unsigned short CONSTRAINT_ERR = 4;
- const unsigned short DATA_ERR = 5;
- const unsigned short NOT_ALLOWED_ERR = 6;
- const unsigned short TRANSACTION_INACTIVE_ERR = 7;
- const unsigned short READ_ONLY_ERR = 9;
- const unsigned short VER_ERR = 12;
-
- const unsigned short NOT_FOUND_ERR = 8;
- const unsigned short ABORT_ERR = 20;
- const unsigned short TIMEOUT_ERR = 23;
- const unsigned short QUOTA_ERR = 22;
-};
-
Modified: trunk/Source/WebCore/WebCore.gypi (136868 => 136869)
--- trunk/Source/WebCore/WebCore.gypi 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/WebCore.gypi 2012-12-06 20:11:42 UTC (rev 136869)
@@ -43,7 +43,6 @@
'Modules/indexeddb/IDBAny.idl',
'Modules/indexeddb/IDBCursor.idl',
'Modules/indexeddb/IDBCursorWithValue.idl',
- 'Modules/indexeddb/IDBDatabaseException.idl',
'Modules/indexeddb/IDBDatabase.idl',
'Modules/indexeddb/IDBFactory.idl',
'Modules/indexeddb/IDBIndex.idl',
@@ -6690,8 +6689,6 @@
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSIDBCursor.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSIDBDatabase.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSIDBDatabase.h',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/JSIDBDatabaseException.cpp',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/JSIDBDatabaseException.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSIDBFactory.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSIDBFactory.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSIDBIndex.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (136868 => 136869)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-12-06 20:11:42 UTC (rev 136869)
@@ -10230,62 +10230,6 @@
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseException.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBDatabaseException.h"
- >
- </File>
- <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSIDBFactory.cpp"
>
<FileConfiguration
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (136868 => 136869)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-12-06 20:11:42 UTC (rev 136869)
@@ -5868,8 +5868,6 @@
C585A66311D4FAC5004C3E4B /* IDBBindingUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */; };
C585A67C11D4FB08004C3E4B /* JSIDBAny.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66411D4FB07004C3E4B /* JSIDBAny.cpp */; };
C585A67D11D4FB08004C3E4B /* JSIDBAny.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66511D4FB07004C3E4B /* JSIDBAny.h */; };
- C585A68011D4FB08004C3E4B /* JSIDBDatabaseException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66811D4FB07004C3E4B /* JSIDBDatabaseException.cpp */; };
- C585A68111D4FB08004C3E4B /* JSIDBDatabaseException.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66911D4FB07004C3E4B /* JSIDBDatabaseException.h */; };
C585A68211D4FB08004C3E4B /* JSIDBDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66A11D4FB07004C3E4B /* JSIDBDatabase.cpp */; };
C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66B11D4FB07004C3E4B /* JSIDBDatabase.h */; };
C585A68A11D4FB08004C3E4B /* JSIDBKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A67211D4FB07004C3E4B /* JSIDBKey.cpp */; };
@@ -10751,7 +10749,6 @@
9712A56E15004EDA0048AF10 /* IDBDatabaseError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBDatabaseError.h; path = Modules/indexeddb/IDBDatabaseError.h; sourceTree = "<group>"; };
9712A57015004EDA0048AF10 /* IDBDatabaseException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBDatabaseException.cpp; path = Modules/indexeddb/IDBDatabaseException.cpp; sourceTree = "<group>"; };
9712A57115004EDA0048AF10 /* IDBDatabaseException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBDatabaseException.h; path = Modules/indexeddb/IDBDatabaseException.h; sourceTree = "<group>"; };
- 9712A57215004EDA0048AF10 /* IDBDatabaseException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDBDatabaseException.idl; path = Modules/indexeddb/IDBDatabaseException.idl; sourceTree = "<group>"; };
9712A57315004EDA0048AF10 /* IDBEventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBEventDispatcher.cpp; path = Modules/indexeddb/IDBEventDispatcher.cpp; sourceTree = "<group>"; };
9712A57415004EDA0048AF10 /* IDBEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBEventDispatcher.h; path = Modules/indexeddb/IDBEventDispatcher.h; sourceTree = "<group>"; };
9712A57515004EDA0048AF10 /* IDBFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBFactory.cpp; path = Modules/indexeddb/IDBFactory.cpp; sourceTree = "<group>"; };
@@ -13291,8 +13288,6 @@
C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBBindingUtilities.h; sourceTree = "<group>"; };
C585A66411D4FB07004C3E4B /* JSIDBAny.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBAny.cpp; sourceTree = "<group>"; };
C585A66511D4FB07004C3E4B /* JSIDBAny.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBAny.h; sourceTree = "<group>"; };
- C585A66811D4FB07004C3E4B /* JSIDBDatabaseException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBDatabaseException.cpp; sourceTree = "<group>"; };
- C585A66911D4FB07004C3E4B /* JSIDBDatabaseException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBDatabaseException.h; sourceTree = "<group>"; };
C585A66A11D4FB07004C3E4B /* JSIDBDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBDatabase.cpp; sourceTree = "<group>"; };
C585A66B11D4FB07004C3E4B /* JSIDBDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBDatabase.h; sourceTree = "<group>"; };
C585A67211D4FB07004C3E4B /* JSIDBKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBKey.cpp; sourceTree = "<group>"; };
@@ -18020,7 +18015,6 @@
9712A56E15004EDA0048AF10 /* IDBDatabaseError.h */,
9712A57015004EDA0048AF10 /* IDBDatabaseException.cpp */,
9712A57115004EDA0048AF10 /* IDBDatabaseException.h */,
- 9712A57215004EDA0048AF10 /* IDBDatabaseException.idl */,
9712A57315004EDA0048AF10 /* IDBEventDispatcher.cpp */,
9712A57415004EDA0048AF10 /* IDBEventDispatcher.h */,
9712A57515004EDA0048AF10 /* IDBFactory.cpp */,
@@ -19295,8 +19289,6 @@
81BE20A811F4B66F00915DFA /* JSIDBCursor.h */,
C585A66A11D4FB07004C3E4B /* JSIDBDatabase.cpp */,
C585A66B11D4FB07004C3E4B /* JSIDBDatabase.h */,
- C585A66811D4FB07004C3E4B /* JSIDBDatabaseException.cpp */,
- C585A66911D4FB07004C3E4B /* JSIDBDatabaseException.h */,
C585A69411D4FB13004C3E4B /* JSIDBFactory.cpp */,
C585A69511D4FB13004C3E4B /* JSIDBFactory.h */,
C572EE1C1201C9BC007D8F82 /* JSIDBIndex.cpp */,
@@ -24326,7 +24318,6 @@
C585A67D11D4FB08004C3E4B /* JSIDBAny.h in Headers */,
81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */,
C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */,
- C585A68111D4FB08004C3E4B /* JSIDBDatabaseException.h in Headers */,
C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */,
C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */,
C585A68B11D4FB08004C3E4B /* JSIDBKey.h in Headers */,
@@ -27600,7 +27591,6 @@
C585A65E11D4FAB2004C3E4B /* JSIDBAnyCustom.cpp in Sources */,
81BE20D211F4BC3200915DFA /* JSIDBCursor.cpp in Sources */,
C585A68211D4FB08004C3E4B /* JSIDBDatabase.cpp in Sources */,
- C585A68011D4FB08004C3E4B /* JSIDBDatabaseException.cpp in Sources */,
C585A69611D4FB13004C3E4B /* JSIDBFactory.cpp in Sources */,
C572EE1E1201C9BC007D8F82 /* JSIDBIndex.cpp in Sources */,
C585A68A11D4FB08004C3E4B /* JSIDBKey.cpp in Sources */,
Modified: trunk/Source/WebCore/dom/DOMExceptions.in (136868 => 136869)
--- trunk/Source/WebCore/dom/DOMExceptions.in 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/dom/DOMExceptions.in 2012-12-06 20:11:42 UTC (rev 136869)
@@ -3,7 +3,6 @@
DOMCoreException
EventException
FileException conditional=BLOB
-IDBDatabaseException conditional=INDEXED_DATABASE
RangeException
SQLException conditional=SQL_DATABASE
SVGException conditional=SVG
Modified: trunk/Source/WebCore/dom/make_dom_exceptions.pl (136868 => 136869)
--- trunk/Source/WebCore/dom/make_dom_exceptions.pl 2012-12-06 20:02:19 UTC (rev 136868)
+++ trunk/Source/WebCore/dom/make_dom_exceptions.pl 2012-12-06 20:11:42 UTC (rev 136869)
@@ -151,6 +151,10 @@
print F "#endif\n" if $conditional;
}
+ print F "#if ENABLE(INDEXED_DATABASE)\n";
+ print F "#include \"IDBDatabaseException.h\"\n";
+ print F "#endif\n";
+
print F "\n";
print F "namespace WebCore {\n";
print F "\n";
@@ -170,6 +174,15 @@
print F "#endif\n" if $conditional;
}
+ # FIXME: This special case for IDB is undesirable. It is the first usage
+ # of "new style" DOMExceptions where there is no IDL type, but there are
+ # API-specific exception names and/or messages. Consider refactoring back
+ # into the code generator when a common pattern emerges.
+ print F "#if ENABLE(INDEXED_DATABASE)\n";
+ print F " if (IDBDatabaseException::initializeDescription(ec, this))\n";
+ print F " return;\n";
+ print F "#endif\n";
+
print F " if (DOMCoreException::initializeDescription(ec, this))\n";
print F " return;\n";
print F " ASSERT_NOT_REACHED();\n";
