34818 2010-02-10 17:02:25 -0800 [Chromium] Remove code from SuggestionsPopup that was removed in a previous revision of AutocompletePopup and accidentally added back in the refactoring. 2010-02-10 19:47:53 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 jhawkins webkit-unassigned commit-queue fishd oldest_to_newest 189527 0 jhawkins 2010-02-10 17:02:25 -0800 Patch will follow. 189529 1 48531 jhawkins 2010-02-10 17:04:30 -0800 Created attachment 48531 [Chromium] Remove code from SuggestionsPopup that was removed in a previous revision of AutocompletePopup and accidentally added back in the refactoring 189537 2 48531 eric 2010-02-10 17:24:31 -0800 Comment on attachment 48531 [Chromium] Remove code from SuggestionsPopup that was removed in a previous revision of AutocompletePopup and accidentally added back in the refactoring I like minus lines. :) 189587 3 48531 commit-queue 2010-02-10 19:47:44 -0800 Comment on attachment 48531 [Chromium] Remove code from SuggestionsPopup that was removed in a previous revision of AutocompletePopup and accidentally added back in the refactoring Clearing flags on attachment: 48531 Committed r54640: <http://trac.webkit.org/changeset/54640> 189588 4 commit-queue 2010-02-10 19:47:53 -0800 All reviewed patches have been landed. Closing bug. 48531 2010-02-10 17:04:30 -0800 2010-02-10 19:47:43 -0800 [Chromium] Remove code from SuggestionsPopup that was removed in a previous revision of AutocompletePopup and accidentally added back in the refactoring remove.diff text/plain 8979 jhawkins SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTQ2MzIpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDItMTAgIEphbWVz IEhhd2tpbnMgIDxqaGF3a2luc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBSZW1vdmUgY29kZSBmcm9tIFN1 Z2dlc3Rpb25zUG9wdXAgdGhhdCB3YXMgcmVtb3ZlZCBpbiBhCisgICAgICAgIHByZXZpb3VzIHJl dmlzaW9uIG9mIEF1dG9jb21wbGV0ZVBvcHVwIGFuZCBhY2NpZGVudGFsbHkgYWRkZWQgYmFjayBp bgorICAgICAgICB0aGUgcmVmYWN0b3JpbmcuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM0ODE4CisKKyAgICAgICAgKiBzcmMvQXV0b0ZpbGxQb3B1 cE1lbnVDbGllbnQuY3BwOgorICAgICAgICAqIHNyYy9BdXRvRmlsbFBvcHVwTWVudUNsaWVudC5o OiBBZGRlZCBwcm9wZXJ0eSBzdm46ZW9sLXN0eWxlLgorICAgICAgICAqIHNyYy9TdWdnZXN0aW9u c1BvcHVwTWVudUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlN1Z2dlc3Rpb25zUG9wdXBN ZW51Q2xpZW50Ojpwb3B1cERpZEhpZGUpOgorICAgICAgICAoV2ViS2l0OjpTdWdnZXN0aW9uc1Bv cHVwTWVudUNsaWVudDo6c2V0VGV4dEZyb21JdGVtKToKKyAgICAgICAgKFdlYktpdDo6U3VnZ2Vz dGlvbnNQb3B1cE1lbnVDbGllbnQ6OmluaXRpYWxpemUpOgorICAgICAgICAqIHNyYy9TdWdnZXN0 aW9uc1BvcHVwTWVudUNsaWVudC5oOgorCiAyMDEwLTAyLTEwICBOYXRlIENoYXBpbiAgPGphcGhl dEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQuY3BwCShy ZXZpc2lvbiA1NDYzMikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQXV0b0ZpbGxQb3B1cE1lbnVD bGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OSwxNyArNTksNiBAQCB2b2lkIEF1dG9GaWxs UG9wdXBNZW51Q2xpZW50OjpyZW1vdmVTdWdnCiAgICAgbV9sYWJlbHMucmVtb3ZlKGxpc3RJbmRl eCk7CiB9CiAKLXZvaWQgQXV0b0ZpbGxQb3B1cE1lbnVDbGllbnQ6OiBzZWxlY3Rpb25DaGFuZ2Vk KHVuc2lnbmVkIGxpc3RJbmRleCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJvb2wgZmlyZUV2ZW50cykgewotICAgIGlmIChsaXN0SW5kZXggPT0gc3Rh dGljX2Nhc3Q8dW5zaWduZWQ+KC0xKSkgewotICAgICAgICBTdWdnZXN0aW9uc1BvcHVwTWVudUNs aWVudDo6c2VsZWN0aW9uQ2hhbmdlZChsaXN0SW5kZXgsIGZpcmVFdmVudHMpOwotICAgICAgICBy ZXR1cm47Ci0gICAgfQotCi0gICAgQVNTRVJUKGxpc3RJbmRleCA+PSAwICYmIGxpc3RJbmRleCA8 IG1fbmFtZXMuc2l6ZSgpKTsKLSAgICBzZXRTdWdnZXN0ZWRWYWx1ZShtX25hbWVzW2xpc3RJbmRl eF0pOwotfQotCiB2b2lkIEF1dG9GaWxsUG9wdXBNZW51Q2xpZW50Ojppbml0aWFsaXplKAogICAg IEhUTUxJbnB1dEVsZW1lbnQqIHRleHRGaWVsZCwKICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3Ry aW5nPiYgbmFtZXMsCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0F1dG9GaWxsUG9wdXBNZW51 Q2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9BdXRvRmlsbFBvcHVw TWVudUNsaWVudC5oCShyZXZpc2lvbiA1NDYzMikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQXV0 b0ZpbGxQb3B1cE1lbnVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsOSArNTAsNiBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgZ2V0U3VnZ2VzdGlvbih1bnNpZ25lZCBsaXN0 SW5kZXgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVTdWdnZXN0aW9uQXRJbmRleCh1 bnNpZ25lZCBsaXN0SW5kZXgpOwogCi0gICAgLy8gV2ViQ29yZTo6UG9wdXBNZW51Q2xpZW50IGlt cGxlbWVudGF0aW9uOgotICAgIHZpcnR1YWwgdm9pZCBzZWxlY3Rpb25DaGFuZ2VkKHVuc2lnbmVk IGxpc3RJbmRleCwgYm9vbCBmaXJlRXZlbnRzKTsKLQogICAgIHZvaWQgaW5pdGlhbGl6ZShXZWJD b3JlOjpIVE1MSW5wdXRFbGVtZW50KiwKICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViVmVj dG9yPFdlYlN0cmluZz4mIG5hbWVzLAogICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJWZWN0 b3I8V2ViU3RyaW5nPiYgbGFiZWxzLAoKUHJvcGVydHkgY2hhbmdlcyBvbjogV2ViS2l0L2Nocm9t aXVtL3NyYy9BdXRvRmlsbFBvcHVwTWVudUNsaWVudC5oCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjpl b2wtc3R5bGUKICAgKyBMRgoKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvU3VnZ2VzdGlvbnNQ b3B1cE1lbnVDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvU3Vn Z2VzdGlvbnNQb3B1cE1lbnVDbGllbnQuY3BwCShyZXZpc2lvbiA1NDYzMikKKysrIFdlYktpdC9j aHJvbWl1bS9zcmMvU3VnZ2VzdGlvbnNQb3B1cE1lbnVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC02OSwyMCArNjksNiBAQCB2b2lkIFN1Z2dlc3Rpb25zUG9wdXBNZW51Q2xpZW50Ojp2YWx1 ZUNoCiAgICAgICAgIHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihtX3RleHRGaWVsZC5n ZXQoKSkpOwogfQogCi12b2lkIFN1Z2dlc3Rpb25zUG9wdXBNZW51Q2xpZW50OjpzZWxlY3Rpb25D aGFuZ2VkKHVuc2lnbmVkIGxpc3RJbmRleCwgYm9vbCBmaXJlRXZlbnRzKQotewotICAgIGlmIChs aXN0SW5kZXggIT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KC0xKSkgewotICAgICAgICBjb25zdCBX ZWJTdHJpbmcmIHN1Z2dlc3Rpb24gPSBnZXRTdWdnZXN0aW9uKGxpc3RJbmRleCk7Ci0gICAgICAg IHNldFN1Z2dlc3RlZFZhbHVlKHN1Z2dlc3Rpb24pOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1f dGV4dEZpZWxkLT5zZXRWYWx1ZShtX3R5cGVkRmllbGRWYWx1ZSk7Ci0gICAgICAgIGlmIChtX2xh c3RGaWVsZFZhbHVlcy0+Y29udGFpbnMobV90ZXh0RmllbGQtPm5hbWUoKSkpCi0gICAgICAgICAg ICBtX2xhc3RGaWVsZFZhbHVlcy0+c2V0KG1fdGV4dEZpZWxkLT5uYW1lKCksIG1fdHlwZWRGaWVs ZFZhbHVlKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbV9sYXN0RmllbGRWYWx1ZXMtPmFk ZChtX3RleHRGaWVsZC0+bmFtZSgpLCBtX3R5cGVkRmllbGRWYWx1ZSk7Ci0gICAgfQotfQotCiBT dHJpbmcgU3VnZ2VzdGlvbnNQb3B1cE1lbnVDbGllbnQ6Oml0ZW1UZXh0KHVuc2lnbmVkIGxpc3RJ bmRleCkgY29uc3QKIHsKICAgICByZXR1cm4gZ2V0U3VnZ2VzdGlvbihsaXN0SW5kZXgpOwpAQCAt MTIwLDggKzEwNiw2IEBAIGludCBTdWdnZXN0aW9uc1BvcHVwTWVudUNsaWVudDo6Y2xpZW50UGEK IAogdm9pZCBTdWdnZXN0aW9uc1BvcHVwTWVudUNsaWVudDo6cG9wdXBEaWRIaWRlKCkKIHsKLSAg ICBtX3RleHRGaWVsZC0+c2V0VmFsdWUobV90eXBlZEZpZWxkVmFsdWUpOwotICAgIHJlc2V0TGFz dFN1Z2dlc3Rpb24oKTsKICAgICBXZWJWaWV3SW1wbCogd2ViVmlldyA9IGdldFdlYlZpZXcoKTsK ICAgICBpZiAod2ViVmlldykKICAgICAgICAgd2ViVmlldy0+c3VnZ2VzdGlvbnNQb3B1cERpZEhp ZGUoKTsKQEAgLTEzMCwxNSArMTE0LDYgQEAgdm9pZCBTdWdnZXN0aW9uc1BvcHVwTWVudUNsaWVu dDo6cG9wdXBEaQogdm9pZCBTdWdnZXN0aW9uc1BvcHVwTWVudUNsaWVudDo6c2V0VGV4dEZyb21J dGVtKHVuc2lnbmVkIGxpc3RJbmRleCkKIHsKICAgICBtX3RleHRGaWVsZC0+c2V0VmFsdWUoZ2V0 U3VnZ2VzdGlvbihsaXN0SW5kZXgpKTsKLSAgICByZXNldExhc3RTdWdnZXN0aW9uKCk7Ci19Ci0K LXZvaWQgU3VnZ2VzdGlvbnNQb3B1cE1lbnVDbGllbnQ6OnJlc2V0TGFzdFN1Z2dlc3Rpb24oKQot ewotICAgIGlmIChtX2xhc3RGaWVsZFZhbHVlcy0+Y29udGFpbnMobV90ZXh0RmllbGQtPm5hbWUo KSkpCi0gICAgICAgIG1fbGFzdEZpZWxkVmFsdWVzLT5zZXQobV90ZXh0RmllbGQtPm5hbWUoKSwg bV90ZXh0RmllbGQtPnZhbHVlKCkpOwotICAgIGVsc2UKLSAgICAgICAgbV9sYXN0RmllbGRWYWx1 ZXMtPmFkZChtX3RleHRGaWVsZC0+bmFtZSgpLCBtX3RleHRGaWVsZC0+dmFsdWUoKSk7CiB9CiAK IEZvbnRTZWxlY3RvciogU3VnZ2VzdGlvbnNQb3B1cE1lbnVDbGllbnQ6OmZvbnRTZWxlY3Rvcigp IGNvbnN0CkBAIC0xNzUsMTUgKzE1MCw5IEBAIFJlbmRlclN0eWxlKiBTdWdnZXN0aW9uc1BvcHVw TWVudUNsaWVudDoKIHZvaWQgU3VnZ2VzdGlvbnNQb3B1cE1lbnVDbGllbnQ6OmluaXRpYWxpemUo SFRNTElucHV0RWxlbWVudCogdGV4dEZpZWxkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgZGVmYXVsdFN1Z2dlc3Rpb25JbmRleCkKIHsKLSAgICBpZiAo IW1fbGFzdEZpZWxkVmFsdWVzKQotICAgICAgICBtX2xhc3RGaWVsZFZhbHVlcy5zZXQobmV3IEZp ZWxkVmFsdWVzTWFwKTsKLQogICAgIG1fdGV4dEZpZWxkID0gdGV4dEZpZWxkOwotICAgIG1fdHlw ZWRGaWVsZFZhbHVlID0gdGV4dEZpZWxkLT52YWx1ZSgpOwogICAgIG1fc2VsZWN0ZWRJbmRleCA9 IGRlZmF1bHRTdWdnZXN0aW9uSW5kZXg7CiAKLSAgICBzZXRJbml0aWFsU3VnZ2VzdGlvbigpOwot CiAgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbjsKICAgICBSZW5kZXJUaGVtZTo6 ZGVmYXVsdFRoZW1lKCktPnN5c3RlbUZvbnQoQ1NTVmFsdWVXZWJraXRDb250cm9sLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24pOwpA QCAtMjAxLDUxICsxNzAsNiBAQCB2b2lkIFN1Z2dlc3Rpb25zUG9wdXBNZW51Q2xpZW50Ojppbml0 aWFsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRleHRGaWVsZC0+cmVuZGVy ZXIoKS0+c3R5bGUoKS0+ZGlyZWN0aW9uKCkpKTsKIH0KIAotdm9pZCBTdWdnZXN0aW9uc1BvcHVw TWVudUNsaWVudDo6c2V0SW5pdGlhbFN1Z2dlc3Rpb24oKQotewotICAgIGlmICghZ2V0U3VnZ2Vz dGlvbnNDb3VudCgpIHx8ICFtX3RleHRGaWVsZC0+bmFtZSgpLmxlbmd0aCgpIHx8ICFtX3R5cGVk RmllbGRWYWx1ZS5sZW5ndGgoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaW50IG5ld0luZGV4 ID0gbV9zZWxlY3RlZEluZGV4ID49IDAgPyBtX3NlbGVjdGVkSW5kZXggOiAwOwotICAgIGNvbnN0 IFN0cmluZyYgc3VnZ2VzdGlvbiA9IGdldFN1Z2dlc3Rpb24obmV3SW5kZXgpOwotICAgIGJvb2wg aGFzUHJldmlvdXNWYWx1ZSA9IG1fbGFzdEZpZWxkVmFsdWVzLT5jb250YWlucyhtX3RleHRGaWVs ZC0+bmFtZSgpKTsKLQotICAgIFN0cmluZyBwcmV2VmFsdWU7Ci0gICAgaWYgKGhhc1ByZXZpb3Vz VmFsdWUpCi0gICAgICAgIHByZXZWYWx1ZSA9IG1fbGFzdEZpZWxkVmFsdWVzLT5nZXQobV90ZXh0 RmllbGQtPm5hbWUoKSk7Ci0KLSAgICBpZiAoIWhhc1ByZXZpb3VzVmFsdWUgfHwgbV90eXBlZEZp ZWxkVmFsdWUubGVuZ3RoKCkgPiBtX2xhc3RGaWVsZFZhbHVlcy0+Z2V0KG1fdGV4dEZpZWxkLT5u YW1lKCkpLmxlbmd0aCgpKSB7Ci0gICAgICAgIGlmIChzdWdnZXN0aW9uLnN0YXJ0c1dpdGgobV90 eXBlZEZpZWxkVmFsdWUpKQotICAgICAgICAgICAgbV9zZWxlY3RlZEluZGV4ID0gbmV3SW5kZXg7 Ci0KLSAgICAgICAgaW50IHN0YXJ0ID0gMDsKLSAgICAgICAgU3RyaW5nIG5ld1N1Z2dlc3Rpb24g PSBzdWdnZXN0aW9uOwotICAgICAgICBpZiAoc3VnZ2VzdGlvbi5zdGFydHNXaXRoKG1fdHlwZWRG aWVsZFZhbHVlLCBmYWxzZSkpIHsKLSAgICAgICAgICAgIG5ld1N1Z2dlc3Rpb24gPSBtX3R5cGVk RmllbGRWYWx1ZTsKLSAgICAgICAgICAgIGlmIChzdWdnZXN0aW9uLmxlbmd0aCgpID4gbV90eXBl ZEZpZWxkVmFsdWUubGVuZ3RoKCkpIHsKLSAgICAgICAgICAgICAgICBuZXdTdWdnZXN0aW9uLmFw cGVuZChzdWdnZXN0aW9uLnN1YnN0cmluZyhtX3R5cGVkRmllbGRWYWx1ZS5sZW5ndGgoKSwKLSAg ICAgICAgICAgICAgICAgICAgc3VnZ2VzdGlvbi5sZW5ndGgoKSAtIG1fdHlwZWRGaWVsZFZhbHVl Lmxlbmd0aCgpKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBzdGFydCA9IG1fdHlwZWRG aWVsZFZhbHVlLmxlbmd0aCgpOwotICAgICAgICB9Ci0KLSAgICAgICAgbV90ZXh0RmllbGQtPnNl dFN1Z2dlc3RlZFZhbHVlKG5ld1N1Z2dlc3Rpb24pOwotICAgICAgICBtX3RleHRGaWVsZC0+c2V0 U2VsZWN0aW9uUmFuZ2Uoc3RhcnQsIG5ld1N1Z2dlc3Rpb24ubGVuZ3RoKCkpOwotICAgIH0KLQot ICAgIGlmIChoYXNQcmV2aW91c1ZhbHVlKQotICAgICAgICBtX2xhc3RGaWVsZFZhbHVlcy0+c2V0 KG1fdGV4dEZpZWxkLT5uYW1lKCksIG1fdHlwZWRGaWVsZFZhbHVlKTsKLSAgICBlbHNlCi0gICAg ICAgIG1fbGFzdEZpZWxkVmFsdWVzLT5hZGQobV90ZXh0RmllbGQtPm5hbWUoKSwgbV90eXBlZEZp ZWxkVmFsdWUpOwotfQotCi12b2lkIFN1Z2dlc3Rpb25zUG9wdXBNZW51Q2xpZW50OjpzZXRTdWdn ZXN0ZWRWYWx1ZShjb25zdCBXZWJTdHJpbmcmIHN1Z2dlc3Rpb24pCi17Ci0gICAgbV90ZXh0Rmll bGQtPnNldFN1Z2dlc3RlZFZhbHVlKHN1Z2dlc3Rpb24pOwotICAgIG1fdGV4dEZpZWxkLT5zZXRT ZWxlY3Rpb25SYW5nZShtX3R5cGVkRmllbGRWYWx1ZS5sZW5ndGgoKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc3VnZ2VzdGlvbi5sZW5ndGgoKSk7Ci19Ci0KIFdlYlZpZXdJ bXBsKiBTdWdnZXN0aW9uc1BvcHVwTWVudUNsaWVudDo6Z2V0V2ViVmlldygpIGNvbnN0CiB7CiAg ICAgRnJhbWUqIGZyYW1lID0gbV90ZXh0RmllbGQtPmRvY3VtZW50KCktPmZyYW1lKCk7CkluZGV4 OiBXZWJLaXQvY2hyb21pdW0vc3JjL1N1Z2dlc3Rpb25zUG9wdXBNZW51Q2xpZW50LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9TdWdnZXN0aW9uc1BvcHVwTWVudUNsaWVudC5o CShyZXZpc2lvbiA1NDYzMikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvU3VnZ2VzdGlvbnNQb3B1 cE1lbnVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNiBAQCBwdWJsaWM6CiAK ICAgICAvLyBXZWJDb3JlOjpQb3B1cE1lbnVDbGllbnQgbWV0aG9kczoKICAgICB2aXJ0dWFsIHZv aWQgdmFsdWVDaGFuZ2VkKHVuc2lnbmVkIGxpc3RJbmRleCwgYm9vbCBmaXJlRXZlbnRzID0gdHJ1 ZSk7Ci0gICAgdmlydHVhbCB2b2lkIHNlbGVjdGlvbkNoYW5nZWQodW5zaWduZWQgbGlzdEluZGV4 LCBib29sIGZpcmVFdmVudHMgPSB0cnVlKTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OlN0cmluZyBp dGVtVGV4dCh1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0OwogICAgIHZpcnR1YWwgV2ViQ29yZTo6 U3RyaW5nIGl0ZW1Ub29sVGlwKHVuc2lnbmVkIGxhc3RJbmRleCkgY29uc3QgeyByZXR1cm4gV2Vi Q29yZTo6U3RyaW5nKCk7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXRlbUlzRW5hYmxlZCh1bnNpZ25l ZCBsaXN0SW5kZXgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KQEAgLTkwLDI2ICs4OSwxOSBAQCBw dWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBpbml0aWFsaXplKFdlYkNvcmU6OkhUTUxJbnB1 dEVsZW1lbnQqIHRleHRGaWVsZCwKICAgICAgICAgICAgICAgICAgICAgaW50IGRlZmF1bHRTdWdn ZXN0aW9uSW5kZXgpOwotICAgIHZvaWQgc2V0SW5pdGlhbFN1Z2dlc3Rpb24oKTsKIAogICAgIGlu dCBnZXRTZWxlY3RlZEluZGV4KCkgY29uc3QgeyByZXR1cm4gbV9zZWxlY3RlZEluZGV4OyB9CiAg ICAgdm9pZCBzZXRTZWxlY3RlZEluZGV4KGludCBpbmRleCkgeyBtX3NlbGVjdGVkSW5kZXggPSBp bmRleDsgfQogCi0gICAgdm9pZCBzZXRTdWdnZXN0ZWRWYWx1ZShjb25zdCBXZWJTdHJpbmcmIHN1 Z2dlc3Rpb24pOwotCiAgICAgV2ViVmlld0ltcGwqIGdldFdlYlZpZXcoKSBjb25zdDsKICAgICBX ZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50KiBnZXRUZXh0RmllbGQoKSBjb25zdCB7IHJldHVybiBt X3RleHRGaWVsZC5nZXQoKTsgfQogCiBwcml2YXRlOgogICAgIFdlYkNvcmU6OlJlbmRlclN0eWxl KiB0ZXh0RmllbGRTdHlsZSgpIGNvbnN0OwotICAgIHZvaWQgcmVzZXRMYXN0U3VnZ2VzdGlvbigp OwogCiAgICAgUmVmUHRyPFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ+IG1fdGV4dEZpZWxkOwog ICAgIGludCBtX3NlbGVjdGVkSW5kZXg7Ci0gICAgV2ViQ29yZTo6U3RyaW5nIG1fdHlwZWRGaWVs ZFZhbHVlOwogICAgIE93blB0cjxXZWJDb3JlOjpQb3B1cE1lbnVTdHlsZT4gbV9zdHlsZTsKLSAg ICB0eXBlZGVmIEhhc2hNYXA8V2ViQ29yZTo6U3RyaW5nLCBXZWJDb3JlOjpTdHJpbmc+IEZpZWxk VmFsdWVzTWFwOwotICAgIE93blB0cjxGaWVsZFZhbHVlc01hcD4gbV9sYXN0RmllbGRWYWx1ZXM7 CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK