204803 2019-12-03 11:29:13 -0800 Enable the display list drawing for canvas when the setting 'displayListDrawing' is turned on 2022-02-10 16:49:04 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 207109 P2 Normal --- 1 sabouhallawa sabouhallawa bfulgham cdumez esprehn+autocc ews-watchlist fred.wang glenn gyuyoung.kim kondapallykalyan pdr sergio simon.fraser thorton zalan oldest_to_newest 1595091 0 sabouhallawa 2019-12-03 11:29:13 -0800 Currently the display list drawing on canvas can be turned on only by Internals::setElementUsesDisplayListDrawing(). We may need to enable/disable the display list drawing on an element regardless of the value of the setting 'displayListDrawing'. Internals::setElementUsesDisplayListDrawing() will still override the setting value always. If the Internals function was never called, we will fall back to the settings value. 1595096 1 384728 sabouhallawa 2019-12-03 11:31:13 -0800 Created attachment 384728 Patch 1625328 2 sabouhallawa 2020-03-03 17:04:50 -0800 This already was fixed in <https://trac.webkit.org/changeset/257156> *** This bug has been marked as a duplicate of bug 207109 *** 384728 2019-12-03 11:31:13 -0800 2022-02-10 16:49:04 -0800 Patch bug-204803-20191203113112.patch text/plain 13084 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MzA1NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE5LTEyLTAzICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIHRo ZSBkaXNwbGF5IGxpc3QgZHJhd2luZyBmb3IgY2FudmFzIHdoZW4gdGhlIHNldHRpbmcgJ2Rpc3Bs YXlMaXN0RHJhd2luZycgaXMgdHVybmVkIG9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ4MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgcHJpb3JpdHkgd2lsbCBiZSBmb3IgdGhlIEludGVybmFs cyBmdW5jdGlvbi4gSWYgaXQgaXMgbm90IGNhbGxlZCwKKyAgICAgICAgd2Ugd2lsbCBmYWxsIGJh Y2sgdG8gdGhlIHNldHRpbmdzIHZhbHVlLgorCisgICAgICAgIFJlbmFtZSBzZXRJc1RyYWNraW5n RGlzcGxheUxpc3RSZXBsYXkoKSB0byB0cmFja3NEaXNwbGF5TGlzdFJlcGxheSgpIHRvCisgICAg ICAgIGJlIGNvbnNpc3RlbnQgd2l0aCB0aGUgSFRNTENhbnZhc0VsZW1lbnQgbWV0aG9kLgorCisg ICAgICAgICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpI VE1MQ2FudmFzRWxlbWVudDo6Y3JlYXRlQ29udGV4dDJkKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxDYW52YXNFbGVtZW50OjpzZXRVc2VzRGlzcGxheUxpc3REcmF3aW5nKToKKyAgICAgICAgKiBo dG1sL0hUTUxDYW52YXNFbGVtZW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpHcmFwaGlj c0xheWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpzZXRUcmFja3NEaXNwbGF5TGlzdFJlcGxh eSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjp0cmFja3NEaXNwbGF5TGlzdFJl cGxheSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpzZXRJc1RyYWNr aW5nRGlzcGxheUxpc3RSZXBsYXkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NMYXllcjo6aXNUcmFja2luZ0Rpc3BsYXlMaXN0UmVwbGF5IGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjp+R3JhcGhpY3NMYXllckNBKToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6cGxhdGZvcm1DQUxheWVyUGFpbnRDb250ZW50cyk6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OmNyZWF0ZVRyYW5zZm9ybUFuaW1h dGlvbnNGcm9tS2V5ZnJhbWVzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFw aGljc0xheWVyQ0EuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6Y3JlYXRlR3JhcGhpY3NM YXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnNldFVzZXNEaXNw bGF5TGlzdERyYXdpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpz ZXRUcmFja3NEaXNwbGF5TGlzdFJlcGxheSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckJhY2tpbmc6OnNldElzVHJhY2tpbmdEaXNwbGF5TGlzdFJlcGxheSk6IERlbGV0ZWQuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oOgorICAgICAgICAqIHRlc3Rpbmcv SW50ZXJuYWxzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0RWxlbWVudFRy YWNrc0Rpc3BsYXlMaXN0UmVwbGF5KToKKwogMjAxOS0xMi0wMyAgSm9vbmdodW4gUGFyayAgPGpo NzE4LnBhcmtAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gUmVtb3ZlIGJ1aWxk IHdhcm5pbmcgYmVsb3cgc2luY2UgcjI1Mjk4Ny4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTENhbnZhc0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTENhbnZhc0VsZW1lbnQuY3BwCShyZXZpc2lvbiAyNTMwMTQpCisrKyBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ1LDcgKzM0 NSw4IEBAIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRCogSFRNTENhbnZhc0VsZW0KIAogICAgIG1f Y29udGV4dCA9IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlKCp0aGlzLCBkb2N1bWVu dCgpLmluUXVpcmtzTW9kZSgpKTsKIAotICAgIGRvd25jYXN0PENhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRD4oKm1fY29udGV4dCkuc2V0VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyhtX3VzZXNEaXNwbGF5 TGlzdERyYXdpbmcpOworICAgIGJvb2wgdXNlc0Rpc3BsYXlMaXN0RHJhd2luZyA9IG1fdXNlc0Rp c3BsYXlMaXN0RHJhd2luZy52YWx1ZU9yKGRvY3VtZW50KCkuc2V0dGluZ3MoKS5kaXNwbGF5TGlz dERyYXdpbmdFbmFibGVkKCkpOworICAgIGRvd25jYXN0PENhbnZhc1JlbmRlcmluZ0NvbnRleHQy RD4oKm1fY29udGV4dCkuc2V0VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyh1c2VzRGlzcGxheUxpc3RE cmF3aW5nKTsKICAgICBkb3duY2FzdDxDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ+KCptX2NvbnRl eHQpLnNldFRyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5KG1fdHJhY2tzRGlzcGxheUxpc3RSZXBsYXkp OwogCiAjaWYgVVNFKElPU1VSRkFDRV9DQU5WQVNfQkFDS0lOR19TVE9SRSkgfHwgRU5BQkxFKEFD Q0VMRVJBVEVEXzJEX0NBTlZBUykKQEAgLTgxOCwxMyArODE5LDEzIEBAIGJvb2wgSFRNTENhbnZh c0VsZW1lbnQ6OnNob3VsZEFjY2VsZXJhdGUKIAogdm9pZCBIVE1MQ2FudmFzRWxlbWVudDo6c2V0 VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyhib29sIHVzZXNEaXNwbGF5TGlzdERyYXdpbmcpCiB7Ci0g ICAgaWYgKHVzZXNEaXNwbGF5TGlzdERyYXdpbmcgPT0gbV91c2VzRGlzcGxheUxpc3REcmF3aW5n KQorICAgIGlmIChtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmcgJiYgdXNlc0Rpc3BsYXlMaXN0RHJh d2luZyA9PSAqbV91c2VzRGlzcGxheUxpc3REcmF3aW5nKQogICAgICAgICByZXR1cm47CiAgICAg CiAgICAgbV91c2VzRGlzcGxheUxpc3REcmF3aW5nID0gdXNlc0Rpc3BsYXlMaXN0RHJhd2luZzsK IAogICAgIGlmIChpczxDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ+KG1fY29udGV4dC5nZXQoKSkp Ci0gICAgICAgIGRvd25jYXN0PENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRD4oKm1fY29udGV4dCku c2V0VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyhtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmcpOworICAg ICAgICBkb3duY2FzdDxDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ+KCptX2NvbnRleHQpLnNldFVz ZXNEaXNwbGF5TGlzdERyYXdpbmcodXNlc0Rpc3BsYXlMaXN0RHJhd2luZyk7CiB9CiAKIHZvaWQg SFRNTENhbnZhc0VsZW1lbnQ6OnNldFRyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5KGJvb2wgdHJhY2tz RGlzcGxheUxpc3RSZXBsYXkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNF bGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxl bWVudC5oCShyZXZpc2lvbiAyNTMwMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2MSw3ICsxNjEsNyBAQCBwcml2YXRlOgog CiAgICAgYm9vbCBtX2lnbm9yZVJlc2V0IHsgZmFsc2UgfTsKIAotICAgIGJvb2wgbV91c2VzRGlz cGxheUxpc3REcmF3aW5nIHsgZmFsc2UgfTsKKyAgICBPcHRpb25hbDxib29sPiBtX3VzZXNEaXNw bGF5TGlzdERyYXdpbmc7CiAgICAgYm9vbCBtX3RyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5IHsgZmFs c2UgfTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxDYW52YXNSZW5kZXJpbmdDb250ZXh0PiBtX2Nv bnRleHQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xh eWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0xheWVyLmNwcAkocmV2aXNpb24gMjUzMDE0KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MSw3 ICsxNDEsNyBAQCBHcmFwaGljc0xheWVyOjpHcmFwaGljc0xheWVyKFR5cGUgdHlwZSwgCiAgICAg LCBtX3Nob3dEZWJ1Z0JvcmRlcihmYWxzZSkKICAgICAsIG1fc2hvd1JlcGFpbnRDb3VudGVyKGZh bHNlKQogICAgICwgbV9pc01hc2tMYXllcihmYWxzZSkKLSAgICAsIG1faXNUcmFja2luZ0Rpc3Bs YXlMaXN0UmVwbGF5KGZhbHNlKQorICAgICwgbV90cmFja3NEaXNwbGF5TGlzdFJlcGxheShmYWxz ZSkKICAgICAsIG1fdXNlckludGVyYWN0aW9uRW5hYmxlZCh0cnVlKQogICAgICwgbV9jYW5EZXRh Y2hCYWNraW5nU3RvcmUodHJ1ZSkKIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgJKHJldmlzaW9uIDI1MzAxNCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtNTg3LDggKzU4Nyw4IEBAIHB1YmxpYzoKICAgICAvLyBGb3IgdGVzdGluZy4KICAgICB2 aXJ0dWFsIFN0cmluZyBkaXNwbGF5TGlzdEFzVGV4dChEaXNwbGF5TGlzdDo6QXNUZXh0RmxhZ3Mp IGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0SXNUcmFj a2luZ0Rpc3BsYXlMaXN0UmVwbGF5KGJvb2wgaXNUcmFja2luZykgeyBtX2lzVHJhY2tpbmdEaXNw bGF5TGlzdFJlcGxheSA9IGlzVHJhY2tpbmc7IH0KLSAgICB2aXJ0dWFsIGJvb2wgaXNUcmFja2lu Z0Rpc3BsYXlMaXN0UmVwbGF5KCkgY29uc3QgeyByZXR1cm4gbV9pc1RyYWNraW5nRGlzcGxheUxp c3RSZXBsYXk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0VHJhY2tzRGlzcGxheUxpc3RSZXBsYXko Ym9vbCB0cmFja3NEaXNwbGF5TGlzdFJlcGxheSkgeyBtX3RyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5 ID0gdHJhY2tzRGlzcGxheUxpc3RSZXBsYXk7IH0KKyAgICB2aXJ0dWFsIGJvb2wgdHJhY2tzRGlz cGxheUxpc3RSZXBsYXkoKSBjb25zdCB7IHJldHVybiBtX3RyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5 OyB9CiAgICAgdmlydHVhbCBTdHJpbmcgcmVwbGF5RGlzcGxheUxpc3RBc1RleHQoRGlzcGxheUxp c3Q6OkFzVGV4dEZsYWdzKSBjb25zdCB7IHJldHVybiBTdHJpbmcoKTsgfQogCiAgICAgLy8gUmV0 dXJuIGFuIGVzdGltYXRlIG9mIHRoZSBiYWNraW5nIHN0b3JlIG1lbW9yeSBjb3N0IChpbiBieXRl cykuIE1heSBiZSBpbmNvcnJlY3QgZm9yIHRpbGVkIGxheWVycy4KQEAgLTcwOSw3ICs3MDksNyBA QCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBtX3Nob3dEZWJ1Z0JvcmRlciA6IDE7CiAgICAgYm9vbCBt X3Nob3dSZXBhaW50Q291bnRlciA6IDE7CiAgICAgYm9vbCBtX2lzTWFza0xheWVyIDogMTsKLSAg ICBib29sIG1faXNUcmFja2luZ0Rpc3BsYXlMaXN0UmVwbGF5IDogMTsKKyAgICBib29sIG1fdHJh Y2tzRGlzcGxheUxpc3RSZXBsYXkgOiAxOwogICAgIGJvb2wgbV91c2VySW50ZXJhY3Rpb25FbmFi bGVkIDogMTsKICAgICBib29sIG1fY2FuRGV0YWNoQmFja2luZ1N0b3JlIDogMTsKIApJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGlj c0xheWVyQ0EuY3BwCShyZXZpc2lvbiAyNTMwMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MzUs NyArNDM1LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OmluaXRpYWxpemUoVHlwZSBsYQogCiBH cmFwaGljc0xheWVyQ0E6On5HcmFwaGljc0xheWVyQ0EoKQogewotICAgIGlmIChVTkxJS0VMWShp c1RyYWNraW5nRGlzcGxheUxpc3RSZXBsYXkoKSkpCisgICAgaWYgKFVOTElLRUxZKHRyYWNrc0Rp c3BsYXlMaXN0UmVwbGF5KCkpKQogICAgICAgICBsYXllckRpc3BsYXlMaXN0TWFwKCkucmVtb3Zl KHRoaXMpOwogCiAgICAgLy8gRG8gY2xlYW51cCB3aGlsZSB3ZSBjYW4gc3RpbGwgc2FmZWx5IGNh bGwgbWV0aG9kcyBvbiB0aGUgZGVyaXZlZCBjbGFzcy4KQEAgLTE2ODYsOCArMTY4Niw4IEBAIHZv aWQgR3JhcGhpY3NMYXllckNBOjpwbGF0Zm9ybUNBTGF5ZXJQYWkKICAgICBpZiAobV9kaXNwbGF5 TGlzdCkgewogICAgICAgICBEaXNwbGF5TGlzdDo6UmVwbGF5ZXIgcmVwbGF5ZXIoY29udGV4dCwg Km1fZGlzcGxheUxpc3QpOwogICAgICAgICAKLSAgICAgICAgaWYgKFVOTElLRUxZKGlzVHJhY2tp bmdEaXNwbGF5TGlzdFJlcGxheSgpKSkgewotICAgICAgICAgICAgYXV0byByZXBsYXlMaXN0ID0g cmVwbGF5ZXIucmVwbGF5KGNsaXAsIGlzVHJhY2tpbmdEaXNwbGF5TGlzdFJlcGxheSgpKTsKKyAg ICAgICAgaWYgKFVOTElLRUxZKHRyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5KCkpKSB7CisgICAgICAg ICAgICBhdXRvIHJlcGxheUxpc3QgPSByZXBsYXllci5yZXBsYXkoY2xpcCwgdHJhY2tzRGlzcGxh eUxpc3RSZXBsYXkoKSk7CiAgICAgICAgICAgICBsYXllckRpc3BsYXlMaXN0TWFwKCkuYWRkKHRo aXMsIHN0ZDo6cGFpcjxGbG9hdFJlY3QsIHN0ZDo6dW5pcXVlX3B0cjxEaXNwbGF5TGlzdDo6RGlz cGxheUxpc3Q+PihjbGlwLCBXVEZNb3ZlKHJlcGxheUxpc3QpKSk7CiAgICAgICAgIH0gZWxzZQog ICAgICAgICAgICAgcmVwbGF5ZXIucmVwbGF5KGNsaXApOwpAQCAtMzY3NSwxMyArMzY3NSwxMyBA QCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c2V0QWxsb3dzQmFja2luZ1N0CiAgICAgbm90ZUxheWVy UHJvcGVydHlDaGFuZ2VkKENvdmVyYWdlUmVjdENoYW5nZWQpOwogfQogCi12b2lkIEdyYXBoaWNz TGF5ZXJDQTo6c2V0SXNUcmFja2luZ0Rpc3BsYXlMaXN0UmVwbGF5KGJvb2wgaXNUcmFja2luZykK K3ZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXRUcmFja3NEaXNwbGF5TGlzdFJlcGxheShib29sIHRy YWNrc0Rpc3BsYXlMaXN0UmVwbGF5KQogewotICAgIGlmIChpc1RyYWNraW5nID09IG1faXNUcmFj a2luZ0Rpc3BsYXlMaXN0UmVwbGF5KQorICAgIGlmICh0cmFja3NEaXNwbGF5TGlzdFJlcGxheSA9 PSBtX3RyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2lz VHJhY2tpbmdEaXNwbGF5TGlzdFJlcGxheSA9IGlzVHJhY2tpbmc7Ci0gICAgaWYgKCFtX2lzVHJh Y2tpbmdEaXNwbGF5TGlzdFJlcGxheSkKKyAgICBtX3RyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5ID0g dHJhY2tzRGlzcGxheUxpc3RSZXBsYXk7CisgICAgaWYgKCFtX3RyYWNrc0Rpc3BsYXlMaXN0UmVw bGF5KQogICAgICAgICBsYXllckRpc3BsYXlMaXN0TWFwKCkucmVtb3ZlKHRoaXMpOwogfQogCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0Eu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFw aGljc0xheWVyQ0EuaAkocmV2aXNpb24gMjUzMDE0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgJKHdvcmtpbmcgY29weSkKQEAgLTIyMSw3 ICsyMjEsNyBAQCBwcml2YXRlOgogCiAgICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5nIGRpc3BsYXlM aXN0QXNUZXh0KERpc3BsYXlMaXN0OjpBc1RleHRGbGFncykgY29uc3Qgb3ZlcnJpZGU7CiAKLSAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldElzVHJhY2tpbmdEaXNwbGF5TGlzdFJlcGxheShib29s KSBvdmVycmlkZTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFRyYWNrc0Rpc3BsYXlMaXN0 UmVwbGF5KGJvb2wpIG92ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyByZXBsYXlE aXNwbGF5TGlzdEFzVGV4dChEaXNwbGF5TGlzdDo6QXNUZXh0RmxhZ3MpIGNvbnN0IG92ZXJyaWRl OwogCiAgICAgV0VCQ09SRV9FWFBPUlQgZG91YmxlIGJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRl KCkgY29uc3Qgb3ZlcnJpZGU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJCYWNraW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkocmV2aXNpb24gMjUzMDE0KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMz Niw4ICszMzYsOSBAQCBSZWY8R3JhcGhpY3NMYXllcj4gUmVuZGVyTGF5ZXJCYWNraW5nOjpjCiAg ICAgZ3JhcGhpY3NMYXllci0+c2V0TmFtZShuYW1lKTsKIAogI2lmIFBMQVRGT1JNKENPQ09BKSAm JiBVU0UoQ0EpCisgICAgYm9vbCB1c2VzRGlzcGxheUxpc3REcmF3aW5nID0gbV91c2VzRGlzcGxh eUxpc3REcmF3aW5nLnZhbHVlT3IoY29tcG9zaXRvcigpLmRpc3BsYXlMaXN0RHJhd2luZ0VuYWJs ZWQoKSk7CisgICAgZ3JhcGhpY3NMYXllci0+c2V0VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyh1c2Vz RGlzcGxheUxpc3REcmF3aW5nKTsKICAgICBncmFwaGljc0xheWVyLT5zZXRBY2NlbGVyYXRlc0Ry YXdpbmcoY29tcG9zaXRvcigpLmFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoKSk7Ci0gICAgZ3Jh cGhpY3NMYXllci0+c2V0VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyhjb21wb3NpdG9yKCkuZGlzcGxh eUxpc3REcmF3aW5nRW5hYmxlZCgpKTsKICNlbmRpZgogICAgIAogICAgIHJldHVybiBncmFwaGlj c0xheWVyOwpAQCAtMzQ2LDkgKzM0NywxMSBAQCBSZWY8R3JhcGhpY3NMYXllcj4gUmVuZGVyTGF5 ZXJCYWNraW5nOjpjCiB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6c2V0VXNlc0Rpc3BsYXlMaXN0 RHJhd2luZyhib29sIHVzZXNEaXNwbGF5TGlzdERyYXdpbmcpCiB7CiAgICAgLy8gTm90ZSB0aGF0 IHRoaXMgb25seSBhZmZlY3RzIHRoZSBwcmltYXJ5IGxheWVyLgotICAgIGlmICh1c2VzRGlzcGxh eUxpc3REcmF3aW5nID09IG1fZ3JhcGhpY3NMYXllci0+dXNlc0Rpc3BsYXlMaXN0RHJhd2luZygp KQorICAgIGlmIChtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmcgJiYgdXNlc0Rpc3BsYXlMaXN0RHJh d2luZyA9PSAqbV91c2VzRGlzcGxheUxpc3REcmF3aW5nKQogICAgICAgICByZXR1cm47CiAKKyAg ICBtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmcgPSB1c2VzRGlzcGxheUxpc3REcmF3aW5nOworICAg IAogICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyh1c2VzRGlz cGxheUxpc3REcmF3aW5nKTsKICAgICBpZiAobV9ncmFwaGljc0xheWVyLT5kcmF3c0NvbnRlbnQo KSkKICAgICAgICAgbV9ncmFwaGljc0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKQEAgLTM1OSw5 ICszNjIsOSBAQCBTdHJpbmcgUmVuZGVyTGF5ZXJCYWNraW5nOjpkaXNwbGF5TGlzdEFzCiAgICAg cmV0dXJuIG1fZ3JhcGhpY3NMYXllci0+ZGlzcGxheUxpc3RBc1RleHQoZmxhZ3MpOwogfQogCi12 b2lkIFJlbmRlckxheWVyQmFja2luZzo6c2V0SXNUcmFja2luZ0Rpc3BsYXlMaXN0UmVwbGF5KGJv b2wgaXNUcmFja2luZ1JlcGxheSkKK3ZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpzZXRUcmFja3NE aXNwbGF5TGlzdFJlcGxheShib29sIHRyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5KQogewotICAgIG1f Z3JhcGhpY3NMYXllci0+c2V0SXNUcmFja2luZ0Rpc3BsYXlMaXN0UmVwbGF5KGlzVHJhY2tpbmdS ZXBsYXkpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0VHJhY2tzRGlzcGxheUxpc3RSZXBsYXko dHJhY2tzRGlzcGxheUxpc3RSZXBsYXkpOwogfQogCiBTdHJpbmcgUmVuZGVyTGF5ZXJCYWNraW5n OjpyZXBsYXlEaXNwbGF5TGlzdEFzVGV4dChEaXNwbGF5TGlzdDo6QXNUZXh0RmxhZ3MgZmxhZ3Mp IGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5oCShyZXZpc2lvbiAyNTMwMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4NSw3ICsyODUsNyBAQCBwdWJs aWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRVc2VzRGlzcGxheUxpc3REcmF3aW5nKGJv b2wpOwogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBkaXNwbGF5TGlzdEFzVGV4dChEaXNwbGF5 TGlzdDo6QXNUZXh0RmxhZ3MpIGNvbnN0OwogCi0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRJ c1RyYWNraW5nRGlzcGxheUxpc3RSZXBsYXkoYm9vbCk7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBzZXRUcmFja3NEaXNwbGF5TGlzdFJlcGxheShib29sKTsKICAgICBXRUJDT1JFX0VYUE9SVCBT dHJpbmcgcmVwbGF5RGlzcGxheUxpc3RBc1RleHQoRGlzcGxheUxpc3Q6OkFzVGV4dEZsYWdzKSBj b25zdDsKIAogcHJpdmF0ZToKQEAgLTQzMiw2ICs0MzIsNyBAQCBwcml2YXRlOgogICAgIGJvb2wg bV9yZXF1aXJlc0JhY2tncm91bmRMYXllciB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1N1YnBp eGVsUm91bmRpbmcgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9wYWludHNTdWJwaXhlbEFudGlhbGlh c2VkVGV4dCB7IGZhbHNlIH07IC8vIFRoaXMgaXMgZm9yIGxvZ2dpbmcgb25seS4KKyAgICBPcHRp b25hbDxib29sPiBtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmc7CiB9OwogCiBlbnVtIENhbnZhc0Nv bXBvc2l0aW5nU3RyYXRlZ3kgewpJbmRleDogU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h bHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNw cAkocmV2aXNpb24gMjUzMDE0KQorKysgU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODA5LDcgKzI4MDksNyBAQCBFeGNlcHRpb25Pcjx2b2lk PiBJbnRlcm5hbHM6OnNldEVsZW1lbnRVCiAgICAgcmV0dXJuIHsgfTsKIH0KIAotRXhjZXB0aW9u T3I8dm9pZD4gSW50ZXJuYWxzOjpzZXRFbGVtZW50VHJhY2tzRGlzcGxheUxpc3RSZXBsYXkoRWxl bWVudCYgZWxlbWVudCwgYm9vbCBpc1RyYWNraW5nUmVwbGF5KQorRXhjZXB0aW9uT3I8dm9pZD4g SW50ZXJuYWxzOjpzZXRFbGVtZW50VHJhY2tzRGlzcGxheUxpc3RSZXBsYXkoRWxlbWVudCYgZWxl bWVudCwgYm9vbCB0cmFja3NEaXNwbGF5TGlzdFJlcGxheSkKIHsKICAgICBEb2N1bWVudCogZG9j dW1lbnQgPSBjb250ZXh0RG9jdW1lbnQoKTsKICAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVu dC0+cmVuZGVyVmlldygpKQpAQCAtMjgyMSw3ICsyODIxLDcgQEAgRXhjZXB0aW9uT3I8dm9pZD4g SW50ZXJuYWxzOjpzZXRFbGVtZW50VAogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSW52YWxp ZEFjY2Vzc0Vycm9yIH07CiAKICAgICBpZiAoaXM8SFRNTENhbnZhc0VsZW1lbnQ+KGVsZW1lbnQp KSB7Ci0gICAgICAgIGRvd25jYXN0PEhUTUxDYW52YXNFbGVtZW50PihlbGVtZW50KS5zZXRUcmFj a3NEaXNwbGF5TGlzdFJlcGxheShpc1RyYWNraW5nUmVwbGF5KTsKKyAgICAgICAgZG93bmNhc3Q8 SFRNTENhbnZhc0VsZW1lbnQ+KGVsZW1lbnQpLnNldFRyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5KHRy YWNrc0Rpc3BsYXlMaXN0UmVwbGF5KTsKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKQEAg LTI4MzIsNyArMjgzMiw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEludGVybmFsczo6c2V0RWxlbWVu dFQKICAgICBpZiAoIWxheWVyLT5pc0NvbXBvc2l0ZWQoKSkKICAgICAgICAgcmV0dXJuIEV4Y2Vw dGlvbiB7IEludmFsaWRBY2Nlc3NFcnJvciB9OwogCi0gICAgbGF5ZXItPmJhY2tpbmcoKS0+c2V0 SXNUcmFja2luZ0Rpc3BsYXlMaXN0UmVwbGF5KGlzVHJhY2tpbmdSZXBsYXkpOworICAgIGxheWVy LT5iYWNraW5nKCktPnNldFRyYWNrc0Rpc3BsYXlMaXN0UmVwbGF5KHRyYWNrc0Rpc3BsYXlMaXN0 UmVwbGF5KTsKICAgICByZXR1cm4geyB9OwogfQogCg==