151625 2015-11-26 06:23:04 -0800 [Streams API] Remove use of @catch for exposed promises 2015-12-01 00:16:02 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf benjamin calvaris commit-queue darin keith_miller mark.lam msaboff saam oldest_to_newest 1144506 0 youennf 2015-11-26 06:23:04 -0800 @catch is calling then which may be controlled by user scripts. It is better to rewrite the code from @catch(...) to @then(undefined,...). 1144507 1 266185 youennf 2015-11-26 06:27:46 -0800 Created attachment 266185 Patch 1144509 2 calvaris 2015-11-26 06:46:09 -0800 (In reply to comment #0) > @catch is calling then which may be controlled by user scripts. > It is better to rewrite the code from @catch(...) to @then(undefined,...). I like the patch, it solves the issue. There's an alternative though that might keep some readability in patches as you wouldn't need to so @then(undefined, ...) and would be using @then instead of then for the catch implementation. That might even make other code more robust. 1144510 3 calvaris 2015-11-26 06:47:15 -0800 (In reply to comment #2) > @then(undefined, ...) and would be using @then instead of then for the catch > implementation. That might even make other code more robust. If you decide to do this, do not forget to change the bug description. 1144512 4 youennf 2015-11-26 06:55:49 -0800 (In reply to comment #2) > (In reply to comment #0) > > @catch is calling then which may be controlled by user scripts. > > It is better to rewrite the code from @catch(...) to @then(undefined,...). > > I like the patch, it solves the issue. There's an alternative though that > might keep some readability in patches as you wouldn't need to so > @then(undefined, ...) and would be using @then instead of then for the catch > implementation. That might even make other code more robust. The catch method is defined in the spec so as to rely on the "then" property, which makes that approach impossible. We could write @catch with a new JS code that would call @then, but I don't think the improved readability is sufficient to make that appealing. 1144523 5 calvaris 2015-11-26 08:42:21 -0800 (In reply to comment #4) > The catch method is defined in the spec so as to rely on the "then" > property, which makes that approach impossible. I suspected that, yes. > We could write @catch with a new JS code that would call @then, but I don't > think the improved readability is sufficient to make that appealing. Agree. 1145167 6 266185 commit-queue 2015-12-01 00:15:59 -0800 Comment on attachment 266185 Patch Clearing flags on attachment: 266185 Committed r192865: <http://trac.webkit.org/changeset/192865> 1145168 7 commit-queue 2015-12-01 00:16:02 -0800 All reviewed patches have been landed. Closing bug. 266185 2015-11-26 06:27:46 -0800 2015-12-01 00:15:59 -0800 Patch bug-151625-20151126152727.patch text/plain 5836 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 OWY2ODc4NWQ5N2U5Nzc2Njg0M2Y4ZTMzMmI2NTE4YTBiNTUwNmM4Li5mNWJhYmQ4MDU3YzBmMTlm ZDIzOTMwMTMzNDJiY2E1YTQwNDdjODY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxNS0xMS0yNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubi5mYWJsZXRAY3Jm LmNhbm9uLmZyPgorCisgICAgICAgIFtTdHJlYW1zIEFQSV0gUmVtb3ZlIHVzZSBvZiBAY2F0Y2gg Zm9yIGV4cG9zZWQgcHJvbWlzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MTYyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcnVudGltZS9KU1Byb21pc2VQcm90b3R5cGUuY3BwOgorICAgICAgICAo SlNDOjpKU1Byb21pc2VQcm90b3R5cGU6OmFkZE93bkludGVybmFsU2xvdHMpOiBSZW1vdmluZyBA Y2F0Y2ggZnJvbSB0aGUgcHJvdG90eXBlIGFzIGl0IGlzIG5vdCBzYWZlLgorCiAyMDE1LTExLTI2 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R0xJQl0gSW1wbGVtZW50IGdhcmJhZ2UgY29sbGVjdG9yIHRpbWVycwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDMz OTNkYTdlNGQwZWQxYTI5NzEzMjc1Mjg0MzJmOWZkZTQ5NzljN2UuLjRmN2Y2NDNkNDRlM2QxYzc4 MDYxOWZhZjRjYmExNTc2NWYyZjgxMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAx NS0xMS0yNiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubi5mYWJsZXRAY3JmLmNhbm9uLmZyPgorCisg ICAgICAgIFtTdHJlYW1zIEFQSV0gUmVtb3ZlIHVzZSBvZiBAY2F0Y2ggZm9yIGV4cG9zZWQgcHJv bWlzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 MTYyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBy b21pc2UgQGNhdGNoIGlzIGNhbGxpbmcgInRoZW4iIHdoaWNoIG1heSBiZSBjb250cm9sbGVkIGJ5 IHVzZXIgc2NyaXB0cy4KKyAgICAgICAgVGhpcyBwYXRjaCBzaW1wbHkgcmVwbGFjZXMgQGNhdGNo IGJ5IGNhbGxpbmcgQHRoZW4gZGlyZWN0bHkuCisKKyAgICAgICAgQ292ZXJlZCBieSBtb2RpZmll ZCB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbS5qczoK KyAgICAgICAgKHBpcGVUbyk6CisgICAgICAgICogTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3Ry ZWFtSW50ZXJuYWxzLmpzOgorICAgICAgICAodGVlUmVhZGFibGVTdHJlYW0pOgorCiAyMDE1LTEx LTE4ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29udGVudCBG aWx0ZXJpbmddIENyYXNoIGluIERvY3VtZW50TG9hZGVyOjpub3RpZnlGaW5pc2hlZCgpIHdoZW4g YWxsb3dpbmcgYSBtZWRpYSBkb2N1bWVudCB0byBsb2FkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU1Byb21pc2VQcm90b3R5cGUuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNQcm9taXNlUHJvdG90eXBlLmNwcAppbmRleCAzYjlkMDNmNjFj Zjc1ZTAzNTliZWFmYzQ0N2JhMTUwNmQ2M2M0ZDRiLi40ZGFkYzNhMTdlMjY5NTViODgwNjhmZDFk YmUzN2RjOTY5ZjI3MDBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU1Byb21pc2VQcm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTUHJvbWlzZVByb3RvdHlwZS5jcHAKQEAgLTgzLDcgKzgzLDYgQEAgdm9pZCBKU1Byb21p c2VQcm90b3R5cGU6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgU3RydWN0dXJlKikKIHZvaWQgSlNQ cm9taXNlUHJvdG90eXBlOjphZGRPd25JbnRlcm5hbFNsb3RzKFZNJiB2bSwgSlNHbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCkKIHsKICAgICBKU0NfQlVJTFRJTl9GVU5DVElPTih2bS5wcm9wZXJ0 eU5hbWVzLT5idWlsdGluTmFtZXMoKS50aGVuUHJpdmF0ZU5hbWUoKSwgcHJvbWlzZVByb3RvdHlw ZVRoZW5Db2RlR2VuZXJhdG9yLCBEb250RW51bSB8IERvbnREZWxldGUgfCBSZWFkT25seSk7Ci0g ICAgSlNDX0JVSUxUSU5fRlVOQ1RJT04odm0ucHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCku Y2F0Y2hQcml2YXRlTmFtZSgpLCBwcm9taXNlUHJvdG90eXBlQ2F0Y2hDb2RlR2VuZXJhdG9yLCBE b250RW51bSB8IERvbnREZWxldGUgfCBSZWFkT25seSk7CiB9CiAKIGJvb2wgSlNQcm9taXNlUHJv dG90eXBlOjpnZXRPd25Qcm9wZXJ0eVNsb3QoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRlKiBl eGVjLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uanMg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uanMKaW5kZXgg Njk2Yzk3OGQ0ZjBhM2Q3Y2EzOWQ4Nzc5MDU2MTg2Yjg5MzBmODgyYi4uYzZlY2M3MTRiNjFiNWVk MDcxZjlkYWNlZGI1ZjZmODhlYjQyNDc0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbS5qcwpAQCAtMTcxLDcgKzE3MSw3IEBAIGZ1bmN0aW9u IHBpcGVUbyhkZXN0aW5hdGlvbiwgb3B0aW9ucykKIAogICAgIHJlYWRlciA9IHNvdXJjZS5nZXRS ZWFkZXIoKTsKIAotICAgIEBQcm9taXNlLnByb3RvdHlwZS5AY2F0Y2guQGNhbGwocmVhZGVyLmNs b3NlZCwgYWJvcnREZXN0aW5hdGlvbik7CisgICAgQFByb21pc2UucHJvdG90eXBlLkB0aGVuLkBj YWxsKHJlYWRlci5jbG9zZWQsIHVuZGVmaW5lZCwgYWJvcnREZXN0aW5hdGlvbik7CiAgICAgQFBy b21pc2UucHJvdG90eXBlLkB0aGVuLkBjYWxsKGRlc3RpbmF0aW9uLmNsb3NlZCwKICAgICAgICAg ZnVuY3Rpb24oKSB7CiAgICAgICAgICAgICBpZiAoIWNsb3NlZFB1cnBvc2VmdWxseSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbUludGVy bmFscy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbUlu dGVybmFscy5qcwppbmRleCAzNjdiMTYxZWFhYjYwMDhlZjlhOTllYWE3YTNjNmQ3OWFjZmRjZjk1 Li5hODc4YTVjMWE2M2I2MzQ2NTE3YmJjYTkyNmYzODNhZjg2ZDYyMWVmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1JbnRlcm5hbHMuanMK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtSW50ZXJu YWxzLmpzCkBAIC05Niw3ICs5Niw3IEBAIGZ1bmN0aW9uIHRlZVJlYWRhYmxlU3RyZWFtKHN0cmVh bSwgc2hvdWxkQ2xvbmUpCiAgICAgICAgICJjYW5jZWwiOiBAdGVlUmVhZGFibGVTdHJlYW1CcmFu Y2gyQ2FuY2VsRnVuY3Rpb24odGVlU3RhdGUsIHN0cmVhbSkKICAgICB9KTsKIAotICAgIEBQcm9t aXNlLnByb3RvdHlwZS5AY2F0Y2guQGNhbGwocmVhZGVyLmNsb3NlZCwgZnVuY3Rpb24oZSkgewor ICAgIEBQcm9taXNlLnByb3RvdHlwZS5AdGhlbi5AY2FsbChyZWFkZXIuY2xvc2VkLCB1bmRlZmlu ZWQsIGZ1bmN0aW9uKGUpIHsKICAgICAgICAgaWYgKHRlZVN0YXRlLmNsb3NlZE9yRXJyb3JlZCkK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgQGVycm9yUmVhZGFibGVTdHJlYW0oYnJhbmNo MSwgZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggNjk0ZjBjNWQxYmViMzc4NzI5OTVmZmEyODRmODdjNTQ3NmUzOWZiZi4u NDU2OGJiNzM5OWU2ZTU0MzkxNmY0NjE5YTk5ODUwZjVjNDI4YTk2ZiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEyIEBACisyMDE1LTExLTI2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fu b24uZnI+CisKKyAgICAgICAgW1N0cmVhbXMgQVBJXSBSZW1vdmUgdXNlIG9mIEBjYXRjaCBmb3Ig ZXhwb3NlZCBwcm9taXNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTUxNjI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBzdHJlYW1zL3N0cmVhbXMtcHJvbWlzZXMuaHRtbDogYmVlZmluZyB1cCB0aGUg Y2F0Y2ggdGVzdCBieSBhbHNvIG92ZXJ3cml0dGluZyBQcm9taXNlLnByb3RvdHlwZS50aGVuLgor CiAyMDE1LTExLTE4ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBb Q29udGVudCBGaWx0ZXJpbmddIENyYXNoIGluIERvY3VtZW50TG9hZGVyOjpub3RpZnlGaW5pc2hl ZCgpIHdoZW4gYWxsb3dpbmcgYSBtZWRpYSBkb2N1bWVudCB0byBsb2FkCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9zdHJlYW1zL3N0cmVhbXMtcHJvbWlzZXMuaHRtbCBiL0xheW91dFRlc3RzL3N0 cmVhbXMvc3RyZWFtcy1wcm9taXNlcy5odG1sCmluZGV4IDFhYWM0NmE4NjM3NjJjNjA0MTYzNDhm NTlmMjQwMzQxOWQyM2Y2NzMuLjhiZThhNjVkZGIzMTUxMGNlZDg2NGU0OTc0NGI2YTQ2NTk0MzVm MTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3N0cmVhbXMvc3RyZWFtcy1wcm9taXNlcy5odG1s CisrKyBiL0xheW91dFRlc3RzL3N0cmVhbXMvc3RyZWFtcy1wcm9taXNlcy5odG1sCkBAIC02Niwx NCArNjYsMTcgQEAgdGVzdChmdW5jdGlvbigpIHsKIAogdGVzdChmdW5jdGlvbigpIHsKICAgICBj b25zdCBQcm9taXNlQ2F0Y2hCYWNrdXAgPSBQcm9taXNlLnByb3RvdHlwZS5jYXRjaDsKKyAgICBj b25zdCBQcm9taXNlVGhlbkJhY2t1cCA9IFByb21pc2UucHJvdG90eXBlLnRoZW47CiAKICAgICB0 cnkgewogICAgICAgICBQcm9taXNlLnByb3RvdHlwZS5jYXRjaCA9IGZ1bmN0aW9uKCkgeyBhc3Nl cnRfdW5yZWFjaGVkKCJzdHJlYW1zIHNob3VsZCBub3QgdXNlIHRoaXMgUHJvbWlzZS5wcm90b3R5 cGUuY2F0Y2ggbWV0aG9kIik7IH07CisgICAgICAgIFByb21pc2UucHJvdG90eXBlLnRoZW4gPSBm dW5jdGlvbigpIHsgYXNzZXJ0X3VucmVhY2hlZCgic3RyZWFtcyBzaG91bGQgbm90IHVzZSB0aGlz IFByb21pc2UucHJvdG90eXBlLmNhdGNoIG1ldGhvZCIpOyB9OwogCiAgICAgICAgIGNvbnN0IHJz ID0gbmV3IFJlYWRhYmxlU3RyZWFtKCk7CiAgICAgICAgIHJzLnRlZSgpOwogICAgIH0gZmluYWxs eSB7CiAgICAgICAgIFByb21pc2UucHJvdG90eXBlLmNhdGNoID0gUHJvbWlzZUNhdGNoQmFja3Vw OworICAgICAgICBQcm9taXNlLnByb3RvdHlwZS50aGVuID0gUHJvbWlzZVRoZW5CYWNrdXA7CiAg ICAgfQogfSwgJ1N0cmVhbXMgYW5kIHByb21pc2VzOiByZXBsYWNlIGNhdGNoIG1ldGhvZCBpbiBQ cm9taXNlIHByb3RvdHlwZScpOwogCg==