213661 2020-06-26 14:52:48 -0700 Web Inspector: Canvas: show an error message if unable to fetch shader source 2020-07-07 15:35:40 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg hi inspector-bugzilla-changes sirisopa6315 webkit-bug-importer oldest_to_newest 1666625 0 hi 2020-06-26 14:52:48 -0700 . 1666626 1 402908 hi 2020-06-26 14:53:28 -0700 Created attachment 402908 Patch 1667163 2 402908 bburg 2020-06-29 10:06:22 -0700 Comment on attachment 402908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402908&action=review > Source/WebInspectorUI/UserInterface/Views/ShaderProgramContentView.js:253 > + if (!this.didInitialLayout) { Will this code path ever be taken on subsequent refreshes? If not, how does spinnerContainer get recreated? 1667191 3 402908 hi 2020-06-29 10:58:01 -0700 Comment on attachment 402908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402908&action=review >> Source/WebInspectorUI/UserInterface/Views/ShaderProgramContentView.js:253 >> + if (!this.didInitialLayout) { > > Will this code path ever be taken on subsequent refreshes? If not, how does spinnerContainer get recreated? No, and that's intentional. I think it's a somewhat reasonable claim that "if a shader successfully loads once, it'll likely to successfully load again" (and the same is true for the error case). Yes, it's totally possible for a shader to be destroyed in between two fetches, but I don't think it's gonna be that common. Because of this, we don't want to recreate the spinner each time we fetch as we'd likely see a brief flash from "old content"->"spinner"->"new content" (which is likely the exact same as "old content"). So we only show the spinner for the first fetch as there was no "old content". 1669544 4 402908 bburg 2020-07-07 14:52:20 -0700 Comment on attachment 402908 Patch r=me 1669563 5 ews-feeder 2020-07-07 15:34:44 -0700 Committed r264045: <https://trac.webkit.org/changeset/264045> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402908. 1669566 6 webkit-bug-importer 2020-07-07 15:35:40 -0700 <rdar://problem/65196517> 402908 2020-06-26 14:53:28 -0700 2020-07-07 15:34:44 -0700 Patch bug-213661-20200626145327.patch text/plain 7322 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDAxZjdmOTk1MDQwMTA0ZjFkNjk4ZGVjNGE3MGNk NmU1ZjRlYjNmYTcuLjRiOGUxNzY3NTMyYmJiNmUwMWFmZDE5YzZiYmFiM2I2NGVhYjk0ZGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA2LTI2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD YW52YXM6IHNob3cgYW4gZXJyb3IgbWVzc2FnZSBpZiB1bmFibGUgdG8gZmV0Y2ggc2hhZGVyIHNv dXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEz NjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1Db250ZW50Vmlldy5qczoKKyAgICAgICAg KFdJLlNoYWRlclByb2dyYW1Db250ZW50Vmlldyk6CisgICAgICAgIChXSS5TaGFkZXJQcm9ncmFt Q29udGVudFZpZXcucHJvdG90eXBlLl9yZWZyZXNoQ29udGVudCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9TaGFkZXJQcm9ncmFtQ29udGVudFZpZXcuY3NzOgorICAgICAgICAoLmNv bnRlbnQtdmlldy5zaGFkZXItcHJvZ3JhbSA+IC5zcGlubmVyLWNvbnRhaW5lcik6IEFkZGVkLgor ICAgICAgICAoLmNvbnRlbnQtdmlldy5zaGFkZXItcHJvZ3JhbSA+IC5zcGlubmVyLWNvbnRhaW5l ciA+IC5pbmRldGVybWluYXRlLXByb2dyZXNzLXNwaW5uZXIpOiBBZGRlZC4KKwogMjAyMC0wNi0y MyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogYWRkIGEgdG9vbHRpcCB0byB0aGUgaWNvbiBvZiBvdmVycmlkZGVuIHJlc291cmNlcyB0 byBjbGFyaWZ5IG1lYW5pbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1Db250ZW50Vmlldy5jc3MgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaGFkZXJQcm9ncmFtQ29udGVudFZpZXcu Y3NzCmluZGV4IDJmNmMwNjY0MzExOTE5Y2MxZGNhOGVkZDA0YzMwZjQ2OTAxNzBkZWUuLjA1ZTRm ZjA0ZTZhMGIwNTJmYzk5OWJkZmExNTIyOTVmOWU1MzdmYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1Db250ZW50Vmll dy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2hh ZGVyUHJvZ3JhbUNvbnRlbnRWaWV3LmNzcwpAQCAtNTksNiArNTksMjMgQEAgYm9keVtkaXI9cnRs XSAuY29udGVudC12aWV3LnNoYWRlci1wcm9ncmFtID4gLnNoYWRlci52ZXJ0ZXg6bm90KC5zaGFy ZXMtdmVydGV4LWYKICAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgbGlnaHRncmV5OwogfQog CisuY29udGVudC12aWV3LnNoYWRlci1wcm9ncmFtID4gLnNwaW5uZXItY29udGFpbmVyIHsKKyAg ICBkaXNwbGF5OiBmbGV4OworICAgIGp1c3RpZnktY29udGVudDogY2VudGVyOworICAgIGFsaWdu LWl0ZW1zOiBjZW50ZXI7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAg ICByaWdodDogMDsKKyAgICBib3R0b206IDA7CisgICAgbGVmdDogMDsKKyAgICBiYWNrZ3JvdW5k LWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yLWNvbnRlbnQpOworfQorCisuY29udGVudC12 aWV3LnNoYWRlci1wcm9ncmFtID4gLnNwaW5uZXItY29udGFpbmVyID4gLmluZGV0ZXJtaW5hdGUt cHJvZ3Jlc3Mtc3Bpbm5lciB7CisgICAgd2lkdGg6IDMycHg7CisgICAgaGVpZ2h0OiAzMnB4Owor fQorCiBAbWVkaWEgKHByZWZlcnMtY29sb3Itc2NoZW1lOiBkYXJrKSB7CiAgICAgLmNvbnRlbnQt dmlldy5zaGFkZXItcHJvZ3JhbSA+IC5zaGFkZXIgPiBoZWFkZXIgPiAuc2hhZGVyLXR5cGUgewog ICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclBy b2dyYW1Db250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NoYWRlclByb2dyYW1Db250ZW50Vmlldy5qcwppbmRleCA2ZDQ0ZDZiOGRiZDAwYzAy NjM2OGJiOGE2NDZmY2VlZDJjOGY4NWZiLi4wZjY4NDBiMDE5MWE4MjI1NGY5ODk0ZTNmNWZiM2Zl ZmNjYmM4YzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TaGFkZXJQcm9ncmFtQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2hhZGVyUHJvZ3JhbUNvbnRlbnRWaWV3LmpzCkBA IC04NSwyOCArODUsMjIgQEAgV0kuU2hhZGVyUHJvZ3JhbUNvbnRlbnRWaWV3ID0gY2xhc3MgU2hh ZGVyUHJvZ3JhbUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFYKICAgICAgICAgICAgIGNv bnRhaW5lci5jbGFzc0xpc3QuYWRkKCJzaGFkZXIiLCBzaGFkZXJUeXBlKTsKICAgICAgICAgICAg IGNvbnRhaW5lci5jbGFzc0xpc3QudG9nZ2xlKCJzaGFyZXMtdmVydGV4LWZyYWdtZW50LXNoYWRl ciIsIHNoYXJlc1ZlcnRleEZyYWdtZW50U2hhZGVyKTsKIAotICAgICAgICAgICAgcmV0dXJuIHtj b250YWluZXIsIHRleHRFZGl0b3J9OworICAgICAgICAgICAgcmV0dXJuIHRleHRFZGl0b3I7CiAg ICAgICAgIH07CiAKICAgICAgICAgc3dpdGNoICh0aGlzLnJlcHJlc2VudGVkT2JqZWN0LnByb2dy YW1UeXBlKSB7CiAgICAgICAgIGNhc2UgV0kuU2hhZGVyUHJvZ3JhbS5Qcm9ncmFtVHlwZS5Db21w dXRlOiB7Ci0gICAgICAgICAgICBsZXQgY29tcHV0ZUVkaXRvciA9IGNyZWF0ZUVkaXRvcihXSS5T aGFkZXJQcm9ncmFtLlNoYWRlclR5cGUuQ29tcHV0ZSk7Ci0gICAgICAgICAgICB0aGlzLl9jb21w dXRlQ29udGFpbmVyID0gY29tcHV0ZUVkaXRvci5jb250YWluZXI7Ci0gICAgICAgICAgICB0aGlz Ll9jb21wdXRlRWRpdG9yID0gY29tcHV0ZUVkaXRvci50ZXh0RWRpdG9yOworICAgICAgICAgICAg dGhpcy5fY29tcHV0ZUVkaXRvciA9IGNyZWF0ZUVkaXRvcihXSS5TaGFkZXJQcm9ncmFtLlNoYWRl clR5cGUuQ29tcHV0ZSk7CiAKICAgICAgICAgICAgIHRoaXMuX2xhc3RBY3RpdmVFZGl0b3IgPSB0 aGlzLl9jb21wdXRlRWRpdG9yOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAogICAg ICAgICBjYXNlIFdJLlNoYWRlclByb2dyYW0uUHJvZ3JhbVR5cGUuUmVuZGVyOiB7Ci0gICAgICAg ICAgICBsZXQgdmVydGV4RWRpdG9yID0gY3JlYXRlRWRpdG9yKFdJLlNoYWRlclByb2dyYW0uU2hh ZGVyVHlwZS5WZXJ0ZXgpOwotICAgICAgICAgICAgdGhpcy5fdmVydGV4Q29udGFpbmVyID0gdmVy dGV4RWRpdG9yLmNvbnRhaW5lcjsKLSAgICAgICAgICAgIHRoaXMuX3ZlcnRleEVkaXRvciA9IHZl cnRleEVkaXRvci50ZXh0RWRpdG9yOworICAgICAgICAgICAgdGhpcy5fdmVydGV4RWRpdG9yID0g Y3JlYXRlRWRpdG9yKFdJLlNoYWRlclByb2dyYW0uU2hhZGVyVHlwZS5WZXJ0ZXgpOwogCiAgICAg ICAgICAgICBpZiAoIXNoYXJlc1ZlcnRleEZyYWdtZW50U2hhZGVyKSB7Ci0gICAgICAgICAgICAg ICAgbGV0IGZyYWdtZW50RWRpdG9yID0gY3JlYXRlRWRpdG9yKFdJLlNoYWRlclByb2dyYW0uU2hh ZGVyVHlwZS5GcmFnbWVudCk7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZnJhZ21lbnRDb250YWlu ZXIgPSBmcmFnbWVudEVkaXRvci5jb250YWluZXI7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZnJh Z21lbnRFZGl0b3IgPSBmcmFnbWVudEVkaXRvci50ZXh0RWRpdG9yOworICAgICAgICAgICAgICAg IHRoaXMuX2ZyYWdtZW50RWRpdG9yID0gY3JlYXRlRWRpdG9yKFdJLlNoYWRlclByb2dyYW0uU2hh ZGVyVHlwZS5GcmFnbWVudCk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHRoaXMuX2xh c3RBY3RpdmVFZGl0b3IgPSB0aGlzLl92ZXJ0ZXhFZGl0b3I7CkBAIC0yNTQsMjQgKzI0OCwyOCBA QCBXSS5TaGFkZXJQcm9ncmFtQ29udGVudFZpZXcgPSBjbGFzcyBTaGFkZXJQcm9ncmFtQ29udGVu dFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VgogCiAgICAgX3JlZnJlc2hDb250ZW50KCkKICAgICB7 Ci0gICAgICAgIGxldCBjcmVhdGVDYWxsYmFjayA9IChjb250YWluZXIsIHRleHRFZGl0b3IpID0+ IHsKKyAgICAgICAgbGV0IHNwaW5uZXJDb250YWluZXIgPSBudWxsOworCisgICAgICAgIGlmICgh dGhpcy5kaWRJbml0aWFsTGF5b3V0KSB7CisgICAgICAgICAgICBzcGlubmVyQ29udGFpbmVyID0g dGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsK KyAgICAgICAgICAgIHNwaW5uZXJDb250YWluZXIuY2xhc3NOYW1lID0gInNwaW5uZXItY29udGFp bmVyIjsKKyAgICAgICAgICAgIHNwaW5uZXJDb250YWluZXIuYXBwZW5kQ2hpbGQoKG5ldyBXSS5J bmRldGVybWluYXRlUHJvZ3Jlc3NTcGlubmVyKS5lbGVtZW50KTsKKworICAgICAgICAgICAgdGhp cy5fY29udGVudEVycm9yTWVzc2FnZUVsZW1lbnQ/LnJlbW92ZSgpOworICAgICAgICB9CisKKyAg ICAgICAgbGV0IGNyZWF0ZUNhbGxiYWNrID0gKHRleHRFZGl0b3IpID0+IHsKICAgICAgICAgICAg IHJldHVybiAoc291cmNlKSA9PiB7CisgICAgICAgICAgICAgICAgc3Bpbm5lckNvbnRhaW5lcj8u cmVtb3ZlKCk7CisKICAgICAgICAgICAgICAgICBpZiAoc291cmNlID09PSBudWxsKSB7Ci0gICAg ICAgICAgICAgICAgICAgIGNvbnRhaW5lci5yZW1vdmUoKTsKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgIGlmICghY29udGFp bmVyLnBhcmVudE5vZGUpIHsKLSAgICAgICAgICAgICAgICAgICAgc3dpdGNoIChjb250YWluZXIp IHsKLSAgICAgICAgICAgICAgICAgICAgY2FzZSB0aGlzLl9jb21wdXRlQ29udGFpbmVyOgotICAg ICAgICAgICAgICAgICAgICBjYXNlIHRoaXMuX3ZlcnRleENvbnRhaW5lcjoKLSAgICAgICAgICAg ICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5pbnNlcnRBZGphY2VudEVsZW1lbnQoImFmdGVyYmVn aW4iLCBjb250YWluZXIpOwotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAg ICAgICAgICAgICAgICAgY2FzZSB0aGlzLl9mcmFnbWVudENvbnRhaW5lcjoKLSAgICAgICAgICAg ICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5pbnNlcnRBZGphY2VudEVsZW1lbnQoImJlZm9yZWVu ZCIsIGNvbnRhaW5lcik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgICAgICAgICAgaWYgKCF0aGlzLl9jb250ZW50RXJyb3JNZXNzYWdlRWxlbWVudCkgeworICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgaXNFcnJvciA9IHRydWU7CisgICAgICAgICAgICAg ICAgICAgICAgICB0aGlzLl9jb250ZW50RXJyb3JNZXNzYWdlRWxlbWVudCA9IFdJLmNyZWF0ZU1l c3NhZ2VUZXh0VmlldyhXSS5VSVN0cmluZygiQW4gZXJyb3Igb2NjdXJyZWQgdHJ5aW5nIHRvIGxv YWQgdGhlIHJlc291cmNlLiIpLCBpc0Vycm9yKTsKICAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgICAgICBpZiAoIXRoaXMuX2NvbnRlbnRFcnJvck1lc3NhZ2VFbGVtZW50LnBh cmVudE5vZGUpCisgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5fY29udGVudEVycm9yTWVzc2FnZUVsZW1lbnQpOworICAgICAgICAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgdGV4dEVkaXRv ci5zdHJpbmcgPSBzb3VyY2UgfHwgIiI7CkBAIC0yODAsMTMgKzI3OCwxMyBAQCBXSS5TaGFkZXJQ cm9ncmFtQ29udGVudFZpZXcgPSBjbGFzcyBTaGFkZXJQcm9ncmFtQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5Db250ZW50VgogCiAgICAgICAgIHN3aXRjaCAodGhpcy5yZXByZXNlbnRlZE9iamVjdC5w cm9ncmFtVHlwZSkgewogICAgICAgICBjYXNlIFdJLlNoYWRlclByb2dyYW0uUHJvZ3JhbVR5cGUu Q29tcHV0ZToKLSAgICAgICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmplY3QucmVxdWVzdFNoYWRl clNvdXJjZShXSS5TaGFkZXJQcm9ncmFtLlNoYWRlclR5cGUuQ29tcHV0ZSwgY3JlYXRlQ2FsbGJh Y2sodGhpcy5fY29tcHV0ZUNvbnRhaW5lciwgdGhpcy5fY29tcHV0ZUVkaXRvcikpOworICAgICAg ICAgICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZXF1ZXN0U2hhZGVyU291cmNlKFdJLlNoYWRl clByb2dyYW0uU2hhZGVyVHlwZS5Db21wdXRlLCBjcmVhdGVDYWxsYmFjayh0aGlzLl9jb21wdXRl RWRpdG9yKSk7CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgY2FzZSBXSS5TaGFkZXJQ cm9ncmFtLlByb2dyYW1UeXBlLlJlbmRlcjoKLSAgICAgICAgICAgIHRoaXMucmVwcmVzZW50ZWRP YmplY3QucmVxdWVzdFNoYWRlclNvdXJjZShXSS5TaGFkZXJQcm9ncmFtLlNoYWRlclR5cGUuVmVy dGV4LCBjcmVhdGVDYWxsYmFjayh0aGlzLl92ZXJ0ZXhDb250YWluZXIsIHRoaXMuX3ZlcnRleEVk aXRvcikpOworICAgICAgICAgICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZXF1ZXN0U2hhZGVy U291cmNlKFdJLlNoYWRlclByb2dyYW0uU2hhZGVyVHlwZS5WZXJ0ZXgsIGNyZWF0ZUNhbGxiYWNr KHRoaXMuX3ZlcnRleEVkaXRvcikpOwogICAgICAgICAgICAgaWYgKCF0aGlzLnJlcHJlc2VudGVk T2JqZWN0LnNoYXJlc1ZlcnRleEZyYWdtZW50U2hhZGVyKQotICAgICAgICAgICAgICAgIHRoaXMu cmVwcmVzZW50ZWRPYmplY3QucmVxdWVzdFNoYWRlclNvdXJjZShXSS5TaGFkZXJQcm9ncmFtLlNo YWRlclR5cGUuRnJhZ21lbnQsIGNyZWF0ZUNhbGxiYWNrKHRoaXMuX2ZyYWdtZW50Q29udGFpbmVy LCB0aGlzLl9mcmFnbWVudEVkaXRvcikpOworICAgICAgICAgICAgICAgIHRoaXMucmVwcmVzZW50 ZWRPYmplY3QucmVxdWVzdFNoYWRlclNvdXJjZShXSS5TaGFkZXJQcm9ncmFtLlNoYWRlclR5cGUu RnJhZ21lbnQsIGNyZWF0ZUNhbGxiYWNrKHRoaXMuX2ZyYWdtZW50RWRpdG9yKSk7CiAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIH0KIAo=