183332 2018-03-05 07:58:46 -0800 [CoordGraphics] Clean up CoordinatedImageBacking 2018-03-06 03:36:23 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan bugs-noreply cgarcia webkit-bug-importer oldest_to_newest 1403620 0 zan 2018-03-05 07:58:46 -0800 [CoordGraphics] Clean up CoordinatedImageBacking 1403621 1 335001 zan 2018-03-05 08:08:11 -0800 Created attachment 335001 Patch 1403940 2 335001 zan 2018-03-06 03:35:25 -0800 Comment on attachment 335001 Patch Clearing flags on attachment: 335001 Committed r229316: <https://trac.webkit.org/changeset/229316> 1403941 3 zan 2018-03-06 03:35:29 -0800 All reviewed patches have been landed. Closing bug. 1403943 4 webkit-bug-importer 2018-03-06 03:36:23 -0800 <rdar://problem/38174966> 335001 2018-03-05 08:08:11 -0800 2018-03-06 03:35:25 -0800 Patch bug-183332-20180305170810.patch text/plain 14426 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5MjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTAxZDM5NGM3OTAyZTI2 ZDg5Y2M3YWY4ODNkNDNmZjMzYTA2OWMyMy4uZmM0ODg5MDNhMGEzYWQ4MGQzNGJlMDVkY2U3YTE3 YmNiM2FkNTdmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE4LTAzLTA1ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQ29vcmRHcmFwaGlj c10gQ2xlYW4gdXAgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzMzMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFuIHVwIHRoZSBDb29yZGluYXRlZEltYWdl QmFja2luZyBjbGFzcy4gUHJlZmVyIHJlZmVyZW5jZSB2YWx1ZXMgaW4KKyAgICAgICAgY2xhc3Mg ZnVuY3Rpb25zLCBtZXRob2RzIGFuZCBtZW1iZXIgdmFyaWFibGVzLCB3aGVyZSBwb3NzaWJsZS4g TW92ZQorICAgICAgICBtZW1iZXIgdmFyaWFibGVzIGludG8gYSBtb3JlIHNlbnNpYmxlIG9yZGVy LiBJbml0aWFsaXplIGEgZmV3IG1lbWJlcgorICAgICAgICB2YXJpYWJsZXMgYXQgdGhlIHBsYWNl IG9mIGRlY2xhcmF0aW9uLgorCisgICAgICAgIERyb3AgcmVsZWFzZVN1cmZhY2VJZk5lZWRlZCgp IGFuZCB1cGRhdGVWaXNpYmlsaXR5SWZOZWVkZWQoKSBtZXRob2RzLAorICAgICAgICBpbnRlZ3Jh dGluZyB0aGVtIGludG8gdGhlIHVwZGF0ZSgpIG1ldGhvZCwgd2hpY2ggd2FzIHRoZSBvbmx5IHBs YWNlCisgICAgICAgIHdoZXJlIHRoZXkgd2VyZSBjYWxsZWQgZnJvbS4KKworICAgICAgICBXZSBk b24ndCBoYXZlIHRvIGtlZXAgYSByZWZlcmVuY2UgdG8gdGhlIGJ1ZmZlciBvYmplY3QsIHNpbmNl IHdlJ3JlCisgICAgICAgIG5vdCB1c2luZyBpdCBpbnRlcm5hbGx5IGFmdGVyIGl0J3MgYmVlbiBw YXNzZWQgdG8gdGhlIGNsaWVudCdzCisgICAgICAgIHVwZGF0ZUltYWdlQmFja2luZygpIGltcGxl bWVudGF0aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAtLSBubyBjaGFuZ2UgaW4gYmVoYXZp b3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVk R3JhcGhpY3NMYXllcjo6c3luY0ltYWdlQmFja2luZyk6CisgICAgICAgIChXZWJDb3JlOjpDb29y ZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJlbGVhc2VJbWFnZUJhY2tpbmdJZk5lZWRlZCk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkSW1h Z2VCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkSW1hZ2VCYWNraW5n OjpnZXRDb29yZGluYXRlZEltYWdlQmFja2luZ0lEKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3Jk aW5hdGVkSW1hZ2VCYWNraW5nOjpDb29yZGluYXRlZEltYWdlQmFja2luZyk6CisgICAgICAgIChX ZWJDb3JlOjpDb29yZGluYXRlZEltYWdlQmFja2luZzo6YWRkSG9zdCk6CisgICAgICAgIChXZWJD b3JlOjpDb29yZGluYXRlZEltYWdlQmFja2luZzo6cmVtb3ZlSG9zdCk6CisgICAgICAgIChXZWJD b3JlOjpDb29yZGluYXRlZEltYWdlQmFja2luZzo6dXBkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvb3JkaW5hdGVkSW1hZ2VCYWNraW5nOjpjbGVhckNvbnRlbnRzVGltZXJGaXJlZCk6CisgICAg ICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEltYWdlQmFja2luZzo6Y3JlYXRlKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkSW1hZ2VCYWNraW5nOjptYXJrRGlydHkpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmc6OnJlbGVh c2VTdXJmYWNlSWZOZWVkZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0 ZWRJbWFnZUJhY2tpbmc6OnVwZGF0ZVZpc2liaWxpdHlJZk5lZWRlZCk6IERlbGV0ZWQuCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkSW1h Z2VCYWNraW5nLmg6CisKIDIwMTgtMDMtMDQgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBn bWFpbC5jb20+CiAKICAgICAgICAgW1dURl0gTW92ZSBjdXJyZW50Q1BVVGltZSBhbmQgc2xlZXAo U2Vjb25kcykgdG8gQ1BVVGltZS5oIGFuZCBTZWNvbmRzLmggcmVzcGVjdGl2ZWx5CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IDE1NGU2Y2JiNDQzODM2NTgxNWU0MGNhN2IyZTFmZjNjNzllNzY5ZDcuLjc2NzJiNWNjM2Rk YTQzZDc5ZDMxNjQxNjZjMmMwMDczYjE3NWMwNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTgtMDMtMDUgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAg ICAgIFtDb29yZEdyYXBoaWNzXSBDbGVhbiB1cCBDb29yZGluYXRlZEltYWdlQmFja2luZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMzMyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcDoK KyAgICAgICAgKFdlYktpdDo6Q29tcG9zaXRpbmdDb29yZGluYXRvcjo6Y3JlYXRlSW1hZ2VCYWNr aW5nSWZOZWVkZWQpOgorICAgICAgICBBZGp1c3QgY2FsbCB0byBDb29yZGluYXRlZEltYWdlQmFj a2luZzo6Z2V0Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmdJRCgpLgorCiAyMDE4LTAzLTA0ICBZdXN1 a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIFtXVEZdIE1vdmUg Y3VycmVudENQVVRpbWUgYW5kIHNsZWVwKFNlY29uZHMpIHRvIENQVVRpbWUuaCBhbmQgU2Vjb25k cy5oIHJlc3BlY3RpdmVseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRp bmF0ZWRHcmFwaGljc0xheWVyLmNwcAppbmRleCBjMzdmNmIzNDRkNGM0ZDM3MDU4MWVjYzdjMmY0 NDY4MmFjMWRlZWNlLi42NzRlNDhmMjc4N2ZhMzg4ZGNmNDM2N2FkZmJkNTRiODllMGQ1M2Y2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRp bmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xh eWVyLmNwcApAQCAtNjI4LDEzICs2MjgsMTMgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5 ZXI6OnN5bmNJbWFnZUJhY2tpbmcoKQogICAgICAgICBBU1NFUlQoIXNob3VsZEhhdmVCYWNraW5n U3RvcmUoKSk7CiAgICAgICAgIEFTU0VSVChtX2NvbXBvc2l0ZWRJbWFnZSk7CiAKLSAgICAgICAg Ym9vbCBpbWFnZUluc3RhbmNlUmVwbGFjZWQgPSBtX2Nvb3JkaW5hdGVkSW1hZ2VCYWNraW5nICYm IChtX2Nvb3JkaW5hdGVkSW1hZ2VCYWNraW5nLT5pZCgpICE9IENvb3JkaW5hdGVkSW1hZ2VCYWNr aW5nOjpnZXRDb29yZGluYXRlZEltYWdlQmFja2luZ0lEKG1fY29tcG9zaXRlZEltYWdlLmdldCgp KSk7CisgICAgICAgIGJvb2wgaW1hZ2VJbnN0YW5jZVJlcGxhY2VkID0gbV9jb29yZGluYXRlZElt YWdlQmFja2luZyAmJiAobV9jb29yZGluYXRlZEltYWdlQmFja2luZy0+aWQoKSAhPSBDb29yZGlu YXRlZEltYWdlQmFja2luZzo6Z2V0Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmdJRCgqbV9jb21wb3Np dGVkSW1hZ2UpKTsKICAgICAgICAgaWYgKGltYWdlSW5zdGFuY2VSZXBsYWNlZCkKICAgICAgICAg ICAgIHJlbGVhc2VJbWFnZUJhY2tpbmdJZk5lZWRlZCgpOwogCiAgICAgICAgIGlmICghbV9jb29y ZGluYXRlZEltYWdlQmFja2luZykgewogICAgICAgICAgICAgbV9jb29yZGluYXRlZEltYWdlQmFj a2luZyA9IG1fY29vcmRpbmF0b3ItPmNyZWF0ZUltYWdlQmFja2luZ0lmTmVlZGVkKCptX2NvbXBv c2l0ZWRJbWFnZSk7Ci0gICAgICAgICAgICBtX2Nvb3JkaW5hdGVkSW1hZ2VCYWNraW5nLT5hZGRI b3N0KHRoaXMpOworICAgICAgICAgICAgbV9jb29yZGluYXRlZEltYWdlQmFja2luZy0+YWRkSG9z dCgqdGhpcyk7CiAgICAgICAgICAgICBtX2xheWVyU3RhdGUuaW1hZ2VJRCA9IG1fY29vcmRpbmF0 ZWRJbWFnZUJhY2tpbmctPmlkKCk7CiAgICAgICAgIH0KIApAQCAtNzkwLDcgKzc5MCw3IEBAIHZv aWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpyZWxlYXNlSW1hZ2VCYWNraW5nSWZOZWVkZWQo KQogICAgICAgICByZXR1cm47CiAKICAgICBBU1NFUlQobV9jb29yZGluYXRvcik7Ci0gICAgbV9j b29yZGluYXRlZEltYWdlQmFja2luZy0+cmVtb3ZlSG9zdCh0aGlzKTsKKyAgICBtX2Nvb3JkaW5h dGVkSW1hZ2VCYWNraW5nLT5yZW1vdmVIb3N0KCp0aGlzKTsKICAgICBtX2Nvb3JkaW5hdGVkSW1h Z2VCYWNraW5nID0gbnVsbHB0cjsKICAgICBtX2xheWVyU3RhdGUuaW1hZ2VJRCA9IEludmFsaWRD b29yZGluYXRlZEltYWdlQmFja2luZ0lEOwogICAgIG1fbGF5ZXJTdGF0ZS5pbWFnZUNoYW5nZWQg PSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkSW1hZ2VCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEltYWdl QmFja2luZy5jcHAKaW5kZXggZWU1OWE5MGE0NjQ1N2QyYjI4ZWZjZDQxNWEzNzM3MDFiZGFjY2Yx My4uNWRlMTkyZDIwNjVlYTY2MmY2NDE0MjdkMjlhN2Y3MWMyZmJkNjY1YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3Jk aW5hdGVkSW1hZ2VCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcuY3BwCkBAIC0z NSwxMzAgKzM1LDk2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotQ29vcmRpbmF0ZWRJbWFn ZUJhY2tpbmdJRCBDb29yZGluYXRlZEltYWdlQmFja2luZzo6Z2V0Q29vcmRpbmF0ZWRJbWFnZUJh Y2tpbmdJRChJbWFnZSogaW1hZ2UpCitDb29yZGluYXRlZEltYWdlQmFja2luZ0lEIENvb3JkaW5h dGVkSW1hZ2VCYWNraW5nOjpnZXRDb29yZGluYXRlZEltYWdlQmFja2luZ0lEKEltYWdlJiBpbWFn ZSkKIHsKICAgICAvLyBDb29yZGluYXRlZEltYWdlQmFja2luZyBrZWVwcyBhIFJlZlB0cjxJbWFn ZT4gbWVtYmVyLCBzbyB0aGUgc2FtZSBJbWFnZSBwb2ludGVyIGNhbiBub3QgcmVmZXIgdHdvIGRp ZmZlcmVudCBpbnN0YW5jZXMgdW50aWwgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcgcmVsZWFzZXMg dGhlIG1lbWJlci4KLSAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxDb29yZGluYXRlZEltYWdl QmFja2luZ0lEPihpbWFnZSk7Ci19Ci0KLVJlZjxDb29yZGluYXRlZEltYWdlQmFja2luZz4gQ29v cmRpbmF0ZWRJbWFnZUJhY2tpbmc6OmNyZWF0ZShDbGllbnQmIGNsaWVudCwgUmVmPEltYWdlPiYm IGltYWdlKQotewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IENvb3JkaW5hdGVkSW1hZ2VCYWNr aW5nKGNsaWVudCwgV1RGTW92ZShpbWFnZSkpKTsKKyAgICByZXR1cm4gcmVpbnRlcnByZXRfY2Fz dDxDb29yZGluYXRlZEltYWdlQmFja2luZ0lEPigmaW1hZ2UpOwogfQogCiBDb29yZGluYXRlZElt YWdlQmFja2luZzo6Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcoQ2xpZW50JiBjbGllbnQsIFJlZjxJ bWFnZT4mJiBpbWFnZSkKLSAgICA6IG1fY2xpZW50KCZjbGllbnQpCisgICAgOiBtX2NsaWVudChj bGllbnQpCisgICAgLCBtX2lkKGdldENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nSUQoaW1hZ2UpKQog ICAgICwgbV9pbWFnZShXVEZNb3ZlKGltYWdlKSkKLSAgICAsIG1faWQoZ2V0Q29vcmRpbmF0ZWRJ bWFnZUJhY2tpbmdJRChtX2ltYWdlLmdldCgpKSkKICAgICAsIG1fY2xlYXJDb250ZW50c1RpbWVy KCp0aGlzLCAmQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmc6OmNsZWFyQ29udGVudHNUaW1lckZpcmVk KQotICAgICwgbV9pc0RpcnR5KGZhbHNlKQotICAgICwgbV9pc1Zpc2libGUoZmFsc2UpCiB7Ci0g ICAgLy8gRklYTUU6IFdlIHdvdWxkIG5lZWQgdG8gZGVjb2RlIGEgc21hbGwgaW1hZ2UgZGlyZWN0 bHkgaW50byBhIEdyYXBoaWNzU3VyZmFjZS4KLSAgICAvLyBodHRwOi8vd2Via2l0Lm9yZy9iLzEw MTQyNgotCi0gICAgbV9jbGllbnQtPmNyZWF0ZUltYWdlQmFja2luZyhpZCgpKTsKKyAgICBtX2Ns aWVudC5jcmVhdGVJbWFnZUJhY2tpbmcobV9pZCk7CiB9CiAKIENvb3JkaW5hdGVkSW1hZ2VCYWNr aW5nOjp+Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcoKSA9IGRlZmF1bHQ7CiAKLXZvaWQgQ29vcmRp bmF0ZWRJbWFnZUJhY2tpbmc6OmFkZEhvc3QoSG9zdCogaG9zdCkKK3ZvaWQgQ29vcmRpbmF0ZWRJ bWFnZUJhY2tpbmc6OmFkZEhvc3QoSG9zdCYgaG9zdCkKIHsKLSAgICBBU1NFUlQoIW1faG9zdHMu Y29udGFpbnMoaG9zdCkpOwotICAgIG1faG9zdHMuYXBwZW5kKGhvc3QpOworICAgIEFTU0VSVCgh bV9ob3N0cy5jb250YWlucygmaG9zdCkpOworICAgIG1faG9zdHMuYWRkKCZob3N0KTsKIH0KIAot dm9pZCBDb29yZGluYXRlZEltYWdlQmFja2luZzo6cmVtb3ZlSG9zdChIb3N0KiBob3N0KQordm9p ZCBDb29yZGluYXRlZEltYWdlQmFja2luZzo6cmVtb3ZlSG9zdChIb3N0JiBob3N0KQogewotICAg IHNpemVfdCBwb3NpdGlvbiA9IG1faG9zdHMuZmluZChob3N0KTsKLSAgICBBU1NFUlQocG9zaXRp b24gIT0gbm90Rm91bmQpOwotICAgIG1faG9zdHMucmVtb3ZlKHBvc2l0aW9uKTsKKyAgICBtX2hv c3RzLnJlbW92ZSgmaG9zdCk7CiAKICAgICBpZiAobV9ob3N0cy5pc0VtcHR5KCkpCi0gICAgICAg IG1fY2xpZW50LT5yZW1vdmVJbWFnZUJhY2tpbmcoaWQoKSk7CisgICAgICAgIG1fY2xpZW50LnJl bW92ZUltYWdlQmFja2luZyhtX2lkKTsKIH0KIAotdm9pZCBDb29yZGluYXRlZEltYWdlQmFja2lu Zzo6bWFya0RpcnR5KCkKLXsKLSAgICBtX2lzRGlydHkgPSB0cnVlOwotfQorc3RhdGljIGNvbnN0 IFNlY29uZHMgY2xlYXJDb250ZW50c1RpbWVySW50ZXJ2YWwgeyAzX3MgfTsKIAogdm9pZCBDb29y ZGluYXRlZEltYWdlQmFja2luZzo6dXBkYXRlKCkKIHsKLSAgICByZWxlYXNlU3VyZmFjZUlmTmVl ZGVkKCk7CisgICAgYm9vbCBwcmV2aW91c0lzVmlzaWJsZSA9IG1faXNWaXNpYmxlOworICAgIG1f aXNWaXNpYmxlID0gc3RkOjphbnlfb2YobV9ob3N0cy5iZWdpbigpLCBtX2hvc3RzLmVuZCgpLAor ICAgICAgICBbXShhdXRvKiBob3N0KQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gaG9z dC0+aW1hZ2VCYWNraW5nVmlzaWJsZSgpOworICAgICAgICB9KTsKIAotICAgIGJvb2wgY2hhbmdl ZFRvVmlzaWJsZTsKLSAgICB1cGRhdGVWaXNpYmlsaXR5SWZOZWVkZWQoY2hhbmdlZFRvVmlzaWJs ZSk7Ci0gICAgaWYgKCFtX2lzVmlzaWJsZSkKKyAgICBpZiAoIW1faXNWaXNpYmxlKSB7CisgICAg ICAgIGlmIChwcmV2aW91c0lzVmlzaWJsZSkgeworICAgICAgICAgICAgQVNTRVJUKCFtX2NsZWFy Q29udGVudHNUaW1lci5pc0FjdGl2ZSgpKTsKKyAgICAgICAgICAgIG1fY2xlYXJDb250ZW50c1Rp bWVyLnN0YXJ0T25lU2hvdChjbGVhckNvbnRlbnRzVGltZXJJbnRlcnZhbCk7CisgICAgICAgIH0K ICAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGJvb2wgY2hhbmdlZFRvVmlzaWJsZSA9ICFw cmV2aW91c0lzVmlzaWJsZTsKKyAgICBpZiAobV9jbGVhckNvbnRlbnRzVGltZXIuaXNBY3RpdmUo KSkgeworICAgICAgICBtX2NsZWFyQ29udGVudHNUaW1lci5zdG9wKCk7CisgICAgICAgIC8vIFdl IGRvbid0IHdhbnQgdG8gdXBkYXRlIHRoZSB0ZXh0dXJlIGlmIHdlIGRpZG4ndCByZW1vdmUgdGhl IHRleHR1cmUuCisgICAgICAgIGNoYW5nZWRUb1Zpc2libGUgPSBmYWxzZTsKKyAgICB9CiAKKyAg ICBhdXRvIG5hdGl2ZUltYWdlUHRyID0gbV9pbWFnZS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJh bWUoKTsKICAgICBpZiAoIWNoYW5nZWRUb1Zpc2libGUpIHsKICAgICAgICAgaWYgKCFtX2lzRGly dHkpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKG1fbmF0aXZlSW1hZ2VQdHIg PT0gbV9pbWFnZS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKSkgeworICAgICAgICBpZiAo bV9uYXRpdmVJbWFnZVB0ciA9PSBuYXRpdmVJbWFnZVB0cikgewogICAgICAgICAgICAgbV9pc0Rp cnR5ID0gZmFsc2U7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9CiAKLSAg ICBtX2J1ZmZlciA9IE5pY29zaWE6OkJ1ZmZlcjo6Y3JlYXRlKEludFNpemUobV9pbWFnZS0+c2l6 ZSgpKSwgIW1faW1hZ2UtPmN1cnJlbnRGcmFtZUtub3duVG9CZU9wYXF1ZSgpID8gTmljb3NpYTo6 QnVmZmVyOjpTdXBwb3J0c0FscGhhIDogTmljb3NpYTo6QnVmZmVyOjpOb0ZsYWdzKTsKLSAgICBB U1NFUlQobV9idWZmZXIpOworICAgIG1fbmF0aXZlSW1hZ2VQdHIgPSBXVEZNb3ZlKG5hdGl2ZUlt YWdlUHRyKTsKIAotICAgIE5pY29zaWE6OlBhaW50aW5nQ29udGV4dDo6cGFpbnQoKm1fYnVmZmVy LAorICAgIGF1dG8gYnVmZmVyID0gTmljb3NpYTo6QnVmZmVyOjpjcmVhdGUoSW50U2l6ZShtX2lt YWdlLT5zaXplKCkpLCAhbV9pbWFnZS0+Y3VycmVudEZyYW1lS25vd25Ub0JlT3BhcXVlKCkgPyBO aWNvc2lhOjpCdWZmZXI6OlN1cHBvcnRzQWxwaGEgOiBOaWNvc2lhOjpCdWZmZXI6Ok5vRmxhZ3Mp OworICAgIE5pY29zaWE6OlBhaW50aW5nQ29udGV4dDo6cGFpbnQoYnVmZmVyLAogICAgICAgICBb dGhpc10oR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KQogICAgICAgICB7CiAgICAgICAgICAgICBJ bnRSZWN0IHJlY3QoSW50UG9pbnQ6Onplcm8oKSwgSW50U2l6ZShtX2ltYWdlLT5zaXplKCkpKTsK ICAgICAgICAgICAgIGNvbnRleHQuc2F2ZSgpOwogICAgICAgICAgICAgY29udGV4dC5jbGlwKHJl Y3QpOwotICAgICAgICAgICAgY29udGV4dC5kcmF3SW1hZ2UoKm1faW1hZ2UsIHJlY3QsIHJlY3Qp OworICAgICAgICAgICAgY29udGV4dC5kcmF3SW1hZ2UobV9pbWFnZSwgcmVjdCwgcmVjdCk7CiAg ICAgICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKICAgICAgICAgfSk7CiAKLSAgICBtX25hdGl2 ZUltYWdlUHRyID0gbV9pbWFnZS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKTsKLQotICAg IG1fY2xpZW50LT51cGRhdGVJbWFnZUJhY2tpbmcoaWQoKSwgbV9idWZmZXIuY29weVJlZigpKTsK KyAgICBtX2NsaWVudC51cGRhdGVJbWFnZUJhY2tpbmcobV9pZCwgV1RGTW92ZShidWZmZXIpKTsK ICAgICBtX2lzRGlydHkgPSBmYWxzZTsKIH0KIAotdm9pZCBDb29yZGluYXRlZEltYWdlQmFja2lu Zzo6cmVsZWFzZVN1cmZhY2VJZk5lZWRlZCgpCi17Ci0gICAgbV9idWZmZXIgPSBudWxscHRyOwot fQotCi1zdGF0aWMgY29uc3QgU2Vjb25kcyBjbGVhckNvbnRlbnRzVGltZXJJbnRlcnZhbCB7IDNf cyB9OwotCi12b2lkIENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nOjp1cGRhdGVWaXNpYmlsaXR5SWZO ZWVkZWQoYm9vbCYgY2hhbmdlZFRvVmlzaWJsZSkKLXsKLSAgICBib29sIHByZXZpb3VzSXNWaXNp YmxlID0gbV9pc1Zpc2libGU7Ci0KLSAgICBtX2lzVmlzaWJsZSA9IGZhbHNlOwotICAgIGZvciAo YXV0byYgaG9zdCA6IG1faG9zdHMpIHsKLSAgICAgICAgaWYgKGhvc3QtPmltYWdlQmFja2luZ1Zp c2libGUoKSkgewotICAgICAgICAgICAgbV9pc1Zpc2libGUgPSB0cnVlOwotICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBib29sIGNoYW5nZWRUb0ludmlzaWJsZSA9 IHByZXZpb3VzSXNWaXNpYmxlICYmICFtX2lzVmlzaWJsZTsKLSAgICBpZiAoY2hhbmdlZFRvSW52 aXNpYmxlKSB7Ci0gICAgICAgIEFTU0VSVCghbV9jbGVhckNvbnRlbnRzVGltZXIuaXNBY3RpdmUo KSk7Ci0gICAgICAgIG1fY2xlYXJDb250ZW50c1RpbWVyLnN0YXJ0T25lU2hvdChjbGVhckNvbnRl bnRzVGltZXJJbnRlcnZhbCk7Ci0gICAgfQotCi0gICAgY2hhbmdlZFRvVmlzaWJsZSA9ICFwcmV2 aW91c0lzVmlzaWJsZSAmJiBtX2lzVmlzaWJsZTsKLQotICAgIGlmIChtX2lzVmlzaWJsZSAmJiBt X2NsZWFyQ29udGVudHNUaW1lci5pc0FjdGl2ZSgpKSB7Ci0gICAgICAgIG1fY2xlYXJDb250ZW50 c1RpbWVyLnN0b3AoKTsKLSAgICAgICAgLy8gV2UgZG9uJ3Qgd2FudCB0byB1cGRhdGUgdGhlIHRl eHR1cmUgaWYgd2UgZGlkbid0IHJlbW92ZSB0aGUgdGV4dHVyZS4KLSAgICAgICAgY2hhbmdlZFRv VmlzaWJsZSA9IGZhbHNlOwotICAgIH0KLX0KLQogdm9pZCBDb29yZGluYXRlZEltYWdlQmFja2lu Zzo6Y2xlYXJDb250ZW50c1RpbWVyRmlyZWQoKQogewotICAgIG1fY2xpZW50LT5jbGVhckltYWdl QmFja2luZ0NvbnRlbnRzKGlkKCkpOworICAgIG1fY2xpZW50LmNsZWFySW1hZ2VCYWNraW5nQ29u dGVudHMobV9pZCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0 ZWQvQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEltYWdlQmFja2luZy5oCmluZGV4 IDQ0OGNlMjc5MzAzZTRmODQxMWYzOTAyZTBkOTEwZjZlYWRmZDcxNDIuLmU0YmQ0Mzk4MzUzYzFi NDVlYzdmMDg3ODUyYzJhMzAxNTI3ZjAxOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEltYWdlQmFja2lu Zy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGlu YXRlZC9Db29yZGluYXRlZEltYWdlQmFja2luZy5oCkBAIC0yMyw5ICsyMyw3IEBACiAgKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotCi0jaWZuZGVmIENvb3JkaW5hdGVk SW1hZ2VCYWNraW5nX2gKLSNkZWZpbmUgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmdfaAorI3ByYWdt YSBvbmNlCiAKICNpZiBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCiAKQEAgLTU2LDE3ICs1NCwy MCBAQCBwdWJsaWM6CiAgICAgICAgIHZpcnR1YWwgYm9vbCBpbWFnZUJhY2tpbmdWaXNpYmxlKCkg PSAwOwogICAgIH07CiAKLSAgICBzdGF0aWMgUmVmPENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nPiBj cmVhdGUoQ2xpZW50JiwgUmVmPEltYWdlPiYmKTsKKyAgICBzdGF0aWMgUmVmPENvb3JkaW5hdGVk SW1hZ2VCYWNraW5nPiBjcmVhdGUoQ2xpZW50JiBjbGllbnQsIFJlZjxJbWFnZT4mJiBpbWFnZSkK KyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IENvb3JkaW5hdGVkSW1hZ2VCYWNr aW5nKGNsaWVudCwgV1RGTW92ZShpbWFnZSkpKTsKKyAgICB9CiAgICAgdmlydHVhbCB+Q29vcmRp bmF0ZWRJbWFnZUJhY2tpbmcoKTsKIAotICAgIHN0YXRpYyBDb29yZGluYXRlZEltYWdlQmFja2lu Z0lEIGdldENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nSUQoSW1hZ2UqKTsKKyAgICBzdGF0aWMgQ29v cmRpbmF0ZWRJbWFnZUJhY2tpbmdJRCBnZXRDb29yZGluYXRlZEltYWdlQmFja2luZ0lEKEltYWdl Jik7CiAgICAgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmdJRCBpZCgpIGNvbnN0IHsgcmV0dXJuIG1f aWQ7IH0KIAotICAgIHZvaWQgYWRkSG9zdChIb3N0Kik7Ci0gICAgdm9pZCByZW1vdmVIb3N0KEhv c3QqKTsKKyAgICB2b2lkIGFkZEhvc3QoSG9zdCYpOworICAgIHZvaWQgcmVtb3ZlSG9zdChIb3N0 Jik7CiAKICAgICAvLyBXaGVuIGEgbmV3IGltYWdlIGlzIHVwZGF0ZWQgb3IgYW4gYW5pbWF0ZWQg Z2lmIGlzIHByb2dyZXNzZWQsIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciBjYWxscyBtYXJrRGly dHkoKS4KLSAgICB2b2lkIG1hcmtEaXJ0eSgpOworICAgIHZvaWQgbWFya0RpcnR5KCkgeyBtX2lz RGlydHkgPSB0cnVlOyB9CiAKICAgICAvLyBDcmVhdGUsIHJlbW92ZSBvciB1cGRhdGUgaXRzIGJh Y2tpbmcuCiAgICAgdm9pZCB1cGRhdGUoKTsKQEAgLTc0LDI2ICs3NSwyMSBAQCBwdWJsaWM6CiBw cml2YXRlOgogICAgIENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nKENsaWVudCYsIFJlZjxJbWFnZT4m Jik7CiAKLSAgICB2b2lkIHJlbGVhc2VTdXJmYWNlSWZOZWVkZWQoKTsKLSAgICB2b2lkIHVwZGF0 ZVZpc2liaWxpdHlJZk5lZWRlZChib29sJiBjaGFuZ2VkVG9WaXNpYmxlKTsKICAgICB2b2lkIGNs ZWFyQ29udGVudHNUaW1lckZpcmVkKCk7CiAKLSAgICBDbGllbnQqIG1fY2xpZW50OwotICAgIFJl ZlB0cjxJbWFnZT4gbV9pbWFnZTsKLSAgICBOYXRpdmVJbWFnZVB0ciBtX25hdGl2ZUltYWdlUHRy OwotICAgIENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nSUQgbV9pZDsKLSAgICBWZWN0b3I8SG9zdCo+ IG1faG9zdHM7CisgICAgQ2xpZW50JiBtX2NsaWVudDsKKyAgICBIYXNoU2V0PEhvc3QqPiBtX2hv c3RzOwogCi0gICAgUmVmUHRyPE5pY29zaWE6OkJ1ZmZlcj4gbV9idWZmZXI7CisgICAgQ29vcmRp bmF0ZWRJbWFnZUJhY2tpbmdJRCBtX2lkOworICAgIFJlZjxJbWFnZT4gbV9pbWFnZTsKKyAgICBO YXRpdmVJbWFnZVB0ciBtX25hdGl2ZUltYWdlUHRyOwogCiAgICAgVGltZXIgbV9jbGVhckNvbnRl bnRzVGltZXI7CiAKLSAgICBib29sIG1faXNEaXJ0eTsKLSAgICBib29sIG1faXNWaXNpYmxlOwot CisgICAgYm9vbCBtX2lzRGlydHkgeyBmYWxzZSB9OworICAgIGJvb2wgbV9pc1Zpc2libGUgeyBm YWxzZSB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQotI2VuZGlmIC8vIFVTRShDT09S RElOQVRFRF9HUkFQSElDUykKIAotI2VuZGlmIC8vIENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nX2gK KyNlbmRpZiAvLyBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0NvbXBvc2l0aW5n Q29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRp bmF0ZWRHcmFwaGljcy9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcAppbmRleCA2NjJhZDY3NjEy NWQxNzdjZjlmODI1NzE4YWY1NGI3MjY0ODIxNzk3Li5jNTIwYjU5MTkxYjQ2MDRlY2UxNTA4MDFj ZjQzY2VmMDhiNTYzNWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0NvbXBvc2l0aW5nQ29vcmRpbmF0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29t cG9zaXRpbmdDb29yZGluYXRvci5jcHAKQEAgLTIxMyw3ICsyMTMsNyBAQCB2b2lkIENvbXBvc2l0 aW5nQ29vcmRpbmF0b3I6OnN5bmNMYXllclN0YXRlKENvb3JkaW5hdGVkTGF5ZXJJRCBpZCwgQ29v cmRpbmF0ZWRHcgogCiBSZWY8Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmc+IENvbXBvc2l0aW5nQ29v cmRpbmF0b3I6OmNyZWF0ZUltYWdlQmFja2luZ0lmTmVlZGVkKEltYWdlJiBpbWFnZSkKIHsKLSAg ICBDb29yZGluYXRlZEltYWdlQmFja2luZ0lEIGltYWdlSUQgPSBDb29yZGluYXRlZEltYWdlQmFj a2luZzo6Z2V0Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmdJRCgmaW1hZ2UpOworICAgIENvb3JkaW5h dGVkSW1hZ2VCYWNraW5nSUQgaW1hZ2VJRCA9IENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nOjpnZXRD b29yZGluYXRlZEltYWdlQmFja2luZ0lEKGltYWdlKTsKICAgICBhdXRvIGFkZFJlc3VsdCA9IG1f aW1hZ2VCYWNraW5ncy5lbnN1cmUoaW1hZ2VJRCwgW3RoaXMsICZpbWFnZV0gewogICAgICAgICBy ZXR1cm4gQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmc6OmNyZWF0ZSgqdGhpcywgaW1hZ2UpOwogICAg IH0pOwo=