Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (210587 => 210588)
--- trunk/Source/WebCore/CMakeLists.txt 2017-01-11 16:00:16 UTC (rev 210587)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-01-11 17:38:35 UTC (rev 210588)
@@ -1096,7 +1096,6 @@
bindings/js/JSCustomElementInterface.cpp
bindings/js/JSCustomElementRegistryCustom.cpp
bindings/js/JSCustomEventCustom.cpp
- bindings/js/JSCustomSQLStatementErrorCallback.cpp
bindings/js/JSCustomXPathNSResolver.cpp
bindings/js/JSDOMBinding.cpp
bindings/js/JSDOMGlobalObject.cpp
@@ -1167,6 +1166,7 @@
bindings/js/JSReadableStreamPrivateConstructors.cpp
bindings/js/JSReadableStreamSourceCustom.cpp
bindings/js/JSRTCStatsResponseCustom.cpp
+ bindings/js/JSSQLStatementErrorCallbackCustom.cpp
bindings/js/JSSVGPathSegCustom.cpp
bindings/js/JSStorageCustom.cpp
bindings/js/JSStyleSheetCustom.cpp
Modified: trunk/Source/WebCore/ChangeLog (210587 => 210588)
--- trunk/Source/WebCore/ChangeLog 2017-01-11 16:00:16 UTC (rev 210587)
+++ trunk/Source/WebCore/ChangeLog 2017-01-11 17:38:35 UTC (rev 210588)
@@ -1,3 +1,16 @@
+2017-01-10 Sam Weinig <s...@webkit.org>
+
+ Rename JSCustomSQLStatementErrorCallback.cpp to JSSQLStatementErrorCallbackCustom.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=166913
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSCustomSQLStatementErrorCallback.cpp: Removed.
+ * bindings/js/JSSQLStatementErrorCallbackCustom.cpp: Copied from Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp.
+ Rename to match conventions.
+
2017-01-11 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r210571.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (210587 => 210588)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-01-11 16:00:16 UTC (rev 210587)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-01-11 17:38:35 UTC (rev 210588)
@@ -2242,7 +2242,7 @@
51E3F9D60DA05E1D00250911 /* JSStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E3F9D40DA05E1D00250911 /* JSStorage.cpp */; };
51E4143416A6596300C633C7 /* ResourceHandleTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E4143216A6595100C633C7 /* ResourceHandleTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
51E6821016387302003BBF3C /* LoaderStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E6820F16387302003BBF3C /* LoaderStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 51EC92650CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */; };
+ 51EC92650CE90DD400F90308 /* JSSQLStatementErrorCallbackCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51EC925D0CE90DD400F90308 /* JSSQLStatementErrorCallbackCustom.cpp */; };
51EE7B381AA50B0500F92B21 /* ResourceLoadInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 51EE7B371AA50B0500F92B21 /* ResourceLoadInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
51EE7B3A1AA5123100F92B21 /* ResourceLoadInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51EE7B391AA5123100F92B21 /* ResourceLoadInfo.cpp */; };
51EEAA731BEFFAB100218008 /* IndexValueEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51EEAA711BEFFA7900218008 /* IndexValueEntry.cpp */; };
@@ -9481,7 +9481,7 @@
51E4143216A6595100C633C7 /* ResourceHandleTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceHandleTypes.h; sourceTree = "<group>"; };
51E6820F16387302003BBF3C /* LoaderStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoaderStrategy.h; sourceTree = "<group>"; };
51EAC5B018163F4E004F1BA4 /* IDBRecordIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBRecordIdentifier.h; sourceTree = "<group>"; };
- 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomSQLStatementErrorCallback.cpp; sourceTree = "<group>"; };
+ 51EC925D0CE90DD400F90308 /* JSSQLStatementErrorCallbackCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLStatementErrorCallbackCustom.cpp; sourceTree = "<group>"; };
51EE7B371AA50B0500F92B21 /* ResourceLoadInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadInfo.h; sourceTree = "<group>"; };
51EE7B391AA5123100F92B21 /* ResourceLoadInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadInfo.cpp; sourceTree = "<group>"; };
51EEAA711BEFFA7900218008 /* IndexValueEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexValueEntry.cpp; sourceTree = "<group>"; };
@@ -22456,7 +22456,6 @@
B1D5ECB4134B58DA0087C78F /* CallbackFunction.h */,
1449E286107D4DB400B5793F /* JSCallbackData.cpp */,
1449E24A107D4A8400B5793F /* JSCallbackData.h */,
- 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */,
E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */,
E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */,
F3D461461161D53200CA0D09 /* JSErrorHandler.cpp */,
@@ -22467,6 +22466,7 @@
935F45410F7C3B5F00D7C1FB /* JSLazyEventListener.h */,
C6F420A016B7164E0052A9F2 /* JSMutationCallback.cpp */,
C6F420A116B7164E0052A9F2 /* JSMutationCallback.h */,
+ 51EC925D0CE90DD400F90308 /* JSSQLStatementErrorCallbackCustom.cpp */,
BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
BCA378BB0D15F64200B793D6 /* ScheduledAction.h */,
);
@@ -29878,7 +29878,7 @@
9BC5F9E01D5AAF6B002B749D /* JSCustomElementRegistryCustom.cpp in Sources */,
E4778B7F115A581A00B5D372 /* JSCustomEvent.cpp in Sources */,
DEC297611B4F2F8D005F5945 /* JSCustomEventCustom.cpp in Sources */,
- 51EC92650CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp in Sources */,
+ 51EC92650CE90DD400F90308 /* JSSQLStatementErrorCallbackCustom.cpp in Sources */,
E10B93C30B73C291003ED890 /* JSCustomXPathNSResolver.cpp in Sources */,
1AE82F8F0CAAFA9D002237AE /* JSDatabase.cpp in Sources */,
B59DD69A119029E5007E9684 /* JSDatabaseCallback.cpp in Sources */,
Deleted: trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp (210587 => 210588)
--- trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp 2017-01-11 16:00:16 UTC (rev 210587)
+++ trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp 2017-01-11 17:38:35 UTC (rev 210588)
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2007 Apple 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 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.
- */
-
-#include "config.h"
-#include "JSSQLStatementErrorCallback.h"
-
-#include "JSSQLError.h"
-#include "JSSQLTransaction.h"
-#include "ScriptExecutionContext.h"
-#include <runtime/Exception.h>
-#include <runtime/JSLock.h>
-#include <wtf/Ref.h>
-
-namespace WebCore {
-
-using namespace JSC;
-
-bool JSSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLError* error)
-{
- if (!m_data || !m_data->globalObject() || !canInvokeCallback())
- return true;
-
- Ref<JSSQLStatementErrorCallback> protectedThis(*this);
-
- JSC::JSLockHolder lock(m_data->globalObject()->vm());
-
- ExecState* exec = m_data->globalObject()->globalExec();
- MarkedArgumentBuffer args;
- args.append(toJS(exec, m_data->globalObject(), transaction));
- args.append(toJS(exec, m_data->globalObject(), error));
-
- NakedPtr<JSC::Exception> returnedException;
- JSValue result = m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
- if (returnedException) {
- reportException(exec, returnedException);
-
- // The spec says:
- // "If the error callback returns false, then move on to the next statement..."
- // "Otherwise, the error callback did not return false, or there was no error callback"
- // Therefore an exception and returning true are the same thing - so, return true on an exception
- return true;
- }
- return result.toBoolean(exec);
-}
-
-}
Copied: trunk/Source/WebCore/bindings/js/JSSQLStatementErrorCallbackCustom.cpp (from rev 210587, trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp) (0 => 210588)
--- trunk/Source/WebCore/bindings/js/JSSQLStatementErrorCallbackCustom.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSSQLStatementErrorCallbackCustom.cpp 2017-01-11 17:38:35 UTC (rev 210588)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2007 Apple 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 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.
+ */
+
+#include "config.h"
+#include "JSSQLStatementErrorCallback.h"
+
+#include "JSSQLError.h"
+#include "JSSQLTransaction.h"
+#include "ScriptExecutionContext.h"
+#include <runtime/Exception.h>
+#include <runtime/JSLock.h>
+#include <wtf/Ref.h>
+
+namespace WebCore {
+
+using namespace JSC;
+
+bool JSSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLError* error)
+{
+ if (!m_data || !m_data->globalObject() || !canInvokeCallback())
+ return true;
+
+ Ref<JSSQLStatementErrorCallback> protectedThis(*this);
+
+ JSC::JSLockHolder lock(m_data->globalObject()->vm());
+
+ ExecState* exec = m_data->globalObject()->globalExec();
+ MarkedArgumentBuffer args;
+ args.append(toJS(exec, m_data->globalObject(), transaction));
+ args.append(toJS(exec, m_data->globalObject(), error));
+
+ NakedPtr<JSC::Exception> returnedException;
+ JSValue result = m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
+ if (returnedException) {
+ reportException(exec, returnedException);
+
+ // The spec says:
+ // "If the error callback returns false, then move on to the next statement..."
+ // "Otherwise, the error callback did not return false, or there was no error callback"
+ // Therefore an exception and returning true are the same thing - so, return true on an exception
+ return true;
+ }
+ return result.toBoolean(exec);
+}
+
+}
