38610 2010-05-05 14:44:20 -0700 [chromium] clear out deprecated methods that are no longer used by chromium 2010-05-06 15:54:24 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd oldest_to_newest 221290 0 fishd 2010-05-05 14:44:20 -0700 [chromium] clear out deprecated methods that are no longer used by chromium 221292 1 55156 fishd 2010-05-05 14:47:18 -0700 Created attachment 55156 v1 patch 221294 2 55156 dglazkov 2010-05-05 14:50:23 -0700 Comment on attachment 55156 v1 patch yay! 222026 3 fishd 2010-05-06 15:54:24 -0700 Landed as http://trac.webkit.org/changeset/58839 55156 2010-05-05 14:47:18 -0700 2010-05-05 14:50:23 -0700 v1 patch clean_1.txt text/plain 12261 fishd SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1ODgzOCkKKysrIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNS0wNSAgRGFy aW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gY2xlYXIgb3V0IGRlcHJlY2F0ZWQg bWV0aG9kcyB0aGF0IGFyZSBubyBsb25nZXIgdXNlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg2MTAKKworICAgICAgICAqIHB1YmxpYy9XZWJGb3Jt RWxlbWVudC5oOgorICAgICAgICAqIHB1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaDoKKyAgICAgICAg KiBwdWJsaWMvV2ViS2l0Q2xpZW50Lmg6CisgICAgICAgICogcHVibGljL1dlYlZpZXcuaDoKKyAg ICAgICAgKiBwdWJsaWMvV2ViVmlld0NsaWVudC5oOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 Q2xpZW50OjpjcmVhdGVQb3B1cE1lbnUpOgorICAgICAgICAqIHNyYy9DaHJvbWVDbGllbnRJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50SW1wbDo6cG9wdXBPcGVuZWQpOgor ICAgICAgICAqIHNyYy9XZWJGb3JtRWxlbWVudC5jcHA6CisgICAgICAgICogc3JjL1dlYklucHV0 RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYklucHV0RWxlbWVudDo6c2V0U2VsZWN0 aW9uUmFuZ2UpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXdJbXBsOjpoaWRlU3VnZ2VzdGlvbnNQb3B1cCk6CisgICAgICAgICogc3JjL1dl YlZpZXdJbXBsLmg6CisKIDIwMTAtMDUtMDUgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCkluZGV4OiBXZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkZvcm1FbGVtZW50LmgNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkZvcm1FbGVtZW50LmgJKHJldmlzaW9uIDU4ODAyKQorKysgV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGb3JtRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC02 Niw4ICs2Niw2IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgICAgICBXRUJLSVRfQVBJIHZvaWQg c3VibWl0KCk7CiAgICAgICAgIC8vIEZJWE1FOiBEZXByZWNhdGUgYW5kIHJlcGxhY2Ugd2l0aCBX ZWJWZWN0b3I8V2ViRWxlbWVudD4uCiAgICAgICAgIFdFQktJVF9BUEkgdm9pZCBnZXROYW1lZEVs ZW1lbnRzKGNvbnN0IFdlYlN0cmluZyYsIFdlYlZlY3RvcjxXZWJOb2RlPiYpOwotICAgICAgICAv LyBERVBSRUNBVEVEOiBSZXBsYWNlZCBieSBnZXRGb3JtQ29udHJvbEVsZW1lbnRzLgotICAgICAg ICBXRUJLSVRfQVBJIHZvaWQgZ2V0SW5wdXRFbGVtZW50cyhXZWJWZWN0b3I8V2ViSW5wdXRFbGVt ZW50PiYpIGNvbnN0OwogICAgICAgICBXRUJLSVRfQVBJIHZvaWQgZ2V0Rm9ybUNvbnRyb2xFbGVt ZW50cyhXZWJWZWN0b3I8V2ViRm9ybUNvbnRyb2xFbGVtZW50PiYpIGNvbnN0OwogCiAjaWYgV0VC S0lUX0lNUExFTUVOVEFUSU9OCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYklucHV0 RWxlbWVudC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1 dEVsZW1lbnQuaAkocmV2aXNpb24gNTg4MDIpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YklucHV0RWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC05MCwxMiArOTAsNiBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKICAgICAgICAgV0VCS0lUX0FQSSB2b2lkIHNldEF1dG9maWxsZWQoYm9vbCk7 CiAgICAgICAgIFdFQktJVF9BUEkgdm9pZCBkaXNwYXRjaEZvcm1Db250cm9sQ2hhbmdlRXZlbnQo KTsKICAgICAgICAgV0VCS0lUX0FQSSB2b2lkIHNldFNlbGVjdGlvblJhbmdlKGludCwgaW50KTsK LSAgICAgICAgLy8gREVQUkVDQVRFRDogVGhlIGZvbGxvd2luZyB0d28gbWV0aG9kcyBoYXZlIGJl ZW4gbW92ZWQgdG8gV2ViRm9ybUNvbnRyb2xFbGVtZW50LgotICAgICAgICBXRUJLSVRfQVBJIFdl YlN0cmluZyBuYW1lKCkgY29uc3Q7Ci0gICAgICAgIC8vIFJldHVybnMgdGhlIG5hbWUgdGhhdCBz aG91bGQgYmUgdXNlZCBmb3IgdGhlIHNwZWNpZmllZCB8ZWxlbWVudHwgd2hlbgotICAgICAgICAv LyBzdG9yaW5nIEF1dG9GaWxsIGRhdGEuICBUaGlzIGlzIGVpdGhlciB0aGUgZmllbGQgbmFtZSBv ciBpdHMgaWQsIGFuCi0gICAgICAgIC8vIGVtcHR5IHN0cmluZyBpZiBpdCBoYXMgbm8gbmFtZSBh bmQgbm8gaWQuCi0gICAgICAgIFdFQktJVF9BUEkgV2ViU3RyaW5nIG5hbWVGb3JBdXRvZmlsbCgp IGNvbnN0OwogCiAjaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCiAgICAgICAgIFdlYklucHV0RWxl bWVudChjb25zdCBXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6SFRNTElucHV0RWxlbWVudD4mKTsK SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViS2l0Q2xpZW50LmgNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYktpdENsaWVudC5oCShyZXZpc2lvbiA1ODgw MikKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViS2l0Q2xpZW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTg5LDEwICs4OSw2IEBAIHB1YmxpYzoKICAgICAvLyBSZXR1cm4gYSBMb2NhbFN0b3Jh Z2UgbmFtZXNwYWNlIHRoYXQgY29ycmVzcG9uZHMgdG8gdGhlIGZvbGxvd2luZyBwYXRoLgogICAg IHZpcnR1YWwgV2ViU3RvcmFnZU5hbWVzcGFjZSogY3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNl KGNvbnN0IFdlYlN0cmluZyYgcGF0aCwgdW5zaWduZWQgcXVvdGEpIHsgcmV0dXJuIDA7IH0KIAot ICAgIC8vIFJldHVybiBhIG5ldyBTZXNzaW9uU3RvcmFnZSBuYW1lc3BhY2UuCi0gICAgLy8gVEhJ UyBJUyBERVBSRUNBVEVELiAgV2ViVmlld0NsaWVudDo6Z2V0U2Vzc2lvblN0b3JhZ2VOYW1lc3Bh Y2UoKSBpcyB0aGUgbmV3IHdheSB0byBhY2Nlc3MgdGhpcy4KLSAgICB2aXJ0dWFsIFdlYlN0b3Jh Z2VOYW1lc3BhY2UqIGNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCkgeyByZXR1cm4gMDsg fQotCiAgICAgLy8gQ2FsbGVkIHdoZW4gc3RvcmFnZSBldmVudHMgZmlyZS4KICAgICB2aXJ0dWFs IHZvaWQgZGlzcGF0Y2hTdG9yYWdlRXZlbnQoY29uc3QgV2ViU3RyaW5nJiBrZXksIGNvbnN0IFdl YlN0cmluZyYgb2xkVmFsdWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFdlYlN0cmluZyYgbmV3VmFsdWUsIGNvbnN0IFdlYlN0cmluZyYgb3JpZ2luLApAQCAt MjY3LDcgKzI2Myw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc3RvcFNoYXJlZFRpbWVy KCkgeyB9CiAKICAgICAvLyBDYWxsYWJsZSBmcm9tIGEgYmFja2dyb3VuZCBXZWJLaXQgdGhyZWFk LgotICAgIHZpcnR1YWwgdm9pZCBjYWxsT25NYWluVGhyZWFkKHZvaWQgKCpmdW5jKSgpKSB7IH0g Ly8gREVQUkVDQVRFRAogICAgIHZpcnR1YWwgdm9pZCBjYWxsT25NYWluVGhyZWFkKHZvaWQgKCpm dW5jKSh2b2lkKiksIHZvaWQqIGNvbnRleHQpIHsgfQogCiAgICAgLy8gV2ViR0wgLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KSW5k ZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgJKHJldmlzaW9uIDU4ODAyKQorKysgV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTIyNSwxMyArMjI1 LDYgQEAgcHVibGljOgogCiAgICAgLy8gQXV0b0ZpbGwgLyBBdXRvY29tcGxldGUgLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLSAgICAvLyBERVBSRUNBVEVE OiBXZWJWaWV3OjphcHBseUF1dG9jb21wbGV0ZVN1Z2dlc3Rpb25zIGlzIHRoZSBuZXcgd2F5IHRv Ci0gICAgLy8gYWNjZXNzIHRoaXMuCi0gICAgdmlydHVhbCB2b2lkIGFwcGx5QXV0b2ZpbGxTdWdn ZXN0aW9ucygKLSAgICAgICAgY29uc3QgV2ViTm9kZSYsCi0gICAgICAgIGNvbnN0IFdlYlZlY3Rv cjxXZWJTdHJpbmc+JiBzdWdnZXN0aW9ucywKLSAgICAgICAgaW50IGRlZmF1bHRTdWdnZXN0aW9u SW5kZXgpID0gMDsKLQogICAgIC8vIE5vdGlmaWVzIHRoZSBXZWJWaWV3IHRoYXQgQXV0b0ZpbGwg c3VnZ2VzdGlvbnMgYXJlIGF2YWlsYWJsZSBmb3IgYSBub2RlLgogICAgIHZpcnR1YWwgdm9pZCBh cHBseUF1dG9GaWxsU3VnZ2VzdGlvbnMoCiAgICAgICAgIGNvbnN0IFdlYk5vZGUmLApAQCAtMjQ5 LDExICsyNDIsNiBAQCBwdWJsaWM6CiAgICAgLy8gSGlkZXMgYW55IHBvcHVwIChzdWdnZXN0aW9u cywgc2VsZWN0cy4uLikgdGhhdCBtaWdodCBiZSBzaG93aW5nLgogICAgIHZpcnR1YWwgdm9pZCBo aWRlUG9wdXBzKCkgPSAwOwogCi0gICAgLy8gSGlkZXMgdGhlIHN1Z2dlc3Rpb25zIHBvcHVwIGlm IGFueSBhcmUgc2hvd2luZy4KLSAgICAvLyBERVBSRUNBVEVEOiB1c2UgaGlkZVBvcHVwcygpIGlu c3RlYWQuCi0gICAgdmlydHVhbCB2b2lkIGhpZGVBdXRvZmlsbFBvcHVwKCkgPSAwOwotICAgIHZp cnR1YWwgdm9pZCBoaWRlU3VnZ2VzdGlvbnNQb3B1cCgpID0gMDsKLQogCiAgICAgLy8gQ29udGV4 dCBtZW51IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlld0NsaWVudC5oDQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJKHJl dmlzaW9uIDU4ODAyKQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3Q2xpZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTc5LDEwICs3OSw2IEBAIHB1YmxpYzoKICAgICAvLyByZXNwb25z aWJsZSBmb3IgcmVuZGVyaW5nIHRoZSBjb250ZW50cyBvZiB0aGUgcG9wdXAgbWVudS4KICAgICB2 aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KFdlYlBvcHVwVHlwZSkgeyByZXR1cm4g MDsgfQogICAgIHZpcnR1YWwgV2ViV2lkZ2V0KiBjcmVhdGVQb3B1cE1lbnUoY29uc3QgV2ViUG9w dXBNZW51SW5mbyYpIHsgcmV0dXJuIDA7IH0KLSAgICAvLyBEZXByZWNhdGVkIG1ldGhvZHMuCi0g ICAgdmlydHVhbCBXZWJXaWRnZXQqIGNyZWF0ZVBvcHVwTWVudSgpIHsgcmV0dXJuIDA7IH0KLSAg ICB2aXJ0dWFsIFdlYldpZGdldCogY3JlYXRlUG9wdXBNZW51KGJvb2wgYWN0aXZhdGFibGUpIHsg cmV0dXJuIDA7IH0KLQogCiAgICAgLy8gQ3JlYXRlIGEgc2Vzc2lvbiBzdG9yYWdlIG5hbWVzcGFj ZSBvYmplY3QgYXNzb2NpYXRlZCB3aXRoIHRoaXMgV2ViVmlldy4KICAgICB2aXJ0dWFsIFdlYlN0 b3JhZ2VOYW1lc3BhY2UqIGNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKCkgeyByZXR1cm4g MDsgfQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNwcA0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21lQ2xpZW50SW1wbC5jcHAJKHJl dmlzaW9uIDU4ODAyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9DaHJvbWVDbGllbnRJbXBsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjIzLDEzICs2MjMsNiBAQCB2b2lkIENocm9tZUNsaWVudElt cGw6OnBvcHVwT3BlbmVkKFBvcHVwCiAgICAgfSBlbHNlIHsKICAgICAgICAgd2Vid2lkZ2V0ID0g bV93ZWJWaWV3LT5jbGllbnQoKS0+Y3JlYXRlUG9wdXBNZW51KAogICAgICAgICAgICAgY29udmVy dFBvcHVwVHlwZShwb3B1cENvbnRhaW5lci0+cG9wdXBUeXBlKCkpKTsKLSAgICAgICAgLy8gVHJ5 IHRoZSBkZXByZWNhdGVkIG1ldGhvZHMuCi0gICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIGRl cHJlY2F0ZWQgbWV0aG9kcyBvbmNlIHRoZSBDaHJvbWl1bSBzaWRlIHVzZSB0aGUKLSAgICAgICAg Ly8gICAgICAgIG5ldyBtZXRob2QuCi0gICAgICAgIGlmICghd2Vid2lkZ2V0KQotICAgICAgICAg ICAgd2Vid2lkZ2V0ID0gbV93ZWJWaWV3LT5jbGllbnQoKS0+Y3JlYXRlUG9wdXBNZW51KCk7Ci0g ICAgICAgIGlmICghd2Vid2lkZ2V0KQotICAgICAgICAgICAgd2Vid2lkZ2V0ID0gbV93ZWJWaWV3 LT5jbGllbnQoKS0+Y3JlYXRlUG9wdXBNZW51KGZhbHNlKTsKICAgICAgICAgLy8gV2Ugb25seSBu b3RpZnkgd2hlbiB0aGUgV2ViVmlldyBoYXMgdG8gaGFuZGxlIHRoZSBwb3B1cCwgYXMgd2hlbgog ICAgICAgICAvLyB0aGUgcG9wdXAgaXMgaGFuZGxlZCBleHRlcm5hbGx5LCB0aGUgZmFjdCB0aGF0 IGEgcG9wdXAgaXMgc2hvd2luZyBpcwogICAgICAgICAvLyB0cmFuc3BhcmVudCB0byB0aGUgV2Vi Vmlldy4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViRm9ybUVsZW1lbnQuY3BwDQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGb3JtRWxlbWVudC5jcHAJKHJldmlz aW9uIDU4ODAyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGb3JtRWxlbWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTc4LDE4ICs3OCw2IEBAIHZvaWQgV2ViRm9ybUVsZW1lbnQ6OmdldE5h bWVkRWxlbWVudHMoY28KICAgICByZXN1bHQuYXNzaWduKHRlbXBWZWN0b3IpOwogfQogICAgIAot dm9pZCBXZWJGb3JtRWxlbWVudDo6Z2V0SW5wdXRFbGVtZW50cyhXZWJWZWN0b3I8V2ViSW5wdXRF bGVtZW50PiYgcmVzdWx0KSBjb25zdAotewotICAgIGNvbnN0IEhUTUxGb3JtRWxlbWVudCogZm9y bSA9IGNvbnN0VW53cmFwPEhUTUxGb3JtRWxlbWVudD4oKTsKLSAgICBWZWN0b3I8UmVmUHRyPEhU TUxJbnB1dEVsZW1lbnQ+ID4gdGVtcFZlY3RvcjsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IGZvcm0tPmZvcm1FbGVtZW50cy5zaXplKCk7IGkrKykgewotICAgICAgICBpZiAoZm9ybS0+Zm9y bUVsZW1lbnRzW2ldLT5oYXNMb2NhbE5hbWUoSFRNTE5hbWVzOjppbnB1dFRhZykpCi0gICAgICAg ICAgICB0ZW1wVmVjdG9yLmFwcGVuZChzdGF0aWNfY2FzdDxIVE1MSW5wdXRFbGVtZW50Kj4oCi0g ICAgICAgICAgICAgICAgZm9ybS0+Zm9ybUVsZW1lbnRzW2ldKSk7Ci0gICAgfQotICAgIHJlc3Vs dC5hc3NpZ24odGVtcFZlY3Rvcik7Ci19Ci0KIHZvaWQgV2ViRm9ybUVsZW1lbnQ6OmdldEZvcm1D b250cm9sRWxlbWVudHMoV2ViVmVjdG9yPFdlYkZvcm1Db250cm9sRWxlbWVudD4mIHJlc3VsdCkg Y29uc3QKIHsKICAgICBjb25zdCBIVE1MRm9ybUVsZW1lbnQqIGZvcm0gPSBjb25zdFVud3JhcDxI VE1MRm9ybUVsZW1lbnQ+KCk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RWxl bWVudC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RWxl bWVudC5jcHAJKHJldmlzaW9uIDU4ODAyKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1 dEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCwyNCArOTQsNiBAQCB2b2lkIFdlYklu cHV0RWxlbWVudDo6c2V0U2VsZWN0aW9uUmFuZ2UoCiB7CiAgICAgdW53cmFwPEhUTUxJbnB1dEVs ZW1lbnQ+KCktPnNldFNlbGVjdGlvblJhbmdlKHN0YXJ0LCBlbmQpOwogfQotICAgIAotV2ViU3Ry aW5nIFdlYklucHV0RWxlbWVudDo6bmFtZSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGNvbnN0VW53 cmFwPEhUTUxJbnB1dEVsZW1lbnQ+KCktPm5hbWUoKTsKLX0KLSAgICAKLVdlYlN0cmluZyBXZWJJ bnB1dEVsZW1lbnQ6Om5hbWVGb3JBdXRvZmlsbCgpIGNvbnN0Ci17Ci0gICAgU3RyaW5nIG5hbWUg PSBjb25zdFVud3JhcDxIVE1MSW5wdXRFbGVtZW50PigpLT5uYW1lKCk7Ci0gICAgU3RyaW5nIHRy aW1tZWROYW1lID0gbmFtZS5zdHJpcFdoaXRlU3BhY2UoKTsKLSAgICBpZiAoIXRyaW1tZWROYW1l LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIHRyaW1tZWROYW1lOwotICAgIG5hbWUgPSBjb25z dFVud3JhcDxIVE1MSW5wdXRFbGVtZW50PigpLT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjppZEF0 dHIpOwotICAgIHRyaW1tZWROYW1lID0gbmFtZS5zdHJpcFdoaXRlU3BhY2UoKTsKLSAgICBpZiAo IXRyaW1tZWROYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIHRyaW1tZWROYW1lOwotICAg IHJldHVybiBTdHJpbmcoKTsKLX0KIAogV2ViSW5wdXRFbGVtZW50OjpXZWJJbnB1dEVsZW1lbnQo Y29uc3QgUGFzc1JlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiYgZWxlbSkKICAgICA6IFdlYkZvcm1D b250cm9sRWxlbWVudChlbGVtKQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNw cAkocmV2aXNpb24gNTg4MDIpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtODYyLDYgKzg2MiwxNCBAQCB2b2lkICBXZWJWaWV3SW1wbDo6 cG9wdXBDbG9zZWQoV2ViQ29yZTo6CiAgICAgfQogfQogCit2b2lkIFdlYlZpZXdJbXBsOjpoaWRl U3VnZ2VzdGlvbnNQb3B1cCgpCit7CisgICAgaWYgKG1fc3VnZ2VzdGlvbnNQb3B1cFNob3dpbmcp IHsKKyAgICAgICAgbV9zdWdnZXN0aW9uc1BvcHVwLT5oaWRlUG9wdXAoKTsKKyAgICAgICAgbV9z dWdnZXN0aW9uc1BvcHVwU2hvd2luZyA9IGZhbHNlOworICAgIH0KK30KKwogRnJhbWUqIFdlYlZp ZXdJbXBsOjpmb2N1c2VkV2ViQ29yZUZyYW1lKCkKIHsKICAgICByZXR1cm4gbV9wYWdlLmdldCgp ID8gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCkgOiAwOwpA QCAtMTY4OSwxNCArMTY5Nyw2IEBAIFdlYkFjY2Vzc2liaWxpdHlPYmplY3QgV2ViVmlld0ltcGw6 OmFjY2UKICAgICAgICAgZG9jdW1lbnQtPmF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoZG9j dW1lbnQtPnJlbmRlcmVyKCkpKTsKIH0KIAotdm9pZCBXZWJWaWV3SW1wbDo6YXBwbHlBdXRvZmls bFN1Z2dlc3Rpb25zKAotICAgIGNvbnN0IFdlYk5vZGUmIG5vZGUsCi0gICAgY29uc3QgV2ViVmVj dG9yPFdlYlN0cmluZz4mIHN1Z2dlc3Rpb25zLAotICAgIGludCBkZWZhdWx0U3VnZ2VzdGlvbklu ZGV4KQotewotICAgIGFwcGx5QXV0b2NvbXBsZXRlU3VnZ2VzdGlvbnMobm9kZSwgc3VnZ2VzdGlv bnMsIGRlZmF1bHRTdWdnZXN0aW9uSW5kZXgpOwotfQotCiB2b2lkIFdlYlZpZXdJbXBsOjphcHBs eUF1dG9GaWxsU3VnZ2VzdGlvbnMoCiAgICAgY29uc3QgV2ViTm9kZSYgbm9kZSwKICAgICBjb25z dCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbmFtZXMsCkBAIC0xODE3LDE5ICsxODE3LDYgQEAgdm9p ZCBXZWJWaWV3SW1wbDo6aGlkZVBvcHVwcygpCiAgICAgaGlkZVN1Z2dlc3Rpb25zUG9wdXAoKTsK IH0KIAotdm9pZCBXZWJWaWV3SW1wbDo6aGlkZUF1dG9maWxsUG9wdXAoKQotewotICAgIGhpZGVT dWdnZXN0aW9uc1BvcHVwKCk7Ci19Ci0KLXZvaWQgV2ViVmlld0ltcGw6OmhpZGVTdWdnZXN0aW9u c1BvcHVwKCkKLXsKLSAgICBpZiAobV9zdWdnZXN0aW9uc1BvcHVwU2hvd2luZykgewotICAgICAg ICBtX3N1Z2dlc3Rpb25zUG9wdXAtPmhpZGVQb3B1cCgpOwotICAgICAgICBtX3N1Z2dlc3Rpb25z UG9wdXBTaG93aW5nID0gZmFsc2U7Ci0gICAgfQotfQotCiB2b2lkIFdlYlZpZXdJbXBsOjpwZXJm b3JtQ3VzdG9tQ29udGV4dE1lbnVBY3Rpb24odW5zaWduZWQgYWN0aW9uKQogewogICAgIGlmICgh bV9wYWdlKQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oDQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCShyZXZpc2lvbiA1ODgw MikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAkod29ya2luZyBjb3B5KQpA QCAtMTU3LDEwICsxNTcsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJEZXZUb29sc0FnZW50 KiBkZXZUb29sc0FnZW50KCk7CiAgICAgdmlydHVhbCB2b2lkIHNldERldlRvb2xzQWdlbnQoV2Vi RGV2VG9vbHNBZ2VudCopOwogICAgIHZpcnR1YWwgV2ViQWNjZXNzaWJpbGl0eU9iamVjdCBhY2Nl c3NpYmlsaXR5T2JqZWN0KCk7Ci0gICAgdmlydHVhbCB2b2lkIGFwcGx5QXV0b2ZpbGxTdWdnZXN0 aW9ucygKLSAgICAgICAgY29uc3QgV2ViTm9kZSYsCi0gICAgICAgIGNvbnN0IFdlYlZlY3RvcjxX ZWJTdHJpbmc+JiBzdWdnZXN0aW9ucywKLSAgICAgICAgaW50IGRlZmF1bHRTdWdnZXN0aW9uSW5k ZXgpOwogICAgIHZpcnR1YWwgdm9pZCBhcHBseUF1dG9GaWxsU3VnZ2VzdGlvbnMoCiAgICAgICAg IGNvbnN0IFdlYk5vZGUmLAogICAgICAgICBjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgbmFt ZXMsCkBAIC0xNzEsOCArMTY3LDYgQEAgcHVibGljOgogICAgICAgICBjb25zdCBXZWJWZWN0b3I8 V2ViU3RyaW5nPiYgc3VnZ2VzdGlvbnMsCiAgICAgICAgIGludCBkZWZhdWx0U3VnZ2VzdGlvbklu ZGV4KTsKICAgICB2aXJ0dWFsIHZvaWQgaGlkZVBvcHVwcygpOwotICAgIHZpcnR1YWwgdm9pZCBo aWRlQXV0b2ZpbGxQb3B1cCgpOwotICAgIHZpcnR1YWwgdm9pZCBoaWRlU3VnZ2VzdGlvbnNQb3B1 cCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxiYXJDb2xvcnModW5zaWduZWQgaW5hY3Rp dmVDb2xvciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGFj dGl2ZUNvbG9yLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQg dHJhY2tDb2xvcik7CkBAIC0zMDEsNiArMjk1LDggQEAgcHVibGljOgogICAgIHZvaWQgcG9wdXBP cGVuZWQoV2ViQ29yZTo6UG9wdXBDb250YWluZXIqIHBvcHVwQ29udGFpbmVyKTsKICAgICB2b2lk IHBvcHVwQ2xvc2VkKFdlYkNvcmU6OlBvcHVwQ29udGFpbmVyKiBwb3B1cENvbnRhaW5lcik7CiAK KyAgICB2b2lkIGhpZGVTdWdnZXN0aW9uc1BvcHVwKCk7CisKICAgICAvLyBIQUNLOiBjdXJyZW50 SW5wdXRFdmVudCgpIGlzIGZvciBDaHJvbWVDbGllbnRJbXBsOjpzaG93KCksIHVudGlsIHdlIGNh bgogICAgIC8vIGZpeCBXZWJLaXQgdG8gcGFzcyBlbm91Z2ggaW5mb3JtYXRpb24gdXAgaW50byBD aHJvbWVDbGllbnQ6OnNob3coKSBzbyB3ZQogICAgIC8vIGNhbiBkZWNpZGUgaWYgdGhlIHdpbmRv dy5vcGVuIGV2ZW50IHdhcyBjYXVzZWQgYnkgYSBtaWRkbGUtbW91c2UgY2xpY2sKQEAgLTM0NSw3 ICszNDEsNiBAQCBwcml2YXRlOgogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgdmlldyB3YXMg c2Nyb2xsZWQuCiAgICAgYm9vbCBzY3JvbGxWaWV3V2l0aEtleWJvYXJkKGludCBrZXlDb2RlLCBp bnQgbW9kaWZpZXJzKTsKIAotICAgIC8vIEhpZGVzIHRoZSBzZWxlY3QgcG9wdXAgaWYgb25lIGlz IG9wZW5lZC4KICAgICB2b2lkIGhpZGVTZWxlY3RQb3B1cCgpOwogCiAgICAgLy8gQ29udmVydHMg fHBvc3wgZnJvbSB3aW5kb3cgY29vcmRpbmF0ZXMgdG8gY29udGVudHMgY29vcmRpbmF0ZXMgYW5k IGdldHMK