55916 2011-03-07 18:13:13 -0800 AX: Webkit2 not sending UAZoomFocusChanged notifications 2011-03-08 10:19:13 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach bdakin buildbot webkit-ews oldest_to_newest 363735 0 cfleizach 2011-03-07 18:13:13 -0800 Webkit2 not sending UAZoomFocusChanged notifications TO REPRO -Turn on zoom -Set zoom to follow keyboard focus -Test zoom in TextEdit that zoom is following keyboard focus -Start Safari&Webkit2 -Type text into a text field on a webpage RESULTS -Zoom does not follow KB focus 363736 1 cfleizach 2011-03-07 18:13:40 -0800 The problem is that we cannot convert the view bounds to screen coordinates because that method is not implemented in WK2 (whereas it is in WK1) 363743 2 85006 cfleizach 2011-03-07 18:22:14 -0800 Created attachment 85006 patch 363754 3 buildbot 2011-03-07 18:53:56 -0800 Attachment 85006 did not build on win: Build output: http://queues.webkit.org/results/8106635 363776 4 85006 sam 2011-03-07 19:48:25 -0800 Comment on attachment 85006 patch This breaks Windows, but otherwise looks good. 363789 5 webkit-ews 2011-03-07 20:28:49 -0800 Attachment 85006 did not build on qt: Build output: http://queues.webkit.org/results/8103752 363991 6 85054 cfleizach 2011-03-08 09:28:49 -0800 Created attachment 85054 patch 364009 7 webkit-ews 2011-03-08 09:53:43 -0800 Attachment 85054 did not build on qt: Build output: http://queues.webkit.org/results/8112013 364010 8 85054 darin 2011-03-08 09:55:02 -0800 Comment on attachment 85054 patch View in context: https://bugs.webkit.org/attachment.cgi?id=85054&action=review > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1182 > +WebCore::IntRect WebPage::windowToScreen(const WebCore::IntRect& rect) > +{ > + WebCore::IntRect screenRect; No need for the WebCore:: prefix here in the cpp file, although you do need it in the header. > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:1185 > + sendSync(Messages::WebPageProxy::WindowToScreen(rect), > + Messages::WebPageProxy::WindowToScreen::Reply(screenRect)); We normally don’t line up parentheses like this. in WebKit code. In fact, all on one line is the normal style. 364014 9 buildbot 2011-03-08 10:05:07 -0800 Attachment 85054 did not build on win: Build output: http://queues.webkit.org/results/8104927 364018 10 cfleizach 2011-03-08 10:19:13 -0800 http://trac.webkit.org/changeset/80569 85006 2011-03-07 18:22:14 -0800 2011-03-08 09:28:49 -0800 patch patch.txt text/plain 7524 cfleizach SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNTIwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDMtMDcgIENocmlzIEZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBWDogV2Via2l0MiBub3Qgc2VuZGluZyBVQVpvb21Gb2N1 c0NoYW5nZWQgbm90aWZpY2F0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTU5MTYKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VD bGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwu bW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjp3aW5kb3dUb1NjcmVlbik6Cisg ICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3aW5kb3dUb1Nj cmVlbik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC9xd2twYWdlLmNwcDoKKyAgICAgICAgKFFXS1BhZ2VQcml2YXRlOjp3aW5kb3dUb1NjcmVl bik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaDoKKyAgICAgICAgKiBV SVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1w bDo6d2luZG93VG9TY3JlZW4pOgorICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5oOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50Ojp3aW5kb3dUb1NjcmVlbik6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjp3aW5kb3dUb1NjcmVlbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaDoKKwogMjAxMS0wMy0wNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNs aWVudC5jcHAJKHJldmlzaW9uIDgwNDk1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODUs MTAgKzM4NSw5IEBACiAgICAgcmV0dXJuIEludFBvaW50KCk7CiB9CiAKLUludFJlY3QgV2ViQ2hy b21lQ2xpZW50Ojp3aW5kb3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JikgY29uc3QKK0ludFJlY3Qg V2ViQ2hyb21lQ2xpZW50Ojp3aW5kb3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KSBjb25z dAogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICBy ZXR1cm4gbV9wYWdlLT53aW5kb3dUb1NjcmVlbihyZWN0KTsKIH0KIAogUGxhdGZvcm1QYWdlQ2xp ZW50IFdlYkNocm9tZUNsaWVudDo6cGxhdGZvcm1QYWdlQ2xpZW50KCkgY29uc3QKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9u IDgwNDk1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMTc2LDcgKzExNzYsMTcgQEAKIHsKICAgICBtX3VzZXJBZ2Vu dCA9IHVzZXJBZ2VudDsKIH0KKyAgICAKK1dlYkNvcmU6OkludFJlY3QgV2ViUGFnZTo6d2luZG93 VG9TY3JlZW4oY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCkKK3sKKyAgICBXZWJDb3JlOjpJ bnRSZWN0IHNjcmVlblJlY3Q7CisgICAgCisgICAgc2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6V2luZG93VG9TY3JlZW4ocmVjdCksIAorICAgICAgICAgICAgIE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OldpbmRvd1RvU2NyZWVuOjpSZXBseShzY3JlZW5SZWN0KSk7CiAKKyAgICByZXR1 cm4gc2NyZWVuUmVjdDsKK30KKwogSW50UmVjdCBXZWJQYWdlOjp3aW5kb3dSZXNpemVyUmVjdCgp IGNvbnN0CiB7CiAgICAgaWYgKG1fd2luZG93UmVzaXplclNpemUuaXNFbXB0eSgpKQpJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiA4 MDQ5NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdv cmtpbmcgY29weSkKQEAgLTIzOCw2ICsyMzgsNyBAQAogICAgIHZvaWQgaW5zdGFsbFBhZ2VPdmVy bGF5KFBhc3NSZWZQdHI8UGFnZU92ZXJsYXk+KTsKICAgICB2b2lkIHVuaW5zdGFsbFBhZ2VPdmVy bGF5KFBhZ2VPdmVybGF5Kik7CiAgICAgYm9vbCBoYXNQYWdlT3ZlcmxheSgpIGNvbnN0IHsgcmV0 dXJuIG1fcGFnZU92ZXJsYXk7IH0KKyAgICBXZWJDb3JlOjpJbnRSZWN0IHdpbmRvd1RvU2NyZWVu KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKIAogICAgIFBhc3NSZWZQdHI8V2ViSW1hZ2U+IHNu YXBzaG90SW5WaWV3Q29vcmRpbmF0ZXMoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIEltYWdlT3B0 aW9ucyk7CiAgICAgUGFzc1JlZlB0cjxXZWJJbWFnZT4gc25hcHNob3RJbkRvY3VtZW50Q29vcmRp bmF0ZXMoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIEltYWdlT3B0aW9ucyk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gODA0OTUpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTg4OSw2ICsxODg5LDExIEBACiAgICAgbmV3V2luZG93RnJhbWUgPSBtX3BhZ2VDbGll bnQtPmNvbnZlcnRUb1VzZXJTcGFjZShtX3VpQ2xpZW50LndpbmRvd0ZyYW1lKHRoaXMpKTsKIH0K IAordm9pZCBXZWJQYWdlUHJveHk6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHZpZXdS ZWN0LCBJbnRSZWN0JiByZXN1bHQpCit7CisgICAgcmVzdWx0ID0gbV9wYWdlQ2xpZW50LT53aW5k b3dUb1NjcmVlbih2aWV3UmVjdCk7Cit9CisgICAgCiB2b2lkIFdlYlBhZ2VQcm94eTo6cnVuQmVm b3JlVW5sb2FkQ29uZmlybVBhbmVsKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdWludDY0X3QgZnJh bWVJRCwgYm9vbCYgc2hvdWxkQ2xvc2UpCiB7CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBw cm9jZXNzKCktPndlYkZyYW1lKGZyYW1lSUQpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCShyZXZpc2lvbiA4MDQ5NSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgJKHdvcmtp bmcgY29weSkKQEAgLTc0LDcgKzc1LDggQEAKIAogICAgIHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRS ZWN0IGNvbnZlcnRUb0RldmljZVNwYWNlKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOwogICAg IHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRSZWN0IGNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBXZWJD b3JlOjpGbG9hdFJlY3QmKTsKLQorICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UmVjdCB3aW5kb3dU b1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CisgICAgCiAgICAgdmlydHVhbCB2b2lk IGRvbmVXaXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYsIGJvb2wgd2Fz RXZlbnRIYW5kbGVkKTsKIAogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJQb3B1cE1lbnVQcm94 eT4gY3JlYXRlUG9wdXBNZW51UHJveHkoV2ViUGFnZVByb3h5Kik7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQkocmV2aXNp b24gODA0OTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50 SW1wbC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAzLDYgKzMxMSwxNCBAQAogewogICAgIHJldHVy biBbbV93a1ZpZXcgX2NvbnZlcnRUb1VzZXJTcGFjZTpyZWN0XTsKIH0KKyAgICAKK0ludFJlY3Qg UGFnZUNsaWVudEltcGw6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3QpCit7Cisg ICAgTlNSZWN0IHRlbXBSZWN0ID0gcmVjdDsKKyAgICB0ZW1wUmVjdCA9IFttX3drVmlldyBjb252 ZXJ0UmVjdDp0ZW1wUmVjdCB0b1ZpZXc6bmlsXTsKKyAgICB0ZW1wUmVjdC5vcmlnaW4gPSBbW21f d2tWaWV3IHdpbmRvd10gY29udmVydEJhc2VUb1NjcmVlbjp0ZW1wUmVjdC5vcmlnaW5dOworICAg IHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KHRlbXBSZWN0KTsKK30KIAogdm9pZCBQYWdlQ2xpZW50 SW1wbDo6ZG9uZVdpdGhLZXlFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50JiBldmVu dCwgYm9vbCB3YXNFdmVudEhhbmRsZWQpCiB7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA4MDQ5NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNTM0LDYgKzUzNCw3IEBACiAg ICAgdm9pZCBnZXRJc1Jlc2l6YWJsZShib29sJiBpc1Jlc2l6YWJsZSk7CiAgICAgdm9pZCBzZXRX aW5kb3dGcmFtZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKICAgICB2b2lkIGdldFdpbmRv d0ZyYW1lKFdlYkNvcmU6OkZsb2F0UmVjdCYpOworICAgIHZvaWQgd2luZG93VG9TY3JlZW4oY29u c3QgV2ViQ29yZTo6SW50UmVjdCYgdmlld1JlY3QsIFdlYkNvcmU6OkludFJlY3QmIHJlc3VsdCk7 CiAgICAgdm9pZCBydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwoY29uc3QgU3RyaW5nJiBtZXNz YWdlLCB1aW50NjRfdCBmcmFtZUlELCBib29sJiBzaG91bGRDbG9zZSk7CiAgICAgdm9pZCBkaWRD aGFuZ2VWaWV3cG9ydERhdGEoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKICAg ICB2b2lkIHBhZ2VEaWRTY3JvbGwoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gODA0OTUpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNv cHkpCkBAIC00OCw2ICs0OSw3IEBACiAgICAgR2V0SXNSZXNpemFibGUoKSAtPiAoYm9vbCBpc1Jl c2l6YWJsZSkKICAgICBTZXRXaW5kb3dGcmFtZShXZWJDb3JlOjpGbG9hdFJlY3Qgd2luZG93RnJh bWUpCiAgICAgR2V0V2luZG93RnJhbWUoKSAtPiAoV2ViQ29yZTo6RmxvYXRSZWN0IHdpbmRvd0Zy YW1lKQorICAgIFdpbmRvd1RvU2NyZWVuKFdlYkNvcmU6OkludFJlY3QgcmVjdCkgLT4gKFdlYkNv cmU6OkludFJlY3Qgc2NyZWVuRnJhbWUpCiAgICAgUnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVs KFdURjo6U3RyaW5nIG1lc3NhZ2UsIHVpbnQ2NF90IGZyYW1lSUQpIC0+IChib29sIHNob3VsZENs b3NlKQogICAgIFBhZ2VEaWRTY3JvbGwoKQogICAgIFJ1bk9wZW5QYW5lbCh1aW50NjRfdCBmcmFt ZUlELCBXZWJLaXQ6OldlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGEgcGFyYW1ldGVycykKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAkocmV2aXNpb24gODA0OTUpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMDcsNyArMTA4LDggQEAKICNlbmRpZgogICAgIHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRSZWN0 IGNvbnZlcnRUb0RldmljZVNwYWNlKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpID0gMDsKICAg ICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBjb252ZXJ0VG9Vc2VyU3BhY2UoY29uc3QgV2Vi Q29yZTo6RmxvYXRSZWN0JikgPSAwOwotCisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHdp bmRvd1RvU2NyZWVuKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSA9IDA7CisgICAgCiAgICAgdmly dHVhbCB2b2lkIGRvbmVXaXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYs IGJvb2wgd2FzRXZlbnRIYW5kbGVkKSA9IDA7CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2Vi UG9wdXBNZW51UHJveHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSopID0gMDsK 85054 2011-03-08 09:28:49 -0800 2011-03-08 09:55:01 -0800 patch patch.txt text/plain 9975 cfleizach SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNTIxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDMtMDggIENocmlzIEZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBWDogV2Via2l0MiBub3Qgc2VuZGluZyBVQVpvb21Gb2N1 c0NoYW5nZWQgbm90aWZpY2F0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTU5MTYKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VD bGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwu bW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjp3aW5kb3dUb1NjcmVlbik6Cisg ICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3aW5kb3dUb1Nj cmVlbik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC9xd2twYWdlLmNwcDoKKyAgICAgICAgKFFXS1BhZ2VQcml2YXRlOjp3aW5kb3dUb1NjcmVl bik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaDoKKyAgICAgICAgKiBV SVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1w bDo6d2luZG93VG9TY3JlZW4pOgorICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5oOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21lQ2xpZW50Ojp3aW5kb3dUb1NjcmVlbik6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjp3aW5kb3dUb1NjcmVlbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaDoKKwogMjAxMS0wMy0wNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNs aWVudC5jcHAJKHJldmlzaW9uIDgwNDk1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODUs MTAgKzM4NSw5IEBACiAgICAgcmV0dXJuIEludFBvaW50KCk7CiB9CiAKLUludFJlY3QgV2ViQ2hy b21lQ2xpZW50Ojp3aW5kb3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JikgY29uc3QKK0ludFJlY3Qg V2ViQ2hyb21lQ2xpZW50Ojp3aW5kb3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KSBjb25z dAogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICBy ZXR1cm4gbV9wYWdlLT53aW5kb3dUb1NjcmVlbihyZWN0KTsKIH0KIAogUGxhdGZvcm1QYWdlQ2xp ZW50IFdlYkNocm9tZUNsaWVudDo6cGxhdGZvcm1QYWdlQ2xpZW50KCkgY29uc3QKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9u IDgwNDk1KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMTc2LDcgKzExNzYsMTcgQEAKIHsKICAgICBtX3VzZXJBZ2Vu dCA9IHVzZXJBZ2VudDsKIH0KKyAgICAKK1dlYkNvcmU6OkludFJlY3QgV2ViUGFnZTo6d2luZG93 VG9TY3JlZW4oY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCkKK3sKKyAgICBXZWJDb3JlOjpJ bnRSZWN0IHNjcmVlblJlY3Q7CisgICAgCisgICAgc2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQ cm94eTo6V2luZG93VG9TY3JlZW4ocmVjdCksIAorICAgICAgICAgICAgIE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OldpbmRvd1RvU2NyZWVuOjpSZXBseShzY3JlZW5SZWN0KSk7CiAKKyAgICByZXR1 cm4gc2NyZWVuUmVjdDsKK30KKwogSW50UmVjdCBXZWJQYWdlOjp3aW5kb3dSZXNpemVyUmVjdCgp IGNvbnN0CiB7CiAgICAgaWYgKG1fd2luZG93UmVzaXplclNpemUuaXNFbXB0eSgpKQpJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiA4 MDQ5NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdv cmtpbmcgY29weSkKQEAgLTIzOCw2ICsyMzgsNyBAQAogICAgIHZvaWQgaW5zdGFsbFBhZ2VPdmVy bGF5KFBhc3NSZWZQdHI8UGFnZU92ZXJsYXk+KTsKICAgICB2b2lkIHVuaW5zdGFsbFBhZ2VPdmVy bGF5KFBhZ2VPdmVybGF5Kik7CiAgICAgYm9vbCBoYXNQYWdlT3ZlcmxheSgpIGNvbnN0IHsgcmV0 dXJuIG1fcGFnZU92ZXJsYXk7IH0KKyAgICBXZWJDb3JlOjpJbnRSZWN0IHdpbmRvd1RvU2NyZWVu KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKIAogICAgIFBhc3NSZWZQdHI8V2ViSW1hZ2U+IHNu YXBzaG90SW5WaWV3Q29vcmRpbmF0ZXMoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIEltYWdlT3B0 aW9ucyk7CiAgICAgUGFzc1JlZlB0cjxXZWJJbWFnZT4gc25hcHNob3RJbkRvY3VtZW50Q29vcmRp bmF0ZXMoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIEltYWdlT3B0aW9ucyk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gODA0OTUpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTg4OSw2ICsxODg5LDExIEBACiAgICAgbmV3V2luZG93RnJhbWUgPSBtX3BhZ2VDbGll bnQtPmNvbnZlcnRUb1VzZXJTcGFjZShtX3VpQ2xpZW50LndpbmRvd0ZyYW1lKHRoaXMpKTsKIH0K IAordm9pZCBXZWJQYWdlUHJveHk6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHZpZXdS ZWN0LCBJbnRSZWN0JiByZXN1bHQpCit7CisgICAgcmVzdWx0ID0gbV9wYWdlQ2xpZW50LT53aW5k b3dUb1NjcmVlbih2aWV3UmVjdCk7Cit9CisgICAgCiB2b2lkIFdlYlBhZ2VQcm94eTo6cnVuQmVm b3JlVW5sb2FkQ29uZmlybVBhbmVsKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdWludDY0X3QgZnJh bWVJRCwgYm9vbCYgc2hvdWxkQ2xvc2UpCiB7CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBw cm9jZXNzKCktPndlYkZyYW1lKGZyYW1lSUQpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCShyZXZpc2lvbiA4MDQ5NSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgJKHdvcmtp bmcgY29weSkKQEAgLTc0LDcgKzc0LDggQEAKIAogICAgIHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRS ZWN0IGNvbnZlcnRUb0RldmljZVNwYWNlKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOwogICAg IHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRSZWN0IGNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBXZWJD b3JlOjpGbG9hdFJlY3QmKTsKLQorICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UmVjdCB3aW5kb3dU b1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CisgICAgCiAgICAgdmlydHVhbCB2b2lk IGRvbmVXaXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYsIGJvb2wgd2Fz RXZlbnRIYW5kbGVkKTsKIAogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJQb3B1cE1lbnVQcm94 eT4gY3JlYXRlUG9wdXBNZW51UHJveHkoV2ViUGFnZVByb3h5Kik7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQkocmV2aXNp b24gODA0OTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50 SW1wbC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAzLDYgKzMwMywxNCBAQAogewogICAgIHJldHVy biBbbV93a1ZpZXcgX2NvbnZlcnRUb1VzZXJTcGFjZTpyZWN0XTsKIH0KKyAgICAKK0ludFJlY3Qg UGFnZUNsaWVudEltcGw6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3QpCit7Cisg ICAgTlNSZWN0IHRlbXBSZWN0ID0gcmVjdDsKKyAgICB0ZW1wUmVjdCA9IFttX3drVmlldyBjb252 ZXJ0UmVjdDp0ZW1wUmVjdCB0b1ZpZXc6bmlsXTsKKyAgICB0ZW1wUmVjdC5vcmlnaW4gPSBbW21f d2tWaWV3IHdpbmRvd10gY29udmVydEJhc2VUb1NjcmVlbjp0ZW1wUmVjdC5vcmlnaW5dOworICAg IHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KHRlbXBSZWN0KTsKK30KIAogdm9pZCBQYWdlQ2xpZW50 SW1wbDo6ZG9uZVdpdGhLZXlFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50JiBldmVu dCwgYm9vbCB3YXNFdmVudEhhbmRsZWQpCiB7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F3a3BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAJKHJldmlzaW9uIDgwNDk1KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjIyLDYg KzIyMiwxMSBAQAogICAgIHJldHVybiByZWN0OwogfQogCitJbnRSZWN0IFFXS1BhZ2VQcml2YXRl Ojp3aW5kb3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KQoreworICAgIHJldHVybiByZWN0 OworfQorCiBGbG9hdFJlY3QgUVdLUGFnZVByaXZhdGU6OmNvbnZlcnRUb1VzZXJTcGFjZShjb25z dCBGbG9hdFJlY3QmIHJlY3QpCiB7CiAgICAgcmV0dXJuIHJlY3Q7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmgJKHJldmlzaW9uIDgwNDk1KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaAkod29ya2luZyBjb3B5 KQpAQCAtNzcsNiArNzcsOCBAQAogICAgIHZpcnR1YWwgdm9pZCBjbGVhckFsbEVkaXRDb21tYW5k cygpOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRSZWN0IGNvbnZlcnRUb0RldmljZVNwYWNl KGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRS ZWN0IGNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKKyAgICB2 aXJ0dWFsIFdlYkNvcmU6OkludFJlY3Qgd2luZG93VG9TY3JlZW4oY29uc3QgSW50UmVjdCYpOwor CiAgICAgdmlydHVhbCB2b2lkIGRvbmVXaXRoS2V5RXZlbnQoY29uc3QgV2ViS2l0OjpOYXRpdmVX ZWJLZXlib2FyZEV2ZW50JiwgYm9vbCB3YXNFdmVudEhhbmRsZWQpOwogICAgIHZpcnR1YWwgdm9p ZCBzZWxlY3Rpb25DaGFuZ2VkKGJvb2wsIGJvb2wsIGJvb2wsIGJvb2wpOwogICAgIHZpcnR1YWwg UGFzc1JlZlB0cjxXZWJLaXQ6OldlYlBvcHVwTWVudVByb3h5PiBjcmVhdGVQb3B1cE1lbnVQcm94 eShXZWJLaXQ6OldlYlBhZ2VQcm94eSopOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv d2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiA4MDQ5NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy93aW4vV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgwNiw2ICs4MDYsMTEgQEAK ICAgICByZXR1cm4gcmVjdDsKIH0KIAorSW50UmVjdCBQYWdlQ2xpZW50SW1wbDo6d2luZG93VG9T Y3JlZW4oY29uc3QgSW50UmVjdCYgcmVjdCkKK3sKKyAgICByZXR1cm4gcmVjdDsKK30KKwogRmxv YXRSZWN0IFdlYlZpZXc6OmNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBGbG9hdFJlY3QmIHJlY3Qp CiB7CiAgICAgcmV0dXJuIHJlY3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2lu L1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dl YlZpZXcuaAkocmV2aXNpb24gODA0OTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2lu L1dlYlZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMTUxLDYgKzE1MSw3IEBACiAgICAgdmlydHVh bCB2b2lkIGNsZWFyQWxsRWRpdENvbW1hbmRzKCk7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpGbG9h dFJlY3QgY29udmVydFRvRGV2aWNlU3BhY2UoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0Jik7CiAg ICAgdmlydHVhbCBXZWJDb3JlOjpGbG9hdFJlY3QgY29udmVydFRvVXNlclNwYWNlKGNvbnN0IFdl YkNvcmU6OkZsb2F0UmVjdCYpOworICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UmVjdCB3aW5kb3dU b1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIGRvbmVX aXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYsIGJvb2wgd2FzRXZlbnRI YW5kbGVkKTsKICAgICB2aXJ0dWFsIHZvaWQgY29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2VkKGJv b2wpOwogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJQb3B1cE1lbnVQcm94eT4gY3JlYXRlUG9w dXBNZW51UHJveHkoV2ViUGFnZVByb3h5Kik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA4MDQ5NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNTM0LDYgKzUzNCw3IEBACiAg ICAgdm9pZCBnZXRJc1Jlc2l6YWJsZShib29sJiBpc1Jlc2l6YWJsZSk7CiAgICAgdm9pZCBzZXRX aW5kb3dGcmFtZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKICAgICB2b2lkIGdldFdpbmRv d0ZyYW1lKFdlYkNvcmU6OkZsb2F0UmVjdCYpOworICAgIHZvaWQgd2luZG93VG9TY3JlZW4oY29u c3QgV2ViQ29yZTo6SW50UmVjdCYgdmlld1JlY3QsIFdlYkNvcmU6OkludFJlY3QmIHJlc3VsdCk7 CiAgICAgdm9pZCBydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwoY29uc3QgU3RyaW5nJiBtZXNz YWdlLCB1aW50NjRfdCBmcmFtZUlELCBib29sJiBzaG91bGRDbG9zZSk7CiAgICAgdm9pZCBkaWRD aGFuZ2VWaWV3cG9ydERhdGEoY29uc3QgV2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKICAg ICB2b2lkIHBhZ2VEaWRTY3JvbGwoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gODA0OTUpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNv cHkpCkBAIC00OCw2ICs0OCw3IEBACiAgICAgR2V0SXNSZXNpemFibGUoKSAtPiAoYm9vbCBpc1Jl c2l6YWJsZSkKICAgICBTZXRXaW5kb3dGcmFtZShXZWJDb3JlOjpGbG9hdFJlY3Qgd2luZG93RnJh bWUpCiAgICAgR2V0V2luZG93RnJhbWUoKSAtPiAoV2ViQ29yZTo6RmxvYXRSZWN0IHdpbmRvd0Zy YW1lKQorICAgIFdpbmRvd1RvU2NyZWVuKFdlYkNvcmU6OkludFJlY3QgcmVjdCkgLT4gKFdlYkNv cmU6OkludFJlY3Qgc2NyZWVuRnJhbWUpCiAgICAgUnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVs KFdURjo6U3RyaW5nIG1lc3NhZ2UsIHVpbnQ2NF90IGZyYW1lSUQpIC0+IChib29sIHNob3VsZENs b3NlKQogICAgIFBhZ2VEaWRTY3JvbGwoKQogICAgIFJ1bk9wZW5QYW5lbCh1aW50NjRfdCBmcmFt ZUlELCBXZWJLaXQ6OldlYk9wZW5QYW5lbFBhcmFtZXRlcnM6OkRhdGEgcGFyYW1ldGVycykKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAkocmV2aXNpb24gODA0OTUpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMDcsNyArMTA3LDggQEAKICNlbmRpZgogICAgIHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRSZWN0 IGNvbnZlcnRUb0RldmljZVNwYWNlKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpID0gMDsKICAg ICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBjb252ZXJ0VG9Vc2VyU3BhY2UoY29uc3QgV2Vi Q29yZTo6RmxvYXRSZWN0JikgPSAwOwotCisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHdp bmRvd1RvU2NyZWVuKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSA9IDA7CisgICAgCiAgICAgdmly dHVhbCB2b2lkIGRvbmVXaXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYs IGJvb2wgd2FzRXZlbnRIYW5kbGVkKSA9IDA7CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2Vi UG9wdXBNZW51UHJveHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSopID0gMDsK