Diff
Modified: trunk/LayoutTests/ChangeLog (203765 => 203766)
--- trunk/LayoutTests/ChangeLog 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/LayoutTests/ChangeLog 2016-07-27 06:37:49 UTC (rev 203766)
@@ -1,3 +1,15 @@
+2016-07-26 Youenn Fablet <[email protected]>
+
+ JS Built-ins should throw this-error messages consistently with binding generated code
+ https://bugs.webkit.org/show_bug.cgi?id=160191
+
+ Reviewed by Darin Adler.
+
+ * fetch/fetch-error-messages-expected.txt: Added.
+ * fetch/fetch-error-messages.html: Added.
+ * streams/readable-stream-error-messages-expected.txt: Added.
+ * streams/readable-stream-error-messages.html: Added.
+
2016-07-26 Myles C. Maxfield <[email protected]>
[iOS] SF-Heavy is inaccessible by web content
Added: trunk/LayoutTests/fetch/fetch-error-messages-expected.txt (0 => 203766)
--- trunk/LayoutTests/fetch/fetch-error-messages-expected.txt (rev 0)
+++ trunk/LayoutTests/fetch/fetch-error-messages-expected.txt 2016-07-27 06:37:49 UTC (rev 203766)
@@ -0,0 +1,4 @@
+CONSOLE MESSAGE: line 11: TypeError: The Response.body getter can only be used on instances of Response
+
+PASS Exercising TypeError messages in Fetch Response
+
Added: trunk/LayoutTests/fetch/fetch-error-messages.html (0 => 203766)
--- trunk/LayoutTests/fetch/fetch-error-messages.html (rev 0)
+++ trunk/LayoutTests/fetch/fetch-error-messages.html 2016-07-27 06:37:49 UTC (rev 203766)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<script src=''></script>
+<script src=''></script>
+<script>
+function printMethodError(method, target)
+{
+ try {
+ method.call(target);
+ assert_unreached();
+ } catch(e) {
+ console.log(e);
+ }
+}
+
+function printGetterError(object, getterName, target)
+{
+ const getter = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(object), getterName).get;
+ printMethodError(getter, target);
+}
+
+test(function(test) {
+ // This test prints exceptions to check the format of their messages.
+
+ var request = new Request("");
+ var response = new Response("");
+
+ printGetterError(response, "body", request);
+
+}, "Exercising TypeError messages in Fetch Response");
+</script>
Added: trunk/LayoutTests/streams/readable-stream-error-messages-expected.txt (0 => 203766)
--- trunk/LayoutTests/streams/readable-stream-error-messages-expected.txt (rev 0)
+++ trunk/LayoutTests/streams/readable-stream-error-messages-expected.txt 2016-07-27 06:37:49 UTC (rev 203766)
@@ -0,0 +1,15 @@
+CONSOLE MESSAGE: line 11: TypeError: Can only call ReadableStream.getReader on instances of ReadableStream
+CONSOLE MESSAGE: line 11: TypeError: Can only call ReadableStream.tee on instances of ReadableStream
+CONSOLE MESSAGE: line 11: TypeError: The ReadableStream.locked getter can only be used on instances of ReadableStream
+CONSOLE MESSAGE: line 11: TypeError: Can only call ReadableStreamController.enqueue on instances of ReadableStreamController
+CONSOLE MESSAGE: line 11: TypeError: Can only call ReadableStreamController.error on instances of ReadableStreamController
+CONSOLE MESSAGE: line 11: TypeError: Can only call ReadableStreamController.close on instances of ReadableStreamController
+CONSOLE MESSAGE: line 11: TypeError: The ReadableStreamController.desiredSize getter can only be used on instances of ReadableStreamController
+CONSOLE MESSAGE: line 11: TypeError: Can only call ReadableStreamReader.releaseLock on instances of ReadableStreamReader
+CONSOLE MESSAGE: line 18: TypeError: Can only call ReadableStream.cancel on instances of ReadableStream
+CONSOLE MESSAGE: line 18: TypeError: Can only call ReadableStreamReader.cancel on instances of ReadableStreamReader
+CONSOLE MESSAGE: line 18: TypeError: Can only call ReadableStreamReader.read on instances of ReadableStreamReader
+CONSOLE MESSAGE: line 18: TypeError: The ReadableStreamReader.closed getter can only be used on instances of ReadableStreamReader
+
+PASS Exercising TypeError messages in ReadableStream, ReadableStreamController and ReadableStreamReader
+
Added: trunk/LayoutTests/streams/readable-stream-error-messages.html (0 => 203766)
--- trunk/LayoutTests/streams/readable-stream-error-messages.html (rev 0)
+++ trunk/LayoutTests/streams/readable-stream-error-messages.html 2016-07-27 06:37:49 UTC (rev 203766)
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<script src=''></script>
+<script src=''></script>
+<script>
+function printMethodError(method, target)
+{
+ try {
+ method.call(target);
+ assert_unreached();
+ } catch(e) {
+ console.log(e);
+ }
+}
+
+function printPromiseMethodError(method, target)
+{
+ return method.call(target).then(assert_unreached, (e) => {
+ console.log(e);
+ });
+}
+
+function printGetterError(object, getterName, target)
+{
+ const getter = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(object), getterName).get;
+ printMethodError(getter, target);
+}
+
+function printPromiseGetterError(object, getterName, target)
+{
+ const getter = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(object), getterName).get;
+ printPromiseMethodError(getter, target);
+}
+
+promise_test(function(test) {
+ // This test prints exceptions to check the format of their messages.
+ var controller;
+ var stream = new ReadableStream({
+ start: (c) => {
+ controller = c;
+ }
+ });
+ var reader = stream.getReader();
+
+ var results = [];
+
+ results.push(printPromiseMethodError(stream.cancel, controller));
+ results.push(printMethodError(stream.getReader, controller));
+ results.push(printMethodError(stream.tee, controller));
+ results.push(printGetterError(stream, "locked", controller));
+
+ results.push(printMethodError(controller.enqueue, reader));
+ results.push(printMethodError(controller.error, reader));
+ results.push(printMethodError(controller.close, reader));
+ results.push(printGetterError(controller, "desiredSize", reader));
+
+ results.push(printPromiseMethodError(reader.cancel, stream));
+ results.push(printPromiseMethodError(reader.read, stream));
+ results.push(printMethodError(reader.releaseLock, stream));
+ results.push(printPromiseGetterError(reader, "closed", stream));
+
+ return Promise.all(results);
+}, "Exercising TypeError messages in ReadableStream, ReadableStreamController and ReadableStreamReader");
+</script>
Modified: trunk/Source/WebCore/ChangeLog (203765 => 203766)
--- trunk/Source/WebCore/ChangeLog 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/ChangeLog 2016-07-27 06:37:49 UTC (rev 203766)
@@ -1,3 +1,51 @@
+2016-07-26 Youenn Fablet <[email protected]>
+
+ JS Built-ins should throw this-error messages consistently with binding generated code
+ https://bugs.webkit.org/show_bug.cgi?id=160191
+
+ Reviewed by Darin Adler.
+
+ Introducing @makeThisTypeError and @makeGetterTypeError to create TypeError objects with a consistent error message.
+ Making use of these functions in streams API and fetch API related built-in code.
+
+ Refactored JSDOMBinding.cpp code by adding makeThisTypeErrorMessage and makeGetterTypeErrorMessage helper routines
+ These routines are used by both new built-in functions as well as binding generated code helper routine.
+
+ Tests: fetch/fetch-error-messages.html
+ streams/readable-stream-error-messages.html
+
+ * Modules/fetch/FetchResponse.js:
+ (body): Adding an explicit check so that the error message is right. The previous error message was related to the call of Response.@isDisturbed.
+ * Modules/streams/ReadableStream.js:
+ (cancel):
+ (getReader):
+ (pipeTo):
+ (tee):
+ (locked):
+ * Modules/streams/ReadableStreamController.js:
+ (enqueue):
+ (error):
+ (close):
+ (desiredSize):
+ * Modules/streams/ReadableStreamReader.js:
+ (cancel):
+ (read):
+ (releaseLock):
+ (closed):
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::makeGetterTypeErrorMessage):
+ (WebCore::throwGetterTypeError):
+ (WebCore::makeThisTypeErrorMessage):
+ (WebCore::throwThisTypeError):
+ (WebCore::throwSequenceTypeError): Deleted.
+ (WebCore::throwSetterTypeError): Deleted.
+ * bindings/js/JSDOMBinding.h:
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::makeThisTypeErrorForBuiltins):
+ (WebCore::makeGetterTypeErrorForBuiltins):
+ (WebCore::JSDOMGlobalObject::addBuiltinGlobals):
+ * bindings/js/WebCoreBuiltinNames.h:
+
2016-07-26 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix GTK+ distcheck build.
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.js (203765 => 203766)
--- trunk/Source/WebCore/Modules/fetch/FetchResponse.js 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.js 2016-07-27 06:37:49 UTC (rev 203766)
@@ -56,6 +56,9 @@
function body()
{
+ if (!(this instanceof @Response))
+ throw @makeGetterTypeError("Response", "body");
+
if (!this.@body) {
if (@Response.prototype.@isDisturbed.@call(this)) {
this.@body = new @ReadableStream();
Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (203765 => 203766)
--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2016-07-27 06:37:49 UTC (rev 203766)
@@ -71,7 +71,7 @@
"use strict";
if (!@isReadableStream(this))
- return @Promise.@reject(new @TypeError("Function should be called on a ReadableStream"));
+ return @Promise.@reject(@makeThisTypeError("ReadableStream", "cancel"));
if (@isReadableStreamLocked(this))
return @Promise.@reject(new @TypeError("ReadableStream is locked"));
@@ -84,7 +84,7 @@
"use strict";
if (!@isReadableStream(this))
- throw new @TypeError("Function should be called on a ReadableStream");
+ throw @makeThisTypeError("ReadableStream", "getReader");
return new @ReadableStreamReader(this);
}
@@ -186,7 +186,7 @@
);
doPipe();
-
+
return promiseCapability.@promise;
}
@@ -195,7 +195,7 @@
"use strict";
if (!@isReadableStream(this))
- throw new @TypeError("Function should be called on a ReadableStream");
+ throw @makeThisTypeError("ReadableStream", "tee");
return @teeReadableStream(this, false);
}
@@ -205,7 +205,7 @@
"use strict";
if (!@isReadableStream(this))
- throw new @TypeError("Function should be called on a ReadableStream");
+ throw @makeGetterTypeError("ReadableStream", "locked");
return @isReadableStreamLocked(this);
}
Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamController.js (203765 => 203766)
--- trunk/Source/WebCore/Modules/streams/ReadableStreamController.js 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamController.js 2016-07-27 06:37:49 UTC (rev 203766)
@@ -30,7 +30,7 @@
"use strict";
if (!@isReadableStreamController(this))
- throw new @TypeError("Function should be called on a ReadableStreamController");
+ throw @makeThisTypeError("ReadableStreamController", "enqueue");
const stream = this.@controlledReadableStream;
@@ -48,7 +48,7 @@
"use strict";
if (!@isReadableStreamController(this))
- throw new @TypeError("Function should be called on a ReadableStreamController");
+ throw @makeThisTypeError("ReadableStreamController", "error");
const stream = this.@controlledReadableStream;
if (stream.@state !== @streamReadable)
@@ -62,7 +62,7 @@
"use strict";
if (!@isReadableStreamController(this))
- throw new @TypeError("Function should be called on a ReadableStreamController");
+ throw @makeThisTypeError("ReadableStreamController", "close");
const stream = this.@controlledReadableStream;
if (stream.@closeRequested)
@@ -79,7 +79,7 @@
"use strict";
if (!@isReadableStreamController(this))
- throw new @TypeError("Function should be called on a ReadableStreamController");
+ throw @makeGetterTypeError("ReadableStreamController", "desiredSize");
return @getReadableStreamDesiredSize(this.@controlledReadableStream);
}
Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js (203765 => 203766)
--- trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamReader.js 2016-07-27 06:37:49 UTC (rev 203766)
@@ -30,7 +30,7 @@
"use strict";
if (!@isReadableStreamReader(this))
- return @Promise.@reject(new @TypeError("Function should be called on a ReadableStreamReader"));
+ return @Promise.@reject(@makeThisTypeError("ReadableStreamReader", "cancel"));
if (!this.@ownerReadableStream)
return @Promise.@reject(new @TypeError("cancel() called on a reader owned by no readable stream"));
@@ -43,7 +43,7 @@
"use strict";
if (!@isReadableStreamReader(this))
- return @Promise.@reject(new @TypeError("Function should be called on a ReadableStreamReader"));
+ return @Promise.@reject(@makeThisTypeError("ReadableStreamReader", "read"));
if (!this.@ownerReadableStream)
return @Promise.@reject(new @TypeError("read() called on a reader owned by no readable stream"));
@@ -55,7 +55,7 @@
"use strict";
if (!@isReadableStreamReader(this))
- throw new @TypeError("Function should be called on a ReadableStreamReader");
+ throw @makeThisTypeError("ReadableStreamReader", "releaseLock");
const stream = this.@ownerReadableStream;
if (!stream)
@@ -78,7 +78,7 @@
"use strict";
if (!@isReadableStreamReader(this))
- return @Promise.@reject(new @TypeError("Callee of closed is not a ReadableStreamReader"));
+ return @Promise.@reject(@makeGetterTypeError("ReadableStreamReader", "closed"));
return this.@closedPromiseCapability.@promise;
}
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (203765 => 203766)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-07-27 06:37:49 UTC (rev 203766)
@@ -833,11 +833,6 @@
return throwVMError(&state, createReferenceError(&state, makeString(interfaceName, " constructor associated document is unavailable")));
}
-JSC::EncodedJSValue throwGetterTypeError(JSC::ExecState& state, const char* interfaceName, const char* attributeName)
-{
- return throwVMTypeError(&state, makeString("The ", interfaceName, '.', attributeName, " getter can only be used on instances of ", interfaceName));
-}
-
void throwSequenceTypeError(JSC::ExecState& state)
{
throwTypeError(state, ASCIILiteral("Value is not a sequence"));
@@ -848,6 +843,16 @@
throwTypeError(&state, ASCIILiteral("The provided value is non-finite"));
}
+String makeGetterTypeErrorMessage(const char* interfaceName, const char* attributeName)
+{
+ return makeString("The ", interfaceName, '.', attributeName, " getter can only be used on instances of ", interfaceName);
+}
+
+JSC::EncodedJSValue throwGetterTypeError(JSC::ExecState& state, const char* interfaceName, const char* attributeName)
+{
+ return throwVMTypeError(&state, makeGetterTypeErrorMessage(interfaceName, attributeName));
+}
+
bool throwSetterTypeError(JSC::ExecState& state, const char* interfaceName, const char* attributeName)
{
throwTypeError(state, makeString("The ", interfaceName, '.', attributeName, " setter can only be used on instances of ", interfaceName));
@@ -854,9 +859,14 @@
return false;
}
+String makeThisTypeErrorMessage(const char* interfaceName, const char* functionName)
+{
+ return makeString("Can only call ", interfaceName, '.', functionName, " on instances of ", interfaceName);
+}
+
EncodedJSValue throwThisTypeError(JSC::ExecState& state, const char* interfaceName, const char* functionName)
{
- return throwVMTypeError(&state, makeString("Can only call ", interfaceName, '.', functionName, " on instances of ", interfaceName));
+ return throwTypeError(state, makeThisTypeErrorMessage(interfaceName, functionName));
}
void callFunctionWithCurrentArguments(JSC::ExecState& state, JSC::JSObject& thisObject, JSC::JSFunction& function)
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (203765 => 203766)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-07-27 06:37:49 UTC (rev 203766)
@@ -125,6 +125,9 @@
JSC::EncodedJSValue throwArgumentMustBeFunctionError(JSC::ExecState&, unsigned argumentIndex, const char* argumentName, const char* functionInterfaceName, const char* functionName);
WEBCORE_EXPORT JSC::EncodedJSValue throwArgumentTypeError(JSC::ExecState&, unsigned argumentIndex, const char* argumentName, const char* functionInterfaceName, const char* functionName, const char* expectedType);
JSC::EncodedJSValue throwConstructorDocumentUnavailableError(JSC::ExecState&, const char* interfaceName);
+
+String makeGetterTypeErrorMessage(const char* interfaceName, const char* attributeName);
+String makeThisTypeErrorMessage(const char* interfaceName, const char* attributeName);
WEBCORE_EXPORT JSC::EncodedJSValue throwGetterTypeError(JSC::ExecState&, const char* interfaceName, const char* attributeName);
WEBCORE_EXPORT JSC::EncodedJSValue throwThisTypeError(JSC::ExecState&, const char* interfaceName, const char* functionName);
Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (203765 => 203766)
--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2016-07-27 06:37:49 UTC (rev 203766)
@@ -45,6 +45,9 @@
namespace WebCore {
+EncodedJSValue JSC_HOST_CALL makeThisTypeErrorForBuiltins(ExecState*);
+EncodedJSValue JSC_HOST_CALL makeGetterTypeErrorForBuiltins(ExecState*);
+
const ClassInfo JSDOMGlobalObject::s_info = { "DOMGlobalObject", &JSGlobalObject::s_info, 0, CREATE_METHOD_TABLE(JSDOMGlobalObject) };
JSDOMGlobalObject::JSDOMGlobalObject(VM& vm, Structure* structure, Ref<DOMWrapperWorld>&& world, const GlobalObjectMethodTable* globalObjectMethodTable)
@@ -61,6 +64,30 @@
static_cast<JSDOMGlobalObject*>(cell)->JSDOMGlobalObject::~JSDOMGlobalObject();
}
+EncodedJSValue JSC_HOST_CALL makeThisTypeErrorForBuiltins(ExecState* execState)
+{
+ ASSERT(execState);
+ ASSERT(execState->argumentCount() == 2);
+
+ auto interfaceName = execState->uncheckedArgument(0).getString(execState);
+ ASSERT(!execState->hadException());
+ auto functionName = execState->uncheckedArgument(1).getString(execState);
+ ASSERT(!execState->hadException());
+ return JSValue::encode(createTypeError(execState, makeThisTypeErrorMessage(interfaceName.utf8().data(), functionName.utf8().data())));
+}
+
+EncodedJSValue JSC_HOST_CALL makeGetterTypeErrorForBuiltins(ExecState* execState)
+{
+ ASSERT(execState);
+ ASSERT(execState->argumentCount() == 2);
+
+ auto interfaceName = execState->uncheckedArgument(0).getString(execState);
+ ASSERT(!execState->hadException());
+ auto attributeName = execState->uncheckedArgument(1).getString(execState);
+ ASSERT(!execState->hadException());
+ return JSValue::encode(createTypeError(execState, makeGetterTypeErrorMessage(interfaceName.utf8().data(), attributeName.utf8().data())));
+}
+
void JSDOMGlobalObject::addBuiltinGlobals(VM& vm)
{
m_builtinInternalFunctions.initialize(*this);
@@ -74,9 +101,15 @@
JSC::WriteBarrier<JSC::JSObject> temp;
constructors().add(privateReadableStreamControllerConstructor->info(), temp).iterator->value.set(vm, this, privateReadableStreamControllerConstructor);
constructors().add(privateReadableStreamReaderConstructor->info(), temp).iterator->value.set(vm, this, privateReadableStreamReaderConstructor);
+#endif
JSVMClientData& clientData = *static_cast<JSVMClientData*>(vm.clientData);
JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
+ JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().makeThisTypeErrorPrivateName(),
+ JSFunction::create(vm, this, 2, String(), makeThisTypeErrorForBuiltins), DontDelete | ReadOnly),
+ JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().makeGetterTypeErrorPrivateName(),
+ JSFunction::create(vm, this, 2, String(), makeGetterTypeErrorForBuiltins), DontDelete | ReadOnly),
+#if ENABLE(STREAMS_API)
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamClosingPrivateName(), jsNumber(2), DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamErroredPrivateName(), jsNumber(3), DontDelete | ReadOnly),
@@ -85,11 +118,9 @@
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamWritablePrivateName(), jsNumber(6), DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().ReadableStreamControllerPrivateName(), privateReadableStreamControllerConstructor, DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().ReadableStreamReaderPrivateName(), privateReadableStreamReaderConstructor, DontDelete | ReadOnly),
+#endif
};
addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
-#else
- UNUSED_PARAM(vm);
-#endif
}
void JSDOMGlobalObject::finishCreation(VM& vm)
Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (203765 => 203766)
--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-07-27 06:35:30 UTC (rev 203765)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2016-07-27 06:37:49 UTC (rev 203766)
@@ -51,6 +51,8 @@
macro(initializeWith) \
macro(isDisturbed) \
macro(localStreams) \
+ macro(makeThisTypeError) \
+ macro(makeGetterTypeError) \
macro(operations) \
macro(ownerReadableStream) \
macro(privateGetStats) \
