Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (219672 => 219673)
--- trunk/Source/WebCore/CMakeLists.txt 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-07-20 05:23:48 UTC (rev 219673)
@@ -330,7 +330,6 @@
Modules/webdatabase/Database.idl
Modules/webdatabase/DatabaseCallback.idl
Modules/webdatabase/SQLError.idl
- Modules/webdatabase/SQLException.idl
Modules/webdatabase/SQLResultSet.idl
Modules/webdatabase/SQLResultSetRowList.idl
Modules/webdatabase/SQLStatementCallback.idl
@@ -1069,7 +1068,6 @@
Modules/webdatabase/DatabaseThread.cpp
Modules/webdatabase/DatabaseTracker.cpp
Modules/webdatabase/OriginLock.cpp
- Modules/webdatabase/SQLException.cpp
Modules/webdatabase/SQLResultSet.cpp
Modules/webdatabase/SQLResultSetRowList.cpp
Modules/webdatabase/SQLStatement.cpp
Modified: trunk/Source/WebCore/ChangeLog (219672 => 219673)
--- trunk/Source/WebCore/ChangeLog 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/ChangeLog 2017-07-20 05:23:48 UTC (rev 219673)
@@ -1,3 +1,26 @@
+2017-07-19 Chris Dumez <[email protected]>
+
+ Drop SQLException type
+ https://bugs.webkit.org/show_bug.cgi?id=174665
+
+ Reviewed by Sam Weinig.
+
+ Drop SQLException type. We never throw such exception. Also, Firefox
+ and Chrome no longer expose this type.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * Modules/webdatabase/SQLException.cpp: Removed.
+ * Modules/webdatabase/SQLException.h: Removed.
+ * Modules/webdatabase/SQLException.idl: Removed.
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSDOMExceptionHandling.cpp:
+ (WebCore::createDOMException):
+ * bindings/js/JSExceptionBase.cpp:
+ (WebCore::toExceptionBase):
+ * dom/DOMExceptions.in:
+
2017-07-19 Wenson Hsieh <[email protected]>
Unreviewed, tweak a comment above TemporarySelectionOptionIgnoreSelectionChanges in Editor.cpp.
Modified: trunk/Source/WebCore/DerivedSources.cpp (219672 => 219673)
--- trunk/Source/WebCore/DerivedSources.cpp 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/DerivedSources.cpp 2017-07-20 05:23:48 UTC (rev 219673)
@@ -406,7 +406,6 @@
#include "JSSpeechSynthesisUtterance.cpp"
#include "JSSpeechSynthesisVoice.cpp"
#include "JSSQLError.cpp"
-#include "JSSQLException.cpp"
#include "JSSQLResultSet.cpp"
#include "JSSQLResultSetRowList.cpp"
#include "JSSQLStatementCallback.cpp"
Modified: trunk/Source/WebCore/DerivedSources.make (219672 => 219673)
--- trunk/Source/WebCore/DerivedSources.make 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/DerivedSources.make 2017-07-20 05:23:48 UTC (rev 219673)
@@ -267,7 +267,6 @@
$(WebCore)/Modules/webdatabase/Database.idl \
$(WebCore)/Modules/webdatabase/DatabaseCallback.idl \
$(WebCore)/Modules/webdatabase/SQLError.idl \
- $(WebCore)/Modules/webdatabase/SQLException.idl \
$(WebCore)/Modules/webdatabase/SQLResultSet.idl \
$(WebCore)/Modules/webdatabase/SQLResultSetRowList.idl \
$(WebCore)/Modules/webdatabase/SQLStatementCallback.idl \
Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLException.cpp (219672 => 219673)
--- trunk/Source/WebCore/Modules/webdatabase/SQLException.cpp 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLException.cpp 2017-07-20 05:23:48 UTC (rev 219673)
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- * 3. Neither the name of Apple Inc. ("Apple") 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 GOOGLE 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.
- */
-
-#include "config.h"
-#include "SQLException.h"
-
-#include "ExceptionCodeDescription.h"
-
-namespace WebCore {
-
-static const struct SQLExceptionNameDescription {
- const char* const name;
- const char* const description;
-} sqlExceptions[] = {
- { "UNKNOWN_ERR", "The operation failed for reasons unrelated to the database." },
- { "DATABASE_ERR", "The operation failed for some reason related to the database." },
- { "VERSION_ERR", "The actual database version did not match the expected version." },
- { "TOO_LARGE_ERR", "Data returned from the database is too large." },
- { "QUOTA_ERR", "Quota was exceeded." },
- { "SYNTAX_ERR", "Invalid or unauthorized statement; or the number of arguments did not match the number of ? placeholders." },
- { "CONSTRAINT_ERR", "A constraint was violated." },
- { "TIMEOUT_ERR", "A transaction lock could not be acquired in a reasonable time." }
-};
-
-bool SQLException::initializeDescription(ExceptionCode ec, ExceptionCodeDescription* description)
-{
- if (ec < SQLExceptionOffset || ec > SQLExceptionMax)
- return false;
-
- description->typeName = "DOM SQL";
- description->code = ec - SQLExceptionOffset;
- description->type = SQLExceptionType;
-
- size_t tableSize = WTF_ARRAY_LENGTH(sqlExceptions);
- size_t tableIndex = ec - UNKNOWN_ERR;
-
- description->name = tableIndex < tableSize ? sqlExceptions[tableIndex].name : 0;
- description->description = tableIndex < tableSize ? sqlExceptions[tableIndex].description : 0;
-
- return true;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLException.h (219672 => 219673)
--- trunk/Source/WebCore/Modules/webdatabase/SQLException.h 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLException.h 2017-07-20 05:23:48 UTC (rev 219673)
@@ -1,67 +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.
- */
-
-#pragma once
-
-#include "ExceptionBase.h"
-
-namespace WebCore {
-
-class SQLException : public ExceptionBase {
-public:
- static Ref<SQLException> create(const ExceptionCodeDescription& description)
- {
- return adoptRef(*new SQLException(description));
- }
-
- static const int SQLExceptionOffset = 1000;
- static const int SQLExceptionMax = 1099;
-
- enum SQLExceptionCode {
- UNKNOWN_ERR = SQLExceptionOffset,
- DATABASE_ERR = SQLExceptionOffset + 1,
- VERSION_ERR = SQLExceptionOffset + 2,
- TOO_LARGE_ERR = SQLExceptionOffset + 3,
- QUOTA_ERR = SQLExceptionOffset + 4,
- SYNTAX_ERR = SQLExceptionOffset + 5,
- CONSTRAINT_ERR = SQLExceptionOffset + 6,
- TIMEOUT_ERR = SQLExceptionOffset + 7
- };
-
- static bool initializeDescription(ExceptionCode, ExceptionCodeDescription*);
-
-private:
- explicit SQLException(const ExceptionCodeDescription& description)
- : ExceptionBase(description)
- {
- }
-};
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/Modules/webdatabase/SQLException.idl (219672 => 219673)
--- trunk/Source/WebCore/Modules/webdatabase/SQLException.idl 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLException.idl 2017-07-20 05:23:48 UTC (rev 219673)
@@ -1,47 +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.
- */
-
-[
- DoNotCheckConstants,
- ImplementationLacksVTable
-] exception SQLException {
- readonly attribute unsigned long code;
- readonly attribute DOMString message;
-
- // SQLExceptionCode: used only in the sync DB API
- const unsigned short UNKNOWN_ERR = 0;
- const unsigned short DATABASE_ERR = 1;
- const unsigned short VERSION_ERR = 2;
- const unsigned short TOO_LARGE_ERR = 3;
- const unsigned short QUOTA_ERR = 4;
- const unsigned short SYNTAX_ERR = 5;
- const unsigned short CONSTRAINT_ERR = 6;
- const unsigned short TIMEOUT_ERR = 7;
-};
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (219672 => 219673)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-07-20 05:23:48 UTC (rev 219673)
@@ -4137,8 +4137,6 @@
97BC6A331505F081001B74AC /* DatabaseManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69F11505F081001B74AC /* DatabaseManagerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
97BC6A3B1505F081001B74AC /* SQLCallbackWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69F91505F081001B74AC /* SQLCallbackWrapper.h */; };
97BC6A3C1505F081001B74AC /* SQLError.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69FA1505F081001B74AC /* SQLError.h */; };
- 97BC6A3E1505F081001B74AC /* SQLException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69FC1505F081001B74AC /* SQLException.cpp */; };
- 97BC6A3F1505F081001B74AC /* SQLException.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69FD1505F081001B74AC /* SQLException.h */; };
97BC6A411505F081001B74AC /* SQLResultSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69FF1505F081001B74AC /* SQLResultSet.cpp */; };
97BC6A421505F081001B74AC /* SQLResultSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC6A001505F081001B74AC /* SQLResultSet.h */; };
97BC6A441505F081001B74AC /* SQLResultSetRowList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC6A021505F081001B74AC /* SQLResultSetRowList.cpp */; };
@@ -5501,8 +5499,6 @@
B50F5B810E96CD9900AD71A6 /* WebCoreObjCExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = B50F5B800E96CD9900AD71A6 /* WebCoreObjCExtras.mm */; };
B51A2F3F17D7D3AE0072517A /* ImageQualityController.h in Headers */ = {isa = PBXBuildFile; fileRef = B51A2F3E17D7D3A40072517A /* ImageQualityController.h */; };
B51A2F4117D7D5DE0072517A /* ImageQualityController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B51A2F4017D7D5DA0072517A /* ImageQualityController.cpp */; };
- B525A96511CA2340003A23A8 /* JSSQLException.h in Headers */ = {isa = PBXBuildFile; fileRef = B525A96311CA2340003A23A8 /* JSSQLException.h */; };
- B525A96611CA2340003A23A8 /* JSSQLException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B525A96411CA2340003A23A8 /* JSSQLException.cpp */; };
B5320D6B122A24E9002D1440 /* FontPlatformData.h in Headers */ = {isa = PBXBuildFile; fileRef = B5320D69122A24E9002D1440 /* FontPlatformData.h */; settings = {ATTRIBUTES = (Private, ); }; };
B5320D6C122A24E9002D1440 /* FontPlatformDataCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5320D6A122A24E9002D1440 /* FontPlatformDataCocoa.mm */; };
B543B85717EB758F003BE93A /* SVGPropertyInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B543B85617EB758F003BE93A /* SVGPropertyInfo.cpp */; };
@@ -12326,9 +12322,6 @@
97BC69F91505F081001B74AC /* SQLCallbackWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLCallbackWrapper.h; sourceTree = "<group>"; };
97BC69FA1505F081001B74AC /* SQLError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLError.h; sourceTree = "<group>"; };
97BC69FB1505F081001B74AC /* SQLError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLError.idl; sourceTree = "<group>"; };
- 97BC69FC1505F081001B74AC /* SQLException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLException.cpp; sourceTree = "<group>"; };
- 97BC69FD1505F081001B74AC /* SQLException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLException.h; sourceTree = "<group>"; };
- 97BC69FE1505F081001B74AC /* SQLException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLException.idl; sourceTree = "<group>"; };
97BC69FF1505F081001B74AC /* SQLResultSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLResultSet.cpp; sourceTree = "<group>"; };
97BC6A001505F081001B74AC /* SQLResultSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLResultSet.h; sourceTree = "<group>"; };
97BC6A011505F081001B74AC /* SQLResultSet.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLResultSet.idl; sourceTree = "<group>"; };
@@ -13964,8 +13957,6 @@
B50F5B800E96CD9900AD71A6 /* WebCoreObjCExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreObjCExtras.mm; sourceTree = "<group>"; };
B51A2F3E17D7D3A40072517A /* ImageQualityController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageQualityController.h; sourceTree = "<group>"; };
B51A2F4017D7D5DA0072517A /* ImageQualityController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageQualityController.cpp; sourceTree = "<group>"; };
- B525A96311CA2340003A23A8 /* JSSQLException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLException.h; sourceTree = "<group>"; };
- B525A96411CA2340003A23A8 /* JSSQLException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLException.cpp; sourceTree = "<group>"; };
B5320D69122A24E9002D1440 /* FontPlatformData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontPlatformData.h; sourceTree = "<group>"; };
B5320D6A122A24E9002D1440 /* FontPlatformDataCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FontPlatformDataCocoa.mm; sourceTree = "<group>"; };
B543B85617EB758F003BE93A /* SVGPropertyInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPropertyInfo.cpp; sourceTree = "<group>"; };
@@ -20902,9 +20893,6 @@
97BC69F91505F081001B74AC /* SQLCallbackWrapper.h */,
97BC69FA1505F081001B74AC /* SQLError.h */,
97BC69FB1505F081001B74AC /* SQLError.idl */,
- 97BC69FC1505F081001B74AC /* SQLException.cpp */,
- 97BC69FD1505F081001B74AC /* SQLException.h */,
- 97BC69FE1505F081001B74AC /* SQLException.idl */,
97BC69FF1505F081001B74AC /* SQLResultSet.cpp */,
97BC6A001505F081001B74AC /* SQLResultSet.h */,
97BC6A011505F081001B74AC /* SQLResultSet.idl */,
@@ -22228,8 +22216,6 @@
269239921505E1AA009E57FC /* JSIDBVersionChangeEvent.h */,
514C76350CE9225E007EF3CD /* JSSQLError.cpp */,
BC8243250D0CE8A200460C8F /* JSSQLError.h */,
- B525A96411CA2340003A23A8 /* JSSQLException.cpp */,
- B525A96311CA2340003A23A8 /* JSSQLException.h */,
1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */,
1AE82FEB0CAB07EE002237AE /* JSSQLResultSet.h */,
1AFE11970CBFFCC4003017FA /* JSSQLResultSetRowList.cpp */,
@@ -28249,7 +28235,6 @@
AA7FEEA716A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.h in Headers */,
AA7FEEA916A4E6F3004C0C33 /* JSSpeechSynthesisVoice.h in Headers */,
BC8243290D0CE8A200460C8F /* JSSQLError.h in Headers */,
- B525A96511CA2340003A23A8 /* JSSQLException.h in Headers */,
1AE82FED0CAB07EE002237AE /* JSSQLResultSet.h in Headers */,
1AFE119A0CBFFCC4003017FA /* JSSQLResultSetRowList.h in Headers */,
B59DD6A511902A62007E9684 /* JSSQLStatementCallback.h in Headers */,
@@ -29475,7 +29460,6 @@
7C83DE861D04CC5D00FEBCF3 /* SpringSolver.h in Headers */,
97BC6A3B1505F081001B74AC /* SQLCallbackWrapper.h in Headers */,
97BC6A3C1505F081001B74AC /* SQLError.h in Headers */,
- 97BC6A3F1505F081001B74AC /* SQLException.h in Headers */,
1A22464A0CC98DDB00C05240 /* SQLiteDatabase.h in Headers */,
7E474E1F12494DC900235364 /* SQLiteDatabaseTracker.h in Headers */,
7E474E1E12494DC900235364 /* SQLiteDatabaseTrackerClient.h in Headers */,
@@ -32257,7 +32241,6 @@
AA7FEEA616A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.cpp in Sources */,
AA7FEEA816A4E6F3004C0C33 /* JSSpeechSynthesisVoice.cpp in Sources */,
514C76370CE9225E007EF3CD /* JSSQLError.cpp in Sources */,
- B525A96611CA2340003A23A8 /* JSSQLException.cpp in Sources */,
1AE82FEC0CAB07EE002237AE /* JSSQLResultSet.cpp in Sources */,
1AFE11990CBFFCC4003017FA /* JSSQLResultSetRowList.cpp in Sources */,
B59DD6A611902A62007E9684 /* JSSQLStatementCallback.cpp in Sources */,
@@ -33314,7 +33297,6 @@
93309E13099E64920056E581 /* SplitTextNodeCommand.cpp in Sources */,
93309E15099E64920056E581 /* SplitTextNodeContainingElementCommand.cpp in Sources */,
A1E1154813015C5D0054AC8C /* SpotLightSource.cpp in Sources */,
- 97BC6A3E1505F081001B74AC /* SQLException.cpp in Sources */,
1A2E6E7A0CC556D5004A2062 /* SQLiteAuthorizer.cpp in Sources */,
1A2246490CC98DDB00C05240 /* SQLiteDatabase.cpp in Sources */,
7E474E2012494DC900235364 /* SQLiteDatabaseTracker.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/js/JSDOMExceptionHandling.cpp (219672 => 219673)
--- trunk/Source/WebCore/bindings/js/JSDOMExceptionHandling.cpp 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/bindings/js/JSDOMExceptionHandling.cpp 2017-07-20 05:23:48 UTC (rev 219673)
@@ -177,9 +177,6 @@
case FileExceptionType:
errorObject = toJS(exec, globalObject, FileException::create(description));
break;
- case SQLExceptionType:
- errorObject = toJS(exec, globalObject, SQLException::create(description));
- break;
case SVGExceptionType:
errorObject = toJS(exec, globalObject, SVGException::create(description));
break;
Modified: trunk/Source/WebCore/bindings/js/JSExceptionBase.cpp (219672 => 219673)
--- trunk/Source/WebCore/bindings/js/JSExceptionBase.cpp 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/bindings/js/JSExceptionBase.cpp 2017-07-20 05:23:48 UTC (rev 219673)
@@ -27,10 +27,8 @@
#include "JSExceptionBase.h"
#include "JSDOMCoreException.h"
-#include "JSSQLException.h"
#include "JSSVGException.h"
#include "JSXPathException.h"
-#include "SQLException.h"
namespace WebCore {
@@ -42,10 +40,8 @@
return reinterpret_cast<ExceptionBase*>(svgException);
if (XPathException* pathException = JSXPathException::toWrapped(vm, value))
return reinterpret_cast<ExceptionBase*>(pathException);
- if (SQLException* pathException = JSSQLException::toWrapped(vm, value))
- return reinterpret_cast<ExceptionBase*>(pathException);
- return 0;
+ return nullptr;
}
} // namespace WebCore
Modified: trunk/Source/WebCore/dom/DOMExceptions.in (219672 => 219673)
--- trunk/Source/WebCore/dom/DOMExceptions.in 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebCore/dom/DOMExceptions.in 2017-07-20 05:23:48 UTC (rev 219673)
@@ -2,7 +2,6 @@
DOMCoreException
FileException
-SQLException
SVGException
XPathException
Modified: trunk/Source/WebInspectorUI/.eslintrc (219672 => 219673)
--- trunk/Source/WebInspectorUI/.eslintrc 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebInspectorUI/.eslintrc 2017-07-20 05:23:48 UTC (rev 219673)
@@ -80,7 +80,6 @@
// DOM
"CSSPrimitiveValue": true,
"Exception": true,
- "SQLException": true,
"WebKitPoint": true,
// Utilities
Modified: trunk/Source/WebInspectorUI/ChangeLog (219672 => 219673)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-07-20 05:23:48 UTC (rev 219673)
@@ -1,3 +1,19 @@
+2017-07-19 Chris Dumez <[email protected]>
+
+ Drop SQLException type
+ https://bugs.webkit.org/show_bug.cgi?id=174665
+
+ Reviewed by Sam Weinig.
+
+ Use SQLError instead of SQLException, this is what the script should really
+ use here since it is checking the code of an SQLError.
+
+ * .eslintrc:
+ * UserInterface/Models/DatabaseObject.js:
+ (WebInspector.DatabaseObject.prototype.executeSQL.queryCallback):
+ (WebInspector.DatabaseObject.prototype.executeSQL):
+ (WebInspector.DatabaseObject):
+
2017-07-18 Andy Estes <[email protected]>
[Xcode] Enable CLANG_WARN_RANGE_LOOP_ANALYSIS
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseObject.js (219672 => 219673)
--- trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseObject.js 2017-07-20 03:49:58 UTC (rev 219672)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DatabaseObject.js 2017-07-20 05:23:48 UTC (rev 219673)
@@ -70,10 +70,10 @@
if (sqlError) {
switch (sqlError.code) {
- case SQLException.VERSION_ERR:
+ case SQLError.VERSION_ERR:
errorCallback(WebInspector.UIString("Database no longer has expected version."));
break;
- case SQLException.TOO_LARGE_ERR:
+ case SQLError.TOO_LARGE_ERR:
errorCallback(WebInspector.UIString("Data returned from the database is too large."));
break;
default:
