189932 2018-09-24 14:43:28 -0700 Clean up code around RenderLayer's "has accelerated scrolling" functions 2018-09-25 08:50:22 -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 simon.fraser webkit-bug-importer zalan oldest_to_newest 1462897 0 simon.fraser 2018-09-24 14:43:28 -0700 Clean up code around RenderLayer's "has accelerated scrolling" functions 1462900 1 350691 simon.fraser 2018-09-24 14:47:46 -0700 Created attachment 350691 Patch 1463145 2 350691 commit-queue 2018-09-25 08:49:30 -0700 Comment on attachment 350691 Patch Clearing flags on attachment: 350691 Committed r236459: <https://trac.webkit.org/changeset/236459> 1463146 3 commit-queue 2018-09-25 08:49:31 -0700 All reviewed patches have been landed. Closing bug. 1463147 4 webkit-bug-importer 2018-09-25 08:50:22 -0700 <rdar://problem/44762256> 350691 2018-09-24 14:47:46 -0700 2018-09-25 08:49:30 -0700 Patch bug-189932-20180924144745.patch text/plain 10665 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjBkZTU4ZGIyNjI0NjJl OTg4N2Q4MzI0MWI0NjllMjE1YTEwZDY3MS4uODYxOWY5YTUyNzNiN2ZiOGJiMzQzNGY1ODc1Y2Fi ZTI2ODNjNzVhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE4LTA5LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIGNv ZGUgYXJvdW5kIFJlbmRlckxheWVyJ3MgImhhcyBhY2NlbGVyYXRlZCBzY3JvbGxpbmciIGZ1bmN0 aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5 OTMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAg ICAgICBSZW5kZXJMYXllciBoYWQ6CisgICAgICAgIAorICAgICAgICBib29sIGhhc0FjY2VsZXJh dGVkVG91Y2hTY3JvbGxpbmcoKQorICAgICAgICBib29sIGhhc1RvdWNoU2Nyb2xsYWJsZU92ZXJm bG93KCkKKyAgICAgICAgYm9vbCB1c2VzQWNjZWxlcmF0ZWRTY3JvbGxpbmcoKQorICAgICAgICBi b29sIHVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkKKyAgICAgICAgYm9vbCB1c2VzQXN5bmNTY3Jv bGxpbmcoKQorICAgICAgICAKKyAgICAgICAgd2hpY2ggYXJlIGhhcmQgdG8ga2VlcCBpbiB5b3Vy IGhlYWQuIFJlbW92ZWQgdXNlc0FjY2VsZXJhdGVkU2Nyb2xsaW5nKCkgc2luY2UgaXQganVzdCBy ZXR1cm5zIGhhc1RvdWNoU2Nyb2xsYWJsZU92ZXJmbG93KCkuCisgICAgICAgIFJlbmFtZWQgaGFz QWNjZWxlcmF0ZWRUb3VjaFNjcm9sbGluZygpIHRvIGNhblVzZUFjY2VsZXJhdGVkVG91Y2hTY3Jv bGxpbmcoKSB0byBpbmRpY2F0ZSB0aGF0IGl0IGp1c3QgbG9va3MgYXQgc3R5bGUsCisgICAgICAg IG5vdCB3aGV0aGVyIGxheW91dCBoYXMgZ2l2ZW4gdGhlIGxheWVyIHNjcm9sbGFibGUgb3ZlcmZs b3cgeWV0LiBUaWR5IHVwIHNvbWUgI2lmZGVmcy4KKyAgICAgICAgCisgICAgICAgIHVzZXNDb21w b3NpdGVkU2Nyb2xsaW5nKCkgYW5kIHVzZXNBc3luY1Njcm9sbGluZygpIGFyZSBTY3JvbGxhYmxl QXJlYSBvdmVycmlkZXMsIGFuZAorICAgICAgICBsb29rIGF0IGJhY2tpbmcgbGF5ZXJzLCBzbyBy ZXF1aXJlIHRoYXQgY29tcG9zaXRpbmcgaGFzIHJ1biBhbHJlYWR5LiBOb3RlIHRoaXMgaW4gY29t bWVudHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhblVzZUFjY2VsZXJhdGVkVG91Y2hTY3JvbGxpbmcgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Omhhc1RvdWNoU2Nyb2xsYWJsZU92 ZXJmbG93IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpoYW5kbGVUb3Vj aEV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1c2VzQXN5bmNTY3JvbGxp bmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNob3dzT3ZlcmZsb3dD b250cm9scyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRl Q2xpcFJlY3RzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpoYXNBY2Nl bGVyYXRlZFRvdWNoU2Nyb2xsaW5nIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyOjp1c2VzQWNjZWxlcmF0ZWRTY3JvbGxpbmcgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bGF5ZXJPckFuY2VzdG9y SXNUcmFuc2Zvcm1lZE9yVXNpbmdDb21wb3NpdGVkU2Nyb2xsaW5nKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbik6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnVzZUNvb3JkaW5hdGVkU2Nyb2xsaW5nRm9yTGF5ZXIgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0Nv bXBvc2l0aW5nRm9yT3ZlcmZsb3dTY3JvbGxpbmcgY29uc3QpOgorCiAyMDE4LTA5LTI0ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBTZXBhcmF0ZSBNYWMgYW5k IGlPUyBpbXBsZW1lbnRhdGlvbiBvZiB3aW5kb3dzS2V5Q29kZUZvckNoYXJDb2RlKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDY5NmVhNTM0NWVmYzMxZjAw Yjg1ZGI3MmQwM2M0ODA2M2FiNmIwNmUuLmVmNDM0NDBhMDc3OWIxZTZkMWQwZTBkZTYzMDQ0M2M0 Yzc4OTMxZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAt MTk0OCwxNCArMTk0OCwxMCBAQCBMYXlvdXRTaXplIFJlbmRlckxheWVyOjpvZmZzZXRGcm9tQW5j ZXN0b3IoY29uc3QgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5ZXIsIENvbAogICAgIHJldHVybiB0 b0xheW91dFNpemUoY29udmVydFRvTGF5ZXJDb29yZHMoYW5jZXN0b3JMYXllciwgTGF5b3V0UG9p bnQoKSwgYWRqdXN0Rm9yQ29sdW1ucykpOwogfQogCi0jaWYgUExBVEZPUk0oSU9TKQotYm9vbCBS ZW5kZXJMYXllcjo6aGFzQWNjZWxlcmF0ZWRUb3VjaFNjcm9sbGluZygpIGNvbnN0Citib29sIFJl bmRlckxheWVyOjpjYW5Vc2VBY2NlbGVyYXRlZFRvdWNoU2Nyb2xsaW5nKCkgY29uc3QKIHsKLSNp ZiBFTkFCTEUoQUNDRUxFUkFURURfT1ZFUkZMT1dfU0NST0xMSU5HKQotICAgIGlmICghc2Nyb2xs c092ZXJmbG93KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiByZW5kZXJl cigpLnN0eWxlKCkudXNlVG91Y2hPdmVyZmxvd1Njcm9sbGluZygpIHx8IHJlbmRlcmVyKCkuc2V0 dGluZ3MoKS5hbHdheXNVc2VBY2NlbGVyYXRlZE92ZXJmbG93U2Nyb2xsKCk7CisjaWYgUExBVEZP Uk0oSU9TKSAmJiBFTkFCTEUoQUNDRUxFUkFURURfT1ZFUkZMT1dfU0NST0xMSU5HKQorICAgIHJl dHVybiBzY3JvbGxzT3ZlcmZsb3coKSAmJiAocmVuZGVyZXIoKS5zdHlsZSgpLnVzZVRvdWNoT3Zl cmZsb3dTY3JvbGxpbmcoKSB8fCByZW5kZXJlcigpLnNldHRpbmdzKCkuYWx3YXlzVXNlQWNjZWxl cmF0ZWRPdmVyZmxvd1Njcm9sbCgpKTsKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlm CkBAIC0xOTYzLDMxICsxOTU5LDE5IEBAIGJvb2wgUmVuZGVyTGF5ZXI6Omhhc0FjY2VsZXJhdGVk VG91Y2hTY3JvbGxpbmcoKSBjb25zdAogCiBib29sIFJlbmRlckxheWVyOjpoYXNUb3VjaFNjcm9s bGFibGVPdmVyZmxvdygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGhhc0FjY2VsZXJhdGVkVG91Y2hT Y3JvbGxpbmcoKSAmJiAoaGFzU2Nyb2xsYWJsZUhvcml6b250YWxPdmVyZmxvdygpIHx8IGhhc1Nj cm9sbGFibGVWZXJ0aWNhbE92ZXJmbG93KCkpOworICAgIHJldHVybiBjYW5Vc2VBY2NlbGVyYXRl ZFRvdWNoU2Nyb2xsaW5nKCkgJiYgKGhhc1Njcm9sbGFibGVIb3Jpem9udGFsT3ZlcmZsb3coKSB8 fCBoYXNTY3JvbGxhYmxlVmVydGljYWxPdmVyZmxvdygpKTsKIH0KIAotI2lmIEVOQUJMRShUT1VD SF9FVkVOVFMpCisjaWYgRU5BQkxFKElPU19UT1VDSF9FVkVOVFMpCiBib29sIFJlbmRlckxheWVy OjpoYW5kbGVUb3VjaEV2ZW50KGNvbnN0IFBsYXRmb3JtVG91Y2hFdmVudCYgdG91Y2hFdmVudCkK IHsKICAgICAvLyBJZiB3ZSBoYXZlIGFjY2VsZXJhdGVkIHNjcm9sbGluZywgbGV0IHRoZSBzY3Jv bGxpbmcgYmUgaGFuZGxlZCBvdXRzaWRlIG9mIFdlYktpdC4KLSAgICBpZiAodXNlc0FjY2VsZXJh dGVkU2Nyb2xsaW5nKCkpCisgICAgaWYgKGhhc1RvdWNoU2Nyb2xsYWJsZU92ZXJmbG93KCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiBTY3JvbGxhYmxlQXJlYTo6aGFuZGxl VG91Y2hFdmVudCh0b3VjaEV2ZW50KTsKIH0KLSNlbmRpZgotI2VuZGlmIC8vIFBMQVRGT1JNKElP UykKLQotYm9vbCBSZW5kZXJMYXllcjo6dXNlc0FjY2VsZXJhdGVkU2Nyb2xsaW5nKCkgY29uc3QK LXsKLSNpZiBQTEFURk9STShJT1MpCi0gICAgcmV0dXJuIGhhc1RvdWNoU2Nyb2xsYWJsZU92ZXJm bG93KCk7Ci0jZWxzZQotICAgIHJldHVybiBmYWxzZTsKLSNlbmRpZgotfQogCi0jaWYgRU5BQkxF KElPU19UT1VDSF9FVkVOVFMpCiB2b2lkIFJlbmRlckxheWVyOjpyZWdpc3RlckFzVG91Y2hFdmVu dExpc3RlbmVyRm9yU2Nyb2xsaW5nKCkKIHsKICAgICBpZiAoIXJlbmRlcmVyKCkuZWxlbWVudCgp IHx8IG1fcmVnaXN0ZXJlZEFzVG91Y2hFdmVudExpc3RlbmVyRm9yU2Nyb2xsaW5nKQpAQCAtMjAw NywxNCArMTk5MSwxNiBAQCB2b2lkIFJlbmRlckxheWVyOjp1bnJlZ2lzdGVyQXNUb3VjaEV2ZW50 TGlzdGVuZXJGb3JTY3JvbGxpbmcoKQogfQogI2VuZGlmIC8vIEVOQUJMRShJT1NfVE9VQ0hfRVZF TlRTKQogCisvLyBGSVhNRTogdGhpcyBpcyBvbmx5IHZhbGlkIGFmdGVyIHdlJ3ZlIG1hZGUgbGF5 ZXJzLgogYm9vbCBSZW5kZXJMYXllcjo6dXNlc0NvbXBvc2l0ZWRTY3JvbGxpbmcoKSBjb25zdAog ewogICAgIHJldHVybiBpc0NvbXBvc2l0ZWQoKSAmJiBiYWNraW5nKCktPmhhc1Njcm9sbGluZ0xh eWVyKCk7CiB9CiAKKy8vIEZJWE1FOiB0aGlzIGlzIG9ubHkgdmFsaWQgYWZ0ZXIgd2UndmUgbWFk ZSBsYXllcnMuCiBib29sIFJlbmRlckxheWVyOjp1c2VzQXN5bmNTY3JvbGxpbmcoKSBjb25zdAog ewotICAgIHJldHVybiBoYXNBY2NlbGVyYXRlZFRvdWNoU2Nyb2xsaW5nKCkgJiYgdXNlc0NvbXBv c2l0ZWRTY3JvbGxpbmcoKTsKKyAgICByZXR1cm4gY2FuVXNlQWNjZWxlcmF0ZWRUb3VjaFNjcm9s bGluZygpICYmIHVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCk7CiB9CiAKIHN0YXRpYyBpbmxpbmUg aW50IGFkanVzdGVkU2Nyb2xsRGVsdGEoaW50IGJlZ2lubmluZ0RlbHRhKQpAQCAtMzM4OCw3ICsz Mzc0LDcgQEAgYm9vbCBSZW5kZXJMYXllcjo6c2hvd3NPdmVyZmxvd0NvbnRyb2xzKCkgY29uc3QK IHsKICNpZiBQTEFURk9STShJT1MpCiAgICAgLy8gRG9uJ3QgcmVuZGVyIChjdXN0b20pIHNjcm9s bGJhcnMgaWYgd2UgaGF2ZSBhY2NlbGVyYXRlZCBzY3JvbGxpbmcuCi0gICAgaWYgKGhhc0FjY2Vs ZXJhdGVkVG91Y2hTY3JvbGxpbmcoKSkKKyAgICBpZiAoY2FuVXNlQWNjZWxlcmF0ZWRUb3VjaFNj cm9sbGluZygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKIApAQCAtNjA4MCw3ICs2 MDY2LDcgQEAgc3RhdGljIGJvb2wgY3JlYXRlc1N0YWNraW5nQ29udGV4dChjb25zdCBSZW5kZXJM YXllciYgbGF5ZXIpCiAgICAgICAgIHx8IHJlbmRlcmVyLmhhc1JlZmxlY3Rpb24oKQogICAgICAg ICB8fCByZW5kZXJlci5zdHlsZSgpLmhhc0lzb2xhdGlvbigpCiAjaWYgUExBVEZPUk0oSU9TKQot ICAgICAgICB8fCBsYXllci5oYXNBY2NlbGVyYXRlZFRvdWNoU2Nyb2xsaW5nKCkKKyAgICAgICAg fHwgbGF5ZXIuY2FuVXNlQWNjZWxlcmF0ZWRUb3VjaFNjcm9sbGluZygpCiAjZW5kaWYKICAgICAg ICAgfHwgKHJlbmRlcmVyLnN0eWxlKCkud2lsbENoYW5nZSgpICYmIHJlbmRlcmVyLnN0eWxlKCku d2lsbENoYW5nZSgpLT5jYW5DcmVhdGVTdGFja2luZ0NvbnRleHQoKSk7CiB9CkBAIC02NDE0LDcg KzY0MDAsNyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVTY3JvbGxhYmxlQXJlYVNldChib29s IGhhc092ZXJmbG93KQogCiAjaWYgRU5BQkxFKElPU19UT1VDSF9FVkVOVFMpCiAgICAgaWYgKGFk ZGVkT3JSZW1vdmVkKSB7Ci0gICAgICAgIGlmIChpc1Njcm9sbGFibGUgJiYgIWhhc0FjY2VsZXJh dGVkVG91Y2hTY3JvbGxpbmcoKSkKKyAgICAgICAgaWYgKGlzU2Nyb2xsYWJsZSAmJiAhY2FuVXNl QWNjZWxlcmF0ZWRUb3VjaFNjcm9sbGluZygpKQogICAgICAgICAgICAgcmVnaXN0ZXJBc1RvdWNo RXZlbnRMaXN0ZW5lckZvclNjcm9sbGluZygpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAg IC8vIFdlIG9ubHkgbmVlZCB0aGUgdG91Y2ggbGlzdGVuZXIgZm9yIHVuYWNjZWxlcmF0ZWQgb3Zl cmZsb3cgc2Nyb2xsaW5nLCBzbyBpZiB3ZSBiZWNhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgKaW5kZXggNGFiY2EyOWMxMDY1Zjc5MjVlNWU4YzNkMGNiOTFjYTdkM2RkNTQw MC4uNjhkN2U5M2YzNzgzOTMyYmQ1NTVkMDY0YTgwMmE3MGJlOGVmZTc4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTI1MSw3ICsyNTEsNyBAQCBwdWJsaWM6CiAj ZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKLSNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQorI2lm IEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRTKQogICAgIGJvb2wgaGFuZGxlVG91Y2hFdmVudChjb25z dCBQbGF0Zm9ybVRvdWNoRXZlbnQmKSBvdmVycmlkZTsKICNlbmRpZgogICAgIApAQCAtMjY0LDE2 ICsyNjQsMTIgQEAgcHVibGljOgogCiAgICAgYm9vbCByZXF1aXJlc1Njcm9sbEJvdW5kc09yaWdp blVwZGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWlyZXNTY3JvbGxCb3VuZHNPcmlnaW5VcGRh dGU7IH0KICAgICB2b2lkIHNldFJlcXVpcmVzU2Nyb2xsQm91bmRzT3JpZ2luVXBkYXRlKGJvb2wg cmVxdWlyZXNVcGRhdGUgPSB0cnVlKSB7IG1fcmVxdWlyZXNTY3JvbGxCb3VuZHNPcmlnaW5VcGRh dGUgPSByZXF1aXJlc1VwZGF0ZTsgfQorI2VuZGlmCiAKICAgICAvLyBSZXR1cm5zIHRydWUgd2hl biB0aGUgbGF5ZXIgY291bGQgZG8gdG91Y2ggc2Nyb2xsaW5nLCBidXQgZG9lc24ndCBsb29rIGF0 IHdoZXRoZXIgdGhlcmUgaXMgYWN0dWFsbHkgc2Nyb2xsYWJsZSBvdmVyZmxvdy4KLSAgICBib29s IGhhc0FjY2VsZXJhdGVkVG91Y2hTY3JvbGxpbmcoKSBjb25zdDsKKyAgICBib29sIGNhblVzZUFj Y2VsZXJhdGVkVG91Y2hTY3JvbGxpbmcoKSBjb25zdDsKICAgICAvLyBSZXR1cm5zIHRydWUgd2hl biB0aGVyZSBpcyBhY3R1YWxseSBzY3JvbGxhYmxlIG92ZXJmbG93IChyZXF1aXJlcyBsYXlvdXQg dG8gYmUgdXAtdG8tZGF0ZSkuCiAgICAgYm9vbCBoYXNUb3VjaFNjcm9sbGFibGVPdmVyZmxvdygp IGNvbnN0OwotI2Vsc2UKLSAgICBib29sIGhhc0FjY2VsZXJhdGVkVG91Y2hTY3JvbGxpbmcoKSBj b25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIGJvb2wgaGFzVG91Y2hTY3JvbGxhYmxlT3ZlcmZs b3coKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotI2VuZGlmCi0gICAgYm9vbCB1c2VzQWNjZWxl cmF0ZWRTY3JvbGxpbmcoKSBjb25zdDsKIAogICAgIGludCB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRo KE92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5ID0gSWdub3JlT3ZlcmxheVNjcm9sbGJhclNp emUpIGNvbnN0OwogICAgIGludCBob3Jpem9udGFsU2Nyb2xsYmFySGVpZ2h0KE92ZXJsYXlTY3Jv bGxiYXJTaXplUmVsZXZhbmN5ID0gSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUpIGNvbnN0OwpA QCAtODk2LDcgKzg5Miw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCB1c2VzTW9ja1Njcm9sbEFuaW1h dG9yKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBsb2dNb2NrU2Nyb2xsQW5pbWF0b3JNZXNz YWdlKGNvbnN0IFN0cmluZyYpIGNvbnN0IG92ZXJyaWRlOwogCi0jaWYgUExBVEZPUk0oSU9TKQor I2lmIEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRTKQogICAgIHZvaWQgcmVnaXN0ZXJBc1RvdWNoRXZl bnRMaXN0ZW5lckZvclNjcm9sbGluZygpOwogICAgIHZvaWQgdW5yZWdpc3RlckFzVG91Y2hFdmVu dExpc3RlbmVyRm9yU2Nyb2xsaW5nKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggNjQ1Yjg0YzI5MmU4MzUyMGE2NGNk OTY1YjA1NGE0ZDg3Y2MzMGZkNC4uZTVjNzM0MjM4ZmFjN2Y4YzI0ZTRmNTBiOTZjZjc2YWJiZjIw YTE0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAKQEAgLTU2MCw3ICs1NjAsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRl Q3VzdG9tQXBwZWFyYW5jZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCiBzdGF0aWMgYm9vbCBs YXllck9yQW5jZXN0b3JJc1RyYW5zZm9ybWVkT3JVc2luZ0NvbXBvc2l0ZWRTY3JvbGxpbmcoUmVu ZGVyTGF5ZXImIGxheWVyKQogewogICAgIGZvciAoYXV0byogY3VyciA9ICZsYXllcjsgY3Vycjsg Y3VyciA9IGN1cnItPnBhcmVudCgpKSB7Ci0gICAgICAgIGlmIChjdXJyLT5oYXNUcmFuc2Zvcm0o KSB8fCBjdXJyLT51c2VzQWNjZWxlcmF0ZWRTY3JvbGxpbmcoKSkKKyAgICAgICAgaWYgKGN1cnIt Pmhhc1RyYW5zZm9ybSgpIHx8IGN1cnItPmhhc1RvdWNoU2Nyb2xsYWJsZU92ZXJmbG93KCkpCiAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTY4Niw3ICs2ODYsNyBAQCBib29s IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbigpCiAgICAgYm9vbCBuZWVk c0Rlc2NlbmRhbnRzQ2xpcHBpbmdMYXllciA9IGNvbXBvc2l0b3IoKS5jbGlwc0NvbXBvc2l0aW5n RGVzY2VuZGFudHMobV9vd25pbmdMYXllcik7CiAKICAgICBpZiAoIXJlbmRlcmVyKCkudmlldygp Lm5lZWRzTGF5b3V0KCkpIHsKLSAgICAgICAgYm9vbCB1c2VzQ29tcG9zaXRlZFNjcm9sbGluZyA9 IG1fb3duaW5nTGF5ZXIudXNlc0FjY2VsZXJhdGVkU2Nyb2xsaW5nKCk7CisgICAgICAgIGJvb2wg dXNlc0NvbXBvc2l0ZWRTY3JvbGxpbmcgPSBtX293bmluZ0xheWVyLmhhc1RvdWNoU2Nyb2xsYWJs ZU92ZXJmbG93KCk7CiAKICAgICAgICAgLy8gT3VyIHNjcm9sbGluZyBsYXllciB3aWxsIGNsaXAu CiAgICAgICAgIGlmICh1c2VzQ29tcG9zaXRlZFNjcm9sbGluZykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggODE4NTU3NmIz MTA5ZmEzODQxNzVkODk2ZGQwNzljNDE4YmM0MDE1OC4uZDI2ZmFiZTQxNWQ2ZDU0ODZhYjU5Y2U0 Mzc1ZDYwNzIzYWVkOGViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTI2NjMsNyArMjY2Myw3IEBAIGJvb2wgUmVuZGVy TGF5ZXJDb21wb3NpdG9yOjp1c2VDb29yZGluYXRlZFNjcm9sbGluZ0ZvckxheWVyKGNvbnN0IFJl bmRlckxheWVyJiBsCiAgICAgaWYgKGxheWVyLmlzUmVuZGVyVmlld0xheWVyKCkgJiYgaGFzQ29v cmRpbmF0ZWRTY3JvbGxpbmcoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICByZXR1cm4g bGF5ZXIudXNlc0FjY2VsZXJhdGVkU2Nyb2xsaW5nKCk7CisgICAgcmV0dXJuIGxheWVyLmhhc1Rv dWNoU2Nyb2xsYWJsZU92ZXJmbG93KCk7CiB9CiAKIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9y OjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yUG9zaXRpb24oUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCYg cmVuZGVyZXIsIGNvbnN0IFJlbmRlckxheWVyJiBsYXllciwgUmVuZGVyTGF5ZXI6OlZpZXdwb3J0 Q29uc3RyYWluZWROb3RDb21wb3NpdGVkUmVhc29uKiB2aWV3cG9ydENvbnN0cmFpbmVkTm90Q29t cG9zaXRlZFJlYXNvbikgY29uc3QKQEAgLTI3NDgsNyArMjc0OCw3IEBAIGJvb2wgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjpyZXF1aXJlc0NvbXBvc2l0aW5nRm9yUG9zaXRpb24oUmVuZGVyTGF5ZXJN b2RlbE9iamVjCiBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGlu Z0Zvck92ZXJmbG93U2Nyb2xsaW5nKGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikgY29uc3QKIHsK ICNpZiBQTEFURk9STShJT1MpCi0gICAgaWYgKCFsYXllci5oYXNBY2NlbGVyYXRlZFRvdWNoU2Ny b2xsaW5nKCkpCisgICAgaWYgKCFsYXllci5jYW5Vc2VBY2NlbGVyYXRlZFRvdWNoU2Nyb2xsaW5n KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghbV9pblBvc3RMYXlvdXRVcGRh dGUpIHsK