67141 2011-08-29 11:34:04 -0700 Cleanup: notifyFormStateChanged, formControlValueMatchesRenderer, and setFormControlValueMatchesRenderer 2011-08-29 13:18:51 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66241 1 rniwa rniwa adele darin dglazkov eric morrita tkent oldest_to_newest 458315 0 rniwa 2011-08-29 11:34:04 -0700 notifyFormStateChanged is duplicated in HTMLInputElement and HTMLTextAreaElement (one is a static local function, and the other one is a member of HTMLInputElement). Also formControlValueMatchesRenderer and setFormControlValueMatchesRenderer are somehow member functions of Node, which is probably a left-over from WML. 458324 1 105506 rniwa 2011-08-29 11:40:44 -0700 Created attachment 105506 cleanup 458325 2 rniwa 2011-08-29 11:41:16 -0700 I just had to refactor code. The existing code was too disgusting. 458332 3 105506 eric 2011-08-29 11:51:58 -0700 Comment on attachment 105506 cleanup LGTM. 458341 4 105506 eric 2011-08-29 12:04:04 -0700 Comment on attachment 105506 cleanup Attachment 105506 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/9569063 458407 5 rniwa 2011-08-29 13:18:51 -0700 Committed r94009: <http://trac.webkit.org/changeset/94009> 105506 2011-08-29 11:40:44 -0700 2011-08-29 12:04:04 -0700 cleanup bug-67141-20110829114043.patch text/plain 10073 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzOTkyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDgtMjkgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW51cDogbm90aWZ5Rm9ybVN0 YXRlQ2hhbmdlZCwgZm9ybUNvbnRyb2xWYWx1ZU1hdGNoZXNSZW5kZXJlciwgYW5kIHNldEZvcm1D b250cm9sVmFsdWVNYXRjaGVzUmVuZGVyZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY3MTQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoaXMgaXMgYSByZWZhY3Rvcmlu Zy4KKworICAgICAgICAqIGRvbS9FbGVtZW50Lmg6IFJlbW92ZWQgZm9ybUNvbnRyb2xWYWx1ZU1h dGNoZXNSZW5kZXJlciBhbmQgc2V0Rm9ybUNvbnRyb2xWYWx1ZU1hdGNoZXNSZW5kZXJlci4KKyAg ICAgICAgKiBodG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwOiBSZW1vdmVkIG5vdGlmeUZvcm1TdGF0 ZUNoYW5nZWQuCisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgICog aHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUZXh0 QXJlYUVsZW1lbnQ6OnVwZGF0ZVZhbHVlKTogQ2FsbHMgbm90aWZ5Rm9ybVN0YXRlQ2hhbmdlZDsg bW9kaWZpZXMgbV93YXNNb2RpZmllZEJ5VXNlci4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUZXh0 QXJlYUVsZW1lbnQ6OnNldFZhbHVlQ29tbW9uKTogQ2FsbHMgbm90aWZ5Rm9ybVN0YXRlQ2hhbmdl ZDsgYWxzbyByZW5hbWVkIHZhbHVlIHRvIG5ld1ZhbHVlCisgICAgICAgIHRvIGF2b2lkIHRoZSBj b25mbGljdCB3aXRoIHZhbHVlKCkuCisgICAgICAgICogaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50 Lmg6IE1hZGUgbV93YXNNb2RpZmllZEJ5VXNlciBtdXRhYmxlLgorICAgICAgICAqIGh0bWwvSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRleHRG b3JtQ29udHJvbEVsZW1lbnQ6Om5vdGlmeUZvcm1TdGF0ZUNoYW5nZWQpOiBFeHRyYWN0ZWQgZnJv bSBub3RpZnlGb3JtU3RhdGVDaGFuZ2VkIGluCisgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQuY3Bw IGFuZCBIVE1MVGV4dEFyZWFFbGVtZW50LmNwcC4KKyAgICAgICAgKiBodG1sL0hUTUxUZXh0Rm9y bUNvbnRyb2xFbGVtZW50Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9s LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sOjpzZXRJbm5lclRleHRW YWx1ZSk6IENhbGxzIHNldEZvcm1Db250cm9sVmFsdWVNYXRjaGVzUmVuZGVyZXIuCisKIDIwMTEt MDgtMjkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgTWFj IGJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAkocmV2aXNpb24gOTM2MTMpCisrKyBT b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMzcsOSArMzM3 LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGNhbkNvbnRhaW5SYW5nZUVuZFBvaW50 KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgdmlydHVhbCBib29sIGZvcm1Db250cm9s VmFsdWVNYXRjaGVzUmVuZGVyZXIoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1 YWwgdm9pZCBzZXRGb3JtQ29udHJvbFZhbHVlTWF0Y2hlc1JlbmRlcmVyKGJvb2wpIHsgfQotCiAg ICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIGZvcm1Db250cm9sTmFtZSgpIGNvbnN0IHsg cmV0dXJuIG51bGxBdG9tOyB9CiAgICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIGZvcm1D b250cm9sVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG51bGxBdG9tOyB9CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAkocmV2aXNpb24gOTM2MTMpCisrKyBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y OSwxMCArMjksNyBAQAogI2luY2x1ZGUgIkhUTUxJbnB1dEVsZW1lbnQuaCIKIAogI2luY2x1ZGUg IkFYT2JqZWN0Q2FjaGUuaCIKLSNpbmNsdWRlICJBdHRyaWJ1dGUuaCIKICNpbmNsdWRlICJCZWZv cmVUZXh0SW5zZXJ0ZWRFdmVudC5oIgotI2luY2x1ZGUgIkNocm9tZS5oIgotI2luY2x1ZGUgIkNo cm9tZUNsaWVudC5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIKICNpbmNsdWRlICJE b2N1bWVudC5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKQEAgLTQ1LDE0ICs0MiwxMSBAQAog I2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIkhUTUxPcHRpb25FbGVtZW50LmgiCiAj aW5jbHVkZSAiSFRNTFBhcnNlcklkaW9tcy5oIgotI2luY2x1ZGUgIkljb24uaCIKICNpbmNsdWRl ICJJbnB1dFR5cGUuaCIKICNpbmNsdWRlICJLZXlib2FyZEV2ZW50LmgiCiAjaW5jbHVkZSAiTG9j YWxpemVkU3RyaW5ncy5oIgogI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJOdW1i ZXJJbnB1dFR5cGUuaCIKLSNpbmNsdWRlICJQYWdlLmgiCi0jaW5jbHVkZSAiUGxhdGZvcm1Nb3Vz ZUV2ZW50LmgiCiAjaW5jbHVkZSAiUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmgiCiAjaW5j bHVkZSAiUmVuZGVyVGhlbWUuaCIKICNpbmNsdWRlICJSdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgi CkBAIC0xOTA5LDE2ICsxOTAzLDYgQEAgQ2hlY2tlZFJhZGlvQnV0dG9ucyYgSFRNTElucHV0RWxl bWVudDo6YwogICAgIHJldHVybiBkb2N1bWVudCgpLT5jaGVja2VkUmFkaW9CdXR0b25zKCk7CiB9 CiAKLXZvaWQgSFRNTElucHV0RWxlbWVudDo6bm90aWZ5Rm9ybVN0YXRlQ2hhbmdlZCgpCi17Ci0g ICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQoKS0+ZnJhbWUoKTsKLSAgICBpZiAoIWZyYW1lKQot ICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAoUGFnZSogcGFnZSA9IGZyYW1lLT5wYWdlKCkpCi0g ICAgICAgIHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+Zm9ybVN0YXRlRGlkQ2hhbmdlKHRoaXMp OwotfQotCiB2b2lkIEhUTUxJbnB1dEVsZW1lbnQ6OnBhcnNlTWF4TGVuZ3RoQXR0cmlidXRlKEF0 dHJpYnV0ZSogYXR0cmlidXRlKQogewogICAgIGludCBtYXhMZW5ndGggPSBhdHRyaWJ1dGUtPmlz TnVsbCgpID8gbWF4aW11bUxlbmd0aCA6IGF0dHJpYnV0ZS0+dmFsdWUoKS50b0ludCgpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgJKHJldmlzaW9uIDkzNjEzKQor KysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmgJKHdvcmtpbmcgY29weSkK QEAgLTIyOSw3ICsyMjksNiBAQCBwdWJsaWM6CiAjZW5kaWYKIAogICAgIGJvb2wgbGFzdENoYW5n ZVdhc1VzZXJFZGl0KCkgY29uc3Q7Ci0gICAgdm9pZCBub3RpZnlGb3JtU3RhdGVDaGFuZ2VkKCk7 CiAKICAgICBzdGF0aWMgY29uc3QgaW50IG1heGltdW1MZW5ndGg7CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50LmNwcAkocmV2aXNpb24gOTM2MTMpCisr KyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0QXJlYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yOSwyNSArMjksMTkgQEAKICNpbmNsdWRlICJBdHRyaWJ1dGUuaCIKICNpbmNsdWRl ICJCZWZvcmVUZXh0SW5zZXJ0ZWRFdmVudC5oIgogI2luY2x1ZGUgIkNTU1ZhbHVlS2V5d29yZHMu aCIKLSNpbmNsdWRlICJDaHJvbWUuaCIKLSNpbmNsdWRlICJDaHJvbWVDbGllbnQuaCIKICNpbmNs dWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1l cy5oIgogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKLSNpbmNsdWRlICJGb2N1c0NvbnRyb2xs ZXIuaCIKICNpbmNsdWRlICJGb3JtRGF0YUxpc3QuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2lu Y2x1ZGUgIkhUTUxOYW1lcy5oIgotI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJSZW5kZXJT dHlsZS5oIgogI2luY2x1ZGUgIlJlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLmgiCi0jaW5jbHVk ZSAiU2NyaXB0RXZlbnRMaXN0ZW5lci5oIgogI2luY2x1ZGUgIlNoYWRvd1Jvb3QuaCIKICNpbmNs dWRlICJUZXh0LmgiCiAjaW5jbHVkZSAiVGV4dENvbnRyb2xJbm5lckVsZW1lbnRzLmgiCiAjaW5j bHVkZSAiVGV4dEl0ZXJhdG9yLmgiCi0jaW5jbHVkZSAiVmlzaWJsZVNlbGVjdGlvbi5oIgogI2lu Y2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTcs MTQgKzUxLDYgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIHN0YXRpYyBjb25zdCBpbnQg ZGVmYXVsdFJvd3MgPSAyOwogc3RhdGljIGNvbnN0IGludCBkZWZhdWx0Q29scyA9IDIwOwogCi1z dGF0aWMgaW5saW5lIHZvaWQgbm90aWZ5Rm9ybVN0YXRlQ2hhbmdlZChjb25zdCBIVE1MVGV4dEFy ZWFFbGVtZW50KiBlbGVtZW50KQotewotICAgIEZyYW1lKiBmcmFtZSA9IGVsZW1lbnQtPmRvY3Vt ZW50KCktPmZyYW1lKCk7Ci0gICAgaWYgKCFmcmFtZSkKLSAgICAgICAgcmV0dXJuOwotICAgIGZy YW1lLT5wYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+Zm9ybVN0YXRlRGlkQ2hhbmdlKGVsZW1l bnQpOwotfQotCiBIVE1MVGV4dEFyZWFFbGVtZW50OjpIVE1MVGV4dEFyZWFFbGVtZW50KGNvbnN0 IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsIERvY3VtZW50KiBkb2N1bWVudCwgSFRNTEZvcm1FbGVt ZW50KiBmb3JtKQogICAgIDogSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQodGFnTmFtZSwgZG9j dW1lbnQsIGZvcm0pCiAgICAgLCBtX3Jvd3MoZGVmYXVsdFJvd3MpCkBAIC0zMDYsOSArMjkyLDkg QEAgdm9pZCBIVE1MVGV4dEFyZWFFbGVtZW50Ojp1cGRhdGVWYWx1ZSgpIAogICAgIEFTU0VSVChy ZW5kZXJlcigpKTsKICAgICBtX3ZhbHVlID0gdG9SZW5kZXJUZXh0Q29udHJvbChyZW5kZXJlcigp KS0+dGV4dCgpOwogICAgIGNvbnN0X2Nhc3Q8SFRNTFRleHRBcmVhRWxlbWVudCo+KHRoaXMpLT5z ZXRGb3JtQ29udHJvbFZhbHVlTWF0Y2hlc1JlbmRlcmVyKHRydWUpOwotICAgIG5vdGlmeUZvcm1T dGF0ZUNoYW5nZWQodGhpcyk7CisgICAgY29uc3RfY2FzdDxIVE1MVGV4dEFyZWFFbGVtZW50Kj4o dGhpcyktPm5vdGlmeUZvcm1TdGF0ZUNoYW5nZWQoKTsKICAgICBtX2lzRGlydHkgPSB0cnVlOwot ICAgIGNvbnN0X2Nhc3Q8SFRNTFRleHRBcmVhRWxlbWVudCo+KHRoaXMpLT5tX3dhc01vZGlmaWVk QnlVc2VyID0gdHJ1ZTsKKyAgICBtX3dhc01vZGlmaWVkQnlVc2VyID0gdHJ1ZTsKICAgICBjb25z dF9jYXN0PEhUTUxUZXh0QXJlYUVsZW1lbnQqPih0aGlzKS0+dXBkYXRlUGxhY2Vob2xkZXJWaXNp YmlsaXR5KGZhbHNlKTsKIH0KIApAQCAtMzMyLDE4ICszMTgsMTggQEAgdm9pZCBIVE1MVGV4dEFy ZWFFbGVtZW50OjpzZXROb25EaXJ0eVZhbAogICAgIHNldE5lZWRzVmFsaWRpdHlDaGVjaygpOwog fQogCi12b2lkIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OnNldFZhbHVlQ29tbW9uKGNvbnN0IFN0cmlu ZyYgdmFsdWUpCit2b2lkIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OnNldFZhbHVlQ29tbW9uKGNvbnN0 IFN0cmluZyYgbmV3VmFsdWUpCiB7CiAgICAgbV93YXNNb2RpZmllZEJ5VXNlciA9IGZhbHNlOwog ICAgIC8vIENvZGUgZWxzZXdoZXJlIG5vcm1hbGl6ZXMgbGluZSBlbmRpbmdzIGFkZGVkIGJ5IHRo ZSB1c2VyIHZpYSB0aGUga2V5Ym9hcmQgb3IgcGFzdGluZy4KICAgICAvLyBXZSBub3JtYWxpemUg bGluZSBlbmRpbmdzIGNvbWluZyBmcm9tIEphdmFTY3JpcHQgaGVyZS4KLSAgICBTdHJpbmcgbm9y bWFsaXplZFZhbHVlID0gdmFsdWUuaXNOdWxsKCkgPyAiIiA6IHZhbHVlOworICAgIFN0cmluZyBu b3JtYWxpemVkVmFsdWUgPSBuZXdWYWx1ZS5pc051bGwoKSA/ICIiIDogbmV3VmFsdWU7CiAgICAg bm9ybWFsaXplZFZhbHVlLnJlcGxhY2UoIlxyXG4iLCAiXG4iKTsKICAgICBub3JtYWxpemVkVmFs dWUucmVwbGFjZSgnXHInLCAnXG4nKTsKIAogICAgIC8vIFJldHVybiBlYXJseSBiZWNhdXNlIHdl IGRvbid0IHdhbnQgdG8gbW92ZSB0aGUgY2FyZXQgb3IgdHJpZ2dlciBvdGhlciBzaWRlIGVmZmVj dHMKICAgICAvLyB3aGVuIHRoZSB2YWx1ZSBpc24ndCBjaGFuZ2luZy4gVGhpcyBtYXRjaGVzIEZp cmVmb3ggYmVoYXZpb3IsIGF0IGxlYXN0LgotICAgIGlmIChub3JtYWxpemVkVmFsdWUgPT0gdGhp cy0+dmFsdWUoKSkKKyAgICBpZiAobm9ybWFsaXplZFZhbHVlID09IHZhbHVlKCkpCiAgICAgICAg IHJldHVybjsKIAogICAgIG1fdmFsdWUgPSBub3JtYWxpemVkVmFsdWU7CkBAIC0zNTcsNyArMzQz LDcgQEAgdm9pZCBIVE1MVGV4dEFyZWFFbGVtZW50OjpzZXRWYWx1ZUNvbW1vbgogICAgICAgICBz ZXRTZWxlY3Rpb25SYW5nZShlbmRPZlN0cmluZywgZW5kT2ZTdHJpbmcpOwogICAgIH0KIAotICAg IG5vdGlmeUZvcm1TdGF0ZUNoYW5nZWQodGhpcyk7CisgICAgbm90aWZ5Rm9ybVN0YXRlQ2hhbmdl ZCgpOwogICAgIHNldFRleHRBc09mTGFzdEZvcm1Db250cm9sQ2hhbmdlRXZlbnQobm9ybWFsaXpl ZFZhbHVlKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVt ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVt ZW50LmgJKHJldmlzaW9uIDkzNjEzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFy ZWFFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTExMyw3ICsxMTMsNyBAQCBwcml2YXRlOgog ICAgIFJlZlB0cjxIVE1MRWxlbWVudD4gbV9wbGFjZWhvbGRlcjsKICAgICBtdXRhYmxlIFN0cmlu ZyBtX3ZhbHVlOwogICAgIG11dGFibGUgYm9vbCBtX2lzRGlydHk7Ci0gICAgYm9vbCBtX3dhc01v ZGlmaWVkQnlVc2VyOworICAgIG11dGFibGUgYm9vbCBtX3dhc01vZGlmaWVkQnlVc2VyOwogfTsK IAogfSAvL25hbWVzcGFjZQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1D b250cm9sRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M VGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAJKHJldmlzaW9uIDkzNjEzKQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI2LDYgKzI2LDggQEAKICNpbmNsdWRlICJIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5o IgogCiAjaW5jbHVkZSAiQXR0cmlidXRlLmgiCisjaW5jbHVkZSAiQ2hyb21lLmgiCisjaW5jbHVk ZSAiQ2hyb21lQ2xpZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJFdmVu dC5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKQEAgLTMzLDYgKzM1LDcgQEAKICNpbmNsdWRl ICJIVE1MRm9ybUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MSW5wdXRFbGVtZW50LmgiCiAjaW5j bHVkZSAiSFRNTE5hbWVzLmgiCisjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlJlbmRlckJv eC5oIgogI2luY2x1ZGUgIlJlbmRlclRleHRDb250cm9sLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhl bWUuaCIKQEAgLTQzMyw2ICs0MzYsMTYgQEAgdm9pZCBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVu dDo6cGFyc2VNYQogICAgICAgICBIVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0aFN0YXRlOjpwYXJz ZU1hcHBlZEF0dHJpYnV0ZShhdHRyKTsKIH0KIAordm9pZCBIVE1MVGV4dEZvcm1Db250cm9sRWxl bWVudDo6bm90aWZ5Rm9ybVN0YXRlQ2hhbmdlZCgpCit7CisgICAgRnJhbWUqIGZyYW1lID0gZG9j dW1lbnQoKS0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm47CisgICAg CisgICAgaWYgKFBhZ2UqIHBhZ2UgPSBmcmFtZS0+cGFnZSgpKQorICAgICAgICBwYWdlLT5jaHJv bWUoKS0+Y2xpZW50KCktPmZvcm1TdGF0ZURpZENoYW5nZSh0aGlzKTsKK30KKwogSFRNTFRleHRG b3JtQ29udHJvbEVsZW1lbnQqIGVuY2xvc2luZ1RleHRGb3JtQ29udHJvbChjb25zdCBQb3NpdGlv biYgcG9zaXRpb24pCiB7CiAgICAgQVNTRVJUKHBvc2l0aW9uLmlzTnVsbCgpIHx8IHBvc2l0aW9u LmFuY2hvclR5cGUoKSA9PSBQb3NpdGlvbjo6UG9zaXRpb25Jc09mZnNldEluQW5jaG9yCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5o CShyZXZpc2lvbiA5MzYxMykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29u dHJvbEVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNzQsNiArNzQsNyBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCBIVE1MRWxlbWVudCogaW5uZXJUZXh0RWxlbWVudCgpIGNvbnN0ID0gMDsKIAog ICAgIHZvaWQgc2VsZWN0aW9uQ2hhbmdlZChib29sIHVzZXJUcmlnZ2VyZWQpOworICAgIHZvaWQg bm90aWZ5Rm9ybVN0YXRlQ2hhbmdlZCgpOwogCiBwcm90ZWN0ZWQ6CiAgICAgSFRNTFRleHRGb3Jt Q29udHJvbEVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50KiwgSFRNTEZvcm1F bGVtZW50Kik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRy b2wuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbC5jcHAJKHJldmlzaW9uIDkzNjEzKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHRDb250cm9sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcxLDcgKzE3MSw3IEBA IHZvaWQgUmVuZGVyVGV4dENvbnRyb2w6OnNldElubmVyVGV4dFZhbHUKICAgICAgICAgbV9sYXN0 Q2hhbmdlV2FzVXNlckVkaXQgPSBmYWxzZTsKICAgICB9CiAKLSAgICBzdGF0aWNfY2FzdDxFbGVt ZW50Kj4obm9kZSgpKS0+c2V0Rm9ybUNvbnRyb2xWYWx1ZU1hdGNoZXNSZW5kZXJlcih0cnVlKTsK KyAgICB0ZXh0Rm9ybUNvbnRyb2xFbGVtZW50KCktPnNldEZvcm1Db250cm9sVmFsdWVNYXRjaGVz UmVuZGVyZXIodHJ1ZSk7CiB9CiAKIFZpc2libGVQb3NpdGlvbiBSZW5kZXJUZXh0Q29udHJvbDo6 dmlzaWJsZVBvc2l0aW9uRm9ySW5kZXgoaW50IGluZGV4KSBjb25zdAo=