229061 2021-08-12 17:22:41 -0700 Web Inspector: refactor `WI.ImageUtilities.scratchCanvasContext2D` to not use a callback 2022-03-28 09:14:03 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All NEW InRadar P2 Normal --- 1 hi hi ews-watchlist hi inspector-bugzilla-changes pangle webkit-bug-importer oldest_to_newest 1783999 0 hi 2021-08-12 17:22:41 -0700 Having a callback makes it unclear as to whether the function is async (it's not). All of the callers expect it to be sync. 1784000 1 435458 hi 2021-08-12 17:29:37 -0700 Created attachment 435458 Patch 1784132 2 435458 pangle 2021-08-13 09:45:59 -0700 Comment on attachment 435458 Patch I thought about this some more, and I'm concerned it trades one confusing construct for another, less common, confusing construct. The call sites at first glance now read as loops, which to me invokes the question "Why does this work need to be done more than once", a question that much like the sync/async situation can only really be answered by a trip to the definition of `WI.ImageUtilities.scratchCanvasContext2D`. I enjoy this solution from a technical perspective, but I'm not sure it meets the stated goal in the changelog of making these call sites clearer. It's just unclear in a different way. 1784172 3 hi 2021-08-13 11:14:19 -0700 Yeah FWIW this is kinda a "hack" of sorts 😅 I personally found that the loop looked better than a callback, but that's just me. 1785638 4 webkit-bug-importer 2021-08-19 17:23:24 -0700 <rdar://problem/82148919> 435458 2021-08-12 17:29:37 -0700 2022-03-28 09:14:03 -0700 Patch bug-229061-20210812172937.patch text/plain 7197 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDUxMjQxZjNkY2U3NmYwNTA2NzE2OGEzNzcxYzhh YTQ5NGExOTk3ODkuLjExZDVkODE4MzliZjM4N2QwMjc2MzQ1N2UzNTM2NTJmNDBjNmI1NWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA4LTEyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBy ZWZhY3RvciBgV0kuSW1hZ2VVdGlsaXRpZXMuc2NyYXRjaENhbnZhc0NvbnRleHQyRGAgdG8gbm90 IHVzZSBhIGNhbGxiYWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjkwNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBIYXZpbmcgYSBjYWxsYmFjayBtYWtlcyBpdCB1bmNsZWFyIGFzIHRvIHdoZXRoZXIg dGhlIGZ1bmN0aW9uIGlzIGFzeW5jLiBBbGwgb2YgdGhlIGNhbGxlcnMKKyAgICAgICAgZXhwZWN0 IGl0IHRvIGJlIHN5bmMuIEluc3RlYWQsIG1ha2UgdGhlIGZ1bmN0aW9uIGEgSlMgZ2VuZXJhdG9y IHNvIHRoYXQgaXQgY2FuIGB5aWVsZGAgdGhlCisgICAgICAgIDJEIGNhbnZhcyBjb250ZXh0IGFu ZCBzdGlsbCBoYXZlIGxvZ2ljIGFmdGVyIHRoYXQgIml0ZXJhdGlvbiIgdG8gcmVzZXQgYW55IG1v ZGlmaWVkIHN0YXRlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0 aWVzLmpzOgorICAgICAgICAoV0kuSW1hZ2VVdGlsaXRpZXMuc2NyYXRjaENhbnZhc0NvbnRleHQy RCk6CisgICAgICAgIChXSS5JbWFnZVV0aWxpdGllcy5pbWFnZUZyb21JbWFnZUJpdG1hcCk6Cisg ICAgICAgIChXSS5JbWFnZVV0aWxpdGllcy5pbWFnZUZyb21JbWFnZURhdGEpOgorICAgICAgICAo V0kuSW1hZ2VVdGlsaXRpZXMuaW1hZ2VGcm9tQ2FudmFzR3JhZGllbnQpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgIChIVE1MSW5wdXRFbGVtZW50 LnByb3RvdHlwZS5hdXRvc2l6ZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvUmVj b3JkaW5nLmpzOgorICAgICAgICAoV0kuUmVjb3JkaW5nLnByb3RvdHlwZS5hc3luYyBzd2l6emxl KToKKwogMjAyMS0wOC0xMiAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogQWRkaW5nIGV4ZWN1dGlvbiBjb250ZXh0cyBhZnRlciBwYWdl IGxvYWQgZG9lc24ndCBzaG93IGEgaGlkZGVuIGV4ZWN1dGlvbiBzZWxlY3RvcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGll cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGls aXRpZXMuanMKaW5kZXggMGY5ZjZjY2VkMWI0YWViODUyN2JmNDIzY2ZkZjkzMjliNDllNzA4OS4u OGY0MDI0N2I2NzU2NWQ1ZDIxZTE0ZmVjMGU3ZDRkNzk3MDExZTdiNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0 aWVzLmpzCkBAIC02NSwxNiArNjUsMTYgQEAgV0kuSW1hZ2VVdGlsaXRpZXMgPSBjbGFzcyBJbWFn ZVV0aWxpdGllcyB7CiAgICAgICAgIH0pOwogICAgIH0KIAotICAgIHN0YXRpYyBzY3JhdGNoQ2Fu dmFzQ29udGV4dDJEKGNhbGxiYWNrKQorICAgIHN0YXRpYyAqc2NyYXRjaENhbnZhc0NvbnRleHQy RCgpCiAgICAgewogICAgICAgICBpZiAoIVdJLkltYWdlVXRpbGl0aWVzLl9zY3JhdGNoQ29udGV4 dDJEKQogICAgICAgICAgICAgV0kuSW1hZ2VVdGlsaXRpZXMuX3NjcmF0Y2hDb250ZXh0MkQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJjYW52YXMiKS5nZXRDb250ZXh0KCIyZCIpOwogCiAgICAg ICAgIGxldCBjb250ZXh0ID0gV0kuSW1hZ2VVdGlsaXRpZXMuX3NjcmF0Y2hDb250ZXh0MkQ7Ci0K ICAgICAgICAgY29udGV4dC5jbGVhclJlY3QoMCwgMCwgY29udGV4dC5jYW52YXMud2lkdGgsIGNv bnRleHQuY2FudmFzLmhlaWdodCk7CisgICAgICAgIGNvbnRleHQuYmVnaW5QYXRoKCk7CiAgICAg ICAgIGNvbnRleHQuc2F2ZSgpOwotICAgICAgICBjYWxsYmFjayhjb250ZXh0KTsKKyAgICAgICAg eWllbGQgY29udGV4dDsKICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CiAgICAgfQogCkBAIC04 MywxNCArODMsMTQgQEAgV0kuSW1hZ2VVdGlsaXRpZXMgPSBjbGFzcyBJbWFnZVV0aWxpdGllcyB7 CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGRhdGEgaW5zdGFuY2VvZiBJbWFnZUJpdG1hcCk7CiAK ICAgICAgICAgbGV0IGltYWdlID0gbnVsbDsKLSAgICAgICAgV0kuSW1hZ2VVdGlsaXRpZXMuc2Ny YXRjaENhbnZhc0NvbnRleHQyRCgoY29udGV4dCkgPT4geworICAgICAgICBmb3IgKGxldCBjb250 ZXh0IG9mIFdJLkltYWdlVXRpbGl0aWVzLnNjcmF0Y2hDYW52YXNDb250ZXh0MkQoKSkgewogICAg ICAgICAgICAgY29udGV4dC5jYW52YXMud2lkdGggPSBkYXRhLndpZHRoOwogICAgICAgICAgICAg Y29udGV4dC5jYW52YXMuaGVpZ2h0ID0gZGF0YS5oZWlnaHQ7CiAgICAgICAgICAgICBjb250ZXh0 LmRyYXdJbWFnZShkYXRhLCAwLCAwKTsKIAogICAgICAgICAgICAgaW1hZ2UgPSBuZXcgSW1hZ2U7 CiAgICAgICAgICAgICBpbWFnZS5zcmMgPSBjb250ZXh0LmNhbnZhcy50b0RhdGFVUkwoKTsKLSAg ICAgICAgfSk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGltYWdlOwogICAgIH0KIApAQCAt OTksMTQgKzk5LDE0IEBAIFdJLkltYWdlVXRpbGl0aWVzID0gY2xhc3MgSW1hZ2VVdGlsaXRpZXMg ewogICAgICAgICBjb25zb2xlLmFzc2VydChkYXRhIGluc3RhbmNlb2YgSW1hZ2VEYXRhKTsKIAog ICAgICAgICBsZXQgaW1hZ2UgPSBudWxsOwotICAgICAgICBXSS5JbWFnZVV0aWxpdGllcy5zY3Jh dGNoQ2FudmFzQ29udGV4dDJEKChjb250ZXh0KSA9PiB7CisgICAgICAgIGZvciAobGV0IGNvbnRl eHQgb2YgV0kuSW1hZ2VVdGlsaXRpZXMuc2NyYXRjaENhbnZhc0NvbnRleHQyRCgpKSB7CiAgICAg ICAgICAgICBjb250ZXh0LmNhbnZhcy53aWR0aCA9IGRhdGEud2lkdGg7CiAgICAgICAgICAgICBj b250ZXh0LmNhbnZhcy5oZWlnaHQgPSBkYXRhLmhlaWdodDsKICAgICAgICAgICAgIGNvbnRleHQu cHV0SW1hZ2VEYXRhKGRhdGEsIDAsIDApOwogCiAgICAgICAgICAgICBpbWFnZSA9IG5ldyBJbWFn ZTsKICAgICAgICAgICAgIGltYWdlLnNyYyA9IGNvbnRleHQuY2FudmFzLnRvRGF0YVVSTCgpOwot ICAgICAgICB9KTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4gaW1hZ2U7CiAgICAgfQogCkBA IC0xMTUsNyArMTE1LDcgQEAgV0kuSW1hZ2VVdGlsaXRpZXMgPSBjbGFzcyBJbWFnZVV0aWxpdGll cyB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGdyYWRpZW50IGluc3RhbmNlb2YgQ2FudmFzR3Jh ZGllbnQpOwogCiAgICAgICAgIGxldCBpbWFnZSA9IG51bGw7Ci0gICAgICAgIFdJLkltYWdlVXRp bGl0aWVzLnNjcmF0Y2hDYW52YXNDb250ZXh0MkQoKGNvbnRleHQpID0+IHsKKyAgICAgICAgZm9y IChsZXQgY29udGV4dCBvZiBXSS5JbWFnZVV0aWxpdGllcy5zY3JhdGNoQ2FudmFzQ29udGV4dDJE KCkpIHsKICAgICAgICAgICAgIGNvbnRleHQuY2FudmFzLndpZHRoID0gd2lkdGg7CiAgICAgICAg ICAgICBjb250ZXh0LmNhbnZhcy5oZWlnaHQgPSBoZWlnaHQ7CiAgICAgICAgICAgICBjb250ZXh0 LmZpbGxTdHlsZSA9IGdyYWRpZW50OwpAQCAtMTIzLDcgKzEyMyw3IEBAIFdJLkltYWdlVXRpbGl0 aWVzID0gY2xhc3MgSW1hZ2VVdGlsaXRpZXMgewogCiAgICAgICAgICAgICBpbWFnZSA9IG5ldyBJ bWFnZTsKICAgICAgICAgICAgIGltYWdlLnNyYyA9IGNvbnRleHQuY2FudmFzLnRvRGF0YVVSTCgp OwotICAgICAgICB9KTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4gaW1hZ2U7CiAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0 aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRp bGl0aWVzLmpzCmluZGV4IDJkOTE5NjA1ZmYyM2IzMjBkOWRiNDk3MjdiZTIxMTQ4NzFmNmZjN2Uu Ljg5NDFjN2U2MmY0YjZhYjAxYzRiOWQ2ODc3MWI5MmQ4OWU3OTY5OWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBA IC01MDUsMTMgKzUwNSwxMyBAQCBPYmplY3QuZGVmaW5lUHJvcGVydHkoRG9jdW1lbnRGcmFnbWVu dC5wcm90b3R5cGUsICJjcmVhdGVDaGlsZCIsCiAgICAgICAgICAgICAgICAgZXh0cmEgKz0gMTM7 IC8vIE51bWJlciBpbnB1dCBpbm5lciBzcGluIGJ1dHRvbiB3aWR0aC4KICAgICAgICAgICAgIGV4 dHJhICs9IDI7IC8vIEFkZCBleHRyYSBwaXhlbHMgZm9yIHRoZSBjdXJzb3IuCiAKLSAgICAgICAg ICAgIFdJLkltYWdlVXRpbGl0aWVzLnNjcmF0Y2hDYW52YXNDb250ZXh0MkQoKGNvbnRleHQpID0+ IHsKKyAgICAgICAgICAgIGZvciAobGV0IGNvbnRleHQgb2YgV0kuSW1hZ2VVdGlsaXRpZXMuc2Ny YXRjaENhbnZhc0NvbnRleHQyRCgpKSB7CiAgICAgICAgICAgICAgICAgdGhpc1tmb250U3ltYm9s XSB8fD0gd2luZG93LmdldENvbXB1dGVkU3R5bGUodGhpcykuZm9udDsKIAogICAgICAgICAgICAg ICAgIGNvbnRleHQuZm9udCA9IHRoaXNbZm9udFN5bWJvbF07CiAgICAgICAgICAgICAgICAgbGV0 IHRleHRNZXRyaWNzID0gY29udGV4dC5tZWFzdXJlVGV4dCh0aGlzLnZhbHVlIHx8IHRoaXMucGxh Y2Vob2xkZXIpOwogICAgICAgICAgICAgICAgIHRoaXMuc3R5bGUuc2V0UHJvcGVydHkoIndpZHRo IiwgKHRleHRNZXRyaWNzLndpZHRoICsgZXh0cmEpICsgInB4Iik7Ci0gICAgICAgICAgICB9KTsK KyAgICAgICAgICAgIH0KICAgICAgICAgfSwKICAgICB9KTsKIH0pKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVjb3JkaW5nLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlY29yZGluZy5qcwpp bmRleCA2MDRhOTllNWM4Yzk5MWIwMDM2NzZjZTY4YTk4OTUzMTI4Mzk0OTMwLi40N2M3MzlmNmVh MWE3ZWYzZmU0MWFjNzA0ZTE1ODRhMmI3YWY2ZjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVjb3JkaW5nLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZWNvcmRpbmcuanMKQEAgLTQwNywx NCArNDA3LDE0IEBAIFdJLlJlY29yZGluZyA9IGNsYXNzIFJlY29yZGluZyBleHRlbmRzIFdJLk9i amVjdAogCiAgICAgICAgICAgICAgICAgICAgIHBvaW50cyA9IGF3YWl0IFByb21pc2UuYWxsKHBv aW50cy5tYXAoKGl0ZW0pID0+IHRoaXMuc3dpenpsZShpdGVtLCBXSS5SZWNvcmRpbmcuU3dpenps ZS5OdW1iZXIpKSk7CiAKLSAgICAgICAgICAgICAgICAgICAgV0kuSW1hZ2VVdGlsaXRpZXMuc2Ny YXRjaENhbnZhc0NvbnRleHQyRCgoY29udGV4dCkgPT4geworICAgICAgICAgICAgICAgICAgICBm b3IgKGxldCBjb250ZXh0IG9mIFdJLkltYWdlVXRpbGl0aWVzLnNjcmF0Y2hDYW52YXNDb250ZXh0 MkQoKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGdyYWRpZW50VHlwZSA9PSAicmFk aWFsLWdyYWRpZW50IikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9zd2l6emxl W2luZGV4XVt0eXBlXSA9IGNvbnRleHQuY3JlYXRlUmFkaWFsR3JhZGllbnQoLi4ucG9pbnRzKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKGdyYWRpZW50VHlwZSA9PSAibGluZWFy LWdyYWRpZW50IikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9zd2l6emxlW2lu ZGV4XVt0eXBlXSA9IGNvbnRleHQuY3JlYXRlTGluZWFyR3JhZGllbnQoLi4ucG9pbnRzKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 aGlzLl9zd2l6emxlW2luZGV4XVt0eXBlXSA9IGNvbnRleHQuY3JlYXRlQ29uaWNHcmFkaWVudCgu Li5wb2ludHMpOwotICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICAgICAg fQogCiAgICAgICAgICAgICAgICAgICAgIGxldCBzdG9wcyA9IFtdOwogICAgICAgICAgICAgICAg ICAgICBmb3IgKGxldCBzdG9wIG9mIGRhdGFbMl0pIHsKQEAgLTQzNywxMCArNDM3LDEwIEBAIFdJ LlJlY29yZGluZyA9IGNsYXNzIFJlY29yZGluZyBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAg ICAgICAgICAgICAgICAgdGhpcy5zd2l6emxlKGRhdGFbMV0sIFdJLlJlY29yZGluZy5Td2l6emxl LlN0cmluZyksCiAgICAgICAgICAgICAgICAgICAgIF0pOwogCi0gICAgICAgICAgICAgICAgICAg IFdJLkltYWdlVXRpbGl0aWVzLnNjcmF0Y2hDYW52YXNDb250ZXh0MkQoKGNvbnRleHQpID0+IHsK KyAgICAgICAgICAgICAgICAgICAgZm9yIChsZXQgY29udGV4dCBvZiBXSS5JbWFnZVV0aWxpdGll cy5zY3JhdGNoQ2FudmFzQ29udGV4dDJEKCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHRo aXMuX3N3aXp6bGVbaW5kZXhdW3R5cGVdID0gY29udGV4dC5jcmVhdGVQYXR0ZXJuKGltYWdlLCBy ZXBlYXQpOwogICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fc3dpenpsZVtpbmRleF1bdHlw ZV0uX19pbWFnZSA9IGltYWdlOwotICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgICAgIHRoaXMuX3N3aXp6bGVbaW5kZXhdW3R5 cGVdLl9fZGF0YSA9IHtpbWFnZTogaW1hZ2UuX19kYXRhLCByZXBlYXR9OwogICAgICAgICAgICAg ICAgICAgICBicmVhazsK