40397 2010-06-09 17:53:46 -0700 [Chromium] Add the ability to specify a separator in AutoFillPopupMenuChromium 2010-06-10 18:10:43 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 jhawkins webkit-unassigned abarth eric fishd webkit.review.bot oldest_to_newest 236109 0 jhawkins 2010-06-09 17:53:46 -0700 Will upload patch . 236110 1 58316 jhawkins 2010-06-09 17:57:27 -0700 Created attachment 58316 Patch 236159 2 58316 fishd 2010-06-09 22:25:35 -0700 Comment on attachment 58316 Patch WebKit/chromium/public/WebViewClient.h:295 + virtual void didAcceptAutoFillSuggestion(const WebNode&, perhaps you should keep the old form of this method around and make the default implementation of this method call that one? that way you won't require a two-sided patch landing to avoid regressing chrome? WebKit/chromium/src/AutoFillPopupMenuClient.cpp:63 + return suggestion; nit: indent by 4 spaces looks ok otherwise. 236436 3 58387 jhawkins 2010-06-10 10:52:23 -0700 Created attachment 58387 Patch 236437 4 jhawkins 2010-06-10 10:53:36 -0700 (In reply to comment #2) > (From update of attachment 58316 [details]) > WebKit/chromium/public/WebViewClient.h:295 > + virtual void didAcceptAutoFillSuggestion(const WebNode&, > perhaps you should keep the old form of this method around and make > the default implementation of this method call that one? that way > you won't require a two-sided patch landing to avoid regressing chrome? > I'll commit the chromium side first, which adds the new method and deprecates the old, obviating the need for the old method in the API. > WebKit/chromium/src/AutoFillPopupMenuClient.cpp:63 > + return suggestion; > nit: indent by 4 spaces > Done. 236609 5 jhawkins 2010-06-10 17:51:48 -0700 Committed r60985: <http://trac.webkit.org/changeset/60985> 236621 6 webkit.review.bot 2010-06-10 18:10:43 -0700 http://trac.webkit.org/changeset/60985 might have broken Chromium Mac Release The following changes are on the blame list: http://trac.webkit.org/changeset/60984 http://trac.webkit.org/changeset/60985 58316 2010-06-09 17:57:27 -0700 2010-06-10 10:52:19 -0700 Patch bug-40397-20100609175726.patch text/plain 10933 jhawkins SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjA5MjYpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDYtMDkgIEphbWVz IEhhd2tpbnMgIDxqaGF3a2luc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBBZGQgdGhlIGFiaWxpdHkgdG8g c3BlY2lmeSBhIHNlcGFyYXRvciBpbgorICAgICAgICBBdXRvRmlsbFBvcHVwTWVudUNsaWVudC4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzOTcK KworICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Q2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdDbGllbnQ6OmRpZEFjY2VwdEF1dG9GaWxsU3VnZ2VzdGlvbik6CisgICAgICAgICogc3Jj L0F1dG9GaWxsUG9wdXBNZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QXV0b0ZpbGxQ b3B1cE1lbnVDbGllbnQ6OmdldFN1Z2dlc3Rpb25zQ291bnQpOgorICAgICAgICAoV2ViS2l0OjpB dXRvRmlsbFBvcHVwTWVudUNsaWVudDo6Z2V0U3VnZ2VzdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OkF1dG9GaWxsUG9wdXBNZW51Q2xpZW50Ojp2YWx1ZUNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0 OjpBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6c2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAgIChX ZWJLaXQ6OkF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjppdGVtSXNTZXBhcmF0b3IpOgorICAgICAg ICAoV2ViS2l0OjpBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6aW5pdGlhbGl6ZSk6CisgICAgICAg IChXZWJLaXQ6OkF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpzZXRTdWdnZXN0aW9ucyk6CisgICAg ICAgICogc3JjL0F1dG9GaWxsUG9wdXBNZW51Q2xpZW50Lmg6CisgICAgICAgICogc3JjL1dlYlZp ZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmFwcGx5QXV0b0ZpbGxT dWdnZXN0aW9ucyk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTAtMDYtMDkg IEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0Ns aWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVu dC5oCShyZXZpc2lvbiA2MDkyMykKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0Ns aWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNzMsNyArMjczLDcgQEAgcHVibGljOgogICAgIHZp cnR1YWwgdm9pZCBkaWRVcGRhdGVJbnNwZWN0b3JTZXR0aW5nKGNvbnN0IFdlYlN0cmluZyYga2V5 LCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlKSB7IH0KIAogCi0gICAgLy8gQXV0b2ZpbGwgLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisg ICAgLy8gQXV0b0ZpbGwgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAKICAgICAvLyBRdWVyaWVzIHRoZSBicm93c2VyIGZvciBzdWdn ZXN0aW9ucyB0byBiZSBzaG93biBmb3IgdGhlIGZvcm0gdGV4dAogICAgIC8vIGZpZWxkIG5hbWVk IHxuYW1lfC4gIHx2YWx1ZXwgaXMgdGhlIHRleHQgZW50ZXJlZCBieSB0aGUgdXNlciBzbwpAQCAt MjgyLDE3ICsyODIsMjAgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBuYW1lLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiB2YWx1ZSkgeyB9CiAKLSAgICAv LyBJbnN0cnVjdHMgdGhlIGJyb3dzZXIgdG8gcmVtb3ZlIHRoZSBhdXRvZmlsbCBlbnRyeSBzcGVj aWZpZWQgZnJvbQorICAgIC8vIEluc3RydWN0cyB0aGUgYnJvd3NlciB0byByZW1vdmUgdGhlIEF1 dG9jb21wbGV0ZSBlbnRyeSBzcGVjaWZpZWQgZnJvbQogICAgIC8vIGl0cyBEQi4KKyAgICAvLyBG SVhNRTogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIG5hbWVkIHJlbW92ZUF1dG9jb21wbGV0ZVN1Z2Vz dGlvbi4KICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlQXV0b2ZpbGxTdWdnZXN0aW9ucyhjb25zdCBX ZWJTdHJpbmcmIG5hbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgV2ViU3RyaW5nJiB2YWx1ZSkgeyB9CiAKICAgICAvLyBJbmZvcm1zIHRoZSBicm93 c2VyIHRoYXQgdGhlIHVzZXIgaGFzIGFjY2VwdGVkIGFuIEF1dG9GaWxsIHN1Z2dlc3Rpb24gZm9y CiAgICAgLy8gYSBXZWJOb2RlLiAgfG5hbWV8IGFuZCB8bGFiZWx8IGZvcm0gYSBrZXkgaW50byB0 aGUgc2V0IG9mIEF1dG9GaWxsCi0gICAgLy8gcHJvZmlsZXMuCisgICAgLy8gcHJvZmlsZXMuICB8 aW5kZXh8IGlzIGFuIGluZGV4IG9mIHRoZSBzZWxlY3RlZCBzdWdnZXN0aW9uIGluIHRoZSBsaXN0 IG9mCisgICAgLy8gc3VnZ2VzdGlvbnMgcHJvdmlkZWQgYnkgdGhlIGNsaWVudAogICAgIHZpcnR1 YWwgdm9pZCBkaWRBY2NlcHRBdXRvRmlsbFN1Z2dlc3Rpb24oY29uc3QgV2ViTm9kZSYsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcm IG5hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBXZWJTdHJpbmcmIGxhYmVsKSB7IH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IFdlYlN0cmluZyYgbGFiZWwsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbmRleCkgeyB9CiAKICAgICAvLyBJ bmZvcm1zIHRoZSBicm93c2VyIHRoYXQgdGhlIHVzZXIgaGFzIHNlbGVjdGVkIGFuIEF1dG9GaWxs IHN1Z2dlc3Rpb24gZm9yCiAgICAgLy8gYSBXZWJOb2RlLiAgVGhpcyBoYXBwZW5zIHdoZW4gdGhl IHVzZXIgaG92ZXJzIG92ZXIgYSBzdWdnZXN0aW9uIG9yIHVzZXMKSW5kZXg6IFdlYktpdC9jaHJv bWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwCShyZXZpc2lvbiA2MDky MykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00NCwxNCArNDQsMjUgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHVu c2lnbmVkIEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpnZXRTdWdnZXN0aW9uc0NvdW50KCkgY29u c3QKIHsKLSAgICByZXR1cm4gbV9uYW1lcy5zaXplKCk7CisgICAgcmV0dXJuIG1fbmFtZXMuc2l6 ZSgpICsgKChtX3NlcGFyYXRvckluZGV4ID09IC0xKSA/IDAgOiAxKTsKIH0KIAogV2ViU3RyaW5n IEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpnZXRTdWdnZXN0aW9uKHVuc2lnbmVkIGxpc3RJbmRl eCkgY29uc3QKIHsKKyAgICBpZiAobGlzdEluZGV4ID09IG1fc2VwYXJhdG9ySW5kZXgpCisgICAg ICAgIHJldHVybiBXZWJTdHJpbmcoKTsKKworICAgIGlmIChtX3NlcGFyYXRvckluZGV4ICE9IC0x ICYmIGxpc3RJbmRleCA+IG1fc2VwYXJhdG9ySW5kZXgpCisgICAgICAgIC0tbGlzdEluZGV4Owor CiAgICAgLy8gRklYTUU6IE1vZGlmeSB0aGUgUG9wdXBNZW51IHRvIGFkZCB0aGUgbGFiZWwgaW4g Z3JheSByaWdodC1qdXN0aWZpZWQuCiAgICAgQVNTRVJUKGxpc3RJbmRleCA+PSAwICYmIGxpc3RJ bmRleCA8IG1fbmFtZXMuc2l6ZSgpKTsKLSAgICByZXR1cm4gbV9uYW1lc1tsaXN0SW5kZXhdICsg U3RyaW5nKCIgKCIpICsgbV9sYWJlbHNbbGlzdEluZGV4XSArIFN0cmluZygiKSIpOworCisgICAg V2ViU3RyaW5nIHN1Z2dlc3Rpb24gPSBtX25hbWVzW2xpc3RJbmRleF07CisgICAgaWYgKG1fbGFi ZWxzW2xpc3RJbmRleF0uaXNFbXB0eSgpKQorICAgICAgcmV0dXJuIHN1Z2dlc3Rpb247CisKKyAg ICByZXR1cm4gc3VnZ2VzdGlvbiArIFN0cmluZygiICgiKSArIG1fbGFiZWxzW2xpc3RJbmRleF0g KyBTdHJpbmcoIikiKTsKIH0KIAogdm9pZCBBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6cmVtb3Zl U3VnZ2VzdGlvbkF0SW5kZXgodW5zaWduZWQgbGlzdEluZGV4KQpAQCAtNjQsMjUgKzc1LDMyIEBA IHZvaWQgQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQ6OnJlbW92ZVN1Z2cKIAogdm9pZCBBdXRvRmls bFBvcHVwTWVudUNsaWVudDo6dmFsdWVDaGFuZ2VkKHVuc2lnbmVkIGxpc3RJbmRleCwgYm9vbCBm aXJlRXZlbnRzKQogewotICAgIEFTU0VSVChsaXN0SW5kZXggPj0gMCAmJiBsaXN0SW5kZXggPCBt X25hbWVzLnNpemUoKSk7Ci0KICAgICBXZWJWaWV3SW1wbCogd2ViVmlldyA9IGdldFdlYlZpZXco KTsKICAgICBpZiAoIXdlYlZpZXcpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX3NlcGFy YXRvckluZGV4ICE9IC0xICYmIGxpc3RJbmRleCA+IG1fc2VwYXJhdG9ySW5kZXgpCisgICAgICAg IC0tbGlzdEluZGV4OworCisgICAgQVNTRVJUKGxpc3RJbmRleCA+PSAwICYmIGxpc3RJbmRleCA8 IG1fbmFtZXMuc2l6ZSgpKTsKKwogICAgIHdlYlZpZXctPmNsaWVudCgpLT5kaWRBY2NlcHRBdXRv RmlsbFN1Z2dlc3Rpb24oV2ViTm9kZShnZXRUZXh0RmllbGQoKSksCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX25hbWVzW2xpc3RJbmRleF0sCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2xhYmVs c1tsaXN0SW5kZXhdKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1fbGFiZWxzW2xpc3RJbmRleF0sCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBsaXN0SW5kZXgpOwogfQogCiB2b2lkIEF1dG9GaWxs UG9wdXBNZW51Q2xpZW50OjpzZWxlY3Rpb25DaGFuZ2VkKHVuc2lnbmVkIGxpc3RJbmRleCwgYm9v bCBmaXJlRXZlbnRzKQogewotICAgIEFTU0VSVChsaXN0SW5kZXggPj0gMCAmJiBsaXN0SW5kZXgg PCBtX25hbWVzLnNpemUoKSk7Ci0KICAgICBXZWJWaWV3SW1wbCogd2ViVmlldyA9IGdldFdlYlZp ZXcoKTsKICAgICBpZiAoIXdlYlZpZXcpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX3Nl cGFyYXRvckluZGV4ICE9IC0xICYmIGxpc3RJbmRleCA+IG1fc2VwYXJhdG9ySW5kZXgpCisgICAg ICAgIC0tbGlzdEluZGV4OworCisgICAgQVNTRVJUKGxpc3RJbmRleCA+PSAwICYmIGxpc3RJbmRl eCA8IG1fbmFtZXMuc2l6ZSgpKTsKKwogICAgIHdlYlZpZXctPmNsaWVudCgpLT5kaWRTZWxlY3RB dXRvRmlsbFN1Z2dlc3Rpb24oV2ViTm9kZShnZXRUZXh0RmllbGQoKSksCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX25hbWVzW2xpc3RJbmRleF0s CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2xh YmVsc1tsaXN0SW5kZXhdKTsKQEAgLTEwOCwyNiArMTI2LDMzIEBAIHZvaWQgQXV0b0ZpbGxQb3B1 cE1lbnVDbGllbnQ6OnBvcHVwRGlkSGkKICAgICB3ZWJWaWV3LT5jbGllbnQoKS0+ZGlkQ2xlYXJB dXRvRmlsbFNlbGVjdGlvbihXZWJOb2RlKGdldFRleHRGaWVsZCgpKSk7CiB9CiAKK2Jvb2wgQXV0 b0ZpbGxQb3B1cE1lbnVDbGllbnQ6Oml0ZW1Jc1NlcGFyYXRvcih1bnNpZ25lZCBsaXN0SW5kZXgp IGNvbnN0Cit7CisgICAgcmV0dXJuIChtX3NlcGFyYXRvckluZGV4ICE9IC0xICYmIG1fc2VwYXJh dG9ySW5kZXggPT0gbGlzdEluZGV4KTsKK30KKwogdm9pZCBBdXRvRmlsbFBvcHVwTWVudUNsaWVu dDo6aW5pdGlhbGl6ZSgKICAgICBIVE1MSW5wdXRFbGVtZW50KiB0ZXh0RmllbGQsCiAgICAgY29u c3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIG5hbWVzLAogICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJT dHJpbmc+JiBsYWJlbHMsCi0gICAgaW50IGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgpCisgICAgaW50 IHNlcGFyYXRvckluZGV4KQogewogICAgIEFTU0VSVChuYW1lcy5zaXplKCkgPT0gbGFiZWxzLnNp emUoKSk7Ci0gICAgQVNTRVJUKGRlZmF1bHRTdWdnZXN0aW9uSW5kZXggPCBzdGF0aWNfY2FzdDxp bnQ+KG5hbWVzLnNpemUoKSkpOworICAgIEFTU0VSVChzZXBhcmF0b3JJbmRleCA8IHN0YXRpY19j YXN0PGludD4obmFtZXMuc2l6ZSgpKSk7CiAKICAgICAvLyBUaGUgc3VnZ2VzdGlvbnMgbXVzdCBi ZSBzZXQgYmVmb3JlIGluaXRpYWxpemluZyB0aGUKICAgICAvLyBTdWdnZXN0aW9uc1BvcHVwTWVu dUNsaWVudC4KLSAgICBzZXRTdWdnZXN0aW9ucyhuYW1lcywgbGFiZWxzKTsKKyAgICBzZXRTdWdn ZXN0aW9ucyhuYW1lcywgbGFiZWxzLCBzZXBhcmF0b3JJbmRleCk7CiAKLSAgICBTdWdnZXN0aW9u c1BvcHVwTWVudUNsaWVudDo6aW5pdGlhbGl6ZSh0ZXh0RmllbGQsIGRlZmF1bHRTdWdnZXN0aW9u SW5kZXgpOworICAgIFN1Z2dlc3Rpb25zUG9wdXBNZW51Q2xpZW50Ojppbml0aWFsaXplKHRleHRG aWVsZCwgLTEpOwogfQogCiB2b2lkIEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpzZXRTdWdnZXN0 aW9ucyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbmFtZXMsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYg bGFiZWxzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIGxhYmVscywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGludCBzZXBhcmF0b3JJbmRleCkKIHsKICAgICBBU1NFUlQo bmFtZXMuc2l6ZSgpID09IGxhYmVscy5zaXplKCkpOworICAgIEFTU0VSVChzZXBhcmF0b3JJbmRl eCA8IHN0YXRpY19jYXN0PGludD4obmFtZXMuc2l6ZSgpKSk7CiAKICAgICBtX25hbWVzLmNsZWFy KCk7CiAgICAgbV9sYWJlbHMuY2xlYXIoKTsKQEAgLTEzNiw2ICsxNjEsOCBAQCB2b2lkIEF1dG9G aWxsUG9wdXBNZW51Q2xpZW50OjpzZXRTdWdnZXN0CiAgICAgICAgIG1fbGFiZWxzLmFwcGVuZChs YWJlbHNbaV0pOwogICAgIH0KIAorICAgIG1fc2VwYXJhdG9ySW5kZXggPSBzZXBhcmF0b3JJbmRl eDsKKwogICAgIC8vIFRyeSB0byBwcmVzZXJ2ZSBzZWxlY3Rpb24gaWYgcG9zc2libGUuCiAgICAg aWYgKGdldFNlbGVjdGVkSW5kZXgoKSA+PSBzdGF0aWNfY2FzdDxpbnQ+KG5hbWVzLnNpemUoKSkp CiAgICAgICAgIHNldFNlbGVjdGVkSW5kZXgoLTEpOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3Ny Yy9BdXRvRmlsbFBvcHVwTWVudUNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1 bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuaAkocmV2aXNpb24gNjA5MjMpCisrKyBXZWJL aXQvY2hyb21pdW0vc3JjL0F1dG9GaWxsUG9wdXBNZW51Q2xpZW50LmgJKHdvcmtpbmcgY29weSkK QEAgLTU1LDE4ICs1NSwyMyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNlbGVjdGlvbkNo YW5nZWQodW5zaWduZWQgbGlzdEluZGV4LCBib29sIGZpcmVFdmVudHMgPSB0cnVlKTsKICAgICB2 aXJ0dWFsIHZvaWQgc2VsZWN0aW9uQ2xlYXJlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBwb3B1cERp ZEhpZGUoKTsKKyAgICB2aXJ0dWFsIGJvb2wgaXRlbUlzU2VwYXJhdG9yKHVuc2lnbmVkIGxpc3RJ bmRleCkgY29uc3Q7CiAKICAgICB2b2lkIGluaXRpYWxpemUoV2ViQ29yZTo6SFRNTElucHV0RWxl bWVudCosCiAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBu YW1lcywKICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIGxh YmVscywKLSAgICAgICAgICAgICAgICAgICAgaW50IGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgpOwor ICAgICAgICAgICAgICAgICAgICBpbnQgc2VwYXJhdG9ySW5kZXgpOwogCiAgICAgdm9pZCBzZXRT dWdnZXN0aW9ucyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbmFtZXMsCi0gICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbGFiZWxzKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBsYWJlbHMsCisg ICAgICAgICAgICAgICAgICAgICAgICBpbnQgc2VwYXJhdG9ySW5kZXgpOwogCiBwcml2YXRlOgog ICAgIFZlY3RvcjxXZWJDb3JlOjpTdHJpbmc+IG1fbmFtZXM7CiAgICAgVmVjdG9yPFdlYkNvcmU6 OlN0cmluZz4gbV9sYWJlbHM7CisKKyAgICAvLyBUaGUgaW5kZXggb2YgdGhlIHNlcGFyYXRvci4g IC0xIGlmIHRoZXJlIGlzIG5vIHNlcGFyYXRvci4KKyAgICBpbnQgbV9zZXBhcmF0b3JJbmRleDsK IH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAJKHJldmlzaW9uIDYwOTIzKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3ODYsMTAgKzE3ODYsMTAgQEAgdm9pZCBXZWJW aWV3SW1wbDo6YXBwbHlBdXRvRmlsbFN1Z2dlc3RpbwogICAgIGNvbnN0IFdlYk5vZGUmIG5vZGUs CiAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIG5hbWVzLAogICAgIGNvbnN0IFdlYlZl Y3RvcjxXZWJTdHJpbmc+JiBsYWJlbHMsCi0gICAgaW50IGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgp CisgICAgaW50IHNlcGFyYXRvckluZGV4KQogewogICAgIEFTU0VSVChuYW1lcy5zaXplKCkgPT0g bGFiZWxzLnNpemUoKSk7Ci0gICAgQVNTRVJUKGRlZmF1bHRTdWdnZXN0aW9uSW5kZXggPCBzdGF0 aWNfY2FzdDxpbnQ+KG5hbWVzLnNpemUoKSkpOworICAgIEFTU0VSVChzZXBhcmF0b3JJbmRleCA8 IHN0YXRpY19jYXN0PGludD4obmFtZXMuc2l6ZSgpKSk7CiAKICAgICBpZiAobmFtZXMuaXNFbXB0 eSgpKSB7CiAgICAgICAgIGhpZGVTdWdnZXN0aW9uc1BvcHVwKCk7CkBAIC0xODE0LDcgKzE4MTQs NyBAQCB2b2lkIFdlYlZpZXdJbXBsOjphcHBseUF1dG9GaWxsU3VnZ2VzdGlvCiAgICAgICAgIG1f YXV0b0ZpbGxQb3B1cENsaWVudC5zZXQobmV3IEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50KTsKIAog ICAgIG1fYXV0b0ZpbGxQb3B1cENsaWVudC0+aW5pdGlhbGl6ZShpbnB1dEVsZW0sIG5hbWVzLCBs YWJlbHMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHRTdWdn ZXN0aW9uSW5kZXgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXBh cmF0b3JJbmRleCk7CiAKICAgICBpZiAobV9zdWdnZXN0aW9uc1BvcHVwQ2xpZW50ICE9IG1fYXV0 b0ZpbGxQb3B1cENsaWVudC5nZXQoKSkgewogICAgICAgICBoaWRlU3VnZ2VzdGlvbnNQb3B1cCgp OwpAQCAtMTgzMSw3ICsxODMxLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6YXBwbHlBdXRvRmlsbFN1 Z2dlc3RpbwogICAgICAgICBtX3N1Z2dlc3Rpb25zUG9wdXAgPSBtX2F1dG9GaWxsUG9wdXAuZ2V0 KCk7CiAKICAgICBpZiAobV9zdWdnZXN0aW9uc1BvcHVwU2hvd2luZykgewotICAgICAgICBtX2F1 dG9GaWxsUG9wdXBDbGllbnQtPnNldFN1Z2dlc3Rpb25zKG5hbWVzLCBsYWJlbHMpOworICAgICAg ICBtX2F1dG9GaWxsUG9wdXBDbGllbnQtPnNldFN1Z2dlc3Rpb25zKG5hbWVzLCBsYWJlbHMsIHNl cGFyYXRvckluZGV4KTsKICAgICAgICAgcmVmcmVzaFN1Z2dlc3Rpb25zUG9wdXAoKTsKICAgICB9 IGVsc2UgewogICAgICAgICBtX3N1Z2dlc3Rpb25zUG9wdXAtPnNob3coZm9jdXNlZE5vZGUtPmdl dFJlY3QoKSwKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgJKHJldmlzaW9uIDYwOTIz KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNjYsNyArMTY2LDcgQEAgcHVibGljOgogICAgICAgICBjb25zdCBXZWJOb2RlJiwKICAgICAg ICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIG5hbWVzLAogICAgICAgICBjb25zdCBXZWJW ZWN0b3I8V2ViU3RyaW5nPiYgbGFiZWxzLAotICAgICAgICBpbnQgZGVmYXVsdFN1Z2dlc3Rpb25J bmRleCk7CisgICAgICAgIGludCBzZXBhcmF0b3JJbmRleCk7CiAgICAgdmlydHVhbCB2b2lkIGFw cGx5QXV0b2NvbXBsZXRlU3VnZ2VzdGlvbnMoCiAgICAgICAgIGNvbnN0IFdlYk5vZGUmLAogICAg ICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgc3VnZ2VzdGlvbnMsCg== 58387 2010-06-10 10:52:23 -0700 2010-06-10 15:07:12 -0700 Patch bug-40397-20100610105222.patch text/plain 11311 jhawkins SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjA5MjYpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDYtMDkgIEphbWVz IEhhd2tpbnMgIDxqaGF3a2luc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBBZGQgdGhlIGFiaWxpdHkgdG8g c3BlY2lmeSBhIHNlcGFyYXRvciBpbgorICAgICAgICBBdXRvRmlsbFBvcHVwTWVudUNsaWVudC4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzOTcK KworICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Q2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdDbGllbnQ6OmRpZEFjY2VwdEF1dG9GaWxsU3VnZ2VzdGlvbik6CisgICAgICAgICogc3Jj L0F1dG9GaWxsUG9wdXBNZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QXV0b0ZpbGxQ b3B1cE1lbnVDbGllbnQ6OmdldFN1Z2dlc3Rpb25zQ291bnQpOgorICAgICAgICAoV2ViS2l0OjpB dXRvRmlsbFBvcHVwTWVudUNsaWVudDo6Z2V0U3VnZ2VzdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OkF1dG9GaWxsUG9wdXBNZW51Q2xpZW50Ojp2YWx1ZUNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0 OjpBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6c2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAgIChX ZWJLaXQ6OkF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjppdGVtSXNTZXBhcmF0b3IpOgorICAgICAg ICAoV2ViS2l0OjpBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6aW5pdGlhbGl6ZSk6CisgICAgICAg IChXZWJLaXQ6OkF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpzZXRTdWdnZXN0aW9ucyk6CisgICAg ICAgICogc3JjL0F1dG9GaWxsUG9wdXBNZW51Q2xpZW50Lmg6CisgICAgICAgICogc3JjL1dlYlZp ZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmFwcGx5QXV0b0ZpbGxT dWdnZXN0aW9ucyk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTAtMDYtMDkg IEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0Ns aWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVu dC5oCShyZXZpc2lvbiA2MDkyMykKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0Ns aWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNzMsNyArMjczLDcgQEAgcHVibGljOgogICAgIHZp cnR1YWwgdm9pZCBkaWRVcGRhdGVJbnNwZWN0b3JTZXR0aW5nKGNvbnN0IFdlYlN0cmluZyYga2V5 LCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlKSB7IH0KIAogCi0gICAgLy8gQXV0b2ZpbGwgLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisg ICAgLy8gQXV0b0ZpbGwgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAKICAgICAvLyBRdWVyaWVzIHRoZSBicm93c2VyIGZvciBzdWdn ZXN0aW9ucyB0byBiZSBzaG93biBmb3IgdGhlIGZvcm0gdGV4dAogICAgIC8vIGZpZWxkIG5hbWVk IHxuYW1lfC4gIHx2YWx1ZXwgaXMgdGhlIHRleHQgZW50ZXJlZCBieSB0aGUgdXNlciBzbwpAQCAt MjgyLDE3ICsyODIsMjAgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBuYW1lLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiB2YWx1ZSkgeyB9CiAKLSAgICAv LyBJbnN0cnVjdHMgdGhlIGJyb3dzZXIgdG8gcmVtb3ZlIHRoZSBhdXRvZmlsbCBlbnRyeSBzcGVj aWZpZWQgZnJvbQorICAgIC8vIEluc3RydWN0cyB0aGUgYnJvd3NlciB0byByZW1vdmUgdGhlIEF1 dG9jb21wbGV0ZSBlbnRyeSBzcGVjaWZpZWQgZnJvbQogICAgIC8vIGl0cyBEQi4KKyAgICAvLyBG SVhNRTogVGhpcyBtZXRob2Qgc2hvdWxkIGJlIG5hbWVkIHJlbW92ZUF1dG9jb21wbGV0ZVN1Z2Vz dGlvbi4KICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlQXV0b2ZpbGxTdWdnZXN0aW9ucyhjb25zdCBX ZWJTdHJpbmcmIG5hbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgV2ViU3RyaW5nJiB2YWx1ZSkgeyB9CiAKICAgICAvLyBJbmZvcm1zIHRoZSBicm93 c2VyIHRoYXQgdGhlIHVzZXIgaGFzIGFjY2VwdGVkIGFuIEF1dG9GaWxsIHN1Z2dlc3Rpb24gZm9y CiAgICAgLy8gYSBXZWJOb2RlLiAgfG5hbWV8IGFuZCB8bGFiZWx8IGZvcm0gYSBrZXkgaW50byB0 aGUgc2V0IG9mIEF1dG9GaWxsCi0gICAgLy8gcHJvZmlsZXMuCisgICAgLy8gcHJvZmlsZXMuICB8 aW5kZXh8IGlzIGFuIGluZGV4IG9mIHRoZSBzZWxlY3RlZCBzdWdnZXN0aW9uIGluIHRoZSBsaXN0 IG9mCisgICAgLy8gc3VnZ2VzdGlvbnMgcHJvdmlkZWQgYnkgdGhlIGNsaWVudAogICAgIHZpcnR1 YWwgdm9pZCBkaWRBY2NlcHRBdXRvRmlsbFN1Z2dlc3Rpb24oY29uc3QgV2ViTm9kZSYsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJTdHJpbmcm IG5hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBXZWJTdHJpbmcmIGxhYmVsKSB7IH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IFdlYlN0cmluZyYgbGFiZWwsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbmRleCkgeyB9CiAKICAgICAvLyBJ bmZvcm1zIHRoZSBicm93c2VyIHRoYXQgdGhlIHVzZXIgaGFzIHNlbGVjdGVkIGFuIEF1dG9GaWxs IHN1Z2dlc3Rpb24gZm9yCiAgICAgLy8gYSBXZWJOb2RlLiAgVGhpcyBoYXBwZW5zIHdoZW4gdGhl IHVzZXIgaG92ZXJzIG92ZXIgYSBzdWdnZXN0aW9uIG9yIHVzZXMKSW5kZXg6IFdlYktpdC9jaHJv bWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwCShyZXZpc2lvbiA2MDky MykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00NCwxNCArNDQsMjUgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIHVu c2lnbmVkIEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpnZXRTdWdnZXN0aW9uc0NvdW50KCkgY29u c3QKIHsKLSAgICByZXR1cm4gbV9uYW1lcy5zaXplKCk7CisgICAgcmV0dXJuIG1fbmFtZXMuc2l6 ZSgpICsgKChtX3NlcGFyYXRvckluZGV4ID09IC0xKSA/IDAgOiAxKTsKIH0KIAogV2ViU3RyaW5n IEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpnZXRTdWdnZXN0aW9uKHVuc2lnbmVkIGxpc3RJbmRl eCkgY29uc3QKIHsKKyAgICBpZiAobGlzdEluZGV4ID09IG1fc2VwYXJhdG9ySW5kZXgpCisgICAg ICAgIHJldHVybiBXZWJTdHJpbmcoKTsKKworICAgIGlmIChtX3NlcGFyYXRvckluZGV4ICE9IC0x ICYmIGxpc3RJbmRleCA+IG1fc2VwYXJhdG9ySW5kZXgpCisgICAgICAgIC0tbGlzdEluZGV4Owor CiAgICAgLy8gRklYTUU6IE1vZGlmeSB0aGUgUG9wdXBNZW51IHRvIGFkZCB0aGUgbGFiZWwgaW4g Z3JheSByaWdodC1qdXN0aWZpZWQuCiAgICAgQVNTRVJUKGxpc3RJbmRleCA+PSAwICYmIGxpc3RJ bmRleCA8IG1fbmFtZXMuc2l6ZSgpKTsKLSAgICByZXR1cm4gbV9uYW1lc1tsaXN0SW5kZXhdICsg U3RyaW5nKCIgKCIpICsgbV9sYWJlbHNbbGlzdEluZGV4XSArIFN0cmluZygiKSIpOworCisgICAg V2ViU3RyaW5nIHN1Z2dlc3Rpb24gPSBtX25hbWVzW2xpc3RJbmRleF07CisgICAgaWYgKG1fbGFi ZWxzW2xpc3RJbmRleF0uaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gc3VnZ2VzdGlvbjsKKwor ICAgIHJldHVybiBzdWdnZXN0aW9uICsgU3RyaW5nKCIgKCIpICsgbV9sYWJlbHNbbGlzdEluZGV4 XSArIFN0cmluZygiKSIpOwogfQogCiB2b2lkIEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpyZW1v dmVTdWdnZXN0aW9uQXRJbmRleCh1bnNpZ25lZCBsaXN0SW5kZXgpCkBAIC02NCwyNSArNzUsMzIg QEAgdm9pZCBBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6cmVtb3ZlU3VnZwogCiB2b2lkIEF1dG9G aWxsUG9wdXBNZW51Q2xpZW50Ojp2YWx1ZUNoYW5nZWQodW5zaWduZWQgbGlzdEluZGV4LCBib29s IGZpcmVFdmVudHMpCiB7Ci0gICAgQVNTRVJUKGxpc3RJbmRleCA+PSAwICYmIGxpc3RJbmRleCA8 IG1fbmFtZXMuc2l6ZSgpKTsKLQogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3ID0gZ2V0V2ViVmll dygpOwogICAgIGlmICghd2ViVmlldykKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKG1fc2Vw YXJhdG9ySW5kZXggIT0gLTEgJiYgbGlzdEluZGV4ID4gbV9zZXBhcmF0b3JJbmRleCkKKyAgICAg ICAgLS1saXN0SW5kZXg7CisKKyAgICBBU1NFUlQobGlzdEluZGV4ID49IDAgJiYgbGlzdEluZGV4 IDwgbV9uYW1lcy5zaXplKCkpOworCiAgICAgd2ViVmlldy0+Y2xpZW50KCktPmRpZEFjY2VwdEF1 dG9GaWxsU3VnZ2VzdGlvbihXZWJOb2RlKGdldFRleHRGaWVsZCgpKSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbmFtZXNbbGlzdEluZGV4XSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbGFi ZWxzW2xpc3RJbmRleF0pOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbV9sYWJlbHNbbGlzdEluZGV4XSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpc3RJbmRleCk7CiB9CiAKIHZvaWQgQXV0b0Zp bGxQb3B1cE1lbnVDbGllbnQ6OnNlbGVjdGlvbkNoYW5nZWQodW5zaWduZWQgbGlzdEluZGV4LCBi b29sIGZpcmVFdmVudHMpCiB7Ci0gICAgQVNTRVJUKGxpc3RJbmRleCA+PSAwICYmIGxpc3RJbmRl eCA8IG1fbmFtZXMuc2l6ZSgpKTsKLQogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3ID0gZ2V0V2Vi VmlldygpOwogICAgIGlmICghd2ViVmlldykKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKG1f c2VwYXJhdG9ySW5kZXggIT0gLTEgJiYgbGlzdEluZGV4ID4gbV9zZXBhcmF0b3JJbmRleCkKKyAg ICAgICAgLS1saXN0SW5kZXg7CisKKyAgICBBU1NFUlQobGlzdEluZGV4ID49IDAgJiYgbGlzdElu ZGV4IDwgbV9uYW1lcy5zaXplKCkpOworCiAgICAgd2ViVmlldy0+Y2xpZW50KCktPmRpZFNlbGVj dEF1dG9GaWxsU3VnZ2VzdGlvbihXZWJOb2RlKGdldFRleHRGaWVsZCgpKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbmFtZXNbbGlzdEluZGV4 XSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1f bGFiZWxzW2xpc3RJbmRleF0pOwpAQCAtOTIsNyArMTEwLDcgQEAgdm9pZCBBdXRvRmlsbFBvcHVw TWVudUNsaWVudDo6c2VsZWN0aW9uQwogewogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3ID0gZ2V0 V2ViVmlldygpOwogICAgIGlmICghd2ViVmlldykKLSAgICAgIHJldHVybjsKKyAgICAgICAgcmV0 dXJuOwogCiAgICAgd2ViVmlldy0+Y2xpZW50KCktPmRpZENsZWFyQXV0b0ZpbGxTZWxlY3Rpb24o V2ViTm9kZShnZXRUZXh0RmllbGQoKSkpOwogfQpAQCAtMTAzLDMxICsxMjEsMzggQEAgdm9pZCBB dXRvRmlsbFBvcHVwTWVudUNsaWVudDo6cG9wdXBEaWRIaQogICAgIC8vIHNoYXJlIHRoZSBleGFj dCBzYW1lIGZ1bmN0aW9uYWxpdHkuCiAgICAgV2ViVmlld0ltcGwqIHdlYlZpZXcgPSBnZXRXZWJW aWV3KCk7CiAgICAgaWYgKCF3ZWJWaWV3KQotICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm47 CiAKICAgICB3ZWJWaWV3LT5jbGllbnQoKS0+ZGlkQ2xlYXJBdXRvRmlsbFNlbGVjdGlvbihXZWJO b2RlKGdldFRleHRGaWVsZCgpKSk7CiB9CiAKK2Jvb2wgQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQ6 Oml0ZW1Jc1NlcGFyYXRvcih1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0Cit7CisgICAgcmV0dXJu IChtX3NlcGFyYXRvckluZGV4ICE9IC0xICYmIG1fc2VwYXJhdG9ySW5kZXggPT0gbGlzdEluZGV4 KTsKK30KKwogdm9pZCBBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6aW5pdGlhbGl6ZSgKICAgICBI VE1MSW5wdXRFbGVtZW50KiB0ZXh0RmllbGQsCiAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmlu Zz4mIG5hbWVzLAogICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBsYWJlbHMsCi0gICAg aW50IGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgpCisgICAgaW50IHNlcGFyYXRvckluZGV4KQogewog ICAgIEFTU0VSVChuYW1lcy5zaXplKCkgPT0gbGFiZWxzLnNpemUoKSk7Ci0gICAgQVNTRVJUKGRl ZmF1bHRTdWdnZXN0aW9uSW5kZXggPCBzdGF0aWNfY2FzdDxpbnQ+KG5hbWVzLnNpemUoKSkpOwor ICAgIEFTU0VSVChzZXBhcmF0b3JJbmRleCA8IHN0YXRpY19jYXN0PGludD4obmFtZXMuc2l6ZSgp KSk7CiAKICAgICAvLyBUaGUgc3VnZ2VzdGlvbnMgbXVzdCBiZSBzZXQgYmVmb3JlIGluaXRpYWxp emluZyB0aGUKICAgICAvLyBTdWdnZXN0aW9uc1BvcHVwTWVudUNsaWVudC4KLSAgICBzZXRTdWdn ZXN0aW9ucyhuYW1lcywgbGFiZWxzKTsKKyAgICBzZXRTdWdnZXN0aW9ucyhuYW1lcywgbGFiZWxz LCBzZXBhcmF0b3JJbmRleCk7CiAKLSAgICBTdWdnZXN0aW9uc1BvcHVwTWVudUNsaWVudDo6aW5p dGlhbGl6ZSh0ZXh0RmllbGQsIGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgpOworICAgIFN1Z2dlc3Rp b25zUG9wdXBNZW51Q2xpZW50Ojppbml0aWFsaXplKHRleHRGaWVsZCwgLTEpOwogfQogCiB2b2lk IEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpzZXRTdWdnZXN0aW9ucyhjb25zdCBXZWJWZWN0b3I8 V2ViU3RyaW5nPiYgbmFtZXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbGFiZWxzKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmlu Zz4mIGxhYmVscywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGludCBzZXBhcmF0b3JJbmRleCkKIHsKICAgICBBU1NFUlQobmFtZXMuc2l6ZSgpID09IGxhYmVs cy5zaXplKCkpOworICAgIEFTU0VSVChzZXBhcmF0b3JJbmRleCA8IHN0YXRpY19jYXN0PGludD4o bmFtZXMuc2l6ZSgpKSk7CiAKICAgICBtX25hbWVzLmNsZWFyKCk7CiAgICAgbV9sYWJlbHMuY2xl YXIoKTsKQEAgLTEzNiw2ICsxNjEsOCBAQCB2b2lkIEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50Ojpz ZXRTdWdnZXN0CiAgICAgICAgIG1fbGFiZWxzLmFwcGVuZChsYWJlbHNbaV0pOwogICAgIH0KIAor ICAgIG1fc2VwYXJhdG9ySW5kZXggPSBzZXBhcmF0b3JJbmRleDsKKwogICAgIC8vIFRyeSB0byBw cmVzZXJ2ZSBzZWxlY3Rpb24gaWYgcG9zc2libGUuCiAgICAgaWYgKGdldFNlbGVjdGVkSW5kZXgo KSA+PSBzdGF0aWNfY2FzdDxpbnQ+KG5hbWVzLnNpemUoKSkpCiAgICAgICAgIHNldFNlbGVjdGVk SW5kZXgoLTEpOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9BdXRvRmlsbFBvcHVwTWVudUNs aWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1l bnVDbGllbnQuaAkocmV2aXNpb24gNjA5MjMpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0F1dG9G aWxsUG9wdXBNZW51Q2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDE4ICs1NSwyMyBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNlbGVjdGlvbkNoYW5nZWQodW5zaWduZWQgbGlzdElu ZGV4LCBib29sIGZpcmVFdmVudHMgPSB0cnVlKTsKICAgICB2aXJ0dWFsIHZvaWQgc2VsZWN0aW9u Q2xlYXJlZCgpOwogICAgIHZpcnR1YWwgdm9pZCBwb3B1cERpZEhpZGUoKTsKKyAgICB2aXJ0dWFs IGJvb2wgaXRlbUlzU2VwYXJhdG9yKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3Q7CiAKICAgICB2 b2lkIGluaXRpYWxpemUoV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudCosCiAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBuYW1lcywKICAgICAgICAgICAgICAg ICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIGxhYmVscywKLSAgICAgICAgICAgICAg ICAgICAgaW50IGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgpOworICAgICAgICAgICAgICAgICAgICBp bnQgc2VwYXJhdG9ySW5kZXgpOwogCiAgICAgdm9pZCBzZXRTdWdnZXN0aW9ucyhjb25zdCBXZWJW ZWN0b3I8V2ViU3RyaW5nPiYgbmFtZXMsCi0gICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBX ZWJWZWN0b3I8V2ViU3RyaW5nPiYgbGFiZWxzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNv bnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBsYWJlbHMsCisgICAgICAgICAgICAgICAgICAgICAg ICBpbnQgc2VwYXJhdG9ySW5kZXgpOwogCiBwcml2YXRlOgogICAgIFZlY3RvcjxXZWJDb3JlOjpT dHJpbmc+IG1fbmFtZXM7CiAgICAgVmVjdG9yPFdlYkNvcmU6OlN0cmluZz4gbV9sYWJlbHM7CisK KyAgICAvLyBUaGUgaW5kZXggb2YgdGhlIHNlcGFyYXRvci4gIC0xIGlmIHRoZXJlIGlzIG5vIHNl cGFyYXRvci4KKyAgICBpbnQgbV9zZXBhcmF0b3JJbmRleDsKIH07CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJldmlzaW9uIDYw OTIzKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE3ODYsMTAgKzE3ODYsMTAgQEAgdm9pZCBXZWJWaWV3SW1wbDo6YXBwbHlBdXRvRmls bFN1Z2dlc3RpbwogICAgIGNvbnN0IFdlYk5vZGUmIG5vZGUsCiAgICAgY29uc3QgV2ViVmVjdG9y PFdlYlN0cmluZz4mIG5hbWVzLAogICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBsYWJl bHMsCi0gICAgaW50IGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgpCisgICAgaW50IHNlcGFyYXRvcklu ZGV4KQogewogICAgIEFTU0VSVChuYW1lcy5zaXplKCkgPT0gbGFiZWxzLnNpemUoKSk7Ci0gICAg QVNTRVJUKGRlZmF1bHRTdWdnZXN0aW9uSW5kZXggPCBzdGF0aWNfY2FzdDxpbnQ+KG5hbWVzLnNp emUoKSkpOworICAgIEFTU0VSVChzZXBhcmF0b3JJbmRleCA8IHN0YXRpY19jYXN0PGludD4obmFt ZXMuc2l6ZSgpKSk7CiAKICAgICBpZiAobmFtZXMuaXNFbXB0eSgpKSB7CiAgICAgICAgIGhpZGVT dWdnZXN0aW9uc1BvcHVwKCk7CkBAIC0xODE0LDcgKzE4MTQsNyBAQCB2b2lkIFdlYlZpZXdJbXBs OjphcHBseUF1dG9GaWxsU3VnZ2VzdGlvCiAgICAgICAgIG1fYXV0b0ZpbGxQb3B1cENsaWVudC5z ZXQobmV3IEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50KTsKIAogICAgIG1fYXV0b0ZpbGxQb3B1cENs aWVudC0+aW5pdGlhbGl6ZShpbnB1dEVsZW0sIG5hbWVzLCBsYWJlbHMsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXBhcmF0b3JJbmRleCk7CiAKICAgICBp ZiAobV9zdWdnZXN0aW9uc1BvcHVwQ2xpZW50ICE9IG1fYXV0b0ZpbGxQb3B1cENsaWVudC5nZXQo KSkgewogICAgICAgICBoaWRlU3VnZ2VzdGlvbnNQb3B1cCgpOwpAQCAtMTgzMSw3ICsxODMxLDcg QEAgdm9pZCBXZWJWaWV3SW1wbDo6YXBwbHlBdXRvRmlsbFN1Z2dlc3RpbwogICAgICAgICBtX3N1 Z2dlc3Rpb25zUG9wdXAgPSBtX2F1dG9GaWxsUG9wdXAuZ2V0KCk7CiAKICAgICBpZiAobV9zdWdn ZXN0aW9uc1BvcHVwU2hvd2luZykgewotICAgICAgICBtX2F1dG9GaWxsUG9wdXBDbGllbnQtPnNl dFN1Z2dlc3Rpb25zKG5hbWVzLCBsYWJlbHMpOworICAgICAgICBtX2F1dG9GaWxsUG9wdXBDbGll bnQtPnNldFN1Z2dlc3Rpb25zKG5hbWVzLCBsYWJlbHMsIHNlcGFyYXRvckluZGV4KTsKICAgICAg ICAgcmVmcmVzaFN1Z2dlc3Rpb25zUG9wdXAoKTsKICAgICB9IGVsc2UgewogICAgICAgICBtX3N1 Z2dlc3Rpb25zUG9wdXAtPnNob3coZm9jdXNlZE5vZGUtPmdldFJlY3QoKSwKSW5kZXg6IFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmgJKHJldmlzaW9uIDYwOTIzKQorKysgV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsNyArMTY2LDcgQEAgcHVi bGljOgogICAgICAgICBjb25zdCBXZWJOb2RlJiwKICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdl YlN0cmluZz4mIG5hbWVzLAogICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbGFi ZWxzLAotICAgICAgICBpbnQgZGVmYXVsdFN1Z2dlc3Rpb25JbmRleCk7CisgICAgICAgIGludCBz ZXBhcmF0b3JJbmRleCk7CiAgICAgdmlydHVhbCB2b2lkIGFwcGx5QXV0b2NvbXBsZXRlU3VnZ2Vz dGlvbnMoCiAgICAgICAgIGNvbnN0IFdlYk5vZGUmLAogICAgICAgICBjb25zdCBXZWJWZWN0b3I8 V2ViU3RyaW5nPiYgc3VnZ2VzdGlvbnMsCg==