42301 2010-07-14 16:05:32 -0700 [Chromium] Use the unique ID instead of the profile label to identify the accepted AutoFill suggestion. 2010-07-14 18:00:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 jhawkins webkit-unassigned dglazkov dhollowa fishd jamesr oldest_to_newest 251492 0 jhawkins 2010-07-14 16:05:32 -0700 [Chromium] Use the unique ID instead of the profile label to identify the accepted AutoFill suggestion. 251495 1 61579 jhawkins 2010-07-14 16:06:53 -0700 Created attachment 61579 Patch 251508 2 dhollowa 2010-07-14 16:31:39 -0700 LGTM. 251522 3 61579 fishd 2010-07-14 16:55:37 -0700 Comment on attachment 61579 Patch WebKit/chromium/public/WebView.h:258 + // Notifies the WebView that AutoFill suggestions are available for a node. it might be nice to explain what the uniqueIDs parameter is all about. it isn't very obvious from reading the signature of the method. R=me 251533 4 jhawkins 2010-07-14 17:20:08 -0700 Committed r63379: <http://trac.webkit.org/changeset/63379> 251560 5 jamesr 2010-07-14 18:00:07 -0700 This doesn't compile in debug. WebViewImpl.cpp:1740 61579 2010-07-14 16:06:53 -0700 2010-07-14 16:55:37 -0700 Patch bug-42301-20100714160652.patch text/plain 11544 jhawkins SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjMzNjcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDctMTQgIEphbWVz IEhhd2tpbnMgIDxqaGF3a2luc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBVc2UgdGhlIHVuaXF1ZSBJRCBp bnN0ZWFkIG9mIHRoZSBwcm9maWxlIGxhYmVsIHRvIGlkZW50aWZ5CisgICAgICAgIHRoZSBhY2Nl cHRlZCBBdXRvRmlsbCBzdWdnZXN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDIzMDEKKworICAgICAgICAqIHB1YmxpYy9XZWJWaWV3Lmg6Cisg ICAgICAgICogcHVibGljL1dlYlZpZXdDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmll d0NsaWVudDo6ZGlkQWNjZXB0QXV0b0ZpbGxTdWdnZXN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0NsaWVudDo6ZGlkU2VsZWN0QXV0b0ZpbGxTdWdnZXN0aW9uKToKKyAgICAgICAgKiBz cmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpBdXRvRmls bFBvcHVwTWVudUNsaWVudDo6dmFsdWVDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6QXV0b0Zp bGxQb3B1cE1lbnVDbGllbnQ6OnNlbGVjdGlvbkNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpB dXRvRmlsbFBvcHVwTWVudUNsaWVudDo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJLaXQ6OkF1 dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpzZXRTdWdnZXN0aW9ucyk6CisgICAgICAgIChXZWJLaXQ6 OkF1dG9GaWxsUG9wdXBNZW51Q2xpZW50Ojp0ZXh0RmllbGRTdHlsZSk6CisgICAgICAgICogc3Jj L0F1dG9GaWxsUG9wdXBNZW51Q2xpZW50Lmg6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmFwcGx5QXV0b0ZpbGxTdWdnZXN0aW9u cyk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjphcHBseUF1dG9jb21wbGV0ZVN1Z2dl c3Rpb25zKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMC0wNy0xNCAgSmF5 IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGF2aWQgTGV2aW4uCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAkocmV2aXNpb24gNjMz NjApCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAkod29ya2luZyBjb3B5KQpA QCAtMjQ4LDExICsyNDgsMTkgQEAgcHVibGljOgogCiAgICAgLy8gQXV0b0ZpbGwgIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKKyAg ICAvLyBERVBSRUNBVEVELgorICAgIHZpcnR1YWwgdm9pZCBhcHBseUF1dG9GaWxsU3VnZ2VzdGlv bnMoCisgICAgICAgIGNvbnN0IFdlYk5vZGUmLAorICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2Vi U3RyaW5nPiYgbmFtZXMsCisgICAgICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBsYWJl bHMsCisgICAgICAgIGludCBzZXBhcmF0b3JJbmRleCkgPSAwOworCiAgICAgLy8gTm90aWZpZXMg dGhlIFdlYlZpZXcgdGhhdCBBdXRvRmlsbCBzdWdnZXN0aW9ucyBhcmUgYXZhaWxhYmxlIGZvciBh IG5vZGUuCiAgICAgdmlydHVhbCB2b2lkIGFwcGx5QXV0b0ZpbGxTdWdnZXN0aW9ucygKICAgICAg ICAgY29uc3QgV2ViTm9kZSYsCiAgICAgICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBu YW1lcywKICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIGxhYmVscywKKyAgICAg ICAgY29uc3QgV2ViVmVjdG9yPGludD4mIHVuaXF1ZUlEcywKICAgICAgICAgaW50IHNlcGFyYXRv ckluZGV4KSA9IDA7CiAKICAgICAvLyBOb3RpZmllcyB0aGUgV2ViVmlldyB0aGF0IEF1dG9jb21w bGV0ZSBzdWdnZXN0aW9ucyBhcmUgYXZhaWxhYmxlIGZvciBhCkluZGV4OiBXZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlZpZXdDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlZpZXdDbGllbnQuaAkocmV2aXNpb24gNjMzNjApCisrKyBXZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlZpZXdDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzA3LDYgKzMwNyw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkQWNjZXB0QXV0b0ZpbGxTdWdnZXN0aW9u KGNvbnN0IFdlYk5vZGUmLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3QgV2ViU3RyaW5nJiBuYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBsYWJlbCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCB1bmlxdWVJRCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGluZGV4KSB7IH0KIAog ICAgIC8vIEluZm9ybXMgdGhlIGJyb3dzZXIgdGhhdCB0aGUgdXNlciBoYXMgc2VsZWN0ZWQgYW4g QXV0b0ZpbGwgc3VnZ2VzdGlvbiBmb3IKQEAgLTMxNCwxMCArMzE1LDExIEBAIHB1YmxpYzoKICAg ICAvLyB0aGUgYXJyb3cga2V5cyB0byBuYXZpZ2F0ZSB0byBhIHN1Z2dlc3Rpb24uCiAgICAgdmly dHVhbCB2b2lkIGRpZFNlbGVjdEF1dG9GaWxsU3VnZ2VzdGlvbihjb25zdCBXZWJOb2RlJiwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYlN0cmlu ZyYgbmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnN0IFdlYlN0cmluZyYgbGFiZWwpIHsgfQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBsYWJlbCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCB1bmlxdWVJRCkgeyB9CiAKICAgICAvLyBJ bmZvcm1zIHRoZSBicm93c2VyIHRoYXQgdGhlIHVzZXIgaGFzIGNsZWFyZWQgdGhlIHNlbGVjdGlv biBmcm9tIHRoZQotICAgIC8vIEF1dG9GaWxsIHN1Z2dlc3Rpb25zIGRyb3Bkb3duLiAgVGhpcyBo YXBwZW5zIHdoZW4gYSB1c2VyIHVzZXMgdGhlIGFycm93CisgICAgLy8gQXV0b0ZpbGwgc3VnZ2Vz dGlvbnMgcG9wdXAuICBUaGlzIGhhcHBlbnMgd2hlbiBhIHVzZXIgdXNlcyB0aGUgYXJyb3cKICAg ICAvLyBrZXlzIHRvIG5hdmlnYXRlIG91dHNpZGUgdGhlIHJhbmdlIG9mIHBvc3NpYmxlIHNlbGVj dGlvbnMuCiAgICAgdmlydHVhbCB2b2lkIGRpZENsZWFyQXV0b0ZpbGxTZWxlY3Rpb24oY29uc3Qg V2ViTm9kZSYpIHsgfQogCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0F1dG9GaWxsUG9wdXBN ZW51Q2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0F1dG9GaWxs UG9wdXBNZW51Q2xpZW50LmNwcAkocmV2aXNpb24gNjMzNjApCisrKyBXZWJLaXQvY2hyb21pdW0v c3JjL0F1dG9GaWxsUG9wdXBNZW51Q2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIxLDYg KzEyMSw3IEBAIHZvaWQgQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQ6OnZhbHVlQ2hhbmcKICAgICAg IHdlYlZpZXctPmNsaWVudCgpLT5kaWRBY2NlcHRBdXRvRmlsbFN1Z2dlc3Rpb24oV2ViTm9kZShn ZXRUZXh0RmllbGQoKSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1fbmFtZXNbbGlzdEluZGV4XSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9sYWJlbHNbbGlzdEluZGV4XSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV91bmlxdWVJ RHNbbGlzdEluZGV4XSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbGlzdEluZGV4KTsKICAgICB9CiB9CkBAIC0xMzgsNyArMTM5LDggQEAgdm9p ZCBBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6c2VsZWN0aW9uQwogCiAgICAgd2ViVmlldy0+Y2xp ZW50KCktPmRpZFNlbGVjdEF1dG9GaWxsU3VnZ2VzdGlvbihXZWJOb2RlKGdldFRleHRGaWVsZCgp KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1f bmFtZXNbbGlzdEluZGV4XSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1fbGFiZWxzW2xpc3RJbmRleF0pOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9sYWJlbHNbbGlzdEluZGV4XSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fdW5pcXVlSURz W2xpc3RJbmRleF0pOwogfQogCiB2b2lkIEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50OjpzZWxlY3Rp b25DbGVhcmVkKCkKQEAgLTIyOSw5ICsyMzEsMTEgQEAgdm9pZCBBdXRvRmlsbFBvcHVwTWVudUNs aWVudDo6aW5pdGlhbGl6ZQogICAgIEhUTUxJbnB1dEVsZW1lbnQqIHRleHRGaWVsZCwKICAgICBj b25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbmFtZXMsCiAgICAgY29uc3QgV2ViVmVjdG9yPFdl YlN0cmluZz4mIGxhYmVscywKKyAgICBjb25zdCBXZWJWZWN0b3I8aW50PiYgdW5pcXVlSURzLAog ICAgIGludCBzZXBhcmF0b3JJbmRleCkKIHsKICAgICBBU1NFUlQobmFtZXMuc2l6ZSgpID09IGxh YmVscy5zaXplKCkpOworICAgIEFTU0VSVChuYW1lcy5zaXplKCkgPT0gdW5pcXVlSURzLnNpemUo KSk7CiAgICAgQVNTRVJUKHNlcGFyYXRvckluZGV4IDwgc3RhdGljX2Nhc3Q8aW50PihuYW1lcy5z aXplKCkpKTsKIAogICAgIG1fc2VsZWN0ZWRJbmRleCA9IC0xOwpAQCAtMjM5LDcgKzI0Myw3IEBA IHZvaWQgQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQ6OmluaXRpYWxpemUKIAogICAgIC8vIFRoZSBz dWdnZXN0aW9ucyBtdXN0IGJlIHNldCBiZWZvcmUgaW5pdGlhbGl6aW5nIHRoZQogICAgIC8vIEF1 dG9GaWxsUG9wdXBNZW51Q2xpZW50LgotICAgIHNldFN1Z2dlc3Rpb25zKG5hbWVzLCBsYWJlbHMs IHNlcGFyYXRvckluZGV4KTsKKyAgICBzZXRTdWdnZXN0aW9ucyhuYW1lcywgbGFiZWxzLCB1bmlx dWVJRHMsIHNlcGFyYXRvckluZGV4KTsKIAogICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3Jp cHRpb247CiAgICAgUmVuZGVyVGhlbWU6OmRlZmF1bHRUaGVtZSgpLT5zeXN0ZW1Gb250KENTU1Zh bHVlV2Via2l0Q29udHJvbCwKQEAgLTI1OCwxNiArMjYyLDIwIEBAIHZvaWQgQXV0b0ZpbGxQb3B1 cE1lbnVDbGllbnQ6OmluaXRpYWxpemUKIAogdm9pZCBBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6 c2V0U3VnZ2VzdGlvbnMoY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIG5hbWVzLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdl YlN0cmluZz4mIGxhYmVscywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IFdlYlZlY3RvcjxpbnQ+JiB1bmlxdWVJRHMsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgc2VwYXJhdG9ySW5kZXgpCiB7CiAgICAg QVNTRVJUKG5hbWVzLnNpemUoKSA9PSBsYWJlbHMuc2l6ZSgpKTsKKyAgICBBU1NFUlQobmFtZXMu c2l6ZSgpID09IHVuaXF1ZUlEcy5zaXplKCkpOwogICAgIEFTU0VSVChzZXBhcmF0b3JJbmRleCA8 IHN0YXRpY19jYXN0PGludD4obmFtZXMuc2l6ZSgpKSk7CiAKICAgICBtX25hbWVzLmNsZWFyKCk7 CiAgICAgbV9sYWJlbHMuY2xlYXIoKTsKKyAgICBtX3VuaXF1ZUlEcy5jbGVhcigpOwogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbmFtZXMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgbV9uYW1l cy5hcHBlbmQobmFtZXNbaV0pOwogICAgICAgICBtX2xhYmVscy5hcHBlbmQobGFiZWxzW2ldKTsK KyAgICAgICAgbV91bmlxdWVJRHMuYXBwZW5kKHVuaXF1ZUlEc1tpXSk7CiAgICAgfQogCiAgICAg bV9zZXBhcmF0b3JJbmRleCA9IHNlcGFyYXRvckluZGV4OwpAQCAtMzA1LDcgKzMxMyw3IEBAIFJl bmRlclN0eWxlKiBBdXRvRmlsbFBvcHVwTWVudUNsaWVudDo6dGUKICAgICBSZW5kZXJTdHlsZSog c3R5bGUgPSBtX3RleHRGaWVsZC0+Y29tcHV0ZWRTdHlsZSgpOwogICAgIGlmICghc3R5bGUpIHsK ICAgICAgICAgLy8gSXQgc2VlbXMgd2UgY2FuIG9ubHkgaGF2ZSBhIDAgc3R5bGUgaW4gYSBUZXh0 RmllbGQgaWYgdGhlCi0gICAgICAgIC8vIG5vZGUgaXMgZGV0YWNoZWQsIGluIHdoaWNoIGNhc2Ug d2UgdGhlIHBvcHVwIHNob3VkIG5vdCBiZQorICAgICAgICAvLyBub2RlIGlzIGRldGFjaGVkLCBp biB3aGljaCBjYXNlIHdlIHRoZSBwb3B1cCBzaG91bGQgbm90IGJlCiAgICAgICAgIC8vIHNob3dp bmcuICBQbGVhc2UgcmVwb3J0IHRoaXMgaW4gaHR0cDovL2NyYnVnLmNvbS83NzA4IGFuZAogICAg ICAgICAvLyBpbmNsdWRlIHRoZSBwYWdlIHlvdSB3ZXJlIHZpc2l0aW5nLgogICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1 cE1lbnVDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0F1dG9GaWxs UG9wdXBNZW51Q2xpZW50LmgJKHJldmlzaW9uIDYzMzYwKQorKysgV2ViS2l0L2Nocm9taXVtL3Ny Yy9BdXRvRmlsbFBvcHVwTWVudUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC05NywxMCArOTcs MTIgQEAgcHVibGljOgogICAgIHZvaWQgaW5pdGlhbGl6ZShXZWJDb3JlOjpIVE1MSW5wdXRFbGVt ZW50KiwKICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIG5h bWVzLAogICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbGFi ZWxzLAorICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJWZWN0b3I8aW50PiYgdW5pcXVlSURz LAogICAgICAgICAgICAgICAgICAgICBpbnQgc2VwYXJhdG9ySW5kZXgpOwogCiAgICAgdm9pZCBz ZXRTdWdnZXN0aW9ucyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbmFtZXMsCiAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbGFiZWxzLAorICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViVmVjdG9yPGludD4mIHVuaXF1ZUlEcywKICAg ICAgICAgICAgICAgICAgICAgICAgIGludCBzZXBhcmF0b3JJbmRleCk7CiAKICAgICAvLyBERVBS RUNBVEVEOiBXaWxsIGJlIHJlbW92ZWQgb25jZSBBdXRvY29tcGxldGUgYW5kIEF1dG9GaWxsIG1l cmdlIGlzCkBAIC0xMjIsNiArMTI0LDcgQEAgcHJpdmF0ZToKICAgICAvLyBUaGUgbmFtZXMgYW5k IGxhYmVscyB0aGF0IG1ha2UgdXAgdGhlIHRleHQgb2YgdGhlIG1lbnUgaXRlbXMuCiAgICAgVmVj dG9yPFdlYkNvcmU6OlN0cmluZz4gbV9uYW1lczsKICAgICBWZWN0b3I8V2ViQ29yZTo6U3RyaW5n PiBtX2xhYmVsczsKKyAgICBWZWN0b3I8aW50PiBtX3VuaXF1ZUlEczsKIAogICAgIC8vIFRoZSBp bmRleCBvZiB0aGUgc2VwYXJhdG9yLiAgLTEgaWYgdGhlcmUgaXMgbm8gc2VwYXJhdG9yLgogICAg IGludCBtX3NlcGFyYXRvckluZGV4OwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAJKHJldmlzaW9uIDYzMzYwKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MjMsNyArMTcyMywxOSBAQCB2b2lkIFdlYlZpZXdJbXBs OjphcHBseUF1dG9GaWxsU3VnZ2VzdGlvCiAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4m IGxhYmVscywKICAgICBpbnQgc2VwYXJhdG9ySW5kZXgpCiB7CisgICAgV2ViVmVjdG9yPGludD4g dW5pcXVlSURzKG5hbWVzLnNpemUoKSk7CisgICAgYXBwbHlBdXRvRmlsbFN1Z2dlc3Rpb25zKG5v ZGUsIG5hbWVzLCBsYWJlbHMsIHVuaXF1ZUlEcywgc2VwYXJhdG9ySW5kZXgpOworfQorCit2b2lk IFdlYlZpZXdJbXBsOjphcHBseUF1dG9GaWxsU3VnZ2VzdGlvbnMoCisgICAgY29uc3QgV2ViTm9k ZSYgbm9kZSwKKyAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbmFtZXMsCisgICAgY29u c3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIGxhYmVscywKKyAgICBjb25zdCBXZWJWZWN0b3I8aW50 PiYgdW5pcXVlSURzLAorICAgIGludCBzZXBhcmF0b3JJbmRleCkKK3sKICAgICBBU1NFUlQobmFt ZXMuc2l6ZSgpID09IGxhYmVscy5zaXplKCkpOworICAgIEFTU0VSVChuYW1lcy5zaXplKCkgPT0g dW5pcXVlX2lkcy5zaXplKCkpOwogICAgIEFTU0VSVChzZXBhcmF0b3JJbmRleCA8IHN0YXRpY19j YXN0PGludD4obmFtZXMuc2l6ZSgpKSk7CiAKICAgICBpZiAobmFtZXMuaXNFbXB0eSgpKSB7CkBA IC0xNzQ4LDcgKzE3NjAsOCBAQCB2b2lkIFdlYlZpZXdJbXBsOjphcHBseUF1dG9GaWxsU3VnZ2Vz dGlvCiAgICAgaWYgKCFtX2F1dG9GaWxsUG9wdXBDbGllbnQuZ2V0KCkpCiAgICAgICAgIG1fYXV0 b0ZpbGxQb3B1cENsaWVudC5zZXQobmV3IEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50KTsKIAotICAg IG1fYXV0b0ZpbGxQb3B1cENsaWVudC0+aW5pdGlhbGl6ZShpbnB1dEVsZW0sIG5hbWVzLCBsYWJl bHMsIHNlcGFyYXRvckluZGV4KTsKKyAgICBtX2F1dG9GaWxsUG9wdXBDbGllbnQtPmluaXRpYWxp emUoCisgICAgICAgIGlucHV0RWxlbSwgbmFtZXMsIGxhYmVscywgdW5pcXVlSURzLCBzZXBhcmF0 b3JJbmRleCk7CiAKICAgICBpZiAoIW1fYXV0b0ZpbGxQb3B1cC5nZXQoKSkgewogICAgICAgICBt X2F1dG9GaWxsUG9wdXAgPSBQb3B1cENvbnRhaW5lcjo6Y3JlYXRlKG1fYXV0b0ZpbGxQb3B1cENs aWVudC5nZXQoKSwKQEAgLTE3NTcsNyArMTc3MCw4IEBAIHZvaWQgV2ViVmlld0ltcGw6OmFwcGx5 QXV0b0ZpbGxTdWdnZXN0aW8KICAgICB9CiAKICAgICBpZiAobV9hdXRvRmlsbFBvcHVwU2hvd2lu ZykgewotICAgICAgICBtX2F1dG9GaWxsUG9wdXBDbGllbnQtPnNldFN1Z2dlc3Rpb25zKG5hbWVz LCBsYWJlbHMsIHNlcGFyYXRvckluZGV4KTsKKyAgICAgICAgbV9hdXRvRmlsbFBvcHVwQ2xpZW50 LT5zZXRTdWdnZXN0aW9ucygKKyAgICAgICAgICAgIG5hbWVzLCBsYWJlbHMsIHVuaXF1ZUlEcywg c2VwYXJhdG9ySW5kZXgpOwogICAgICAgICByZWZyZXNoQXV0b0ZpbGxQb3B1cCgpOwogICAgIH0g ZWxzZSB7CiAgICAgICAgIG1fYXV0b0ZpbGxQb3B1cC0+c2hvdyhmb2N1c2VkTm9kZS0+Z2V0UmVj dCgpLApAQCAtMTc3OSwxMyArMTc5MywxMiBAQCB2b2lkIFdlYlZpZXdJbXBsOjphcHBseUF1dG9j b21wbGV0ZVN1Z2dlCiB7CiAgICAgV2ViVmVjdG9yPFdlYlN0cmluZz4gbmFtZXMoc3VnZ2VzdGlv bnMuc2l6ZSgpKTsKICAgICBXZWJWZWN0b3I8V2ViU3RyaW5nPiBsYWJlbHMoc3VnZ2VzdGlvbnMu c2l6ZSgpKTsKKyAgICBXZWJWZWN0b3I8aW50PiB1bmlxdWVJRHMoc3VnZ2VzdGlvbnMuc2l6ZSgp KTsKIAotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3VnZ2VzdGlvbnMuc2l6ZSgpOyArK2kp IHsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHN1Z2dlc3Rpb25zLnNpemUoKTsgKytpKQog ICAgICAgICBuYW1lc1tpXSA9IHN1Z2dlc3Rpb25zW2ldOwotICAgICAgICBsYWJlbHNbaV0gPSBX ZWJTdHJpbmcoKTsKLSAgICB9CiAKLSAgICBhcHBseUF1dG9GaWxsU3VnZ2VzdGlvbnMobm9kZSwg bmFtZXMsIGxhYmVscywgLTEpOworICAgIGFwcGx5QXV0b0ZpbGxTdWdnZXN0aW9ucyhub2RlLCBu YW1lcywgbGFiZWxzLCB1bmlxdWVJRHMsIC0xKTsKICAgICBpZiAobV9hdXRvRmlsbFBvcHVwQ2xp ZW50KQogICAgICAgICBtX2F1dG9GaWxsUG9wdXBDbGllbnQtPnNldEF1dG9jb21wbGV0ZU1vZGUo dHJ1ZSk7CiB9CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCShyZXZpc2lvbiA2MzM2 MCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpA QCAtMTY0LDExICsxNjQsMTggQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IFdlYlN0cmluZyYgdmFsdWUpOwogICAgIHZpcnR1YWwgV2ViRGV2VG9v bHNBZ2VudCogZGV2VG9vbHNBZ2VudCgpOwogICAgIHZpcnR1YWwgV2ViQWNjZXNzaWJpbGl0eU9i amVjdCBhY2Nlc3NpYmlsaXR5T2JqZWN0KCk7CisgICAgLy8gREVQUkVDQVRFRC4KICAgICB2aXJ0 dWFsIHZvaWQgYXBwbHlBdXRvRmlsbFN1Z2dlc3Rpb25zKAogICAgICAgICBjb25zdCBXZWJOb2Rl JiwKICAgICAgICAgY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIG5hbWVzLAogICAgICAgICBj b25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbGFiZWxzLAogICAgICAgICBpbnQgc2VwYXJhdG9y SW5kZXgpOworICAgIHZpcnR1YWwgdm9pZCBhcHBseUF1dG9GaWxsU3VnZ2VzdGlvbnMoCisgICAg ICAgIGNvbnN0IFdlYk5vZGUmLAorICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYg bmFtZXMsCisgICAgICAgIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBsYWJlbHMsCisgICAg ICAgIGNvbnN0IFdlYlZlY3RvcjxpbnQ+JiB1bmlxdWVJRHMsCisgICAgICAgIGludCBzZXBhcmF0 b3JJbmRleCk7CiAgICAgLy8gREVQUkVDQVRFRDogcmVwbGFjaW5nIHdpdGggYXBwbHlBdXRvRmls bFN1Z2dlc3Rpb25zLgogICAgIHZpcnR1YWwgdm9pZCBhcHBseUF1dG9jb21wbGV0ZVN1Z2dlc3Rp b25zKAogICAgICAgICBjb25zdCBXZWJOb2RlJiwK