142371 2015-03-05 16:40:18 -0800 REGRESSION (r180782): Data Detector popovers are not dismissed on scroll or zoom 2015-03-06 12:16:05 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin thorton oldest_to_newest 1074748 0 bdakin 2015-03-05 16:40:18 -0800 After http://trac.webkit.org/changeset/180782 DD popovers are not dismissing on scroll. rdar://problem/20059224 1074753 1 248019 bdakin 2015-03-05 16:47:04 -0800 Created attachment 248019 Patch 1075037 2 248082 bdakin 2015-03-06 11:46:31 -0800 Created attachment 248082 Patch with a different approach 1075042 3 248082 thorton 2015-03-06 11:51:24 -0800 Comment on attachment 248082 Patch with a different approach View in context: https://bugs.webkit.org/attachment.cgi?id=248082&action=review > Source/WebKit2/UIProcess/API/mac/WKView.mm:4416 > + if ([_data->_immediateActionController hasActiveImmediateAction]) { I wonder if we should do if isKey OR the other thing, because I somewhat fear our ability to keep track of hasActiveImmediateAction 1075050 4 248086 bdakin 2015-03-06 12:10:17 -0800 Created attachment 248086 Patch 1075052 5 bdakin 2015-03-06 12:16:05 -0800 http://trac.webkit.org/changeset/181176 Thanks Tim! 248019 2015-03-05 16:47:04 -0800 2015-03-06 11:46:31 -0800 Patch for-review.txt text/plain 8362 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTExNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDE1LTAzLTA1ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTgwNzgyKTog RGF0YSBEZXRlY3RvciBwb3BvdmVycyBhcmUgbm90IGRpc21pc3NlZCBvbiBzY3JvbGwgb3Igem9v bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMzcx CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjAw NTkyMjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIGFkZHMgYSBuZXcgV0tWaWV3UHJpdmF0ZSBtZXRob2QgY2FsbGVkIAorICAgICAg ICBfZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93czooQk9PTClmb3JLZXlXaW5kb3dz T25seS4gVGhpcyBhbGxvd3MgdGhlIAorICAgICAgICBvcmlnaW5hbCBfZGlzbWlzc0NvbnRlbnRS ZWxhdGl2ZUNoaWxkV2luZG93cyBtZXRob2QgdG8gcmV0YWluIGl0cyBvcmlnaW5hbCAKKyAgICAg ICAgYmVoYXZpb3IgYmVmb3JlIHRoZSBjaGFuZ2UgdGhhdCBjYXVzZWQgdGhpcyByZWdyZXNzaW9u LiBUaGUgbmV3IG1ldGhvZCB3aWxsIGNoZWNrIAorICAgICAgICB0byBlbnN1cmUgdGhhdCB0aGUg d2luZG93IGlzIGtleSBpZiBmb3JLZXlXaW5kb3dzT25seSBpcyBzZXQgdG8gWUVTLiAKKworICAg ICAgICBOZXcgbWV0aG9kLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJp dmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKworICAgICAg ICBUaGlzIGNhbGxlciBvZiBfZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93czogc2hv dWxkIG9ubHkgYmUgYWxsb3dlZCBmb3IgCisgICAgICAgIGtleVdpbmRvd3MuCisgICAgICAgICgt W1dLVmlldyB2aWV3RGlkTW92ZVRvV2luZG93XSk6CisKKyAgICAgICAgQ29uc29saWRhdGUgaW1w bGVtZW50YXRpb25zLgorICAgICAgICAoLVtXS1ZpZXcgX2Rpc21pc3NDb250ZW50UmVsYXRpdmVD aGlsZFdpbmRvd3NdKToKKyAgICAgICAgKC1bV0tWaWV3IF9kaXNtaXNzQ29udGVudFJlbGF0aXZl Q2hpbGRXaW5kb3dzOl0pOgorCisgICAgICAgIE5ldyBvcHRpb25hbCBwYXJhbWV0ZXIgdG8gZXhw b3NlIHRoZSBuZXcgZnVuY3Rpb25hbGl0eSBwcm92aWRlZCBieSB0aGUgc2Vjb25kIAorICAgICAg ICBXS1ZpZXcgbWV0aG9kLiBJdCBkZWZhdWx0cyB0byBmYWxzZSB3aGljaCByZXRhaW5zIHRoZSBv cmlnaW5hbCBiZWhhdmlvci4KKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1w bDo6ZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93cyk6CisKKyAgICAgICAgVGhlc2Ug Y2FsbGVycyBvZiBkaXNtaXNzQ29udGVudFJlbGF0aXZlQ2hpbGRXaW5kb3dzIHNob3VsZCBvbmx5 IGJlIGFsbG93ZWQgZm9yIAorICAgICAgICBrZXlXaW5kb3dzLgorICAgICAgICAoV2ViS2l0OjpQ YWdlQ2xpZW50SW1wbDo6bmF2aWdhdGlvbkdlc3R1cmVEaWRCZWdpbik6CisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpy ZXNldFN0YXRlQWZ0ZXJQcm9jZXNzRXhpdGVkKToKKwogMjAxNS0wMy0wNSAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFdLV2ViVmlldyBFbmNvZGVyIGZv ciByZW1vdGUgb2JqZWN0IGNvbW11bmljYXRpb24gZG9lcyBub3QgaW1wbGVtZW50IGVuY29kZUlu dDMyOmZvcktleToKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAkocmV2 aXNpb24gMTgxMDg0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAko d29ya2luZyBjb3B5KQpAQCAtMjI2LDcgKzIyNiw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgcGx1Z2luRm9jdXNPcldpbmRvd0ZvY3VzQ2hhbmdlZCh1aW50NjRfdCBwbHVnaW5Db21wbGV4 VGV4dElucHV0SWRlbnRpZmllciwgYm9vbCBwbHVnaW5IYXNGb2N1c0FuZFdpbmRvd0hhc0ZvY3Vz KSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldFBsdWdpbkNvbXBsZXhUZXh0SW5wdXRTdGF0ZSh1 aW50NjRfdCBwbHVnaW5Db21wbGV4VGV4dElucHV0SWRlbnRpZmllciwgUGx1Z2luQ29tcGxleFRl eHRJbnB1dFN0YXRlKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZFBlcmZvcm1EaWN0aW9uYXJ5 TG9va3VwKGNvbnN0IERpY3Rpb25hcnlQb3B1cEluZm8mKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lk IGRpc21pc3NDb250ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3MoKSA9IDA7CisgICAgdmlydHVhbCB2 b2lkIGRpc21pc3NDb250ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3MoYm9vbCBmb3JLZXlXaW5kb3dz T25seSA9IGZhbHNlKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHNob3dDb3JyZWN0aW9uUGFuZWwo V2ViQ29yZTo6QWx0ZXJuYXRpdmVUZXh0VHlwZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBi b3VuZGluZ0JveE9mUmVwbGFjZWRTdHJpbmcsIGNvbnN0IFN0cmluZyYgcmVwbGFjZWRTdHJpbmcs IGNvbnN0IFN0cmluZyYgcmVwbGFjZW1lbnRTdHJpbmcsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBh bHRlcm5hdGl2ZVJlcGxhY2VtZW50U3RyaW5ncykgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaXNt aXNzQ29ycmVjdGlvblBhbmVsKFdlYkNvcmU6OlJlYXNvbkZvckRpc21pc3NpbmdBbHRlcm5hdGl2 ZVRleHQpID0gMDsKICAgICB2aXJ0dWFsIFN0cmluZyBkaXNtaXNzQ29ycmVjdGlvblBhbmVsU29v bihXZWJDb3JlOjpSZWFzb25Gb3JEaXNtaXNzaW5nQWx0ZXJuYXRpdmVUZXh0KSA9IDA7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTgx MDg0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI4MjUsNyArMjgyNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDb21t aXRMb2FkRm9yRnJhbWUKICAgICAvLyBGSVhNRSAoYnVnIDU5MTExKTogZGlkQ29tbWl0TG9hZEZv ckZyYW1lIGNvbWVzIHRvbyBsYXRlIHdoZW4gcmVzdG9yaW5nIGEgcGFnZSBmcm9tIGIvZiBjYWNo ZSwgbWFraW5nIHVzIGRpc2FibGUgc2VjdXJlIGV2ZW50IG1vZGUgaW4gcGFzc3dvcmQgZmllbGRz LgogICAgIC8vIEZJWE1FOiBBIGxvYWQgZ29pbmcgb24gaW4gb25lIGZyYW1lIHNob3VsZG4ndCBh ZmZlY3QgdGV4dCBlZGl0aW5nIGluIG90aGVyIGZyYW1lcyBvbiB0aGUgcGFnZS4KICAgICBtX3Bh Z2VDbGllbnQucmVzZXRTZWN1cmVJbnB1dFN0YXRlKCk7Ci0gICAgbV9wYWdlQ2xpZW50LmRpc21p c3NDb250ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3MoKTsKKyAgICBtX3BhZ2VDbGllbnQuZGlzbWlz c0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93cyh0cnVlKTsKICNlbmRpZgogCiAgICAgY2xlYXJM b2FkRGVwZW5kZW50Q2FsbGJhY2tzKCk7CkBAIC00NzczLDcgKzQ3NzMsNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6cmVzZXRTdGF0ZUFmdGVyUHJvY2VzCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1B QykKLSAgICBtX3BhZ2VDbGllbnQuZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93cygp OworICAgIG1fcGFnZUNsaWVudC5kaXNtaXNzQ29udGVudFJlbGF0aXZlQ2hpbGRXaW5kb3dzKHRy dWUpOwogI2VuZGlmCiAKICAgICBQYWdlTG9hZFN0YXRlOjpUcmFuc2FjdGlvbiB0cmFuc2FjdGlv biA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ZpZXdQcml2YXRlLmgJKHJldmlzaW9uIDE4 MTA4NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0 ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzksNiArMTM5LDcgQEAKIC0gKHZvaWQpX2NvbXBsZXRl SW1tZWRpYXRlQWN0aW9uQW5pbWF0aW9uOwogCiAtICh2b2lkKV9kaXNtaXNzQ29udGVudFJlbGF0 aXZlQ2hpbGRXaW5kb3dzOworLSAodm9pZClfZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2lu ZG93czooQk9PTClmb3JLZXlXaW5kb3dzT25seTsKIAogLSAodm9pZClfZGlkQ2hhbmdlQ29udGVu dFNpemU6KE5TU2l6ZSluZXdTaXplOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZpc2lvbiAxODEwODQpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTI2MTQs NyArMjYxNCw3IEBAIC0gKHZvaWQpdmlld0RpZE1vdmVUb1dpbmRvdwogICAgICAgICBbTlNFdmVu dCByZW1vdmVNb25pdG9yOl9kYXRhLT5fZmxhZ3NDaGFuZ2VkRXZlbnRNb25pdG9yXTsKICAgICAg ICAgX2RhdGEtPl9mbGFnc0NoYW5nZWRFdmVudE1vbml0b3IgPSBuaWw7CiAKLSAgICAgICAgW3Nl bGYgX2Rpc21pc3NDb250ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3NdOworICAgICAgICBbc2VsZiBf ZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93czpZRVNdOwogCiAjaWYgX19NQUNfT1Nf WF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKICAgICAgICAgaWYgKF9kYXRhLT5faW1t ZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIpCkBAIC00NDEyLDggKzQ0MTIsMTMgQEAgLSAo dm9pZClfZGlkQ2hhbmdlQ29udGVudFNpemU6KE5TU2l6ZSluZQogCiAtICh2b2lkKV9kaXNtaXNz Q29udGVudFJlbGF0aXZlQ2hpbGRXaW5kb3dzCiB7CisgICAgW3NlbGYgX2Rpc21pc3NDb250ZW50 UmVsYXRpdmVDaGlsZFdpbmRvd3M6Tk9dOworfQorCistICh2b2lkKV9kaXNtaXNzQ29udGVudFJl bGF0aXZlQ2hpbGRXaW5kb3dzOihCT09MKWZvcktleVdpbmRvd3NPbmx5Cit7CiAgICAgLy8gRklY TUU6IFdlIGRvbid0IGtub3cgd2hpY2ggcGFuZWwgd2UgYXJlIGRpc21pc3NpbmcsIGl0IG1heSBu b3QgZXZlbiBiZSBpbiB0aGUgY3VycmVudCBwYWdlIChzZWUgPHJkYXI6Ly9wcm9ibGVtLzEzODc1 NzY2PikuCi0gICAgaWYgKFtbc2VsZiB3aW5kb3ddIGlzS2V5V2luZG93XSkgeworICAgIGlmICgh Zm9yS2V5V2luZG93c09ubHkgfHwgW1tzZWxmIHdpbmRvd10gaXNLZXlXaW5kb3ddKSB7CiAgICAg ICAgIGlmIChDbGFzcyBsb29rdXBEZWZpbml0aW9uTW9kdWxlQ2xhc3MgPSBnZXRMVUxvb2t1cERl ZmluaXRpb25Nb2R1bGVDbGFzcygpKQogICAgICAgICAgICAgW2xvb2t1cERlZmluaXRpb25Nb2R1 bGVDbGFzcyBoaWRlRGVmaW5pdGlvbl07CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvUGFnZUNsaWVudEltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLmgJKHJldmlzaW9uIDE4MTA4NCkKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaAkod29ya2luZyBjb3B5KQpAQCAt MTQyLDcgKzE0Miw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIG1ha2VGaXJzdFJlc3Bv bmRlcigpIG92ZXJyaWRlOwogICAgIAogICAgIHZpcnR1YWwgdm9pZCBkaWRQZXJmb3JtRGljdGlv bmFyeUxvb2t1cChjb25zdCBEaWN0aW9uYXJ5UG9wdXBJbmZvJikgb3ZlcnJpZGU7Ci0gICAgdmly dHVhbCB2b2lkIGRpc21pc3NDb250ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3MoKSBvdmVycmlkZTsK KyAgICB2aXJ0dWFsIHZvaWQgZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93cyhib29s IGZvcktleVdpbmRvd3NPbmx5ID0gZmFsc2UpIG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCB2b2lk IHNob3dDb3JyZWN0aW9uUGFuZWwoV2ViQ29yZTo6QWx0ZXJuYXRpdmVUZXh0VHlwZSwgY29uc3Qg V2ViQ29yZTo6RmxvYXRSZWN0JiBib3VuZGluZ0JveE9mUmVwbGFjZWRTdHJpbmcsIGNvbnN0IFN0 cmluZyYgcmVwbGFjZWRTdHJpbmcsIGNvbnN0IFN0cmluZyYgcmVwbGFjZW1lbnRTdHJpbmcsIGNv bnN0IFZlY3RvcjxTdHJpbmc+JiBhbHRlcm5hdGl2ZVJlcGxhY2VtZW50U3RyaW5ncykgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCB2b2lkIGRpc21pc3NDb3JyZWN0aW9uUGFuZWwoV2ViQ29yZTo6UmVh c29uRm9yRGlzbWlzc2luZ0FsdGVybmF0aXZlVGV4dCkgb3ZlcnJpZGU7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0JKHJldmlzaW9uIDE4 MTA4NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0J KHdvcmtpbmcgY29weSkKQEAgLTU3Nyw5ICs1NzcsOSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpk aWRQZXJmb3JtRGljdGlvbmFyCiAgICAgICAgIFtnZXRMVUxvb2t1cERlZmluaXRpb25Nb2R1bGVD bGFzcygpIHNob3dEZWZpbml0aW9uRm9yVGVybTpkaWN0aW9uYXJ5UG9wdXBJbmZvLmF0dHJpYnV0 ZWRTdHJpbmcuc3RyaW5nLmdldCgpIGF0TG9jYXRpb246dGV4dEJhc2VsaW5lT3JpZ2luIG9wdGlv bnM6bXV0YWJsZU9wdGlvbnMuZ2V0KCldOwogfQogCi12b2lkIFBhZ2VDbGllbnRJbXBsOjpkaXNt aXNzQ29udGVudFJlbGF0aXZlQ2hpbGRXaW5kb3dzKCkKK3ZvaWQgUGFnZUNsaWVudEltcGw6OmRp c21pc3NDb250ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3MoYm9vbCBmb3JLZXlXaW5kb3dzT25seSkK IHsKLSAgICBbbV93a1ZpZXcgX2Rpc21pc3NDb250ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3NdOwor ICAgIFttX3drVmlldyBfZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93czpmb3JLZXlX aW5kb3dzT25seV07CiB9CiAKIHZvaWQgUGFnZUNsaWVudEltcGw6OnNob3dDb3JyZWN0aW9uUGFu ZWwoQWx0ZXJuYXRpdmVUZXh0VHlwZSB0eXBlLCBjb25zdCBGbG9hdFJlY3QmIGJvdW5kaW5nQm94 T2ZSZXBsYWNlZFN0cmluZywgY29uc3QgU3RyaW5nJiByZXBsYWNlZFN0cmluZywgY29uc3QgU3Ry aW5nJiByZXBsYWNlbWVudFN0cmluZywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGFsdGVybmF0aXZl UmVwbGFjZW1lbnRTdHJpbmdzKQpAQCAtNzA4LDcgKzcwOCw3IEBAIHZvaWQgUGFnZUNsaWVudElt cGw6OmJlZ2FuRXhpdEZ1bGxTY3JlZW4KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6bmF2aWdhdGlv bkdlc3R1cmVEaWRCZWdpbigpCiB7Ci0gICAgZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2lu ZG93cygpOworICAgIGRpc21pc3NDb250ZW50UmVsYXRpdmVDaGlsZFdpbmRvd3ModHJ1ZSk7CiAK ICNpZiBXS19BUElfRU5BQkxFRAogICAgIGlmIChtX3dlYlZpZXcpCg== 248082 2015-03-06 11:46:31 -0800 2015-03-06 12:10:41 -0800 Patch with a different approach for-review-2.txt text/plain 5095 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTE3NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTAzLTA2ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTgwNzgyKTog RGF0YSBEZXRlY3RvciBwb3BvdmVycyBhcmUgbm90IGRpc21pc3NlZCBvbiBzY3JvbGwgb3Igem9v bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMzcx CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjAw NTkyMjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIGhhcyB0aGUgV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIGtlZXAgdHJhY2sg b2Ygd2hldGhlciBvciBub3QgaXQgaGFzIAorICAgICAgICBhbiBhY3RpdmUgaW1tZWRpYXRlIGFj dGlvbi4gVGhlbiB3ZSBvbmx5IGNhbGwgaW50byBMb29rdXAgYW5kIEREIGlmIHRoaXMgV0tWaWV3 4oCZcyAKKyAgICAgICAgaW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBoYXMgYW4gYWN0aXZlIGFj dGlvbi4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgt W1dLVmlldyBfZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93c10pOgorICAgICAgICAq IFVJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmg6CisgICAgICAgICog VUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIubW06CisgICAgICAgICgt W1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBpbml0V2l0aFBhZ2U6dmlldzpyZWNvZ25pemVy Ol0pOgorICAgICAgICAoLVtXS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgd2lsbERlc3Ryb3lW aWV3Ol0pOgorICAgICAgICAoLVtXS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgX2NsZWFySW1t ZWRpYXRlQWN0aW9uU3RhdGVdKToKKyAgICAgICAgKC1bV0tJbW1lZGlhdGVBY3Rpb25Db250cm9s bGVyIGhhc0FjdGl2ZUltbWVkaWF0ZUFjdGlvbl0pOgorICAgICAgICAoLVtXS0ltbWVkaWF0ZUFj dGlvbkNvbnRyb2xsZXIgaW1tZWRpYXRlQWN0aW9uUmVjb2duaXplcldpbGxCZWdpbkFuaW1hdGlv bjpdKToKKwogMjAxNS0wMy0wNiAgSmVyZW15IEpvbmVzICA8amVyZW15akBhcHBsZS5jb20+CiAK ICAgICAgICAgU2Nyb2xsIHRvIG1ha2UgdGhlIHZpZGVvIGVsZW1lbnQgdmlzaWJsZSB3aGVuIGV4 aXRpbmcgZnVsbHNjcmVlbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW0JKHJldmlzaW9uIDE4MTE3MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDQxMyw3ICs0NDEzLDcgQEAg LSAodm9pZClfZGlkQ2hhbmdlQ29udGVudFNpemU6KE5TU2l6ZSluZQogLSAodm9pZClfZGlzbWlz c0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93cwogewogICAgIC8vIEZJWE1FOiBXZSBkb24ndCBr bm93IHdoaWNoIHBhbmVsIHdlIGFyZSBkaXNtaXNzaW5nLCBpdCBtYXkgbm90IGV2ZW4gYmUgaW4g dGhlIGN1cnJlbnQgcGFnZSAoc2VlIDxyZGFyOi8vcHJvYmxlbS8xMzg3NTc2Nj4pLgotICAgIGlm IChbW3NlbGYgd2luZG93XSBpc0tleVdpbmRvd10pIHsKKyAgICBpZiAoW19kYXRhLT5faW1tZWRp YXRlQWN0aW9uQ29udHJvbGxlciBoYXNBY3RpdmVJbW1lZGlhdGVBY3Rpb25dKSB7CiAgICAgICAg IGlmIChDbGFzcyBsb29rdXBEZWZpbml0aW9uTW9kdWxlQ2xhc3MgPSBnZXRMVUxvb2t1cERlZmlu aXRpb25Nb2R1bGVDbGFzcygpKQogICAgICAgICAgICAgW2xvb2t1cERlZmluaXRpb25Nb2R1bGVD bGFzcyBoaWRlRGVmaW5pdGlvbl07CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIuaAkocmV2aXNp b24gMTgxMTcwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFj dGlvbkNvbnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsOCBAQCBAaW50ZXJm YWNlIFdLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciA6CiAgICAgQk9PTCBfaGFzQWN0aXZhdGVk QWN0aW9uQ29udGV4dDsKICAgICBSZXRhaW5QdHI8RERBY3Rpb25Db250ZXh0PiBfY3VycmVudEFj dGlvbkNvbnRleHQ7CiAgICAgUmV0YWluUHRyPFFMUHJldmlld01lbnVJdGVtPiBfY3VycmVudFFM UHJldmlld01lbnVJdGVtOworCisgICAgQk9PTCBfaGFzQWN0aXZlSW1tZWRpYXRlQWN0aW9uOwog fQogCiAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQYWdlOihXZWJLaXQ6OldlYlBhZ2VQcm94eSYp cGFnZSB2aWV3OihXS1ZpZXcgKil3a1ZpZXcgcmVjb2duaXplcjooTlNJbW1lZGlhdGVBY3Rpb25H ZXN0dXJlUmVjb2duaXplciAqKWltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXI7CkBAIC02OSw2ICs3 MSw3IEBAIEBpbnRlcmZhY2UgV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIDoKIC0gKHZvaWQp ZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0Oihjb25zdCBXZWJLaXQ6OkFjdGlvbk1lbnVIaXRU ZXN0UmVzdWx0JiloaXRUZXN0UmVzdWx0IHVzZXJEYXRhOihBUEk6Ok9iamVjdCopdXNlckRhdGE7 CiAtICh2b2lkKXdrVmlldzooV0tWaWV3ICopd2tWaWV3IHdpbGxIYW5kbGVNb3VzZURvd246KE5T RXZlbnQgKilldmVudDsKIC0gKHZvaWQpZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93 czsKKy0gKEJPT0wpaGFzQWN0aXZlSW1tZWRpYXRlQWN0aW9uOwogCiBAZW5kCiAKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVB Y3Rpb25Db250cm9sbGVyLm1tCShyZXZpc2lvbiAxODExNzApCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5 KQpAQCAtNjYsNiArNjYsNyBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQYWdlOihXZWJQYWdl UHJvCiAgICAgX3drVmlldyA9IHdrVmlldzsKICAgICBfdHlwZSA9IGtXS0ltbWVkaWF0ZUFjdGlv bk5vbmU7CiAgICAgX2ltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXIgPSBpbW1lZGlhdGVBY3Rpb25S ZWNvZ25pemVyOworICAgIF9oYXNBY3RpdmVJbW1lZGlhdGVBY3Rpb24gPSBOTzsKIAogICAgIHJl dHVybiBzZWxmOwogfQpAQCAtODQsNiArODUsNyBAQCAtICh2b2lkKXdpbGxEZXN0cm95Vmlldzoo V0tWaWV3ICopdmlldwogCiAgICAgX2ltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXIgPSBuaWw7CiAg ICAgX2N1cnJlbnRBY3Rpb25Db250ZXh0ID0gbmlsOworICAgIF9oYXNBY3RpdmVJbW1lZGlhdGVB Y3Rpb24gPSBOTzsKIH0KIAogLSAodm9pZCl3a1ZpZXc6KFdLVmlldyAqKXdrVmlldyB3aWxsSGFu ZGxlTW91c2VEb3duOihOU0V2ZW50ICopZXZlbnQKQEAgLTEyMiw2ICsxMjQsNyBAQCAtICh2b2lk KV9jbGVhckltbWVkaWF0ZUFjdGlvblN0YXRlCiAgICAgX2N1cnJlbnRBY3Rpb25Db250ZXh0ID0g bmlsOwogICAgIF91c2VyRGF0YSA9IG5pbDsKICAgICBfY3VycmVudFFMUHJldmlld01lbnVJdGVt ID0gbmlsOworICAgIF9oYXNBY3RpdmVJbW1lZGlhdGVBY3Rpb24gPSBOTzsKIH0KIAogLSAodm9p ZClkaWRQZXJmb3JtQWN0aW9uTWVudUhpdFRlc3Q6KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0UmVz dWx0JiloaXRUZXN0UmVzdWx0IHVzZXJEYXRhOihBUEk6Ok9iamVjdCopdXNlckRhdGEKQEAgLTE0 Niw2ICsxNDksMTEgQEAgLSAodm9pZClkaXNtaXNzQ29udGVudFJlbGF0aXZlQ2hpbGRXaW5kbwog ICAgIFtfY3VycmVudFFMUHJldmlld01lbnVJdGVtIGNsb3NlXTsKIH0KIAorLSAoQk9PTCloYXNB Y3RpdmVJbW1lZGlhdGVBY3Rpb24KK3sKKyAgICByZXR1cm4gX2hhc0FjdGl2ZUltbWVkaWF0ZUFj dGlvbjsKK30KKwogI3ByYWdtYSBtYXJrIE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6 ZXJEZWxlZ2F0ZQogCiAtICh2b2lkKWltbWVkaWF0ZUFjdGlvblJlY29nbml6ZXJXaWxsUHJlcGFy ZTooTlNJbW1lZGlhdGVBY3Rpb25HZXN0dXJlUmVjb2duaXplciAqKWltbWVkaWF0ZUFjdGlvblJl Y29nbml6ZXIKQEAgLTE3Myw2ICsxODEsOCBAQCAtICh2b2lkKWltbWVkaWF0ZUFjdGlvblJlY29n bml6ZXJXaWxsQmVnCiAgICAgaWYgKF9zdGF0ZSA9PSBJbW1lZGlhdGVBY3Rpb25TdGF0ZTo6Tm9u ZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgX2hhc0FjdGl2ZUltbWVkaWF0ZUFjdGlvbiA9IFlF UzsKKwogICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIGJlIGFibGUgdG8gY2FuY2VsIHRoaXMgaWYg dGhlIGdlc3R1cmUgcmVjb2duaXplciBpcyBjYW5jZWxsZWQuCiAgICAgLy8gRklYTUU6IENvbm5l Y3Rpb24gY2FuIGJlIG51bGwgaWYgdGhlIHByb2Nlc3MgaXMgY2xvc2VkOyB3ZSBzaG91bGQgY2xl YW4gdXAgYmV0dGVyIGluIHRoYXQgY2FzZS4KICAgICBpZiAoX3N0YXRlID09IEltbWVkaWF0ZUFj dGlvblN0YXRlOjpQZW5kaW5nKSB7Cg== 248086 2015-03-06 12:10:17 -0800 2015-03-06 12:12:07 -0800 Patch for-review-3.txt text/plain 5216 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTE3NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTAzLTA2ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTgwNzgyKTog RGF0YSBEZXRlY3RvciBwb3BvdmVycyBhcmUgbm90IGRpc21pc3NlZCBvbiBzY3JvbGwgb3Igem9v bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMzcx CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjAw NTkyMjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIGhhcyB0aGUgV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIGtlZXAgdHJhY2sg b2Ygd2hldGhlciBvciBub3QgaXQgaGFzIAorICAgICAgICBhbiBhY3RpdmUgaW1tZWRpYXRlIGFj dGlvbi4gVGhlbiB3ZSBvbmx5IGNhbGwgaW50byBMb29rdXAgYW5kIEREIGlmIHRoZSB3aW5kb3cg aXMgCisgICAgICAgIGtleSBPUiBpZiB0aGUgV0tWaWV34oCZcyBpbW1lZGlhdGVBY3Rpb25Db250 cm9sbGVyIGhhcyBhbiBhY3RpdmUgYWN0aW9uLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF9kaXNtaXNzQ29udGVudFJlbGF0aXZlQ2hp bGRXaW5kb3dzXSk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNv bnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29u dHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyIGluaXRX aXRoUGFnZTp2aWV3OnJlY29nbml6ZXI6XSk6CisgICAgICAgICgtW1dLSW1tZWRpYXRlQWN0aW9u Q29udHJvbGxlciB3aWxsRGVzdHJveVZpZXc6XSk6CisgICAgICAgICgtW1dLSW1tZWRpYXRlQWN0 aW9uQ29udHJvbGxlciBfY2xlYXJJbW1lZGlhdGVBY3Rpb25TdGF0ZV0pOgorICAgICAgICAoLVtX S0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgaGFzQWN0aXZlSW1tZWRpYXRlQWN0aW9uXSk6Cisg ICAgICAgICgtW1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBpbW1lZGlhdGVBY3Rpb25SZWNv Z25pemVyV2lsbEJlZ2luQW5pbWF0aW9uOl0pOgorCiAyMDE1LTAzLTA2ICBKZXJlbXkgSm9uZXMg IDxqZXJlbXlqQGFwcGxlLmNvbT4KIAogICAgICAgICBTY3JvbGwgdG8gbWFrZSB0aGUgdmlkZW8g ZWxlbWVudCB2aXNpYmxlIHdoZW4gZXhpdGluZyBmdWxsc2NyZWVuLgpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gMTgxMTcwKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkp CkBAIC00NDEzLDcgKzQ0MTMsMTEgQEAgLSAodm9pZClfZGlkQ2hhbmdlQ29udGVudFNpemU6KE5T U2l6ZSluZQogLSAodm9pZClfZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxkV2luZG93cwogewog ICAgIC8vIEZJWE1FOiBXZSBkb24ndCBrbm93IHdoaWNoIHBhbmVsIHdlIGFyZSBkaXNtaXNzaW5n LCBpdCBtYXkgbm90IGV2ZW4gYmUgaW4gdGhlIGN1cnJlbnQgcGFnZSAoc2VlIDxyZGFyOi8vcHJv YmxlbS8xMzg3NTc2Nj4pLgotICAgIGlmIChbW3NlbGYgd2luZG93XSBpc0tleVdpbmRvd10pIHsK KyAgICBpZiAoW1tzZWxmIHdpbmRvd10gaXNLZXlXaW5kb3ddCisjaWYgX19NQUNfT1NfWF9WRVJT SU9OX01JTl9SRVFVSVJFRCA+PSAxMDEwMDAKKyAgICB8fCBbX2RhdGEtPl9pbW1lZGlhdGVBY3Rp b25Db250cm9sbGVyIGhhc0FjdGl2ZUltbWVkaWF0ZUFjdGlvbl0KKyNlbmRpZgorICAgICkgewog ICAgICAgICBpZiAoQ2xhc3MgbG9va3VwRGVmaW5pdGlvbk1vZHVsZUNsYXNzID0gZ2V0TFVMb29r dXBEZWZpbml0aW9uTW9kdWxlQ2xhc3MoKSkKICAgICAgICAgICAgIFtsb29rdXBEZWZpbml0aW9u TW9kdWxlQ2xhc3MgaGlkZURlZmluaXRpb25dOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tJbW1lZGlhdGVBY3Rpb25Db250cm9sbGVyLmgJ KHJldmlzaW9uIDE4MTE3MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tJbW1l ZGlhdGVBY3Rpb25Db250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTYyLDYgKzYyLDggQEAg QGludGVyZmFjZSBXS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIgOgogICAgIEJPT0wgX2hhc0Fj dGl2YXRlZEFjdGlvbkNvbnRleHQ7CiAgICAgUmV0YWluUHRyPEREQWN0aW9uQ29udGV4dD4gX2N1 cnJlbnRBY3Rpb25Db250ZXh0OwogICAgIFJldGFpblB0cjxRTFByZXZpZXdNZW51SXRlbT4gX2N1 cnJlbnRRTFByZXZpZXdNZW51SXRlbTsKKworICAgIEJPT0wgX2hhc0FjdGl2ZUltbWVkaWF0ZUFj dGlvbjsKIH0KIAogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZTooV2ViS2l0OjpXZWJQYWdl UHJveHkmKXBhZ2UgdmlldzooV0tWaWV3ICopd2tWaWV3IHJlY29nbml6ZXI6KE5TSW1tZWRpYXRl QWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKilpbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyOwpAQCAt NjksNiArNzEsNyBAQCBAaW50ZXJmYWNlIFdLSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciA6CiAt ICh2b2lkKWRpZFBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdDooY29uc3QgV2ViS2l0OjpBY3Rpb25N ZW51SGl0VGVzdFJlc3VsdCYpaGl0VGVzdFJlc3VsdCB1c2VyRGF0YTooQVBJOjpPYmplY3QqKXVz ZXJEYXRhOwogLSAodm9pZCl3a1ZpZXc6KFdLVmlldyAqKXdrVmlldyB3aWxsSGFuZGxlTW91c2VE b3duOihOU0V2ZW50ICopZXZlbnQ7CiAtICh2b2lkKWRpc21pc3NDb250ZW50UmVsYXRpdmVDaGls ZFdpbmRvd3M7CistIChCT09MKWhhc0FjdGl2ZUltbWVkaWF0ZUFjdGlvbjsKIAogQGVuZAogCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLSW1tZWRpYXRlQWN0aW9uQ29udHJv bGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLSW1t ZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbQkocmV2aXNpb24gMTgxMTcwKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XS0ltbWVkaWF0ZUFjdGlvbkNvbnRyb2xsZXIubW0JKHdvcmtp bmcgY29weSkKQEAgLTY2LDYgKzY2LDcgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZToo V2ViUGFnZVBybwogICAgIF93a1ZpZXcgPSB3a1ZpZXc7CiAgICAgX3R5cGUgPSBrV0tJbW1lZGlh dGVBY3Rpb25Ob25lOwogICAgIF9pbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyID0gaW1tZWRpYXRl QWN0aW9uUmVjb2duaXplcjsKKyAgICBfaGFzQWN0aXZlSW1tZWRpYXRlQWN0aW9uID0gTk87CiAK ICAgICByZXR1cm4gc2VsZjsKIH0KQEAgLTg0LDYgKzg1LDcgQEAgLSAodm9pZCl3aWxsRGVzdHJv eVZpZXc6KFdLVmlldyAqKXZpZXcKIAogICAgIF9pbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyID0g bmlsOwogICAgIF9jdXJyZW50QWN0aW9uQ29udGV4dCA9IG5pbDsKKyAgICBfaGFzQWN0aXZlSW1t ZWRpYXRlQWN0aW9uID0gTk87CiB9CiAKIC0gKHZvaWQpd2tWaWV3OihXS1ZpZXcgKil3a1ZpZXcg d2lsbEhhbmRsZU1vdXNlRG93bjooTlNFdmVudCAqKWV2ZW50CkBAIC0xMjIsNiArMTI0LDcgQEAg LSAodm9pZClfY2xlYXJJbW1lZGlhdGVBY3Rpb25TdGF0ZQogICAgIF9jdXJyZW50QWN0aW9uQ29u dGV4dCA9IG5pbDsKICAgICBfdXNlckRhdGEgPSBuaWw7CiAgICAgX2N1cnJlbnRRTFByZXZpZXdN ZW51SXRlbSA9IG5pbDsKKyAgICBfaGFzQWN0aXZlSW1tZWRpYXRlQWN0aW9uID0gTk87CiB9CiAK IC0gKHZvaWQpZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0Oihjb25zdCBBY3Rpb25NZW51SGl0 VGVzdFJlc3VsdCYpaGl0VGVzdFJlc3VsdCB1c2VyRGF0YTooQVBJOjpPYmplY3QqKXVzZXJEYXRh CkBAIC0xNDYsNiArMTQ5LDExIEBAIC0gKHZvaWQpZGlzbWlzc0NvbnRlbnRSZWxhdGl2ZUNoaWxk V2luZG8KICAgICBbX2N1cnJlbnRRTFByZXZpZXdNZW51SXRlbSBjbG9zZV07CiB9CiAKKy0gKEJP T0wpaGFzQWN0aXZlSW1tZWRpYXRlQWN0aW9uCit7CisgICAgcmV0dXJuIF9oYXNBY3RpdmVJbW1l ZGlhdGVBY3Rpb247Cit9CisKICNwcmFnbWEgbWFyayBOU0ltbWVkaWF0ZUFjdGlvbkdlc3R1cmVS ZWNvZ25pemVyRGVsZWdhdGUKIAogLSAodm9pZClpbW1lZGlhdGVBY3Rpb25SZWNvZ25pemVyV2ls bFByZXBhcmU6KE5TSW1tZWRpYXRlQWN0aW9uR2VzdHVyZVJlY29nbml6ZXIgKilpbW1lZGlhdGVB Y3Rpb25SZWNvZ25pemVyCkBAIC0xNzMsNiArMTgxLDggQEAgLSAodm9pZClpbW1lZGlhdGVBY3Rp b25SZWNvZ25pemVyV2lsbEJlZwogICAgIGlmIChfc3RhdGUgPT0gSW1tZWRpYXRlQWN0aW9uU3Rh dGU6Ok5vbmUpCiAgICAgICAgIHJldHVybjsKIAorICAgIF9oYXNBY3RpdmVJbW1lZGlhdGVBY3Rp b24gPSBZRVM7CisKICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byBiZSBhYmxlIHRvIGNhbmNlbCB0 aGlzIGlmIHRoZSBnZXN0dXJlIHJlY29nbml6ZXIgaXMgY2FuY2VsbGVkLgogICAgIC8vIEZJWE1F OiBDb25uZWN0aW9uIGNhbiBiZSBudWxsIGlmIHRoZSBwcm9jZXNzIGlzIGNsb3NlZDsgd2Ugc2hv dWxkIGNsZWFuIHVwIGJldHRlciBpbiB0aGF0IGNhc2UuCiAgICAgaWYgKF9zdGF0ZSA9PSBJbW1l ZGlhdGVBY3Rpb25TdGF0ZTo6UGVuZGluZykgewo=