197896 2019-05-14 14:54:31 -0700 Web Automation: replace IntPoint/IntRect with FloatPoint/FloatRect when using CSS coordinates 2022-09-29 10:49:09 -0700 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build All All NEW InRadar P2 Normal --- 195696 1 hi hi ahmad.saleem792 ap bburg bfulgham graouts hi joepeck simon.fraser timothy webkit-bug-importer zalan oldest_to_newest 1536263 0 hi 2019-05-14 14:54:31 -0700 CSS coordinates can have decimal values, so we should be returning decimal values from WebDriver commands. 1536377 1 webkit-bug-importer 2019-05-15 00:52:42 -0700 <rdar://problem/50801689> 1541131 2 371164 hi 2019-06-02 15:18:35 -0700 Created attachment 371164 Patch I haven't tested this yet, as my local build isn't working :( 1567797 3 bburg 2019-09-04 11:13:14 -0700 Is there a functional reason to make this change? I.e., are tests newly passing with it applied? 1567798 4 hi 2019-09-04 11:18:53 -0700 (In reply to Brian Burg from comment #3) > Is there a functional reason to make this change? I.e., are tests newly passing with it applied? Yes, but I don't remember which ones. I do remember that there were some tests that expected floating point bounding box values to match what `getBoundingClientRect` returns. 1900454 5 ahmad.saleem792 2022-09-22 14:49:38 -0700 Is it something still on radar for upstream or being worked on? Thanks! 371164 2019-06-02 15:18:35 -0700 2019-06-02 15:18:35 -0700 Patch bug-197896-20190602151834.patch text/plain 14565 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKaW5kZXggMjQ5MTVhZTE3NmU3YjNmZGFkZjFkNjA2ZmI5NWI0MGNlZThkNDUz OC4uZjk5NGJkYjAxMTNiMTJiNjc4OTQ4MjhkM2RmNDBlM2MxNmMwZGQ5YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkRyaXZlci9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkRyaXZlci9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wNi0wMiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh cHBsZS5jb20+CisKKyAgICAgICAgV2ViIEF1dG9tYXRpb246IHJlcGxhY2UgSW50UG9pbnQvSW50 UmVjdCB3aXRoIEZsb2F0UG9pbnQvRmxvYXRSZWN0IHdoZW4gdXNpbmcgQ1NTIGNvb3JkaW5hdGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc4OTYK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUwODAxNjg5PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJE cml2ZXI6OlNlc3Npb246OmNvbXB1dGVFbGVtZW50TGF5b3V0KToKKyAgICAgICAgKFdlYkRyaXZl cjo6U2Vzc2lvbjo6Z2V0RWxlbWVudFJlY3QpOgorCiAyMDE5LTA1LTMxICBEb24gT2xtc3RlYWQg IDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAgICAgICAgW0NNYWtlXSBBZGQgV2ViS2l0OjpX VEYgdGFyZ2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkOWNhNWFkNDhjMmJlNmVkZDdhMjAwYTZhYTYxNDM4ZjBl YjQzM2IuLjdmMTk2ODMxOThjMmQ0MWY4MjdlZWExNGE3NzVjY2UzOGQ2MzlmMDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDYtMDIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBw bGUuY29tPgorCisgICAgICAgIFdlYiBBdXRvbWF0aW9uOiByZXBsYWNlIEludFBvaW50L0ludFJl Y3Qgd2l0aCBGbG9hdFBvaW50L0Zsb2F0UmVjdCB3aGVuIHVzaW5nIENTUyBjb29yZGluYXRlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3ODk2Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDgwMTY4OT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRv bWF0aW9uU2Vzc2lvblByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vz cy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5Ojpjb21wdXRlRWxlbWVudExheW91dCk6CisK KyAgICAgICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpjb21wdXRlRWxlbWVudExh eW91dCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjp2aWV3cG9ydElu Vmlld0NlbnRlclBvaW50T2ZFbGVtZW50KToKKwogMjAxOS0wNS0zMSAgTWVnYW4gR2FyZG5lciAg PG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEVuc3VyZSBrZXlib2FyZCBlZGl0 aW5nIGlzIHVwIHRvIGRhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5j cHAgYi9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uY3BwCmluZGV4IDIwZmI2MDlhYjNkOTAxMDM4 NDE1ZGM3MzM3MjJmYTkxOTdlMWU0NzIuLjMyZTNhNDBiOGZiNDk4ZWE2OWE4NWRkODMzOGVlOWVl NzZjNzRhYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5jcHAKKysrIGIv U291cmNlL1dlYkRyaXZlci9TZXNzaW9uLmNwcApAQCAtOTI1LDEyICs5MjUsMTIgQEAgdm9pZCBT ZXNzaW9uOjpjb21wdXRlRWxlbWVudExheW91dChjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgT3B0 aW9uU2V0PEVsZW1lbnRMYXkKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURjo6bnVs bG9wdCwgV1RGOjpudWxsb3B0LCBmYWxzZSwgbnVsbHB0cik7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KLSAgICAgICAgT3B0aW9uYWw8aW50PiBlbGVtZW50WDsKLSAgICAgICAgT3B0 aW9uYWw8aW50PiBlbGVtZW50WTsKKyAgICAgICAgT3B0aW9uYWw8ZG91YmxlPiBlbGVtZW50WDsK KyAgICAgICAgT3B0aW9uYWw8ZG91YmxlPiBlbGVtZW50WTsKICAgICAgICAgUmVmUHRyPEpTT046 Ok9iamVjdD4gZWxlbWVudFBvc2l0aW9uOwogICAgICAgICBpZiAocmVjdE9iamVjdC0+Z2V0T2Jq ZWN0KCJvcmlnaW4iX3MsIGVsZW1lbnRQb3NpdGlvbikpIHsKLSAgICAgICAgICAgIGludCB4LCB5 OwotICAgICAgICAgICAgaWYgKGVsZW1lbnRQb3NpdGlvbi0+Z2V0SW50ZWdlcigieCJfcywgeCkg JiYgZWxlbWVudFBvc2l0aW9uLT5nZXRJbnRlZ2VyKCJ5Il9zLCB5KSkgeworICAgICAgICAgICAg ZG91YmxlIHgsIHk7CisgICAgICAgICAgICBpZiAoZWxlbWVudFBvc2l0aW9uLT5nZXREb3VibGUo IngiX3MsIHgpICYmIGVsZW1lbnRQb3NpdGlvbi0+Z2V0RG91YmxlKCJ5Il9zLCB5KSkgewogICAg ICAgICAgICAgICAgIGVsZW1lbnRYID0geDsKICAgICAgICAgICAgICAgICBlbGVtZW50WSA9IHk7 CiAgICAgICAgICAgICB9CkBAIC05MzksMTIgKzkzOSwxMiBAQCB2b2lkIFNlc3Npb246OmNvbXB1 dGVFbGVtZW50TGF5b3V0KGNvbnN0IFN0cmluZyYgZWxlbWVudElELCBPcHRpb25TZXQ8RWxlbWVu dExheQogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGOjpudWxsb3B0LCBXVEY6Om51 bGxvcHQsIGZhbHNlLCBudWxscHRyKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQot ICAgICAgICBPcHRpb25hbDxpbnQ+IGVsZW1lbnRXaWR0aDsKLSAgICAgICAgT3B0aW9uYWw8aW50 PiBlbGVtZW50SGVpZ2h0OworICAgICAgICBPcHRpb25hbDxkb3VibGU+IGVsZW1lbnRXaWR0aDsK KyAgICAgICAgT3B0aW9uYWw8ZG91YmxlPiBlbGVtZW50SGVpZ2h0OwogICAgICAgICBSZWZQdHI8 SlNPTjo6T2JqZWN0PiBlbGVtZW50U2l6ZTsKICAgICAgICAgaWYgKHJlY3RPYmplY3QtPmdldE9i amVjdCgic2l6ZSJfcywgZWxlbWVudFNpemUpKSB7Ci0gICAgICAgICAgICBpbnQgd2lkdGgsIGhl aWdodDsKLSAgICAgICAgICAgIGlmIChlbGVtZW50U2l6ZS0+Z2V0SW50ZWdlcigid2lkdGgiX3Ms IHdpZHRoKSAmJiBlbGVtZW50U2l6ZS0+Z2V0SW50ZWdlcigiaGVpZ2h0Il9zLCBoZWlnaHQpKSB7 CisgICAgICAgICAgICBkb3VibGUgd2lkdGgsIGhlaWdodDsKKyAgICAgICAgICAgIGlmIChlbGVt ZW50U2l6ZS0+Z2V0RG91YmxlKCJ3aWR0aCJfcywgd2lkdGgpICYmIGVsZW1lbnRTaXplLT5nZXRE b3VibGUoImhlaWdodCJfcywgaGVpZ2h0KSkgewogICAgICAgICAgICAgICAgIGVsZW1lbnRXaWR0 aCA9IHdpZHRoOwogICAgICAgICAgICAgICAgIGVsZW1lbnRIZWlnaHQgPSBoZWlnaHQ7CiAgICAg ICAgICAgICB9CkBAIC05NjUsOSArOTY1LDkgQEAgdm9pZCBTZXNzaW9uOjpjb21wdXRlRWxlbWVu dExheW91dChjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgT3B0aW9uU2V0PEVsZW1lbnRMYXkKICAg ICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHJlY3QsIFdURjo6bnVsbG9wdCwgaXNPYnNjdXJl ZCwgbnVsbHB0cik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgaW50 IGluVmlld0NlbnRlclBvaW50WCwgaW5WaWV3Q2VudGVyUG9pbnRZOwotICAgICAgICBpZiAoIWlu Vmlld0NlbnRlclBvaW50T2JqZWN0LT5nZXRJbnRlZ2VyKCJ4Il9zLCBpblZpZXdDZW50ZXJQb2lu dFgpCi0gICAgICAgICAgICB8fCAhaW5WaWV3Q2VudGVyUG9pbnRPYmplY3QtPmdldEludGVnZXIo InkiX3MsIGluVmlld0NlbnRlclBvaW50WSkpIHsKKyAgICAgICAgZG91YmxlIGluVmlld0NlbnRl clBvaW50WCwgaW5WaWV3Q2VudGVyUG9pbnRZOworICAgICAgICBpZiAoIWluVmlld0NlbnRlclBv aW50T2JqZWN0LT5nZXREb3VibGUoIngiX3MsIGluVmlld0NlbnRlclBvaW50WCkKKyAgICAgICAg ICAgIHx8ICFpblZpZXdDZW50ZXJQb2ludE9iamVjdC0+Z2V0RG91YmxlKCJ5Il9zLCBpblZpZXdD ZW50ZXJQb2ludFkpKSB7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEY6Om51bGxv cHQsIFdURjo6bnVsbG9wdCwgaXNPYnNjdXJlZCwgbnVsbHB0cik7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KQEAgLTEyNDgsMTAgKzEyNDgsMTAgQEAgdm9pZCBTZXNzaW9uOjpnZXRF bGVtZW50UmVjdChjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgRnVuY3Rpb248dm9pZCAoQ29tbWFu ZFJlc3UKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBSZWZQdHI8SlNPTjo6T2JqZWN0PiByZWN0T2JqZWN0ID0gSlNPTjo6T2JqZWN0OjpjcmVhdGUo KTsKLSAgICAgICAgICAgIHJlY3RPYmplY3QtPnNldEludGVnZXIoIngiX3MsIHJlY3QudmFsdWUo KS5vcmlnaW4ueCk7Ci0gICAgICAgICAgICByZWN0T2JqZWN0LT5zZXRJbnRlZ2VyKCJ5Il9zLCBy ZWN0LnZhbHVlKCkub3JpZ2luLnkpOwotICAgICAgICAgICAgcmVjdE9iamVjdC0+c2V0SW50ZWdl cigid2lkdGgiX3MsIHJlY3QudmFsdWUoKS5zaXplLndpZHRoKTsKLSAgICAgICAgICAgIHJlY3RP YmplY3QtPnNldEludGVnZXIoImhlaWdodCJfcywgcmVjdC52YWx1ZSgpLnNpemUuaGVpZ2h0KTsK KyAgICAgICAgICAgIHJlY3RPYmplY3QtPnNldERvdWJsZSgieCJfcywgcmVjdC52YWx1ZSgpLm9y aWdpbi54KTsKKyAgICAgICAgICAgIHJlY3RPYmplY3QtPnNldERvdWJsZSgieSJfcywgcmVjdC52 YWx1ZSgpLm9yaWdpbi55KTsKKyAgICAgICAgICAgIHJlY3RPYmplY3QtPnNldERvdWJsZSgid2lk dGgiX3MsIHJlY3QudmFsdWUoKS5zaXplLndpZHRoKTsKKyAgICAgICAgICAgIHJlY3RPYmplY3Qt PnNldERvdWJsZSgiaGVpZ2h0Il9zLCByZWN0LnZhbHVlKCkuc2l6ZS5oZWlnaHQpOwogICAgICAg ICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2VzcyhXVEZNb3ZlKHJl Y3RPYmplY3QpKSk7CiAgICAgICAgIH0pOwogICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcApp bmRleCAyZjljZmU5NDI0MDI2MTcyZDkwNmRiZDFhMDNjNGNkMDE1NDRiYjhiLi5jNDMxM2FmNzBl ZTAxYTk0ZTZlMmU4MWJjOTE3M2UzMjc1YTZlYWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcApA QCAtMTA0Miw3ICsxMDQyLDcgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Y29tcHV0ZUVs ZW1lbnRMYXlvdXQoY29uc3QgU3RyaW5nJiBicm93c2luZ0NvbnRleHRIYW4KICAgICBpZiAoIWNv b3JkaW5hdGVTeXN0ZW0pCiAgICAgICAgIEFTWU5DX0ZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9S X0FORF9ERVRBSUxTKEludmFsaWRQYXJhbWV0ZXIsICJUaGUgcGFyYW1ldGVyICdjb29yZGluYXRl U3lzdGVtJyBpcyBpbnZhbGlkLiIpOwogCi0gICAgV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lk KE9wdGlvbmFsPFN0cmluZz4sIFdlYkNvcmU6OkludFJlY3QsIE9wdGlvbmFsPFdlYkNvcmU6Oklu dFBvaW50PiwgYm9vbCk+IGNvbXBsZXRpb25IYW5kbGVyID0gW2NhbGxiYWNrID0gY2FsbGJhY2su Y29weVJlZigpXShPcHRpb25hbDxTdHJpbmc+IGVycm9yVHlwZSwgV2ViQ29yZTo6SW50UmVjdCBy ZWN0LCBPcHRpb25hbDxXZWJDb3JlOjpJbnRQb2ludD4gaW5WaWV3Q2VudGVyUG9pbnQsIGJvb2wg aXNPYnNjdXJlZCkgbXV0YWJsZSB7CisgICAgV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKE9w dGlvbmFsPFN0cmluZz4sIFdlYkNvcmU6OkZsb2F0UmVjdCwgT3B0aW9uYWw8V2ViQ29yZTo6Rmxv YXRQb2ludD4sIGJvb2wpPiBjb21wbGV0aW9uSGFuZGxlciA9IFtjYWxsYmFjayA9IGNhbGxiYWNr LmNvcHlSZWYoKV0oT3B0aW9uYWw8U3RyaW5nPiBlcnJvclR5cGUsIFdlYkNvcmU6OkZsb2F0UmVj dCByZWN0LCBPcHRpb25hbDxXZWJDb3JlOjpGbG9hdFBvaW50PiBpblZpZXdDZW50ZXJQb2ludCwg Ym9vbCBpc09ic2N1cmVkKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKGVycm9yVHlwZSkgewogICAg ICAgICAgICAgY2FsbGJhY2stPnNlbmRGYWlsdXJlKFNUUklOR19GT1JfUFJFREVGSU5FRF9FUlJP Ul9NRVNTQUdFKCplcnJvclR5cGUpKTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTE0NTgsNyAr MTQ1OCw3IEBAIFNpbXVsYXRlZElucHV0U291cmNlKiBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6aW5w dXRTb3VyY2VGb3JUeXBlKFNpbXVsYXRlZElucHV0U291CiAvLyBNQVJLOiBTaW11bGF0ZWRJbnB1 dERpc3BhdGNoZXI6OkNsaWVudCBBUEkKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OnZpZXdw b3J0SW5WaWV3Q2VudGVyUG9pbnRPZkVsZW1lbnQoV2ViUGFnZVByb3h5JiBwYWdlLCB1aW50NjRf dCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG5vZGVIYW5kbGUsIEZ1bmN0aW9uPHZvaWQgKE9wdGlv bmFsPFdlYkNvcmU6OkludFBvaW50PiwgT3B0aW9uYWw8QXV0b21hdGlvbkNvbW1hbmRFcnJvcj4p PiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9p ZChPcHRpb25hbDxTdHJpbmc+LCBXZWJDb3JlOjpJbnRSZWN0LCBPcHRpb25hbDxXZWJDb3JlOjpJ bnRQb2ludD4sIGJvb2wpPiBkaWRDb21wdXRlRWxlbWVudExheW91dEhhbmRsZXIgPSBbY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oT3B0aW9uYWw8U3RyaW5n PiBlcnJvclR5cGUsIFdlYkNvcmU6OkludFJlY3QsIE9wdGlvbmFsPFdlYkNvcmU6OkludFBvaW50 PiBpblZpZXdDZW50ZXJQb2ludCwgYm9vbCkgbXV0YWJsZSB7CisgICAgV1RGOjpDb21wbGV0aW9u SGFuZGxlcjx2b2lkKE9wdGlvbmFsPFN0cmluZz4sIFdlYkNvcmU6OkZsb2F0UmVjdCwgT3B0aW9u YWw8V2ViQ29yZTo6RmxvYXRQb2ludD4sIGJvb2wpPiBkaWRDb21wdXRlRWxlbWVudExheW91dEhh bmRsZXIgPSBbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0o T3B0aW9uYWw8U3RyaW5nPiBlcnJvclR5cGUsIFdlYkNvcmU6OkZsb2F0UmVjdCwgT3B0aW9uYWw8 V2ViQ29yZTo6RmxvYXRQb2ludD4gaW5WaWV3Q2VudGVyUG9pbnQsIGJvb2wpIG11dGFibGUgewog ICAgICAgICBpZiAoZXJyb3JUeXBlKSB7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihX VEY6Om51bGxvcHQsIEFVVE9NQVRJT05fQ09NTUFORF9FUlJPUl9XSVRIX01FU1NBR0UoKmVycm9y VHlwZSkpOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTQ2OSw3ICsxNDY5LDcgQEAgdm9pZCBX ZWJBdXRvbWF0aW9uU2Vzc2lvbjo6dmlld3BvcnRJblZpZXdDZW50ZXJQb2ludE9mRWxlbWVudChX ZWJQYWdlUHJveHkmIHBhZ2UKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKGluVmlld0NlbnRlclBvaW50LCBXVEY6Om51bGxvcHQpOwor ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihyb3VuZGVkSW50UG9pbnQoaW5WaWV3Q2VudGVyUG9p bnQudmFsdWUoKSksIFdURjo6bnVsbG9wdCk7CiAgICAgfTsKIAogICAgIHBhZ2UucHJvY2Vzcygp LnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViQXV0b21hdGlvblNlc3Npb25Qcm94eTo6 Q29tcHV0ZUVsZW1lbnRMYXlvdXQocGFnZS5wYWdlSUQoKSwgZnJhbWVJRCwgbm9kZUhhbmRsZSwg ZmFsc2UsIENvb3JkaW5hdGVTeXN0ZW06OkxheW91dFZpZXdwb3J0KSwgV1RGTW92ZShkaWRDb21w dXRlRWxlbWVudExheW91dEhhbmRsZXIpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eS5j cHAKaW5kZXggNDU0Y2E2YmM4NDQ5ODNmNTk5OGZmZWU0ZGEzNzRjY2ZjYzYyMjVkYS4uYTEwZjE4 Y2UxMjFiYzBlMzk2Y2E1Mzg0MTMyODgyYTNmMDk1YjNjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNl c3Npb25Qcm94eS5jcHAKQEAgLTUyNyw3ICs1MjcsNyBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQ b2ludCBjb252ZXJ0UG9pbnRGcm9tRnJhbWVDbGllbnRUb1Jvb3RWaWV3KFdlYkNvcmU6OkZyYW1l VgogICAgIHJldHVybiBjbGllbnRQb2ludDsKIH0KIAotdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lv blByb3h5Ojpjb21wdXRlRWxlbWVudExheW91dChQYWdlSWRlbnRpZmllciBwYWdlSUQsIHVpbnQ2 NF90IGZyYW1lSUQsIFN0cmluZyBub2RlSGFuZGxlLCBib29sIHNjcm9sbEludG9WaWV3SWZOZWVk ZWQsIENvb3JkaW5hdGVTeXN0ZW0gY29vcmRpbmF0ZVN5c3RlbSwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChPcHRpb25hbDxTdHJpbmc+LCBXZWJDb3JlOjpJbnRSZWN0LCBPcHRpb25hbDxXZWJDb3Jl OjpJbnRQb2ludD4sIGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBXZWJBdXRvbWF0 aW9uU2Vzc2lvblByb3h5Ojpjb21wdXRlRWxlbWVudExheW91dChQYWdlSWRlbnRpZmllciBwYWdl SUQsIHVpbnQ2NF90IGZyYW1lSUQsIFN0cmluZyBub2RlSGFuZGxlLCBib29sIHNjcm9sbEludG9W aWV3SWZOZWVkZWQsIENvb3JkaW5hdGVTeXN0ZW0gY29vcmRpbmF0ZVN5c3RlbSwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChPcHRpb25hbDxTdHJpbmc+LCBXZWJDb3JlOjpGbG9hdFJlY3QsIE9wdGlv bmFsPFdlYkNvcmU6OkZsb2F0UG9pbnQ+LCBib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsK ICAgICBXZWJQYWdlKiBwYWdlID0gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkud2ViUGFnZShwYWdl SUQpOwogICAgIGlmICghcGFnZSkgewpAQCAtNTYxLDE3ICs1NjEsMTcgQEAgdm9pZCBXZWJBdXRv bWF0aW9uU2Vzc2lvblByb3h5Ojpjb21wdXRlRWxlbWVudExheW91dChQYWdlSWRlbnRpZmllciBw YWdlSUQsIHVpbnQKICAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGZyYW1lLT5j b3JlRnJhbWUoKS0+dmlldygpOwogICAgIFdlYkNvcmU6OkZyYW1lVmlldyogbWFpblZpZXcgPSBm cmFtZS0+Y29yZUZyYW1lKCktPm1haW5GcmFtZSgpLnZpZXcoKTsKIAotICAgIFdlYkNvcmU6Oklu dFJlY3QgcmVzdWx0RWxlbWVudEJvdW5kczsKLSAgICBPcHRpb25hbDxXZWJDb3JlOjpJbnRQb2lu dD4gcmVzdWx0SW5WaWV3Q2VudGVyUG9pbnQ7CisgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHJlc3Vs dEVsZW1lbnRCb3VuZHM7CisgICAgT3B0aW9uYWw8V2ViQ29yZTo6RmxvYXRQb2ludD4gcmVzdWx0 SW5WaWV3Q2VudGVyUG9pbnQ7CiAgICAgYm9vbCBpc09ic2N1cmVkID0gZmFsc2U7CiAKICAgICBh dXRvIGVsZW1lbnRCb3VuZHNJblJvb3RDb29yZGluYXRlcyA9IGNvbnZlcnRSZWN0RnJvbUZyYW1l Q2xpZW50VG9Sb290VmlldyhmcmFtZVZpZXcsIGNvcmVFbGVtZW50LT5ib3VuZGluZ0NsaWVudFJl Y3QoKSk7CiAgICAgc3dpdGNoIChjb29yZGluYXRlU3lzdGVtKSB7CiAgICAgY2FzZSBDb29yZGlu YXRlU3lzdGVtOjpQYWdlOgotICAgICAgICByZXN1bHRFbGVtZW50Qm91bmRzID0gZW5jbG9zaW5n SW50UmVjdChtYWluVmlldy0+YWJzb2x1dGVUb0RvY3VtZW50UmVjdChtYWluVmlldy0+cm9vdFZp ZXdUb0NvbnRlbnRzKGVsZW1lbnRCb3VuZHNJblJvb3RDb29yZGluYXRlcykpKTsKKyAgICAgICAg cmVzdWx0RWxlbWVudEJvdW5kcyA9IG1haW5WaWV3LT5hYnNvbHV0ZVRvRG9jdW1lbnRSZWN0KG1h aW5WaWV3LT5yb290Vmlld1RvQ29udGVudHMoZWxlbWVudEJvdW5kc0luUm9vdENvb3JkaW5hdGVz KSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ29vcmRpbmF0ZVN5c3RlbTo6TGF5b3V0Vmll d3BvcnQ6Ci0gICAgICAgIHJlc3VsdEVsZW1lbnRCb3VuZHMgPSBlbmNsb3NpbmdJbnRSZWN0KG1h aW5WaWV3LT5hYnNvbHV0ZVRvTGF5b3V0Vmlld3BvcnRSZWN0KGVsZW1lbnRCb3VuZHNJblJvb3RD b29yZGluYXRlcykpOworICAgICAgICByZXN1bHRFbGVtZW50Qm91bmRzID0gbWFpblZpZXctPmFi c29sdXRlVG9MYXlvdXRWaWV3cG9ydFJlY3QoZWxlbWVudEJvdW5kc0luUm9vdENvb3JkaW5hdGVz KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogCkBAIC02MjUsMTAgKzYyNSwxMCBAQCB2b2lkIFdl YkF1dG9tYXRpb25TZXNzaW9uUHJveHk6OmNvbXB1dGVFbGVtZW50TGF5b3V0KFBhZ2VJZGVudGlm aWVyIHBhZ2VJRCwgdWludAogICAgIGF1dG8gaW5WaWV3Q2VudGVyUG9pbnRJblJvb3RDb29yZGlu YXRlcyA9IGNvbnZlcnRQb2ludEZyb21GcmFtZUNsaWVudFRvUm9vdFZpZXcoZnJhbWVWaWV3LCBl bGVtZW50SW5WaWV3Q2VudGVyUG9pbnQpOwogICAgIHN3aXRjaCAoY29vcmRpbmF0ZVN5c3RlbSkg ewogICAgIGNhc2UgQ29vcmRpbmF0ZVN5c3RlbTo6UGFnZToKLSAgICAgICAgcmVzdWx0SW5WaWV3 Q2VudGVyUG9pbnQgPSByb3VuZGVkSW50UG9pbnQobWFpblZpZXctPmFic29sdXRlVG9Eb2N1bWVu dFBvaW50KGluVmlld0NlbnRlclBvaW50SW5Sb290Q29vcmRpbmF0ZXMpKTsKKyAgICAgICAgcmVz dWx0SW5WaWV3Q2VudGVyUG9pbnQgPSBtYWluVmlldy0+YWJzb2x1dGVUb0RvY3VtZW50UG9pbnQo aW5WaWV3Q2VudGVyUG9pbnRJblJvb3RDb29yZGluYXRlcyk7CiAgICAgICAgIGJyZWFrOwogICAg IGNhc2UgQ29vcmRpbmF0ZVN5c3RlbTo6TGF5b3V0Vmlld3BvcnQ6Ci0gICAgICAgIHJlc3VsdElu Vmlld0NlbnRlclBvaW50ID0gcm91bmRlZEludFBvaW50KG1haW5WaWV3LT5hYnNvbHV0ZVRvTGF5 b3V0Vmlld3BvcnRQb2ludChpblZpZXdDZW50ZXJQb2ludEluUm9vdENvb3JkaW5hdGVzKSk7Cisg ICAgICAgIHJlc3VsdEluVmlld0NlbnRlclBvaW50ID0gbWFpblZpZXctPmFic29sdXRlVG9MYXlv dXRWaWV3cG9ydFBvaW50KGluVmlld0NlbnRlclBvaW50SW5Sb290Q29vcmRpbmF0ZXMpOwogICAg ICAgICBicmVhazsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJveHkuaAppbmRleCAx MTY3NjQ1Mjc3ZGJjMTkzMGE1YTdhNTk3ZGNiYzJkZjNlY2Y1NWM5Li5lOTUyMTYyZmI5ZGY3YWZj NzlmMDhjY2Q5ZjFmZmU3ZmNjYjI2Zjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5LmgKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eS5o CkBAIC02Nyw3ICs2Nyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZXNvbHZlQ2hpbGRGcmFtZVdp dGhOYW1lKFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyLCB1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT dHJpbmcmIG5hbWUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoT3B0aW9uYWw8U3RyaW5nPiwgdWlu dDY0X3QpPiYmKTsKICAgICB2b2lkIHJlc29sdmVQYXJlbnRGcmFtZShXZWJDb3JlOjpQYWdlSWRl bnRpZmllciwgdWludDY0X3QgZnJhbWVJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChPcHRpb25h bDxTdHJpbmc+LCB1aW50NjRfdCk+JiYpOwogICAgIHZvaWQgZm9jdXNGcmFtZShXZWJDb3JlOjpQ YWdlSWRlbnRpZmllciwgdWludDY0X3QgZnJhbWVJRCk7Ci0gICAgdm9pZCBjb21wdXRlRWxlbWVu dExheW91dChXZWJDb3JlOjpQYWdlSWRlbnRpZmllciwgdWludDY0X3QgZnJhbWVJRCwgU3RyaW5n IG5vZGVIYW5kbGUsIGJvb2wgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCwgQ29vcmRpbmF0ZVN5c3Rl bSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChPcHRpb25hbDxTdHJpbmc+LCBXZWJDb3JlOjpJbnRS ZWN0LCBPcHRpb25hbDxXZWJDb3JlOjpJbnRQb2ludD4sIGJvb2wpPiYmKTsKKyAgICB2b2lkIGNv bXB1dGVFbGVtZW50TGF5b3V0KFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyLCB1aW50NjRfdCBmcmFt ZUlELCBTdHJpbmcgbm9kZUhhbmRsZSwgYm9vbCBzY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBDb29y ZGluYXRlU3lzdGVtLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKE9wdGlvbmFsPFN0cmluZz4sIFdl YkNvcmU6OkZsb2F0UmVjdCwgT3B0aW9uYWw8V2ViQ29yZTo6RmxvYXRQb2ludD4sIGJvb2wpPiYm KTsKICAgICB2b2lkIHNlbGVjdE9wdGlvbkVsZW1lbnQoV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIs IHVpbnQ2NF90IGZyYW1lSUQsIFN0cmluZyBub2RlSGFuZGxlLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKE9wdGlvbmFsPFN0cmluZz4pPiYmKTsKICAgICB2b2lkIHRha2VTY3JlZW5zaG90KFdlYkNv cmU6OlBhZ2VJZGVudGlmaWVyLCB1aW50NjRfdCBmcmFtZUlELCBTdHJpbmcgbm9kZUhhbmRsZSwg Ym9vbCBzY3JvbGxJbnRvVmlld0lmTmVlZGVkLCBib29sIGNsaXBUb1ZpZXdwb3J0LCB1aW50NjRf dCBjYWxsYmFja0lEKTsKICAgICB2b2lkIGdldENvb2tpZXNGb3JGcmFtZShXZWJDb3JlOjpQYWdl SWRlbnRpZmllciwgdWludDY0X3QgZnJhbWVJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChPcHRp b25hbDxTdHJpbmc+LCBWZWN0b3I8V2ViQ29yZTo6Q29va2llPik+JiYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25Q cm94eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dl YkF1dG9tYXRpb25TZXNzaW9uUHJveHkubWVzc2FnZXMuaW4KaW5kZXggZDcyZjg5ZDI2MzU5Y2Yw MWNjZmQ1MzFlOTZlMDFmNDQ0MDlhYWY1OC4uNjMzMjNlMTZlNjkwZGUzNzY0ZTJlYjdhYzNjZWNm ODMzZmMwNWZiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0F1dG9tYXRp b24vV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5Lm1lc3Nh Z2VzLmluCkBAIC0zMCw3ICszMCw3IEBAIG1lc3NhZ2VzIC0+IFdlYkF1dG9tYXRpb25TZXNzaW9u UHJveHkgewogCiAgICAgRm9jdXNGcmFtZShXZWJDb3JlOjpQYWdlSWRlbnRpZmllciBwYWdlSUQs IHVpbnQ2NF90IGZyYW1lSUQpCiAKLSAgICBDb21wdXRlRWxlbWVudExheW91dChXZWJDb3JlOjpQ YWdlSWRlbnRpZmllciBwYWdlSUQsIHVpbnQ2NF90IGZyYW1lSUQsIFN0cmluZyBub2RlSGFuZGxl LCBib29sIHNjcm9sbEludG9WaWV3SWZOZWVkZWQsIGVudW06dWludDhfdCBXZWJLaXQ6OkNvb3Jk aW5hdGVTeXN0ZW0gY29vcmRpbmF0ZVN5c3RlbSkgLT4gKE9wdGlvbmFsPFN0cmluZz4gZXJyb3JU eXBlLCBXZWJDb3JlOjpJbnRSZWN0IHJlY3QsIE9wdGlvbmFsPFdlYkNvcmU6OkludFBvaW50PiBp blZpZXdDZW50ZXJQb2ludCwgYm9vbCBpc09ic2N1cmVkKSBBc3luYworICAgIENvbXB1dGVFbGVt ZW50TGF5b3V0KFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgdWludDY0X3QgZnJhbWVJ RCwgU3RyaW5nIG5vZGVIYW5kbGUsIGJvb2wgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCwgZW51bTp1 aW50OF90IFdlYktpdDo6Q29vcmRpbmF0ZVN5c3RlbSBjb29yZGluYXRlU3lzdGVtKSAtPiAoT3B0 aW9uYWw8U3RyaW5nPiBlcnJvclR5cGUsIFdlYkNvcmU6OkZsb2F0UmVjdCByZWN0LCBPcHRpb25h bDxXZWJDb3JlOjpGbG9hdFBvaW50PiBpblZpZXdDZW50ZXJQb2ludCwgYm9vbCBpc09ic2N1cmVk KSBBc3luYwogCiAgICAgU2VsZWN0T3B0aW9uRWxlbWVudChXZWJDb3JlOjpQYWdlSWRlbnRpZmll ciBwYWdlSUQsIHVpbnQ2NF90IGZyYW1lSUQsIFN0cmluZyBub2RlSGFuZGxlKSAtPiAoT3B0aW9u YWw8U3RyaW5nPiBlcnJvclR5cGUpIEFzeW5jCiAK