196848 2019-04-11 20:56:43 -0700 Avoid doing positioned scrolling tree node work for layers not inside overflow:scroll 2019-04-11 22:29:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1526614 0 simon.fraser 2019-04-11 20:56:43 -0700 Avoid doing positioned scrolling tree node work for layers not inside overflow:scroll 1526615 1 367281 simon.fraser 2019-04-11 20:58:20 -0700 Created attachment 367281 Patch 1526637 2 367281 commit-queue 2019-04-11 22:28:55 -0700 Comment on attachment 367281 Patch Clearing flags on attachment: 367281 Committed r244209: <https://trac.webkit.org/changeset/244209> 1526638 3 commit-queue 2019-04-11 22:28:57 -0700 All reviewed patches have been landed. Closing bug. 1526639 4 webkit-bug-importer 2019-04-11 22:29:16 -0700 <rdar://problem/49840978> 367281 2019-04-11 20:58:20 -0700 2019-04-11 22:28:55 -0700 Patch bug-196848-20190411205819.patch text/plain 9766 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2MmJmNDhiNDRlMGVl N2NhMmU5NmViYTE0NzhlODk2YjllNGFjMy4uMmFmYzFlNDlmNThmYmVlNjgyZmZhNjg5NzhkYjUw NGMyYmJhZjAwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA0LTExICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEF2b2lkIGRvaW5n IHBvc2l0aW9uZWQgc2Nyb2xsaW5nIHRyZWUgbm9kZSB3b3JrIGZvciBsYXllcnMgbm90IGluc2lk ZSBvdmVyZmxvdzpzY3JvbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5Njg0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE1haW50YWluIGEgYml0IG9uIFJlbmRlckxheWVyIHdoaWNoIHNheXMgaWYgYSBs YXllciBoYXMgYSBjb21wb3NpdGVkIHNjcm9sbGluZyBhbmNlc3RvcgorICAgICAgICBpbiB0aGUg bGF5ZXIgdHJlZS4gV2Ugb25seSBuZWVkIHRvIGRvIHdvcmsgcmVsYXRlZCB0byBtYWtpbmcgcG9z aXRpb25lZCBzY3JvbGxpbmcgdHJlZSBub2RlcworICAgICAgICBmb3IgbGF5ZXJzIHdoaWNoIGFy ZSBsYXllciB0cmVlIGRlc2NlbmRhbnRzIG9mIG92ZXJmbG93OnNjcm9sbC4KKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6UmVuZGVyTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxh eWVyUG9zaXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6Om91dHB1dFBhaW50T3JkZXJUcmVlTGVn ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Om91dHB1dFBhaW50T3JkZXJUcmVlUmVjdXJzaXZlKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclBvc2l0aW9uIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0Zv ckluZGlyZWN0UmVhc29uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29t cG9zaXRvcjo6aXNWaWV3cG9ydENvbnN0cmFpbmVkRml4ZWRPclN0aWNreUxheWVyIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Zml4ZWRMYXllckludGVy c2VjdHNWaWV3cG9ydCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBv c2l0b3I6OmNvbXB1dGVDb29yZGluYXRlZFBvc2l0aW9uaW5nRm9yTGF5ZXIgY29uc3QpOgorCiAy MDE5LTA0LTExICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtXUEVdIEJ1aWxkIGVycm9yIHdpdGggRU5BQkxFX1ZJREVPPU9GRiBhZnRlciByMjQ0MDc4 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA2OTY2MjgzOTNk NzlmNjRlZTA4YmQ3MGJhZjEyZDAxMjMwZGFiNzJiLi4zMTY0NWFlZmVhMGRkNjlhYjQ4MzQ4MWI3 YWJjZDg0OGZmYTJiNjUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAKQEAgLTI5MSw2ICsyOTEsNyBAQCBSZW5kZXJMYXllcjo6UmVuZGVyTGF5ZXIoUmVuZGVyTGF5 ZXJNb2RlbE9iamVjdCYgcmVuZGVyZXJMYXllck1vZGVsT2JqZWN0KQogICAgICwgbV8zRFRyYW5z Zm9ybWVkRGVzY2VuZGFudFN0YXR1c0RpcnR5KHRydWUpCiAgICAgLCBtX2hhczNEVHJhbnNmb3Jt ZWREZXNjZW5kYW50KGZhbHNlKQogICAgICwgbV9oYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoZmFs c2UpCisgICAgLCBtX2hhc0NvbXBvc2l0ZWRTY3JvbGxpbmdBbmNlc3RvcihmYWxzZSkKICAgICAs IG1faGFzVHJhbnNmb3JtZWRBbmNlc3RvcihmYWxzZSkKICAgICAsIG1faGFzM0RUcmFuc2Zvcm1l ZEFuY2VzdG9yKGZhbHNlKQogICAgICwgbV9pbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uKHN0YXRp Y19jYXN0PHVuc2lnbmVkPihJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpOb25lKSkKQEAgLTkx MSw2ICs5MTIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9ucyhSZW5k ZXJHZW9tZXRyeU1hcCogZ2VvbWV0cnlNYXAsIE9wdGlvblNldAogICAgIG1fcmVwYWludFN0YXR1 cyA9IE5lZWRzTm9ybWFsUmVwYWludDsKICAgICBtX2hhc1RyYW5zZm9ybWVkQW5jZXN0b3IgPSBm bGFncy5jb250YWlucyhTZWVuVHJhbnNmb3JtZWRMYXllcik7CiAgICAgbV9oYXMzRFRyYW5zZm9y bWVkQW5jZXN0b3IgPSBmbGFncy5jb250YWlucyhTZWVuM0RUcmFuc2Zvcm1lZExheWVyKTsKKyAg ICBzZXRIYXNDb21wb3NpdGVkU2Nyb2xsaW5nQW5jZXN0b3IoZmxhZ3MuY29udGFpbnMoU2VlbkNv bXBvc2l0ZWRTY3JvbGxpbmdMYXllcikpOwogCiAgICAgLy8gVXBkYXRlIHRoZSByZWZsZWN0aW9u J3MgcG9zaXRpb24gYW5kIHNpemUuCiAgICAgaWYgKG1fcmVmbGVjdGlvbikKQEAgLTkyNiw2ICs5 MjgsOSBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9ucyhSZW5kZXJHZW9t ZXRyeU1hcCogZ2VvbWV0cnlNYXAsIE9wdGlvblNldAogICAgICAgICBpZiAoIXRyYW5zZm9ybSgp LT5pc0FmZmluZSgpKQogICAgICAgICAgICAgZmxhZ3MuYWRkKFNlZW4zRFRyYW5zZm9ybWVkTGF5 ZXIpOwogICAgIH0KKyAgICAKKyAgICBpZiAoaGFzQ29tcG9zaXRlZFNjcm9sbGFibGVPdmVyZmxv dygpKQorICAgICAgICBmbGFncy5hZGQoU2VlbkNvbXBvc2l0ZWRTY3JvbGxpbmdMYXllcik7CiAK ICAgICBmb3IgKFJlbmRlckxheWVyKiBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxk ID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpCiAgICAgICAgIGNoaWxkLT51cGRhdGVMYXllclBvc2l0 aW9ucyhnZW9tZXRyeU1hcCwgZmxhZ3MpOwpAQCAtOTM5LDcgKzk0NCw3IEBAIHZvaWQgUmVuZGVy TGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zKFJlbmRlckdlb21ldHJ5TWFwKiBnZW9tZXRyeU1h cCwgT3B0aW9uU2V0CiAgICAgICAgIG1fdXBkYXRpbmdNYXJxdWVlUG9zaXRpb24gPSBvbGRVcGRh dGluZ01hcnF1ZWVQb3NpdGlvbjsKICAgICB9CiAKLSAgICBpZiAocmVuZGVyZXIoKS5pc091dE9m Rmxvd1Bvc2l0aW9uZWQoKSAmJiByZW5kZXJlcigpLnN0eWxlKCkucG9zaXRpb24oKSA9PSBQb3Np dGlvblR5cGU6OkZpeGVkICYmIHJlbmRlcmVyKCkuc2V0dGluZ3MoKS5hY2NlbGVyYXRlZENvbXBv c2l0aW5nRm9yRml4ZWRQb3NpdGlvbkVuYWJsZWQoKSkgeworICAgIGlmIChyZW5kZXJlcigpLmlz Rml4ZWRQb3NpdGlvbmVkKCkgJiYgcmVuZGVyZXIoKS5zZXR0aW5ncygpLmFjY2VsZXJhdGVkQ29t cG9zaXRpbmdGb3JGaXhlZFBvc2l0aW9uRW5hYmxlZCgpKSB7CiAgICAgICAgIGJvb2wgaW50ZXJz ZWN0c1ZpZXdwb3J0ID0gY29tcG9zaXRvcigpLmZpeGVkTGF5ZXJJbnRlcnNlY3RzVmlld3BvcnQo KnRoaXMpOwogICAgICAgICBpZiAoaW50ZXJzZWN0c1ZpZXdwb3J0ICE9IG1faXNGaXhlZEludGVy c2VjdGluZ1ZpZXdwb3J0KSB7CiAgICAgICAgICAgICBtX2lzRml4ZWRJbnRlcnNlY3RpbmdWaWV3 cG9ydCA9IGludGVyc2VjdHNWaWV3cG9ydDsKQEAgLTY3NTAsNyArNjc1NSw3IEBAIHZvaWQgc2hv d0xheWVyVHJlZShjb25zdCBXZWJDb3JlOjpSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogc3RhdGlj IHZvaWQgb3V0cHV0UGFpbnRPcmRlclRyZWVMZWdlbmQoVGV4dFN0cmVhbSYgc3RyZWFtKQogewog ICAgIHN0cmVhbS5uZXh0TGluZSgpOwotICAgIHN0cmVhbSA8PCAiKFMpdGFja2luZyBDb250ZXh0 LCAoTilvcm1hbCBmbG93IG9ubHksIChPKXZlcmZsb3cgY2xpcCwgKEEpbHBoYSAob3BhY2l0eSBv ciBtYXNrKSwgaGFzIChCKWxlbmQgbW9kZSwgKEkpc29sYXRlcyBibGVuZGluZywgKFQpcmFuc2Zv cm0taXNoLCAoRilpbHRlciwgRmkoWCllZCBwb3NpdGlvbiwgKEMpb21wb3NpdGVkLCAoYylvbXBv c2l0ZWQgZGVzY2VuZGFudFxuIgorICAgIHN0cmVhbSA8PCAiKFMpdGFja2luZyBDb250ZXh0LCAo Tilvcm1hbCBmbG93IG9ubHksIChPKXZlcmZsb3cgY2xpcCwgKEEpbHBoYSAob3BhY2l0eSBvciBt YXNrKSwgaGFzIChCKWxlbmQgbW9kZSwgKEkpc29sYXRlcyBibGVuZGluZywgKFQpcmFuc2Zvcm0t aXNoLCAoRilpbHRlciwgRmkoWCllZCBwb3NpdGlvbiwgKEMpb21wb3NpdGVkLCAoYylvbXBvc2l0 ZWQgZGVzY2VuZGFudCwgKHMpc2Nyb2xsaW5nIGFuY2VzdG9yXG4iCiAgICAgICAgICJEaXJ0eSAo eiktbGlzdHMsIERpcnR5IChuKW9ybWFsIGZsb3cgbGlzdHNcbiIKICAgICAgICAgIlRyYXZlcnNh bCBuZWVkczogcmVxdWlyZW1lbnRzICh0KXJhdmVyc2FsIG9uIGRlc2NlbmRhbnRzLCAoYilhY2tp bmcgb3IgaGllcmFyY2h5IHRyYXZlcnNhbCBvbiBkZXNjZW5kYW50cywgKHIpZXF1aXJlbWVudHMg dHJhdmVyc2FsIG9uIGFsbCBkZXNjZW5kYW50cywgcmVxdWlyZW1lbnRzIHRyYXZlcnNhbCBvbiBh bGwgKHMpdWJzZXF1ZW50IGxheWVycywgKGgpaWVyYXJjaHkgdHJhdmVyc2FsIG9uIGFsbCBkZXNj ZW5kYW50cywgdXBkYXRlIG9mIHBhaW50IChvKXJkZXIgY2hpbGRyZW5cbiIKICAgICAgICAgIlVw ZGF0ZSBuZWVkczogICAgcG9zdC0obClheW91dCByZXF1aXJlbWVudHMsIChnKWVvbWV0cnksIChr KWlkcyBnZW9tZXRyeSwgKGMpb25maWcsIGxheWVyIGNvbm5lKHgpaW9uLCAocyljcm9sbGluZyB0 cmVlXG4iOwpAQCAtNjc3Nyw2ICs2NzgyLDcgQEAgc3RhdGljIHZvaWQgb3V0cHV0UGFpbnRPcmRl clRyZWVSZWN1cnNpdmUoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBXZWJDb3JlOjpSZW4KICAg ICBzdHJlYW0gPDwgKGxheWVyLnJlbmRlcmVyKCkuaXNGaXhlZFBvc2l0aW9uZWQoKSA/ICJYIiA6 ICItIik7CiAgICAgc3RyZWFtIDw8IChsYXllci5pc0NvbXBvc2l0ZWQoKSA/ICJDIiA6ICItIik7 CiAgICAgc3RyZWFtIDw8IChsYXllci5oYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoKSA/ICJjIiA6 ICItIik7CisgICAgc3RyZWFtIDw8IChsYXllci5oYXNDb21wb3NpdGVkU2Nyb2xsaW5nQW5jZXN0 b3IoKSA/ICJzIiA6ICItIik7CiAKICAgICBzdHJlYW0gPDwgIiAiOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IGYwZTNlNWVjNGVmMThmOTUzM2JmYmUzOWNhMTZj ZTkwMjg1ZTg4YTMuLjkwNzQ4ZmI2NmM5YzYxY2E0ZDUzMGFhMGQ5ODM5YmI5ZDZmZDVhOTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC01MTYsNiArNTE2LDcgQEAg cHVibGljOgogICAgICAgICBVcGRhdGVQYWdpbmF0aW9uICAgICAgICAgICAgICAgICAgICA9IDEg PDwgMywKICAgICAgICAgU2VlblRyYW5zZm9ybWVkTGF5ZXIgICAgICAgICAgICAgICAgPSAxIDw8 IDQsCiAgICAgICAgIFNlZW4zRFRyYW5zZm9ybWVkTGF5ZXIgICAgICAgICAgICAgID0gMSA8PCA1 LAorICAgICAgICBTZWVuQ29tcG9zaXRlZFNjcm9sbGluZ0xheWVyICAgICAgICA9IDEgPDwgNiwK ICAgICB9OwogICAgIHN0YXRpYyBjb25zdGV4cHIgT3B0aW9uU2V0PFVwZGF0ZUxheWVyUG9zaXRp b25zRmxhZz4gdXBkYXRlTGF5ZXJQb3NpdGlvbnNEZWZhdWx0RmxhZ3MoKSB7IHJldHVybiB7IENo ZWNrRm9yUmVwYWludCB9OyB9CiAKQEAgLTgxNCw2ICs4MTUsOSBAQCBwdWJsaWM6CiAgICAgYm9v bCB1c2VzQ29tcG9zaXRlZFNjcm9sbGluZygpIGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wgdXNl c0FzeW5jU2Nyb2xsaW5nKCkgY29uc3Qgb3ZlcnJpZGU7CiAKKyAgICBib29sIGhhc0NvbXBvc2l0 ZWRTY3JvbGxpbmdBbmNlc3RvcigpIGNvbnN0IHsgcmV0dXJuIG1faGFzQ29tcG9zaXRlZFNjcm9s bGluZ0FuY2VzdG9yOyB9CisgICAgdm9pZCBzZXRIYXNDb21wb3NpdGVkU2Nyb2xsaW5nQW5jZXN0 b3IoYm9vbCBoYXNDb21wb3NpdGVkU2Nyb2xsaW5nQW5jZXN0b3IpIHsgbV9oYXNDb21wb3NpdGVk U2Nyb2xsaW5nQW5jZXN0b3IgPSBoYXNDb21wb3NpdGVkU2Nyb2xsaW5nQW5jZXN0b3I7IH0KKwog ICAgIGJvb2wgcGFpbnRzV2l0aFRyYW5zcGFyZW5jeShPcHRpb25TZXQ8UGFpbnRCZWhhdmlvcj4g cGFpbnRCZWhhdmlvcikgY29uc3QKICAgICB7CiAgICAgICAgIHJldHVybiAoaXNUcmFuc3BhcmVu dCgpIHx8IGhhc0JsZW5kTW9kZSgpIHx8IChpc29sYXRlc0JsZW5kaW5nKCkgJiYgIXJlbmRlcmVy KCkuaXNEb2N1bWVudEVsZW1lbnRSZW5kZXJlcigpKSkgJiYgKChwYWludEJlaGF2aW9yICYgUGFp bnRCZWhhdmlvcjo6RmxhdHRlbkNvbXBvc2l0aW5nTGF5ZXJzKSB8fCAhaXNDb21wb3NpdGVkKCkp OwpAQCAtMTIwMSw2ICsxMjA1LDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgLy8gaW4gYSBwcmVzZXJ2ZXMzRCBoaWVyYXJjaHkuIEhpbnQg dG8gZG8gM0QtYXdhcmUgaGl0IHRlc3RpbmcuCiAgICAgYm9vbCBtX2hhc0NvbXBvc2l0aW5nRGVz Y2VuZGFudCA6IDE7IC8vIEluIHRoZSB6LW9yZGVyIHRyZWUuCiAKKyAgICBib29sIG1faGFzQ29t cG9zaXRlZFNjcm9sbGluZ0FuY2VzdG9yIDogMTsgLy8gSW4gdGhlIGxheWVyLW9yZGVyIHRyZWUu CisKICAgICBib29sIG1faGFzVHJhbnNmb3JtZWRBbmNlc3RvciA6IDE7CiAgICAgYm9vbCBtX2hh czNEVHJhbnNmb3JtZWRBbmNlc3RvciA6IDE7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggMWMyYmI5MDA1ZmE1NGU1MmY2 ZTJiOGNmMDEzMmMwYTllZjIzZThjNy4uNDkxYzE3YjFhZDA0ZjdjNmRhODEwNTcxZGQ4N2JjYmVk ZGQ3ZDRkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAKQEAgLTI3MTUsNyArMjcxNSw3IEBAIGJvb2wgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yUG9zaXRpb24oUmVuZGVyTGF5ZXJNb2RlbE9i amVjCiAjZW5kaWYKIAogICAgIGF1dG8gcG9zaXRpb24gPSByZW5kZXJlci5zdHlsZSgpLnBvc2l0 aW9uKCk7Ci0gICAgYm9vbCBpc0ZpeGVkID0gcmVuZGVyZXIuaXNPdXRPZkZsb3dQb3NpdGlvbmVk KCkgJiYgcG9zaXRpb24gPT0gUG9zaXRpb25UeXBlOjpGaXhlZDsKKyAgICBib29sIGlzRml4ZWQg PSByZW5kZXJlci5pc0ZpeGVkUG9zaXRpb25lZCgpOwogICAgIGlmIChpc0ZpeGVkICYmICFsYXll ci5pc1N0YWNraW5nQ29udGV4dCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCkBAIC0y ODAwLDcgKzI4MDAsNyBAQCBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21w b3NpdGluZ0ZvckluZGlyZWN0UmVhc29uKFJlbmRlckxheWVyTW9kZQogICAgICAgICB9CiAgICAg fQogCi0gICAgaWYgKHJlbmRlcmVyLmlzQWJzb2x1dGVseVBvc2l0aW9uZWQoKSAmJiBjb21wb3Np dGluZ0FuY2VzdG9yKSB7CisgICAgaWYgKHJlbmRlcmVyLmlzQWJzb2x1dGVseVBvc2l0aW9uZWQo KSAmJiBjb21wb3NpdGluZ0FuY2VzdG9yICYmIGxheWVyLmhhc0NvbXBvc2l0ZWRTY3JvbGxpbmdB bmNlc3RvcigpKSB7CiAgICAgICAgIGlmIChsYXllckNvbnRhaW5pbmdCbG9ja0Nyb3NzZXNDb29y ZGluYXRlZFNjcm9sbGluZ0JvdW5kYXJ5KGxheWVyLCAqY29tcG9zaXRpbmdBbmNlc3RvcikpIHsK ICAgICAgICAgICAgIHJlYXNvbiA9IFJlbmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVh c29uOjpPdmVyZmxvd1Njcm9sbFBvc2l0aW9uaW5nOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CkBAIC0yODYyLDcgKzI4NjIsNyBAQCBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6aXNWaWV3 cG9ydENvbnN0cmFpbmVkRml4ZWRPclN0aWNreUxheWVyKGNvbnN0IFJlbmRlcgogICAgIGlmIChs YXllci5yZW5kZXJlcigpLmlzU3RpY2tpbHlQb3NpdGlvbmVkKCkpCiAgICAgICAgIHJldHVybiBp c0FzeW5jU2Nyb2xsYWJsZVN0aWNreUxheWVyKGxheWVyKTsKIAotICAgIGlmIChsYXllci5yZW5k ZXJlcigpLnN0eWxlKCkucG9zaXRpb24oKSAhPSBQb3NpdGlvblR5cGU6OkZpeGVkKQorICAgIGlm ICghbGF5ZXIucmVuZGVyZXIoKS5pc0ZpeGVkUG9zaXRpb25lZCgpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICAvLyBGSVhNRTogSGFuZGxlIGZpeGVkIGluc2lkZSBvZiBhIHRyYW5zZm9y bSwgd2hpY2ggc2hvdWxkIG5vdCBiZWhhdmUgYXMgZml4ZWQuCkBAIC0yODc2LDcgKzI4NzYsNyBA QCBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6aXNWaWV3cG9ydENvbnN0cmFpbmVkRml4ZWRP clN0aWNreUxheWVyKGNvbnN0IFJlbmRlcgogCiBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 Zml4ZWRMYXllckludGVyc2VjdHNWaWV3cG9ydChjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpIGNv bnN0CiB7Ci0gICAgQVNTRVJUKGxheWVyLnJlbmRlcmVyKCkuc3R5bGUoKS5wb3NpdGlvbigpID09 IFBvc2l0aW9uVHlwZTo6Rml4ZWQpOworICAgIEFTU0VSVChsYXllci5yZW5kZXJlcigpLmlzRml4 ZWRQb3NpdGlvbmVkKCkpOwogCiAgICAgLy8gRml4ZWQgcG9zaXRpb24gZWxlbWVudHMgdGhhdCBh cmUgaW52aXNpYmxlIGluIHRoZSBjdXJyZW50IHZpZXcgZG9uJ3QgZ2V0IHRoZWlyIG93biBsYXll ci4KICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkbid0IGhhdmUgdG8gY2hlY2sgdXNlRml4ZWRMYXlv dXQoKSBoZXJlOyBvbmUgb2YgdGhlIHZpZXdwb3J0IHJlY3RzIG5lZWRzIHRvIGdpdmUgdGhlIGNv cnJlY3QgYW5zd2VyLgpAQCAtMjk0Nyw2ICsyOTQ3LDkgQEAgU2Nyb2xsUG9zaXRpb25pbmdCZWhh dmlvciBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb29yZGluYXRlZFBvc2l0aW9uaW5n Rm8KIAogICAgIGlmIChsYXllci5yZW5kZXJlcigpLmlzRml4ZWRQb3NpdGlvbmVkKCkpCiAgICAg ICAgIHJldHVybiBTY3JvbGxQb3NpdGlvbmluZ0JlaGF2aW9yOjpOb25lOworICAgIAorICAgIGlm ICghbGF5ZXIuaGFzQ29tcG9zaXRlZFNjcm9sbGluZ0FuY2VzdG9yKCkpCisgICAgICAgIHJldHVy biBTY3JvbGxQb3NpdGlvbmluZ0JlaGF2aW9yOjpOb25lOwogCiAgICAgYXV0byogc2Nyb2xsaW5n Q29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29yZGluYXRvcigpOwogICAgIGlmICghc2Ny b2xsaW5nQ29vcmRpbmF0b3IpCg==