99649 2012-10-17 16:01:50 -0700 [BlackBerry] Cache TouchDown HitTestResult to avoid calling RenderLayer::hitTest unnecessarily 2012-10-24 19:51:16 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Unspecified RESOLVED FIXED P2 Normal --- 0 mlattanzio webkit-unassigned allan.jensen mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 744737 0 mlattanzio 2012-10-17 16:01:50 -0700 RenderLayer::hitTest() can be expensive. We can merge together some of the calls by caching the result. This speeds up the hot path in our touch scrolling code. 749041 1 170244 mlattanzio 2012-10-23 15:10:48 -0700 Created attachment 170244 Patch 749098 2 170244 webkit.review.bot 2012-10-23 16:11:01 -0700 Comment on attachment 170244 Patch Clearing flags on attachment: 170244 Committed r132279: <http://trac.webkit.org/changeset/132279> 749099 3 webkit.review.bot 2012-10-23 16:11:04 -0700 All reviewed patches have been landed. Closing bug. 750319 4 170244 tonikitoo 2012-10-24 19:51:16 -0700 Comment on attachment 170244 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=170244&action=review Good stuff Lattanzio. > Source/WebKit/blackberry/Api/WebPage.cpp:6338 > +bool WebPagePrivate::postponeDocumentStyleRecalc() Why is it returning bool? 170244 2012-10-23 15:10:48 -0700 2012-10-24 19:51:16 -0700 Patch bug-99649-20121023181052.patch text/plain 12330 mlattanzio U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyMjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA5NzIxZDQ1YjNiMGZkMmIyMjAwOTc4N2U4NGNmYWVhZTE3ODljNGNlLi43ZDkyNWZjN2Ix ODIwNWY0ZTg3ZjgxYThmYTg3YzIwMjA2MjliMWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSw0MyBAQAorMjAxMi0xMC0yMyAgTWlrZSBMYXR0YW56aW8gIDxtbGF0 dGFuemlvQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIENhY2hlIFRvdWNoRG93biBI aXRUZXN0UmVzdWx0IHRvIGF2b2lkIGNhbGxpbmcgUmVuZGVyTGF5ZXI6OmhpdFRlc3QgdW5uZWNl c3NhcmlseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTk2NDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS YW5kb20gbGF0ZW5jeSBiZWZvcmUgc2Nyb2xsIHN0YXJ0cyBvbiBzaXRlcyBsaWtlIGh0dHA6Ly9w aW50cmVzdC5jb20KKyAgICAgICAgSW50ZXJuYWwgUFIyMjUzOTgKKworICAgICAgICBUaGUgY2hp ZWYgcHJvYmxlbSBoZXJlIGlzIHRoZSBhbGwgdGhlIGhpdCB0ZXN0aW5nIHRoYXQgd2UgZG8gZm9y CisgICAgICAgIHRvdWNoIGV2ZW50cyBhbmQgc2ltdWxhdGVkIG1vdXNlIGV2ZW50cy4gSWYgdGhl IHJlbmRlciB0cmVlIGlzIGRpcnR5CisgICAgICAgIGhpdCB0ZXN0cyBjYW4gdGFrZSBhIGxvbmcg dGltZSBpbiBEb2N1bWVudDo6cmVjYWxjU3R5bGUoKS4gTWFza2luZworICAgICAgICB0aGUgZmxh Z3MgdGhhdCBmb3JjZSBzdHlsZSByZWNhbGN1bGF0aW9ucyB3aWxsIG1ha2UgdGhlbSBmYXN0LCBh dCB0aGUKKyAgICAgICAgZXhwZW5zZSB0aGF0IHRoZXkgbWlnaHQgYmUgaGFwcGVuaW5nIG9uIHN0 YWxlIGRhdGEuCisKKyAgICAgICAgU2luY2Ugd2UgYXJlIG9ubHkgdXNpbmcgdGhlc2UgaGl0IHRl c3RzIHRvIGxvb2sgZm9yIGV2ZW50IGhhbmRsZXJzIC0KKyAgICAgICAgd2UncmUgbm90IGFjdHVh bGx5IG1vZGlmeWluZyBhbnl0aGluZywgaXQgaXMgYmV0dGVyIHRvIHNraXAgdGhlCisgICAgICAg IERvY3VtZW50OjpyZWNhbGNTdHlsZSgpIGFuZCBzYXZlIG91cnNlbHZlcyB0b25zIG9mIHRpbWUu CisKKyAgICAgICAgKiBBcGkvSW5SZWdpb25TY3JvbGxlci5jcHA6CisgICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OkluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpjYWxjdWxhdGVJblJlZ2lvblNj cm9sbGFibGVBcmVhc0ZvclBvaW50KToKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6CisgICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpXZWJQYWdlUHJpdmF0ZSk6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2U6OnRvdWNoRXZlbnQpOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6c2V0U2Nyb2xsT3JpZ2lu UG9pbnQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6cG9z dHBvbmVEb2N1bWVudFN0eWxlUmVjYWxjKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpyZXN1bWVEb2N1bWVudFN0eWxlUmVj YWxjKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmhpdFRl c3RSZXN1bHQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6 Y2xlYXJDYWNoZWRIaXRUZXN0UmVzdWx0KToKKyAgICAgICAgKiBBcGkvV2ViUGFnZV9wLmg6Cisg ICAgICAgIChXZWJQYWdlUHJpdmF0ZSk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9GYXRGaW5n ZXJzLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6ZmluZEJl c3RQb2ludCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmdldFJl bGV2YW50SW5mb0Zyb21DYWNoZWRIaXRUZXN0KToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0Zh dEZpbmdlcnMuaDoKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNw cDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6VG91Y2hFdmVudEhhbmRsZXI6OmhhbmRs ZVRvdWNoUG9pbnQpOgorCiAyMDEyLTEwLTIzICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CiAK ICAgICAgICAgW0JsYWNrQmVycnldIE1ha2Ugc2VsZWN0aW9uIGluIHNlYXJjaCBpbnB1dCBib3gg bm90IG92ZXJsYXAgY2FuY2VsIGJ1dHRvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvSW5SZWdpb25TY3JvbGxlci5jcHAKaW5kZXggMDkxMzQwNWY4OWU3MDUwMjdmOTQ0NjJl NTJjZDYxODIwMDBjZWQxNy4uYzBjMDM2NTIyYWUzNTQ5OTJkZGRjN2Q1MzBiYTJjY2ZkZjEyM2M1 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9s bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xs ZXIuY3BwCkBAIC0yMDIsNyArMjAyLDcgQEAgdm9pZCBJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6 Y2FsY3VsYXRlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXNGb3JQb2ludChjb25zdCBXZWIKICAgICBB U1NFUlQobV9hY3RpdmVJblJlZ2lvblNjcm9sbGFibGVBcmVhcy5lbXB0eSgpKTsKICAgICBtX25l ZWRzQWN0aXZlU2Nyb2xsYWJsZUFyZWFDYWxjdWxhdGlvbiA9IGZhbHNlOwogCi0gICAgSGl0VGVz dFJlc3VsdCByZXN1bHQgPSBtX3dlYlBhZ2UtPm1fbWFpbkZyYW1lLT5ldmVudEhhbmRsZXIoKS0+ aGl0VGVzdFJlc3VsdEF0UG9pbnQobV93ZWJQYWdlLT5tYXBGcm9tVmlld3BvcnRUb0NvbnRlbnRz KHBvaW50KSk7CisgICAgY29uc3QgSGl0VGVzdFJlc3VsdCYgcmVzdWx0ID0gbV93ZWJQYWdlLT5o aXRUZXN0UmVzdWx0KG1fd2ViUGFnZS0+bWFwRnJvbVZpZXdwb3J0VG9Db250ZW50cyhwb2ludCkp OwogICAgIE5vZGUqIG5vZGUgPSByZXN1bHQuaW5uZXJOb25TaGFyZWROb2RlKCk7CiAgICAgaWYg KCFub2RlIHx8ICFub2RlLT5yZW5kZXJlcigpKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA2NTFhMGFhOTY5Mzc1MDNlYWQ2Y2E2 YmQ1YWQ4YmIyNDQyMWM2MThmLi4xM2RkNmM4MmI0YTljNGViOWE3YWQwNTEyNGVhYzQxYjk1ZjA3 NjdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTQzMiw2 ICs0MzIsOCBAQCBXZWJQYWdlUHJpdmF0ZTo6V2ViUGFnZVByaXZhdGUoV2ViUGFnZSogd2ViUGFn ZSwgV2ViUGFnZUNsaWVudCogY2xpZW50LCBjb25zdCBJbgogICAgICwgbV9kZWZlcnJlZFRhc2tz VGltZXIodGhpcywgJldlYlBhZ2VQcml2YXRlOjpkZWZlcnJlZFRhc2tzVGltZXJGaXJlZCkKICAg ICAsIG1fc2VsZWN0UG9wdXAoMCkKICAgICAsIG1fYXV0b2ZpbGxNYW5hZ2VyKEF1dG9maWxsTWFu YWdlcjo6Y3JlYXRlKHRoaXMpKQorICAgICwgbV9kb2N1bWVudFN0eWxlUmVjYWxjUG9zdHBvbmVk KGZhbHNlKQorICAgICwgbV9kb2N1bWVudENoaWxkTmVlZHNTdHlsZVJlY2FsYyhmYWxzZSkKIHsK ICAgICBzdGF0aWMgYm9vbCBpc0luaXRpYWxpemVkID0gZmFsc2U7CiAgICAgaWYgKCFpc0luaXRp YWxpemVkKSB7CkBAIC00NDEsNiArNDQzLDcgQEAgV2ViUGFnZVByaXZhdGU6OldlYlBhZ2VQcml2 YXRlKFdlYlBhZ2UqIHdlYlBhZ2UsIFdlYlBhZ2VDbGllbnQqIGNsaWVudCwgY29uc3QgSW4KICAg ICB9CiAKICAgICBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZU1hbmFnZXI6Omluc3RhbmNlKCktPnBh Z2VDcmVhdGVkKHRoaXMpOworICAgIGNsZWFyQ2FjaGVkSGl0VGVzdFJlc3VsdCgpOwogfQogCiBX ZWJQYWdlOjpXZWJQYWdlKFdlYlBhZ2VDbGllbnQqIGNsaWVudCwgY29uc3QgQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlN0cmluZyYgcGFnZUdyb3VwTmFtZSwgY29uc3QgUGxhdGZvcm06OkludFJlY3Qm IHJlY3QpCkBAIC00MDc0LDYgKzQwNzcsOSBAQCBib29sIFdlYlBhZ2U6OnRvdWNoRXZlbnQoY29u c3QgUGxhdGZvcm06OlRvdWNoRXZlbnQmIGV2ZW50KQogICAgIGVsc2UgaWYgKHRFdmVudC5tX3R5 cGUgPT0gUGxhdGZvcm06OlRvdWNoRXZlbnQ6OlRvdWNoU3RhcnQgfHwgdEV2ZW50Lm1fdHlwZSA9 PSBQbGF0Zm9ybTo6VG91Y2hFdmVudDo6VG91Y2hDYW5jZWwpCiAgICAgICAgIGQtPm1fcGx1Z2lu TWF5T3Blbk5ld1RhYiA9IGZhbHNlOwogCisgICAgaWYgKHRFdmVudC5tX3R5cGUgPT0gUGxhdGZv cm06OlRvdWNoRXZlbnQ6OlRvdWNoU3RhcnQpCisgICAgICAgIGQtPmNsZWFyQ2FjaGVkSGl0VGVz dFJlc3VsdCgpOworCiAgICAgYm9vbCBoYW5kbGVkID0gZmFsc2U7CiAKICAgICBpZiAoZC0+bV9u ZWVkVG91Y2hFdmVudHMgJiYgIWV2ZW50Lmhhc0dlc3R1cmUoUGxhdGZvcm06Okdlc3R1cmU6Oklu amVjdGVkKSkKQEAgLTQxMTAsOSArNDExNiwxMSBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRT Y3JvbGxPcmlnaW5Qb2ludChjb25zdCBQbGF0Zm9ybTo6SW50UG9pbnQmIHBvaW50KQogICAgIGlm ICghbV9oYXNJblJlZ2lvblNjcm9sbGFibGVBcmVhcykKICAgICAgICAgcmV0dXJuOwogCisgICAg cG9zdHBvbmVEb2N1bWVudFN0eWxlUmVjYWxjKCk7CiAgICAgbV9pblJlZ2lvblNjcm9sbGVyLT5k LT5jYWxjdWxhdGVJblJlZ2lvblNjcm9sbGFibGVBcmVhc0ZvclBvaW50KHBvaW50KTsKICAgICBp ZiAoIW1faW5SZWdpb25TY3JvbGxlci0+ZC0+YWN0aXZlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXMo KS5lbXB0eSgpKQogICAgICAgICBtX2NsaWVudC0+bm90aWZ5SW5SZWdpb25TY3JvbGxhYmxlQXJl YXNDaGFuZ2VkKG1faW5SZWdpb25TY3JvbGxlci0+ZC0+YWN0aXZlSW5SZWdpb25TY3JvbGxhYmxl QXJlYXMoKSk7CisgICAgcmVzdW1lRG9jdW1lbnRTdHlsZVJlY2FsYygpOwogfQogCiB2b2lkIFdl YlBhZ2U6OnNldFNjcm9sbE9yaWdpblBvaW50KGNvbnN0IFBsYXRmb3JtOjpJbnRQb2ludCYgcG9p bnQpCkBAIC02MzI3LDUgKzYzMzUsNDUgQEAgSW50U2l6ZSBXZWJQYWdlUHJpdmF0ZTo6c2NyZWVu U2l6ZSgpIGNvbnN0CiAgICAgcmV0dXJuIFBsYXRmb3JtOjpHcmFwaGljczo6U2NyZWVuOjpwcmlt YXJ5U2NyZWVuKCktPnNpemUoKTsKIH0KIAorYm9vbCBXZWJQYWdlUHJpdmF0ZTo6cG9zdHBvbmVE b2N1bWVudFN0eWxlUmVjYWxjKCkKK3sKKyAgICBpZiAoRG9jdW1lbnQqIGRvY3VtZW50ID0gbV9t YWluRnJhbWUtPmRvY3VtZW50KCkpIHsKKyAgICAgICAgbV9kb2N1bWVudENoaWxkTmVlZHNTdHls ZVJlY2FsYyA9IGRvY3VtZW50LT5jaGlsZE5lZWRzU3R5bGVSZWNhbGMoKTsKKyAgICAgICAgZG9j dW1lbnQtPmNsZWFyQ2hpbGROZWVkc1N0eWxlUmVjYWxjKCk7CisKKyAgICAgICAgbV9kb2N1bWVu dFN0eWxlUmVjYWxjUG9zdHBvbmVkID0gZG9jdW1lbnQtPmlzUGVuZGluZ1N0eWxlUmVjYWxjKCk7 CisgICAgICAgIGRvY3VtZW50LT51bnNjaGVkdWxlU3R5bGVSZWNhbGMoKTsKKyAgICB9Cit9CisK K3ZvaWQgV2ViUGFnZVByaXZhdGU6OnJlc3VtZURvY3VtZW50U3R5bGVSZWNhbGMoKQoreworICAg IGlmIChEb2N1bWVudCogZG9jdW1lbnQgPSBtX21haW5GcmFtZS0+ZG9jdW1lbnQoKSkgeworICAg ICAgICBpZiAobV9kb2N1bWVudENoaWxkTmVlZHNTdHlsZVJlY2FsYykKKyAgICAgICAgICAgIGRv Y3VtZW50LT5zZXRDaGlsZE5lZWRzU3R5bGVSZWNhbGMoKTsKKworICAgICAgICBpZiAobV9kb2N1 bWVudFN0eWxlUmVjYWxjUG9zdHBvbmVkKQorICAgICAgICAgICAgZG9jdW1lbnQtPnNjaGVkdWxl U3R5bGVSZWNhbGMoKTsKKyAgICB9CisKKyAgICBtX2RvY3VtZW50Q2hpbGROZWVkc1N0eWxlUmVj YWxjID0gZmFsc2U7CisgICAgbV9kb2N1bWVudFN0eWxlUmVjYWxjUG9zdHBvbmVkID0gZmFsc2U7 Cit9CisKK2NvbnN0IEhpdFRlc3RSZXN1bHQmIFdlYlBhZ2VQcml2YXRlOjpoaXRUZXN0UmVzdWx0 KGNvbnN0IEludFBvaW50JiBjb250ZW50UG9zKQoreworICAgIGlmIChtX2NhY2hlZEhpdFRlc3RD b250ZW50UG9zICE9IGNvbnRlbnRQb3MpIHsKKyAgICAgICAgbV9jYWNoZWRIaXRUZXN0Q29udGVu dFBvcyA9IGNvbnRlbnRQb3M7CisgICAgICAgIG1fY2FjaGVkSGl0VGVzdFJlc3VsdCA9IG1fbWFp bkZyYW1lLT5ldmVudEhhbmRsZXIoKS0+aGl0VGVzdFJlc3VsdEF0UG9pbnQobV9jYWNoZWRIaXRU ZXN0Q29udGVudFBvcywgSGl0VGVzdFJlcXVlc3Q6OlJlYWRPbmx5IHwgSGl0VGVzdFJlcXVlc3Q6 OkFjdGl2ZSB8IEhpdFRlc3RSZXF1ZXN0OjpBbGxvd1NoYWRvd0NvbnRlbnQpOworICAgIH0KKwor ICAgIHJldHVybiBtX2NhY2hlZEhpdFRlc3RSZXN1bHQ7Cit9CisKK3ZvaWQgV2ViUGFnZVByaXZh dGU6OmNsZWFyQ2FjaGVkSGl0VGVzdFJlc3VsdCgpCit7CisgICAgbV9jYWNoZWRIaXRUZXN0Q29u dGVudFBvcyA9IFdlYkNvcmU6OkludFBvaW50KC0xLCAtMSk7Cit9CisKIH0KIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmggYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCmluZGV4IGM3OGNkOGE0NWUxMGI3ZjNiYzli OWY3NjQ5YWY5MDM3OTNiNGY4MWIuLmFlNmZiNTNjM2FiOWNjOTkxYTdlNDg0NTZiMDMxYTM0ZTdj YThkOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9w LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaApAQCAtMjAs NiArMjAsNyBAQAogI2RlZmluZSBXZWJQYWdlX3BfaAogCiAjaW5jbHVkZSAiQ2hyb21lQ2xpZW50 LmgiCisjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgogI2luY2x1ZGUgIkluUmVnaW9uU2Nyb2xs ZXIuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JDbGllbnRCbGFja0JlcnJ5LmgiCiAjaW5jbHVkZSAi SW5zcGVjdG9yT3ZlcmxheS5oIgpAQCAtNDYwLDYgKzQ2MSwxMiBAQCBwdWJsaWM6CiAgICAgdm9p ZCBhcHBseVNpemVPdmVycmlkZShpbnQgb3ZlcnJpZGVXaWR0aCwgaW50IG92ZXJyaWRlSGVpZ2h0 KTsKICAgICB2b2lkIHNldFRleHRab29tRmFjdG9yKGZsb2F0KTsKIAorICAgIGJvb2wgcG9zdHBv bmVEb2N1bWVudFN0eWxlUmVjYWxjKCk7CisgICAgdm9pZCByZXN1bWVEb2N1bWVudFN0eWxlUmVj YWxjKCk7CisKKyAgICBjb25zdCBXZWJDb3JlOjpIaXRUZXN0UmVzdWx0JiBoaXRUZXN0UmVzdWx0 KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBjb250ZW50UG9zKTsKKyAgICB2b2lkIGNsZWFyQ2Fj aGVkSGl0VGVzdFJlc3VsdCgpOworCiAgICAgV2ViQ29yZTo6SW50U2l6ZSBzY3JlZW5TaXplKCkg Y29uc3Q7CiAKICAgICBXZWJQYWdlKiBtX3dlYlBhZ2U7CkBAIC02MzcsNiArNjQ0LDEyIEBAIHB1 YmxpYzoKICAgICBXZWJDb3JlOjpQYWdlUG9wdXBCbGFja0JlcnJ5KiBtX3NlbGVjdFBvcHVwOwog CiAgICAgUmVmUHRyPFdlYkNvcmU6OkF1dG9maWxsTWFuYWdlcj4gbV9hdXRvZmlsbE1hbmFnZXI7 CisKKyAgICBib29sIG1fZG9jdW1lbnRTdHlsZVJlY2FsY1Bvc3Rwb25lZDsKKyAgICBib29sIG1f ZG9jdW1lbnRDaGlsZE5lZWRzU3R5bGVSZWNhbGM7CisKKyAgICBXZWJDb3JlOjpJbnRQb2ludCBt X2NhY2hlZEhpdFRlc3RDb250ZW50UG9zOworICAgIFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQgbV9j YWNoZWRIaXRUZXN0UmVzdWx0OwogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgfldlYlBhZ2VQcml2 YXRlKCk7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvRmF0RmluZ2Vycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9GYXRGaW5nZXJzLmNwcAppbmRleCAwNzE5N2IxZGQ1YmUwNmEyMzM1M2M3NzAyNTFiNDdi ODY3MWNlYTY5Li44NzdkYzIwMDlmNWNkNjkxMGQ2MjRkZGNjMjlmOGZmYjY2YTYyODFlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJz LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5n ZXJzLmNwcApAQCAtMTgxLDcgKzE4MSw3IEBAIGNvbnN0IEZhdEZpbmdlcnNSZXN1bHQgRmF0Rmlu Z2Vyczo6ZmluZEJlc3RQb2ludCgpCiAgICAgLy8gdGFyZ2FibGUgaXMgYWN0dWFsbHkgZm91bmQg YnkgOjpmaW5kSW50ZXJzZWN0aW5nUmVnaW9ucywgdGhlbiB3ZSBtaWdodCByZXBsYWNlIHdoYXQg d2UganVzdCBzZXQgYmVsb3cgbGF0ZXIgb24uCiAgICAgRWxlbWVudCogZWxlbWVudFVuZGVyUG9p bnQ7CiAgICAgRWxlbWVudCogY2xpY2thYmxlRWxlbWVudFVuZGVyUG9pbnQ7Ci0gICAgZ2V0UmVs ZXZhbnRJbmZvRnJvbVBvaW50KG1fd2ViUGFnZS0+bV9tYWluRnJhbWUtPmRvY3VtZW50KCksIG1f Y29udGVudFBvcywgZWxlbWVudFVuZGVyUG9pbnQsIGNsaWNrYWJsZUVsZW1lbnRVbmRlclBvaW50 KTsKKyAgICBnZXRSZWxldmFudEluZm9Gcm9tQ2FjaGVkSGl0VGVzdChlbGVtZW50VW5kZXJQb2lu dCwgY2xpY2thYmxlRWxlbWVudFVuZGVyUG9pbnQpOwogCiAgICAgaWYgKGVsZW1lbnRVbmRlclBv aW50KSB7CiAgICAgICAgIHJlc3VsdC5tX25vZGVVbmRlckZhdEZpbmdlciA9IGVsZW1lbnRVbmRl clBvaW50OwpAQCAtNTAwLDE1ICs1MDAsMTIgQEAgdm9pZCBGYXRGaW5nZXJzOjpnZXROb2Rlc0Zy b21SZWN0KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgSW50UG9pbnQmIGNvbnRlbnRQb3MKICAg ICBtX2NhY2hlZFJlY3RIaXRUZXN0UmVzdWx0cy5hZGQoZG9jdW1lbnQsIGludGVyc2VjdGVkTm9k ZXMpOwogfQogCi12b2lkIEZhdEZpbmdlcnM6OmdldFJlbGV2YW50SW5mb0Zyb21Qb2ludChEb2N1 bWVudCogZG9jdW1lbnQsIGNvbnN0IEludFBvaW50JiBjb250ZW50UG9zLCBFbGVtZW50KiYgZWxl bWVudFVuZGVyUG9pbnQsIEVsZW1lbnQqJiBjbGlja2FibGVFbGVtZW50VW5kZXJQb2ludCkgY29u c3QKK3ZvaWQgRmF0RmluZ2Vyczo6Z2V0UmVsZXZhbnRJbmZvRnJvbUNhY2hlZEhpdFRlc3QoRWxl bWVudComIGVsZW1lbnRVbmRlclBvaW50LCBFbGVtZW50KiYgY2xpY2thYmxlRWxlbWVudFVuZGVy UG9pbnQpIGNvbnN0CiB7CiAgICAgZWxlbWVudFVuZGVyUG9pbnQgPSAwOwogICAgIGNsaWNrYWJs ZUVsZW1lbnRVbmRlclBvaW50ID0gMDsKIAotICAgIGlmICghZG9jdW1lbnQgfHwgIWRvY3VtZW50 LT5yZW5kZXJlcigpIHx8ICFkb2N1bWVudC0+ZnJhbWUoKSkKLSAgICAgICAgcmV0dXJuOwotCi0g ICAgSGl0VGVzdFJlc3VsdCByZXN1bHQgID0gZG9jdW1lbnQtPmZyYW1lKCktPmV2ZW50SGFuZGxl cigpLT5oaXRUZXN0UmVzdWx0QXRQb2ludChjb250ZW50UG9zLCBIaXRUZXN0UmVxdWVzdDo6UmVh ZE9ubHkgfCBIaXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJlcXVlc3Q6OkFsbG93U2hh ZG93Q29udGVudCk7CisgICAgY29uc3QgSGl0VGVzdFJlc3VsdCYgcmVzdWx0ID0gbV93ZWJQYWdl LT5oaXRUZXN0UmVzdWx0KG1fY29udGVudFBvcyk7CiAgICAgTm9kZSogbm9kZSA9IHJlc3VsdC5p bm5lck5vZGUoKTsKICAgICB3aGlsZSAobm9kZSAmJiAhbm9kZS0+aXNFbGVtZW50Tm9kZSgpKQog ICAgICAgICBub2RlID0gbm9kZS0+cGFyZW50Tm9kZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5oIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5oCmluZGV4IGY4NzJlOGEwODRh MThiMzU4NDJkY2NlZWZhYjM5YjhhMGNkNzQzYWQuLjNlM2M2ZmMzYTI0NmZmNGIwNTlhODkwOTRk YjhiYjU4MTFiMWM3NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0ZhdEZpbmdlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi S2l0U3VwcG9ydC9GYXRGaW5nZXJzLmgKQEAgLTk5LDEwICs5OSw3IEBAIHByaXZhdGU6CiAgICAg dm9pZCBnZXROb2Rlc0Zyb21SZWN0KFdlYkNvcmU6OkRvY3VtZW50KiwgY29uc3QgV2ViQ29yZTo6 SW50UG9pbnQmLCBMaXN0SGFzaFNldDxSZWZQdHI8V2ViQ29yZTo6Tm9kZT4gPiYpOwogCiAgICAg Ly8gSXQgbWltaWNzIERvY3VtZW50OjplbGVtZW50RnJvbVBvaW50LCBidXQgcmVjdXJzaXZlbHkg aGl0LXRlc3RzIGluIGNhc2UgYW4gaW5uZXIgZnJhbWUgaXMgZm91bmQuCi0gICAgdm9pZCBnZXRS ZWxldmFudEluZm9Gcm9tUG9pbnQoV2ViQ29yZTo6RG9jdW1lbnQqLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBXZWJDb3JlOjpFbGVtZW50KiYgZWxlbWVudFVuZGVyUG9p bnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV2ViQ29yZTo6RWxlbWVudCom IGNsaWNrYWJsZUVsZW1lbnRVbmRlclBvaW50KSBjb25zdDsKKyAgICB2b2lkIGdldFJlbGV2YW50 SW5mb0Zyb21DYWNoZWRIaXRUZXN0KFdlYkNvcmU6OkVsZW1lbnQqJiBlbGVtZW50VW5kZXJQb2lu dCwgV2ViQ29yZTo6RWxlbWVudComIGNsaWNrYWJsZUVsZW1lbnRVbmRlclBvaW50KSBjb25zdDsK IAogICAgIGJvb2wgaXNFbGVtZW50Q2xpY2thYmxlKFdlYkNvcmU6OkVsZW1lbnQqKSBjb25zdDsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvVG91 Y2hFdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvVG91Y2hFdmVudEhhbmRsZXIuY3BwCmluZGV4IGQzODhlOGQ1OTlmYzJjN2UyYzNkYzRmZGU3 Zjg0ZTRhZjUwNjY4MTkuLmFjZTc2ZjEyZDExOWQzYzEwZjg4NzM2NTViZmM3Yjg4YzAwNzQ5MGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNo RXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9Ub3VjaEV2ZW50SGFuZGxlci5jcHAKQEAgLTE5OSw2ICsxOTksNyBAQCBib29sIFRvdWNo RXZlbnRIYW5kbGVyOjpoYW5kbGVUb3VjaFBvaW50KFBsYXRmb3JtOjpUb3VjaFBvaW50JiBwb2lu dCwgYm9vbCB1c2VGYQogCiAgICAgICAgICAgICBJbnRQb2ludCBjb250ZW50UG9zKG1fd2ViUGFn ZS0+bWFwRnJvbVZpZXdwb3J0VG9Db250ZW50cyhwb2ludC5tX3BvcykpOwogCisgICAgICAgICAg ICBtX3dlYlBhZ2UtPnBvc3Rwb25lRG9jdW1lbnRTdHlsZVJlY2FsYygpOwogICAgICAgICAgICAg bV9sYXN0RmF0RmluZ2Vyc1Jlc3VsdCA9IEZhdEZpbmdlcnMobV93ZWJQYWdlLCBjb250ZW50UG9z LCBGYXRGaW5nZXJzOjpDbGlja2FibGVFbGVtZW50KS5maW5kQmVzdFBvaW50KCk7CiAKICAgICAg ICAgICAgIEVsZW1lbnQqIGVsZW1lbnRVbmRlckZhdEZpbmdlciA9IDA7CkBAIC0yMTQsNiArMjE1 LDggQEAgYm9vbCBUb3VjaEV2ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hQb2ludChQbGF0Zm9ybTo6 VG91Y2hQb2ludCYgcG9pbnQsIGJvb2wgdXNlRmEKICAgICAgICAgICAgIGlmICghcG9zc2libGVU YXJnZXROb2RlRm9yTW91c2VNb3ZlRXZlbnRzIHx8ICghcG9zc2libGVUYXJnZXROb2RlRm9yTW91 c2VNb3ZlRXZlbnRzLT5oYXNFdmVudExpc3RlbmVycyhldmVudE5hbWVzKCkudG91Y2htb3ZlRXZl bnQpICYmICFtX2NvbnZlcnRUb3VjaFRvTW91c2UpKQogICAgICAgICAgICAgICAgIG1fd2ViUGFn ZS0+Y2xpZW50KCktPm5vdGlmeU5vTW91c2VNb3ZlT3JUb3VjaE1vdmVIYW5kbGVycygpOwogCisg ICAgICAgICAgICBtX3dlYlBhZ2UtPnJlc3VtZURvY3VtZW50U3R5bGVSZWNhbGMoKTsKKwogICAg ICAgICAgICAgaWYgKGVsZW1lbnRVbmRlckZhdEZpbmdlcikKICAgICAgICAgICAgICAgICBkcmF3 VGFwSGlnaGxpZ2h0KCk7CiAK