227182 2021-06-19 13:09:42 -0700 Move rectForPoint() static function out from the HitTestLocation class 2021-06-20 12:47:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 227185 227186 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1771112 0 zalan 2021-06-19 13:09:42 -0700 It should just a static function. 1771113 1 431799 zalan 2021-06-19 13:13:15 -0700 Created attachment 431799 Patch 1771166 2 431799 sam 2021-06-20 09:47:59 -0700 Comment on attachment 431799 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431799&action=review > Source/WebCore/ChangeLog:7 > + Please add a short why here. > Source/WebCore/rendering/HitTestLocation.cpp:29 > + IntPoint actualPoint(flooredIntPoint(point)); Could be slightly nicer by using assignment + auto to avoid stating IntPoint twice. (I do realize you are just moving it, but still). > Source/WebCore/rendering/HitTestLocation.cpp:37 > + return IntRect(actualPoint, actualPadding); This could probably just be return { actualPoint, actualPadding }; 1771167 3 sam 2021-06-20 09:50:29 -0700 (In reply to Sam Weinig from comment #2) > Comment on attachment 431799 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=431799&action=review > > > Source/WebCore/ChangeLog:7 > > + > > Please add a short why here. > > > Source/WebCore/rendering/HitTestLocation.cpp:29 > > + IntPoint actualPoint(flooredIntPoint(point)); > > Could be slightly nicer by using assignment + auto to avoid stating IntPoint > twice. (I do realize you are just moving it, but still). > > > Source/WebCore/rendering/HitTestLocation.cpp:37 > > + return IntRect(actualPoint, actualPadding); > > This could probably just be return { actualPoint, actualPadding }; I see these change in a subsequent patch, so feel free to ignore. 1771178 4 431822 zalan 2021-06-20 11:39:57 -0700 Created attachment 431822 Patch 1771181 5 ews-feeder 2021-06-20 12:46:16 -0700 Committed r279057 (238977@main): <https://commits.webkit.org/238977@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431822. 1771182 6 webkit-bug-importer 2021-06-20 12:47:25 -0700 <rdar://problem/79540449> 431799 2021-06-19 13:13:15 -0700 2021-06-20 11:39:55 -0700 Patch bug-227182-20210619131314.patch text/plain 6735 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4OTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJjYTM3YjMxNTQ3Y2Nm YmRjMWJhZWQ1MjU3M2M4NWVkYjlmYjA1MS4uMWI1MTQ2YjJiMmEyNTBiZjk4ZjE2MmQ3ZTYwNDAy MmYzZjUxMmFiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA2LTE5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHJlY3RGb3JQb2ludCgp IHN0YXRpYyBmdW5jdGlvbiBvdXQgZnJvbSB0aGUgSGl0VGVzdExvY2F0aW9uIGNsYXNzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcxODIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9I aXRUZXN0TG9jYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVjdEZvclBvaW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkhpdFRlc3RMb2NhdGlvbjo6cmVjdEZvclBvaW50KTogRGVsZXRlZC4K KyAgICAgICAgKiByZW5kZXJpbmcvSGl0VGVzdExvY2F0aW9uLmg6CisgICAgICAgICogcmVuZGVy aW5nL0xlZ2FjeUVsbGlwc2lzQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeUVsbGlw c2lzQm94Ojpub2RlQXRQb2ludCk6IFdoaWxlIHRoaXMgbWF5IGJlIGEgZnVuY3Rpb25hbGl0eSBj aGFuZ2Ugd2hlcmUgd2UKKyAgICAgICAgcmVwbGFjZSB0aGUgcHJldmlvdXNseSBzZXQgYXJlYSBw YWRkaW5nIHdpdGggMCAoYWN0dWFsbHkgMXB4KSwgSSBkb24ndCB0aGluayB0aGF0J3Mgd2hhdCB0 aGlzIGlzIGFib3V0LgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkludGVybmFsczo6bm9kZXNGcm9tUmVjdCBjb25zdCk6CisKIDIwMjEtMDYtMTkg IEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBIaXRUZXN0 TG9jYXRpb24oRmxvYXRQb2ludCkgYyd0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9IaXRUZXN0TG9jYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hp dFRlc3RMb2NhdGlvbi5jcHAKaW5kZXggMjQ1NGZlM2FmNjhiZGY2MjFhMmUzZjdlM2U3NTBlYzk3 ZmUwMGUwOC4uOTUxOWEyMzRiNDhkMjAyNTc3NWViOTJmMWNmYWYwYmE0Yjc2ZjIxMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RMb2NhdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RMb2NhdGlvbi5jcHAKQEAgLTI0LDYgKzI0 LDE5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIEludFJlY3QgcmVjdEZvclBv aW50KGNvbnN0IExheW91dFBvaW50JiBwb2ludCwgdW5zaWduZWQgdG9wUGFkZGluZywgdW5zaWdu ZWQgcmlnaHRQYWRkaW5nLCB1bnNpZ25lZCBib3R0b21QYWRkaW5nLCB1bnNpZ25lZCBsZWZ0UGFk ZGluZykKK3sKKyAgICBJbnRQb2ludCBhY3R1YWxQb2ludChmbG9vcmVkSW50UG9pbnQocG9pbnQp KTsKKyAgICBhY3R1YWxQb2ludCAtPSBJbnRTaXplKGxlZnRQYWRkaW5nLCB0b3BQYWRkaW5nKTsK KworICAgIEludFNpemUgYWN0dWFsUGFkZGluZyhsZWZ0UGFkZGluZyArIHJpZ2h0UGFkZGluZywg dG9wUGFkZGluZyArIGJvdHRvbVBhZGRpbmcpOworICAgIC8vIEFzIEludFJlY3QgaXMgbGVmdCBp bmNsdXNpdmUgYW5kIHJpZ2h0IGV4Y2x1c2l2ZSAoc2VlaW5nIEludFJlY3Q6OmNvbnRhaW5zKHgs IHkpKSwgYWRkaW5nICIxIi4KKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSBub24tcmVj dCBiYXNlZCBoaXQtZGV0ZWN0aW9uIHN0b3BzIHVzaW5nIEludFJlY3Q6aW50ZXJzZWN0cy4KKyAg ICBhY3R1YWxQYWRkaW5nICs9IEludFNpemUoMSwgMSk7CisKKyAgICByZXR1cm4gSW50UmVjdChh Y3R1YWxQb2ludCwgYWN0dWFsUGFkZGluZyk7Cit9CisKIEhpdFRlc3RMb2NhdGlvbjo6SGl0VGVz dExvY2F0aW9uKCkgPSBkZWZhdWx0OwogCiBIaXRUZXN0TG9jYXRpb246OkhpdFRlc3RMb2NhdGlv bihjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQpCkBAIC0xNDIsMTcgKzE1NSw0IEBAIGJvb2wgSGl0 VGVzdExvY2F0aW9uOjppbnRlcnNlY3RzKGNvbnN0IFJvdW5kZWRSZWN0JiByZWN0KSBjb25zdAog ICAgIHJldHVybiByZWN0LmludGVyc2VjdHNRdWFkKG1fdHJhbnNmb3JtZWRSZWN0KTsKIH0KIAot SW50UmVjdCBIaXRUZXN0TG9jYXRpb246OnJlY3RGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYg cG9pbnQsIHVuc2lnbmVkIHRvcFBhZGRpbmcsIHVuc2lnbmVkIHJpZ2h0UGFkZGluZywgdW5zaWdu ZWQgYm90dG9tUGFkZGluZywgdW5zaWduZWQgbGVmdFBhZGRpbmcpCi17Ci0gICAgSW50UG9pbnQg YWN0dWFsUG9pbnQoZmxvb3JlZEludFBvaW50KHBvaW50KSk7Ci0gICAgYWN0dWFsUG9pbnQgLT0g SW50U2l6ZShsZWZ0UGFkZGluZywgdG9wUGFkZGluZyk7Ci0KLSAgICBJbnRTaXplIGFjdHVhbFBh ZGRpbmcobGVmdFBhZGRpbmcgKyByaWdodFBhZGRpbmcsIHRvcFBhZGRpbmcgKyBib3R0b21QYWRk aW5nKTsKLSAgICAvLyBBcyBJbnRSZWN0IGlzIGxlZnQgaW5jbHVzaXZlIGFuZCByaWdodCBleGNs dXNpdmUgKHNlZWluZyBJbnRSZWN0Ojpjb250YWlucyh4LCB5KSksIGFkZGluZyAiMSIuCi0gICAg Ly8gRklYTUU6IFJlbW92ZSB0aGlzIG9uY2Ugbm9uLXJlY3QgYmFzZWQgaGl0LWRldGVjdGlvbiBz dG9wcyB1c2luZyBJbnRSZWN0OmludGVyc2VjdHMuCi0gICAgYWN0dWFsUGFkZGluZyArPSBJbnRT aXplKDEsIDEpOwotCi0gICAgcmV0dXJuIEludFJlY3QoYWN0dWFsUG9pbnQsIGFjdHVhbFBhZGRp bmcpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSGl0VGVzdExvY2F0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSGl0VGVzdExvY2F0aW9uLmgKaW5kZXggMTRmZjI0N2E3YmMzYmEwYzNjNTRkMzBhZGZlNzMy MzJlYjNjNDQzOC4uNGI1YjE3YmEyZmYzY2ZiMWViNzc2ODMyNzg5MjFhYzJhNjY2NWQ4OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RMb2NhdGlvbi5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0TG9jYXRpb24uaApAQCAtNDgsMTMgKzQ4 LDEyIEBAIHB1YmxpYzoKICAgICBib29sIGlzUmVjdGlsaW5lYXIoKSBjb25zdCB7IHJldHVybiBt X2lzUmVjdGlsaW5lYXI7IH0KICAgICBJbnRSZWN0IGJvdW5kaW5nQm94KCkgY29uc3QgeyByZXR1 cm4gbV9ib3VuZGluZ0JveDsgfQogICAgIAotICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBJbnRS ZWN0IHJlY3RGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYsIHVuc2lnbmVkIHRvcFBhZGRpbmcs IHVuc2lnbmVkIHJpZ2h0UGFkZGluZywgdW5zaWduZWQgYm90dG9tUGFkZGluZywgdW5zaWduZWQg bGVmdFBhZGRpbmcpOwogICAgIGludCB0b3BQYWRkaW5nKCkgY29uc3QgeyByZXR1cm4gcm91bmRl ZFBvaW50KCkueSgpIC0gbV9ib3VuZGluZ0JveC55KCk7IH0KICAgICBpbnQgcmlnaHRQYWRkaW5n KCkgY29uc3QgeyByZXR1cm4gbV9ib3VuZGluZ0JveC5tYXhYKCkgLSByb3VuZGVkUG9pbnQoKS54 KCkgLSAxOyB9CiAgICAgaW50IGJvdHRvbVBhZGRpbmcoKSBjb25zdCB7IHJldHVybiBtX2JvdW5k aW5nQm94Lm1heFkoKSAtIHJvdW5kZWRQb2ludCgpLnkoKSAtIDE7IH0KICAgICBpbnQgbGVmdFBh ZGRpbmcoKSBjb25zdCB7IHJldHVybiByb3VuZGVkUG9pbnQoKS54KCkgLSBtX2JvdW5kaW5nQm94 LngoKTsgfQogCi0gICAgYm9vbCBpbnRlcnNlY3RzKGNvbnN0IExheW91dFJlY3QmKSBjb25zdDsK KyAgICBXRUJDT1JFX0VYUE9SVCBib29sIGludGVyc2VjdHMoY29uc3QgTGF5b3V0UmVjdCYpIGNv bnN0OwogICAgIGJvb2wgaW50ZXJzZWN0cyhjb25zdCBGbG9hdFJlY3QmKSBjb25zdDsKICAgICBi b29sIGludGVyc2VjdHMoY29uc3QgUm91bmRlZFJlY3QmKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeUVsbGlwc2lzQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lFbGxpcHNpc0JveC5jcHAKaW5kZXggM2JkODk0ZTc3ODIx NWJkZTkyODQxNjlmOTcyZDNlODA1MTQxM2Y3Zi4uMjdlNWQyMTE4NDBlY2Q5YmRiNzBkZTZkZTZi YjM5OTdiOWRlZmJmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2Fj eUVsbGlwc2lzQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5RWxs aXBzaXNCb3guY3BwCkBAIC0xNjAsOCArMTYwLDggQEAgYm9vbCBMZWdhY3lFbGxpcHNpc0JveDo6 bm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdFRlc3RSZXN1bHQK ICAgICAgICAgfQogICAgIH0KIAotICAgIExheW91dFJlY3QgYm91bmRzUmVjdCB7IGFkanVzdGVk TG9jYXRpb24sIExheW91dFNpemUoTGF5b3V0VW5pdChsb2dpY2FsV2lkdGgoKSksIG1faGVpZ2h0 KSB9OwotICAgIGlmICh2aXNpYmxlVG9IaXRUZXN0aW5nKHJlcXVlc3QpICYmIGJvdW5kc1JlY3Qu aW50ZXJzZWN0cyhIaXRUZXN0TG9jYXRpb246OnJlY3RGb3JQb2ludChsb2NhdGlvbkluQ29udGFp bmVyLnBvaW50KCksIDAsIDAsIDAsIDApKSkgeworICAgIGF1dG8gYm91bmRzUmVjdCA9IExheW91 dFJlY3QgeyBhZGp1c3RlZExvY2F0aW9uLCBMYXlvdXRTaXplKExheW91dFVuaXQobG9naWNhbFdp ZHRoKCkpLCBtX2hlaWdodCkgfTsKKyAgICBpZiAodmlzaWJsZVRvSGl0VGVzdGluZyhyZXF1ZXN0 KSAmJiBsb2NhdGlvbkluQ29udGFpbmVyLmludGVyc2VjdHMoYm91bmRzUmVjdCkpIHsKICAgICAg ICAgYmxvY2tGbG93KCkudXBkYXRlSGl0VGVzdFJlc3VsdChyZXN1bHQsIGxvY2F0aW9uSW5Db250 YWluZXIucG9pbnQoKSAtIHRvTGF5b3V0U2l6ZShhZGp1c3RlZExvY2F0aW9uKSk7CiAgICAgICAg IGlmIChyZXN1bHQuYWRkTm9kZVRvTGlzdEJhc2VkVGVzdFJlc3VsdChibG9ja0Zsb3coKS5ub2Rl Rm9ySGl0VGVzdCgpLCByZXF1ZXN0LCBsb2NhdGlvbkluQ29udGFpbmVyLCBib3VuZHNSZWN0KSA9 PSBIaXRUZXN0UHJvZ3Jlc3M6OlN0b3ApCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCA3YWUxNjE3NzExODE4NDc3NThiYWNkZjk0 ZGU2MTFkODk5OTM2YTA1Li43NTZkMDNjNTk3MTJiYTFjMDMyNTJmOGY5ODdiNjQ1ZjllNDA1NDQ0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCkBAIC0yMzEyLDEzICsyMzEyLDEz IEBAIEV4Y2VwdGlvbk9yPFJlZlB0cjxOb2RlTGlzdD4+IEludGVybmFsczo6bm9kZXNGcm9tUmVj dChEb2N1bWVudCYgZG9jdW1lbnQsIGludCBjCiAKICAgICBIaXRUZXN0UmVxdWVzdCByZXF1ZXN0 KGhpdFR5cGUpOwogCisgICAgYXV0byBoaXRUZXN0UmVzdWx0ID0gSGl0VGVzdFJlc3VsdCB7IHBv aW50LCB0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5n IH07CiAgICAgLy8gV2hlbiBpZ25vcmVDbGlwcGluZyBpcyBmYWxzZSwgdGhpcyBtZXRob2QgcmV0 dXJucyBudWxsIGZvciBjb29yZGluYXRlcyBvdXRzaWRlIG9mIHRoZSB2aWV3cG9ydC4KLSAgICBp ZiAoIXJlcXVlc3QuaWdub3JlQ2xpcHBpbmcoKSAmJiAhZnJhbWVWaWV3LT52aXNpYmxlQ29udGVu dFJlY3QoKS5pbnRlcnNlY3RzKEhpdFRlc3RMb2NhdGlvbjo6cmVjdEZvclBvaW50KHBvaW50LCB0 b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxlZnRQYWRkaW5nKSkpCisg ICAgaWYgKCFyZXF1ZXN0Lmlnbm9yZUNsaXBwaW5nKCkgJiYgIWhpdFRlc3RSZXN1bHQuaGl0VGVz dExvY2F0aW9uKCkuaW50ZXJzZWN0cyhMYXlvdXRSZWN0IHsgZnJhbWVWaWV3LT52aXNpYmxlQ29u dGVudFJlY3QoKSB9KSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBIaXRUZXN0UmVz dWx0IHJlc3VsdChwb2ludCwgdG9wUGFkZGluZywgcmlnaHRQYWRkaW5nLCBib3R0b21QYWRkaW5n LCBsZWZ0UGFkZGluZyk7Ci0gICAgZG9jdW1lbnQuaGl0VGVzdChyZXF1ZXN0LCByZXN1bHQpOwot ICAgIGF1dG8gbWF0Y2hlcyA9IFdURjo6bWFwKHJlc3VsdC5saXN0QmFzZWRUZXN0UmVzdWx0KCks IFtdKGNvbnN0IGF1dG8mIG5vZGUpIHsgcmV0dXJuIG5vZGUuY29weVJlZigpOyB9KTsKKyAgICBk b2N1bWVudC5oaXRUZXN0KHJlcXVlc3QsIGhpdFRlc3RSZXN1bHQpOworICAgIGF1dG8gbWF0Y2hl cyA9IFdURjo6bWFwKGhpdFRlc3RSZXN1bHQubGlzdEJhc2VkVGVzdFJlc3VsdCgpLCBbXShjb25z dCBhdXRvJiBub2RlKSB7IHJldHVybiBub2RlLmNvcHlSZWYoKTsgfSk7CiAgICAgcmV0dXJuIFJl ZlB0cjxOb2RlTGlzdD4geyBTdGF0aWNOb2RlTGlzdDo6Y3JlYXRlKFdURk1vdmUobWF0Y2hlcykp IH07CiB9CiAK 431822 2021-06-20 11:39:57 -0700 2021-06-20 12:46:18 -0700 Patch bug-227182-20210620113956.patch text/plain 6902 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIwZGZmY2EwY2ZiYmY3 MGUxY2E5Mjg4ZjFlZWQ1OTBkZDg4MmZkYi4uZTNjZDA3NWE0MmU5NmE2Zjg5MTQyZmY3MmVhMTkz MzlmOTU0ODk0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA2LTIwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHJlY3RGb3JQb2ludCgp IHN0YXRpYyBmdW5jdGlvbiBvdXQgZnJvbSB0aGUgSGl0VGVzdExvY2F0aW9uIGNsYXNzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcxODIKKworICAg ICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgorCisgICAgICAgIFRoaXMgZnVuY3Rpb24gaW1w bGljaXRseSBlbmxhcmdlcyB0aGUgaGl0IHRlc3QgYXJlYSB3aGljaCBtYXkgdHJpZ2dlciB1bmV4 cGVjdGVkIGJlaGF2aW9yLgorICAgICAgICBJdCdzIGJldHRlciB0byBub3QgaGF2ZSBpdCBvbiB0 aGUgY2xhc3MncyBwdWJsaWMgaW50ZXJmYWNlLgorCisgICAgICAgICogcmVuZGVyaW5nL0hpdFRl c3RMb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZWN0Rm9yUG9pbnQpOgorICAgICAg ICAoV2ViQ29yZTo6SGl0VGVzdExvY2F0aW9uOjpyZWN0Rm9yUG9pbnQpOiBEZWxldGVkLgorICAg ICAgICAqIHJlbmRlcmluZy9IaXRUZXN0TG9jYXRpb24uaDoKKyAgICAgICAgKiByZW5kZXJpbmcv TGVnYWN5RWxsaXBzaXNCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5RWxsaXBzaXNC b3g6Om5vZGVBdFBvaW50KTogV2hpbGUgdGhpcyBtYXkgYmUgYSBmdW5jdGlvbmFsaXR5IGNoYW5n ZSB3aGVyZSB3ZQorICAgICAgICByZXBsYWNlIHRoZSBwcmV2aW91c2x5IHNldCBhcmVhIHBhZGRp bmcgd2l0aCAwIChhY3R1YWxseSAxcHgpLCBJIGRvbid0IHRoaW5rIHRoYXQncyB3aGF0IHRoaXMg aXMgYWJvdXQuCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW50ZXJuYWxzOjpub2Rlc0Zyb21SZWN0IGNvbnN0KToKKwogMjAyMS0wNi0yMCAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEhpdFRlc3RMb2Nh dGlvbihGbG9hdFBvaW50KSBjJ3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL0hpdFRlc3RMb2NhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVz dExvY2F0aW9uLmNwcAppbmRleCAyNDU0ZmUzYWY2OGJkZjYyMWEyZTNmN2UzZTc1MGVjOTdmZTAw ZTA4Li45NTE5YTIzNGI0OGQyMDI1Nzc1ZWI5MmYxY2ZhZjBiYTRiNzZmMjEyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdExvY2F0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdExvY2F0aW9uLmNwcApAQCAtMjQsNiArMjQsMTkg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgSW50UmVjdCByZWN0Rm9yUG9pbnQo Y29uc3QgTGF5b3V0UG9pbnQmIHBvaW50LCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNpZ25lZCBy aWdodFBhZGRpbmcsIHVuc2lnbmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQYWRkaW5n KQoreworICAgIEludFBvaW50IGFjdHVhbFBvaW50KGZsb29yZWRJbnRQb2ludChwb2ludCkpOwor ICAgIGFjdHVhbFBvaW50IC09IEludFNpemUobGVmdFBhZGRpbmcsIHRvcFBhZGRpbmcpOworCisg ICAgSW50U2l6ZSBhY3R1YWxQYWRkaW5nKGxlZnRQYWRkaW5nICsgcmlnaHRQYWRkaW5nLCB0b3BQ YWRkaW5nICsgYm90dG9tUGFkZGluZyk7CisgICAgLy8gQXMgSW50UmVjdCBpcyBsZWZ0IGluY2x1 c2l2ZSBhbmQgcmlnaHQgZXhjbHVzaXZlIChzZWVpbmcgSW50UmVjdDo6Y29udGFpbnMoeCwgeSkp LCBhZGRpbmcgIjEiLgorICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBvbmNlIG5vbi1yZWN0IGJh c2VkIGhpdC1kZXRlY3Rpb24gc3RvcHMgdXNpbmcgSW50UmVjdDppbnRlcnNlY3RzLgorICAgIGFj dHVhbFBhZGRpbmcgKz0gSW50U2l6ZSgxLCAxKTsKKworICAgIHJldHVybiBJbnRSZWN0KGFjdHVh bFBvaW50LCBhY3R1YWxQYWRkaW5nKTsKK30KKwogSGl0VGVzdExvY2F0aW9uOjpIaXRUZXN0TG9j YXRpb24oKSA9IGRlZmF1bHQ7CiAKIEhpdFRlc3RMb2NhdGlvbjo6SGl0VGVzdExvY2F0aW9uKGNv bnN0IExheW91dFBvaW50JiBwb2ludCkKQEAgLTE0MiwxNyArMTU1LDQgQEAgYm9vbCBIaXRUZXN0 TG9jYXRpb246OmludGVyc2VjdHMoY29uc3QgUm91bmRlZFJlY3QmIHJlY3QpIGNvbnN0CiAgICAg cmV0dXJuIHJlY3QuaW50ZXJzZWN0c1F1YWQobV90cmFuc2Zvcm1lZFJlY3QpOwogfQogCi1JbnRS ZWN0IEhpdFRlc3RMb2NhdGlvbjo6cmVjdEZvclBvaW50KGNvbnN0IExheW91dFBvaW50JiBwb2lu dCwgdW5zaWduZWQgdG9wUGFkZGluZywgdW5zaWduZWQgcmlnaHRQYWRkaW5nLCB1bnNpZ25lZCBi b3R0b21QYWRkaW5nLCB1bnNpZ25lZCBsZWZ0UGFkZGluZykKLXsKLSAgICBJbnRQb2ludCBhY3R1 YWxQb2ludChmbG9vcmVkSW50UG9pbnQocG9pbnQpKTsKLSAgICBhY3R1YWxQb2ludCAtPSBJbnRT aXplKGxlZnRQYWRkaW5nLCB0b3BQYWRkaW5nKTsKLQotICAgIEludFNpemUgYWN0dWFsUGFkZGlu ZyhsZWZ0UGFkZGluZyArIHJpZ2h0UGFkZGluZywgdG9wUGFkZGluZyArIGJvdHRvbVBhZGRpbmcp OwotICAgIC8vIEFzIEludFJlY3QgaXMgbGVmdCBpbmNsdXNpdmUgYW5kIHJpZ2h0IGV4Y2x1c2l2 ZSAoc2VlaW5nIEludFJlY3Q6OmNvbnRhaW5zKHgsIHkpKSwgYWRkaW5nICIxIi4KLSAgICAvLyBG SVhNRTogUmVtb3ZlIHRoaXMgb25jZSBub24tcmVjdCBiYXNlZCBoaXQtZGV0ZWN0aW9uIHN0b3Bz IHVzaW5nIEludFJlY3Q6aW50ZXJzZWN0cy4KLSAgICBhY3R1YWxQYWRkaW5nICs9IEludFNpemUo MSwgMSk7Ci0KLSAgICByZXR1cm4gSW50UmVjdChhY3R1YWxQb2ludCwgYWN0dWFsUGFkZGluZyk7 Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9IaXRUZXN0TG9jYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9I aXRUZXN0TG9jYXRpb24uaAppbmRleCAxNGZmMjQ3YTdiYzNiYTBjM2M1NGQzMGFkZmU3MzIzMmVi M2M0NDM4Li40YjViMTdiYTJmZjNjZmIxZWI3NzY4MzI3ODkyMWFjMmE2NjY1ZDg5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdExvY2F0aW9uLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RMb2NhdGlvbi5oCkBAIC00OCwxMyArNDgsMTIg QEAgcHVibGljOgogICAgIGJvb2wgaXNSZWN0aWxpbmVhcigpIGNvbnN0IHsgcmV0dXJuIG1faXNS ZWN0aWxpbmVhcjsgfQogICAgIEludFJlY3QgYm91bmRpbmdCb3goKSBjb25zdCB7IHJldHVybiBt X2JvdW5kaW5nQm94OyB9CiAgICAgCi0gICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIEludFJlY3Qg cmVjdEZvclBvaW50KGNvbnN0IExheW91dFBvaW50JiwgdW5zaWduZWQgdG9wUGFkZGluZywgdW5z aWduZWQgcmlnaHRQYWRkaW5nLCB1bnNpZ25lZCBib3R0b21QYWRkaW5nLCB1bnNpZ25lZCBsZWZ0 UGFkZGluZyk7CiAgICAgaW50IHRvcFBhZGRpbmcoKSBjb25zdCB7IHJldHVybiByb3VuZGVkUG9p bnQoKS55KCkgLSBtX2JvdW5kaW5nQm94LnkoKTsgfQogICAgIGludCByaWdodFBhZGRpbmcoKSBj b25zdCB7IHJldHVybiBtX2JvdW5kaW5nQm94Lm1heFgoKSAtIHJvdW5kZWRQb2ludCgpLngoKSAt IDE7IH0KICAgICBpbnQgYm90dG9tUGFkZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fYm91bmRpbmdC b3gubWF4WSgpIC0gcm91bmRlZFBvaW50KCkueSgpIC0gMTsgfQogICAgIGludCBsZWZ0UGFkZGlu ZygpIGNvbnN0IHsgcmV0dXJuIHJvdW5kZWRQb2ludCgpLngoKSAtIG1fYm91bmRpbmdCb3gueCgp OyB9CiAKLSAgICBib29sIGludGVyc2VjdHMoY29uc3QgTGF5b3V0UmVjdCYpIGNvbnN0OworICAg IFdFQkNPUkVfRVhQT1JUIGJvb2wgaW50ZXJzZWN0cyhjb25zdCBMYXlvdXRSZWN0JikgY29uc3Q7 CiAgICAgYm9vbCBpbnRlcnNlY3RzKGNvbnN0IEZsb2F0UmVjdCYpIGNvbnN0OwogICAgIGJvb2wg aW50ZXJzZWN0cyhjb25zdCBSb3VuZGVkUmVjdCYpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5RWxsaXBzaXNCb3guY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0xlZ2FjeUVsbGlwc2lzQm94LmNwcAppbmRleCAzYmQ4OTRlNzc4MjE1YmRl OTI4NDE2OWY5NzJkM2U4MDUxNDEzZjdmLi4yN2U1ZDIxMTg0MGVjZDliZGI3MGRlNmRlNmJiMzk5 N2I5ZGVmYmZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5RWxs aXBzaXNCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lFbGxpcHNp c0JveC5jcHAKQEAgLTE2MCw4ICsxNjAsOCBAQCBib29sIExlZ2FjeUVsbGlwc2lzQm94Ojpub2Rl QXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgSGl0VGVzdFJlc3VsdAogICAg ICAgICB9CiAgICAgfQogCi0gICAgTGF5b3V0UmVjdCBib3VuZHNSZWN0IHsgYWRqdXN0ZWRMb2Nh dGlvbiwgTGF5b3V0U2l6ZShMYXlvdXRVbml0KGxvZ2ljYWxXaWR0aCgpKSwgbV9oZWlnaHQpIH07 Ci0gICAgaWYgKHZpc2libGVUb0hpdFRlc3RpbmcocmVxdWVzdCkgJiYgYm91bmRzUmVjdC5pbnRl cnNlY3RzKEhpdFRlc3RMb2NhdGlvbjo6cmVjdEZvclBvaW50KGxvY2F0aW9uSW5Db250YWluZXIu cG9pbnQoKSwgMCwgMCwgMCwgMCkpKSB7CisgICAgYXV0byBib3VuZHNSZWN0ID0gTGF5b3V0UmVj dCB7IGFkanVzdGVkTG9jYXRpb24sIExheW91dFNpemUoTGF5b3V0VW5pdChsb2dpY2FsV2lkdGgo KSksIG1faGVpZ2h0KSB9OworICAgIGlmICh2aXNpYmxlVG9IaXRUZXN0aW5nKHJlcXVlc3QpICYm IGxvY2F0aW9uSW5Db250YWluZXIuaW50ZXJzZWN0cyhib3VuZHNSZWN0KSkgewogICAgICAgICBi bG9ja0Zsb3coKS51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgbG9jYXRpb25JbkNvbnRhaW5l ci5wb2ludCgpIC0gdG9MYXlvdXRTaXplKGFkanVzdGVkTG9jYXRpb24pKTsKICAgICAgICAgaWYg KHJlc3VsdC5hZGROb2RlVG9MaXN0QmFzZWRUZXN0UmVzdWx0KGJsb2NrRmxvdygpLm5vZGVGb3JI aXRUZXN0KCksIHJlcXVlc3QsIGxvY2F0aW9uSW5Db250YWluZXIsIGJvdW5kc1JlY3QpID09IEhp dFRlc3RQcm9ncmVzczo6U3RvcCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUv dGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDdhZTE2MTc3MTE4MTg0Nzc1OGJhY2RmOTRkZTYx MWQ4OTk5MzZhMDUuLjc1NmQwM2M1OTcxMmJhMWMwMzI1MmY4Zjk4N2I2NDVmOWU0MDU0NDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTIzMTIsMTMgKzIzMTIsMTMgQEAg RXhjZXB0aW9uT3I8UmVmUHRyPE5vZGVMaXN0Pj4gSW50ZXJuYWxzOjpub2Rlc0Zyb21SZWN0KERv Y3VtZW50JiBkb2N1bWVudCwgaW50IGMKIAogICAgIEhpdFRlc3RSZXF1ZXN0IHJlcXVlc3QoaGl0 VHlwZSk7CiAKKyAgICBhdXRvIGhpdFRlc3RSZXN1bHQgPSBIaXRUZXN0UmVzdWx0IHsgcG9pbnQs IHRvcFBhZGRpbmcsIHJpZ2h0UGFkZGluZywgYm90dG9tUGFkZGluZywgbGVmdFBhZGRpbmcgfTsK ICAgICAvLyBXaGVuIGlnbm9yZUNsaXBwaW5nIGlzIGZhbHNlLCB0aGlzIG1ldGhvZCByZXR1cm5z IG51bGwgZm9yIGNvb3JkaW5hdGVzIG91dHNpZGUgb2YgdGhlIHZpZXdwb3J0LgotICAgIGlmICgh cmVxdWVzdC5pZ25vcmVDbGlwcGluZygpICYmICFmcmFtZVZpZXctPnZpc2libGVDb250ZW50UmVj dCgpLmludGVyc2VjdHMoSGl0VGVzdExvY2F0aW9uOjpyZWN0Rm9yUG9pbnQocG9pbnQsIHRvcFBh ZGRpbmcsIHJpZ2h0UGFkZGluZywgYm90dG9tUGFkZGluZywgbGVmdFBhZGRpbmcpKSkKKyAgICBp ZiAoIXJlcXVlc3QuaWdub3JlQ2xpcHBpbmcoKSAmJiAhaGl0VGVzdFJlc3VsdC5oaXRUZXN0TG9j YXRpb24oKS5pbnRlcnNlY3RzKExheW91dFJlY3QgeyBmcmFtZVZpZXctPnZpc2libGVDb250ZW50 UmVjdCgpIH0pKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIEhpdFRlc3RSZXN1bHQg cmVzdWx0KHBvaW50LCB0b3BQYWRkaW5nLCByaWdodFBhZGRpbmcsIGJvdHRvbVBhZGRpbmcsIGxl ZnRQYWRkaW5nKTsKLSAgICBkb2N1bWVudC5oaXRUZXN0KHJlcXVlc3QsIHJlc3VsdCk7Ci0gICAg YXV0byBtYXRjaGVzID0gV1RGOjptYXAocmVzdWx0Lmxpc3RCYXNlZFRlc3RSZXN1bHQoKSwgW10o Y29uc3QgYXV0byYgbm9kZSkgeyByZXR1cm4gbm9kZS5jb3B5UmVmKCk7IH0pOworICAgIGRvY3Vt ZW50LmhpdFRlc3QocmVxdWVzdCwgaGl0VGVzdFJlc3VsdCk7CisgICAgYXV0byBtYXRjaGVzID0g V1RGOjptYXAoaGl0VGVzdFJlc3VsdC5saXN0QmFzZWRUZXN0UmVzdWx0KCksIFtdKGNvbnN0IGF1 dG8mIG5vZGUpIHsgcmV0dXJuIG5vZGUuY29weVJlZigpOyB9KTsKICAgICByZXR1cm4gUmVmUHRy PE5vZGVMaXN0PiB7IFN0YXRpY05vZGVMaXN0OjpjcmVhdGUoV1RGTW92ZShtYXRjaGVzKSkgfTsK IH0KIAo=