172923 2017-06-05 09:32:30 -0700 [GStreamer] Use the same draw timer and mutex when AC disabled or building without OpenGL 2017-06-06 02:01:24 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply magomez mcatanzaro oldest_to_newest 1315711 0 cgarcia 2017-06-05 09:32:30 -0700 We have two different paths to do the same, when building without OpenGL, the VideoRenderRequestScheduler has its own timer and we need to add ifdefs to handle that. But when building with OpenGL we still support non-accelerated rendering that does the same than the VideoRenderRequestScheduler timer, but using the media player timer instead. We can simplify the code and remove more ifdefs by using the media player timer and mutex in all cases for non-accelerated rendering. 1315712 1 312012 cgarcia 2017-06-05 09:35:22 -0700 Created attachment 312012 Patch 1315782 2 312012 mcatanzaro 2017-06-05 14:23:04 -0700 Comment on attachment 312012 Patch Nice! r=me, conditional on Miguel's approval. 1315945 3 magomez 2017-06-06 01:32:06 -0700 Looks good and usual use cases work :) 1315946 4 cgarcia 2017-06-06 01:38:44 -0700 I built without OpenGL yesterday to try it out. 1315949 5 cgarcia 2017-06-06 02:01:24 -0700 Committed r217824: <http://trac.webkit.org/changeset/217824> 312012 2017-06-05 09:35:22 -0700 2017-06-05 14:23:04 -0700 Patch wk2-gst-non-ac-rendering.diff text/plain 8135 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ZDc5ZDEyODI1YS4uMWE5ZDdiODcwZTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMSBAQAogMjAxNy0wNi0wNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dTdHJlYW1lcl0gVXNlIHRoZSBzYW1lIGRyYXcgdGltZXIg YW5kIG11dGV4IHdoZW4gQUMgZGlzYWJsZWQgb3IgYnVpbGRpbmcgd2l0aG91dCBPcGVuR0wKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjkyMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGhhdmUgdHdv IGRpZmZlcmVudCBwYXRocyB0byBkbyB0aGUgc2FtZS4gV2hlbiBidWlsZGluZyB3aXRob3V0IE9w ZW5HTCwgdGhlIFZpZGVvUmVuZGVyUmVxdWVzdFNjaGVkdWxlciBoYXMKKyAgICAgICAgaXRzIG93 biB0aW1lciBhbmQgd2UgbmVlZCB0byBhZGQgaWZkZWZzIHRvIGhhbmRsZSB0aGF0LiBCdXQgd2hl biBidWlsZGluZyB3aXRoIE9wZW5HTCB3ZSBzdGlsbCBzdXBwb3J0CisgICAgICAgIG5vbi1hY2Nl bGVyYXRlZCByZW5kZXJpbmcgdGhhdCBkb2VzIHRoZSBzYW1lIHRoYW4gdGhlIFZpZGVvUmVuZGVy UmVxdWVzdFNjaGVkdWxlciB0aW1lciwgYnV0IHVzaW5nIHRoZSBtZWRpYQorICAgICAgICBwbGF5 ZXIgdGltZXIgaW5zdGVhZC4gV2UgY2FuIHNpbXBsaWZ5IHRoZSBjb2RlIGFuZCByZW1vdmUgbW9y ZSBpZmRlZnMgYnkgdXNpbmcgdGhlIG1lZGlhIHBsYXllciB0aW1lciBhbmQgbXV0ZXgKKyAgICAg ICAgaW4gYWxsIGNhc2VzIGZvciBub24tYWNjZWxlcmF0ZWQgcmVuZGVyaW5nLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZSk6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpyZXBhaW50KToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnRyaWdnZXJSZXBhaW50KToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmNhbmNl bFJlcGFpbnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHA6CisgICAgICAgIChWaWRlb1JlbmRlclJl cXVlc3RTY2hlZHVsZXI6OnN0YXJ0KToKKyAgICAgICAgKFZpZGVvUmVuZGVyUmVxdWVzdFNjaGVk dWxlcjo6c3RvcCk6CisgICAgICAgIChWaWRlb1JlbmRlclJlcXVlc3RTY2hlZHVsZXI6OnJlcXVl c3RSZW5kZXIpOgorICAgICAgICAoVmlkZW9SZW5kZXJSZXF1ZXN0U2NoZWR1bGVyOjpWaWRlb1Jl bmRlclJlcXVlc3RTY2hlZHVsZXIpOiBEZWxldGVkLgorICAgICAgICAoVmlkZW9SZW5kZXJSZXF1 ZXN0U2NoZWR1bGVyOjpyZW5kZXIpOiBEZWxldGVkLgorCisyMDE3LTA2LTA1ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1N0cmVhbWVyXSBE ZWFkbG9jayBpbiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNoYW5nZVBpcGVsaW5lU3Rh dGUsIHdlYiBwcm9jZXNzIG9mdGVuIGxvY2tzIHVwIG9uIHNlZWtpbmcgaW4gYSB5b3V0dWJlIHZp ZGVvIHRoYXQgaGFzIGFscmVhZHkgZnVsbHkgYnVmZmVyZWQKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDAwMwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKaW5kZXggM2MwZmI2NzFlY2Yu LmQ1NjE1MmE5MzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lckJhc2UuY3BwCkBAIC0yMjAsOSArMjIwLDkgQEAgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyQmFzZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZShNZWRpYVBsYXll ciogcGwKICAgICAsIG1fZnBzU2luayhudWxscHRyKQogICAgICwgbV9yZWFkeVN0YXRlKE1lZGlh UGxheWVyOjpIYXZlTm90aGluZykKICAgICAsIG1fbmV0d29ya1N0YXRlKE1lZGlhUGxheWVyOjpF bXB0eSkKKyAgICAsIG1fZHJhd1RpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJk1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnJlcGFpbnQpCiAjaWYgVVNFKFRFWFRVUkVfTUFQUEVS X0dMKQogICAgICwgbV9wbGF0Zm9ybUxheWVyUHJveHkoYWRvcHRSZWYobmV3IFRleHR1cmVNYXBw ZXJQbGF0Zm9ybUxheWVyUHJveHkoKSkpCi0gICAgLCBtX2RyYXdUaW1lcihSdW5Mb29wOjptYWlu KCksIHRoaXMsICZNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpyZXBhaW50KQogI2Vu ZGlmCiB7CiAgICAgZ19tdXRleF9pbml0KCZtX3NhbXBsZU11dGV4KTsKQEAgLTcyOSw3ICs3Mjks NiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnJlcGFpbnQoKQogCiAg ICAgbV9wbGF5ZXItPnJlcGFpbnQoKTsKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKICNp ZiBVU0UoR1NUUkVBTUVSX0dMKQogICAgIGJvb2wgc2hvdWxkTm90aWZ5RHJhdyA9ICFtX3JlbmRl cmluZ0NhbkJlQWNjZWxlcmF0ZWQ7CiAjZWxzZQpAQCAtNzM5LDcgKzczOCw2IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6cmVwYWludCgpCiAgICAgICAgIExvY2tIb2xk ZXIgbG9jayhtX2RyYXdNdXRleCk7CiAgICAgICAgIG1fZHJhd0NvbmRpdGlvbi5ub3RpZnlPbmUo KTsKICAgICB9Ci0jZW5kaWYgLy8gVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQogfQogCiB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnRyaWdnZXJSZXBhaW50KEdzdFNhbXBsZSog c2FtcGxlKQpAQCAtNzU2LDkgKzc1NCw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZTo6dHJpZ2dlclJlcGFpbnQoR3N0U2FtcGxlKiBzYW1wbGUpCiAgICAgICAgIG1fbm90 aWZpZXIubm90aWZ5KE1haW5UaHJlYWROb3RpZmljYXRpb246OlNpemVDaGFuZ2VkLCBbdGhpc10g eyBtX3BsYXllci0+c2l6ZUNoYW5nZWQoKTsgfSk7CiAgICAgfQogCi0jaWYgIVVTRShURVhUVVJF X01BUFBFUl9HTCkKLSAgICByZXBhaW50KCk7Ci0jZWxzZQogICAgIGlmICghbV9yZW5kZXJpbmdD YW5CZUFjY2VsZXJhdGVkKSB7CiAgICAgICAgIExvY2tIb2xkZXIgbG9ja2VyKG1fZHJhd011dGV4 KTsKICAgICAgICAgbV9kcmF3VGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CkBAIC03NjYsNiArNzYx LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjp0cmlnZ2VyUmVwYWlu dChHc3RTYW1wbGUqIHNhbXBsZSkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorI2lmIFVTRShU RVhUVVJFX01BUFBFUl9HTCkKICNpZiBVU0UoR1NUUkVBTUVSX0dMKQogICAgIHB1c2hUZXh0dXJl VG9Db21wb3NpdG9yKCk7CiAjZWxzZQpAQCAtNzc2LDcgKzc3Miw3IEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6dHJpZ2dlclJlcGFpbnQoR3N0U2FtcGxlKiBzYW1wbGUp CiAgICAgICAgIG1fZHJhd0NvbmRpdGlvbi53YWl0KG1fZHJhd011dGV4KTsKICAgICB9CiAjZW5k aWYKLSNlbmRpZiAvLyAhVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2VuZGlmIC8vIFVTRShURVhU VVJFX01BUFBFUl9HTCkKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNl OjpyZXBhaW50Q2FsbGJhY2soTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZSogcGxheWVy LCBHc3RTYW1wbGUqIHNhbXBsZSkKQEAgLTc4Niw3ICs3ODIsNiBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2U6OnJlcGFpbnRDYWxsYmFjayhNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmNhbmNlbFJl cGFpbnQoKQogewotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKICNpZiBVU0UoR1NUUkVBTUVS X0dMKQogICAgIGJvb2wgc2hvdWxkQ2FuY2VsUmVwYWludCA9ICFtX3JlbmRlcmluZ0NhbkJlQWNj ZWxlcmF0ZWQ7CiAjZWxzZQpAQCAtNzk3LDcgKzc5Miw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZTo6Y2FuY2VsUmVwYWludCgpCiAgICAgICAgIExvY2tIb2xkZXIgbG9j a2VyKG1fZHJhd011dGV4KTsKICAgICAgICAgbV9kcmF3Q29uZGl0aW9uLm5vdGlmeU9uZSgpOwog ICAgIH0KLSNlbmRpZiAvLyBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCiB9CiAKIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6cmVwYWludENhbmNlbGxlZENhbGxiYWNrKE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UqIHBsYXllcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oCmluZGV4IDA2NDMxZjFhYmMwLi4wMTI3 NjRiZGQ2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZS5oCkBAIC0yMDgsMTIgKzIwOCwxMyBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBtX3Vz aW5nRmFsbGJhY2tWaWRlb1NpbmsgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9yZW5kZXJpbmdDYW5C ZUFjY2VsZXJhdGVkIHsgZmFsc2UgfTsKIAotI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKLSAg ICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IG1fY29udGV4dDNEOwotICAgIFJlZlB0cjxUZXh0 dXJlTWFwcGVyUGxhdGZvcm1MYXllclByb3h5PiBtX3BsYXRmb3JtTGF5ZXJQcm94eTsKICAgICBD b25kaXRpb24gbV9kcmF3Q29uZGl0aW9uOwogICAgIExvY2sgbV9kcmF3TXV0ZXg7CiAgICAgUnVu TG9vcDo6VGltZXI8TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZT4gbV9kcmF3VGltZXI7 CisKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCisgICAgUmVmUHRyPEdyYXBoaWNzQ29udGV4 dDNEPiBtX2NvbnRleHQzRDsKKyAgICBSZWZQdHI8VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXJQ cm94eT4gbV9wbGF0Zm9ybUxheWVyUHJveHk7CiAjZW5kaWYKIAogI2lmIFVTRShHU1RSRUFNRVJf R0wpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvVmlkZW9TaW5rR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9WaWRlb1NpbmtHU3RyZWFtZXIuY3BwCmluZGV4IDA2MmFmODA4NWZlLi44 ZmI5YzMwYTE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5jcHAKQEAgLTY5LDEz ICs2OSw2IEBAIHN0YXRpYyBHUmVmUHRyPEdzdFNhbXBsZT4gd2Via2l0VmlkZW9TaW5rUmVxdWVz dFJlbmRlcihXZWJLaXRWaWRlb1NpbmsqLCBHc3RCdWZmCiAKIGNsYXNzIFZpZGVvUmVuZGVyUmVx dWVzdFNjaGVkdWxlciB7CiBwdWJsaWM6Ci0gICAgVmlkZW9SZW5kZXJSZXF1ZXN0U2NoZWR1bGVy KCkKLSNpZiAhVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQotICAgICAgICA6IG1fdGltZXIoUnVuTG9v cDo6bWFpbigpLCB0aGlzLCAmVmlkZW9SZW5kZXJSZXF1ZXN0U2NoZWR1bGVyOjpyZW5kZXIpCi0j ZW5kaWYKLSAgICB7Ci0gICAgfQotCiAgICAgdm9pZCBzdGFydCgpCiAgICAgewogICAgICAgICBM b2NrSG9sZGVyIGxvY2tlcihtX3NhbXBsZU11dGV4KTsKQEAgLTg3LDEwICs4MCw2IEBAIHB1Ymxp YzoKICAgICAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9zYW1wbGVNdXRleCk7CiAgICAgICAgIG1f c2FtcGxlID0gbnVsbHB0cjsKICAgICAgICAgbV91bmxvY2tlZCA9IHRydWU7Ci0jaWYgIVVTRShU RVhUVVJFX01BUFBFUl9HTCkKLSAgICAgICAgbV90aW1lci5zdG9wKCk7Ci0gICAgICAgIG1fZGF0 YUNvbmRpdGlvbi5ub3RpZnlPbmUoKTsKLSNlbmRpZgogICAgIH0KIAogICAgIHZvaWQgZHJhaW4o KQpAQCAtMTA5LDQyICs5OCwxOCBAQCBwdWJsaWM6CiAgICAgICAgIGlmICghbV9zYW1wbGUpCiAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCiAg ICAgICAgIGF1dG8gc2FtcGxlID0gV1RGTW92ZShtX3NhbXBsZSk7CiAgICAgICAgIGxvY2tlci51 bmxvY2tFYXJseSgpOwogICAgICAgICBpZiAoTElLRUxZKEdTVF9JU19TQU1QTEUoc2FtcGxlLmdl dCgpKSkpCiAgICAgICAgICAgICB3ZWJraXRWaWRlb1NpbmtSZXBhaW50UmVxdWVzdGVkKHNpbmss IHNhbXBsZS5nZXQoKSk7Ci0jZWxzZQotICAgICAgICBtX3NpbmsgPSBzaW5rOwotICAgICAgICBt X3RpbWVyLnN0YXJ0T25lU2hvdCgwX3MpOwotICAgICAgICBtX2RhdGFDb25kaXRpb24ud2FpdCht X3NhbXBsZU11dGV4KTsKLSNlbmRpZgorCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAog cHJpdmF0ZToKLQotI2lmICFVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCi0gICAgdm9pZCByZW5kZXIo KQotICAgIHsKLSAgICAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9zYW1wbGVNdXRleCk7Ci0gICAg ICAgIEdSZWZQdHI8R3N0U2FtcGxlPiBzYW1wbGUgPSBXVEZNb3ZlKG1fc2FtcGxlKTsKLSAgICAg ICAgR1JlZlB0cjxXZWJLaXRWaWRlb1Npbms+IHNpbmsgPSBXVEZNb3ZlKG1fc2luayk7Ci0gICAg ICAgIGlmIChzYW1wbGUgJiYgIW1fdW5sb2NrZWQgJiYgTElLRUxZKEdTVF9JU19TQU1QTEUoc2Ft cGxlLmdldCgpKSkpCi0gICAgICAgICAgICB3ZWJraXRWaWRlb1NpbmtSZXBhaW50UmVxdWVzdGVk KHNpbmsuZ2V0KCksIHNhbXBsZS5nZXQoKSk7Ci0gICAgICAgIG1fZGF0YUNvbmRpdGlvbi5ub3Rp ZnlPbmUoKTsKLSAgICB9Ci0jZW5kaWYKLQogICAgIExvY2sgbV9zYW1wbGVNdXRleDsKICAgICBH UmVmUHRyPEdzdFNhbXBsZT4gbV9zYW1wbGU7CiAKLSNpZiAhVVNFKFRFWFRVUkVfTUFQUEVSX0dM KQotICAgIFJ1bkxvb3A6OlRpbWVyPFZpZGVvUmVuZGVyUmVxdWVzdFNjaGVkdWxlcj4gbV90aW1l cjsKLSAgICBDb25kaXRpb24gbV9kYXRhQ29uZGl0aW9uOwotICAgIEdSZWZQdHI8V2ViS2l0Vmlk ZW9TaW5rPiBtX3Npbms7Ci0jZW5kaWYKLQogICAgIC8vIElmIHRoaXMgaXMgdHJ1ZSBhbGwgcHJv Y2Vzc2luZyBzaG91bGQgZmluaXNoIEFTQVAKICAgICAvLyBUaGlzIGlzIG5lY2Vzc2FyeSBiZWNh dXNlIHRoZXJlIGNvdWxkIGJlIGEgcmFjZSBiZXR3ZWVuCiAgICAgLy8gdW5sb2NrKCkgYW5kIHJl bmRlcigpLCB3aGVyZSB1bmxvY2soKSB3aW5zLCBzaWduYWxzIHRoZQo=