74998 2011-12-20 23:58:58 -0800 Change the item type of Document::m_formElementsWithState from Element* to HTMLFormControlElementWithState* 2011-12-21 20:58:05 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) All All RESOLVED FIXED P3 Minor --- 1 tkent tkent darin dglazkov oldest_to_newest 525137 0 tkent 2011-12-20 23:58:58 -0800 Pointed out by Darin Adler in https://bugs.webkit.org/show_bug.cgi?id=74909#c4 > - Document::m_formElementsWithState should change to hold HTMLFormControlElement* instead of Element*, and all the functions should likewise change. I think the looser type is a remnant of WML support. 525151 1 120155 tkent 2011-12-21 00:14:50 -0800 Created attachment 120155 Patch 525338 2 120155 kling 2011-12-21 10:47:43 -0800 Comment on attachment 120155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120155&action=review Love it! > Source/WebCore/dom/Document.cpp:4319 > String value; > if (!elementWithState->shouldSaveAndRestoreFormControlState()) > continue; Unrelated to this patch, but we should move "String value;" below the continue to avoid creating the empty string unnecessarily. 525955 3 tkent 2011-12-21 20:39:36 -0800 Thank you for reviewing. I'll move "String value" and land the patch. (In reply to comment #2) > > Source/WebCore/dom/Document.cpp:4319 > > String value; > > if (!elementWithState->shouldSaveAndRestoreFormControlState()) > > continue; > > Unrelated to this patch, but we should move "String value;" below the continue to avoid creating the empty string unnecessarily. 525964 4 tkent 2011-12-21 20:58:05 -0800 Committed r103491: <http://trac.webkit.org/changeset/103491> 120155 2011-12-21 00:14:50 -0800 2011-12-21 10:47:43 -0800 Patch bug-74998-20111221171448.patch text/plain 8754 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzcwMDY2NTU3MDgwOGNi ODE2Y2Q3ZWE5OTY4Mzg4N2VjODc2Yjg1OS4uNzY0MmI5MzM4MTJmOTM5ZDVhMTFmYmNlOGE3ZDQ5 MjcyY2VjOTFhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDExLTEyLTIwICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGFuZ2UgdGhlIGl0ZW0g dHlwZSBvZiBEb2N1bWVudDo6bV9mb3JtRWxlbWVudHNXaXRoU3RhdGUgZnJvbSBFbGVtZW50Kgor ICAgICAgICB0byBIVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0aFN0YXRlKi4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0OTk4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBKdXN0IHJl ZmFjdG9yaW5nLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRvY3VtZW50Ojpmb3JtRWxlbWVudHNTdGF0ZSk6IFVzZSBIVE1MRm9ybUNvbnRyb2xFbGVt ZW50V2l0aFN0YXRlKi4KKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKyAgICAgICAgKFdlYkNv cmU6OkRvY3VtZW50OjpyZWdpc3RlckZvcm1FbGVtZW50V2l0aFN0YXRlKTogQ2hhbmdlIHRoZSBh cmd1bWVudCB0eXBlLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnVucmVnaXN0ZXJGb3Jt RWxlbWVudFdpdGhTdGF0ZSk6IGRpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmZv cm1FbGVtZW50cyk6IFJlbmFtZWQgZnJvbSBnZXRGb3JtRWxlbWVudHMoKS4KKyAgICAgICAgKiBk b20vRWxlbWVudC5oOgorICAgICAgICBSZW1vdmVkIHNob3VsZFNhdmVBbmRSZXN0b3JlRm9ybUNv bnRyb2xTdGF0ZSgpLCBzYXZlRm9ybUNvbnRyb2xTdGF0ZSgpLAorICAgICAgICBhbmQgcmVzdG9y ZUZvcm1Db250cm9sU3RhdGUoKSBiZWNhdXNlIHRoZXkgYXJlIG5vdCBjYWxsZWQgZm9yIEVsZW1l bnQKKyAgICAgICAgYW55bW9yZS4KKyAgICAgICAgKiBodG1sL0hUTUxGb3JtQ29udHJvbEVsZW1l bnQuaDoKKyAgICAgICAgLSBNYWtlIGZvcm1Db250cm9sTmFtZSgpIGFuZCBmb3JtQ29udHJvbFR5 cGUoKSBwdWJsaWMuCisgICAgICAgICBUaGV5IGFyZSBjYWxsZWQgZnJvbSBEb2N1bWVudCBjbGFz cy4KKyAgICAgICAgLSBNYWtlIHNob3VsZFNhdmVBbmRSZXN0b3JlRm9ybUNvbnRyb2xTdGF0ZSgp IHB1YmxpYywgYW5kIG5vbi12aXJ0dWFsLgorICAgICAgICAgVGhpcyBpcyBjYWxsZWQgZnJvbSBE b2N1bWVudCBjbGFzcywgYW5kIG5vIG90aGVyIGNsYXNzZXMgb3ZlcnJpZGUgdGhpcy4KKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxGb3JtQ29udHJvbEVsZW1lbnRXaXRoU3RhdGU6OnNhdmVGb3JtQ29u dHJvbFN0YXRlKToKKyAgICAgICAgTW92ZWQgZnJvbSBFbGVtZW50LgorICAgICAgICAoV2ViQ29y ZTo6SFRNTEZvcm1Db250cm9sRWxlbWVudFdpdGhTdGF0ZTo6cmVzdG9yZUZvcm1Db250cm9sU3Rh dGUpOiBkaXR0by4KKyAgICAgICAgKiBodG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6dXBkYXRlQ2hlY2tlZFJhZGlvQnV0dG9ucyk6 CisgICAgICAgIFVzZSBIVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0aFN0YXRlKiBpbnN0ZWFkIG9m IEVsZW1lbnQqLgorCiAyMDExLTEyLTIwICBFcmljIFBlbm5lciAgPGVwZW5uZXJAZ29vZ2xlLmNv bT4KIAogICAgICAgICBbY2hyb21pdW1dIG1fdHJpZ2dlcklkbGVQYWludHMgbm90IHJlc2V0IGFm dGVyIGEgY29tcG9zaXRlQW5kUmVhZGJhY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGIx ZGI0M2QzODY5NDRiYjIyYTcwODI5NTg4ZDE1ZjA1N2MwNjE0OGYuLjcyYTkwZWVkNDZkOTk5MmQ4 NTEyODRjMDU3Y2M1Yjg1ZjI2OWViNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDMx Myw3ICs0MzEzLDcgQEAgVmVjdG9yPFN0cmluZz4gRG9jdW1lbnQ6OmZvcm1FbGVtZW50c1N0YXRl KCkgY29uc3QKICAgICB0eXBlZGVmIEZvcm1FbGVtZW50TGlzdEhhc2hTZXQ6OmNvbnN0X2l0ZXJh dG9yIEl0ZXJhdG9yOwogICAgIEl0ZXJhdG9yIGVuZCA9IG1fZm9ybUVsZW1lbnRzV2l0aFN0YXRl LmVuZCgpOwogICAgIGZvciAoSXRlcmF0b3IgaXQgPSBtX2Zvcm1FbGVtZW50c1dpdGhTdGF0ZS5i ZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgRWxlbWVudCogZWxlbWVudFdpdGhT dGF0ZSA9ICppdDsKKyAgICAgICAgSFRNTEZvcm1Db250cm9sRWxlbWVudFdpdGhTdGF0ZSogZWxl bWVudFdpdGhTdGF0ZSA9ICppdDsKICAgICAgICAgU3RyaW5nIHZhbHVlOwogICAgICAgICBpZiAo IWVsZW1lbnRXaXRoU3RhdGUtPnNob3VsZFNhdmVBbmRSZXN0b3JlRm9ybUNvbnRyb2xTdGF0ZSgp KQogICAgICAgICAgICAgY29udGludWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDAzYjI1ZWVh NDg1OTNjYWRiNTM1YTc2ODhkYWU0ODdmOWVlMDEzNWQuLmRhZWMyODAxMzNiYTE4OTRkODc0YjZk NjQ0Y2VhYTdhNTAwNjcyMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC05Myw2ICs5Myw3IEBA IGNsYXNzIEhUTUxDb2xsZWN0aW9uOwogY2xhc3MgSFRNTEFsbENvbGxlY3Rpb247CiBjbGFzcyBI VE1MRG9jdW1lbnQ7CiBjbGFzcyBIVE1MRWxlbWVudDsKK2NsYXNzIEhUTUxGb3JtQ29udHJvbEVs ZW1lbnRXaXRoU3RhdGU7CiBjbGFzcyBIVE1MRm9ybUVsZW1lbnQ7CiBjbGFzcyBIVE1MRnJhbWVP d25lckVsZW1lbnQ7CiBjbGFzcyBIVE1MSGVhZEVsZW1lbnQ7CkBAIC0yMjQsOSArMjI1LDYgQEAg cHVibGljOgogICAgIH0KICAgICB2aXJ0dWFsIH5Eb2N1bWVudCgpOwogCi0gICAgdHlwZWRlZiBM aXN0SGFzaFNldDxFbGVtZW50KiwgNjQ+IEZvcm1FbGVtZW50TGlzdEhhc2hTZXQ7Ci0gICAgY29u c3QgRm9ybUVsZW1lbnRMaXN0SGFzaFNldCogZ2V0Rm9ybUVsZW1lbnRzKCkgY29uc3QgeyByZXR1 cm4gJm1fZm9ybUVsZW1lbnRzV2l0aFN0YXRlOyB9ICAgIAotCiAgICAgTWVkaWFRdWVyeU1hdGNo ZXIqIG1lZGlhUXVlcnlNYXRjaGVyKCk7CiAKICAgICB1c2luZyBUcmVlU2NvcGU6OnJlZjsKQEAg LTUxOSwxMiArNTE3LDE0IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFVzZXNMaW5rUnVsZXMoYm9v bCBiKSB7IG1fdXNlc0xpbmtSdWxlcyA9IGI7IH0KIAogICAgIC8vIE1hY2hpbmVyeSBmb3Igc2F2 aW5nIGFuZCByZXN0b3Jpbmcgc3RhdGUgd2hlbiB5b3UgbGVhdmUgYW5kIHRoZW4gZ28gYmFjayB0 byBhIHBhZ2UuCi0gICAgdm9pZCByZWdpc3RlckZvcm1FbGVtZW50V2l0aFN0YXRlKEVsZW1lbnQq IGUpIHsgbV9mb3JtRWxlbWVudHNXaXRoU3RhdGUuYWRkKGUpOyB9Ci0gICAgdm9pZCB1bnJlZ2lz dGVyRm9ybUVsZW1lbnRXaXRoU3RhdGUoRWxlbWVudCogZSkgeyBtX2Zvcm1FbGVtZW50c1dpdGhT dGF0ZS5yZW1vdmUoZSk7IH0KKyAgICB2b2lkIHJlZ2lzdGVyRm9ybUVsZW1lbnRXaXRoU3RhdGUo SFRNTEZvcm1Db250cm9sRWxlbWVudFdpdGhTdGF0ZSogY29udHJvbCkgeyBtX2Zvcm1FbGVtZW50 c1dpdGhTdGF0ZS5hZGQoY29udHJvbCk7IH0KKyAgICB2b2lkIHVucmVnaXN0ZXJGb3JtRWxlbWVu dFdpdGhTdGF0ZShIVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0aFN0YXRlKiBjb250cm9sKSB7IG1f Zm9ybUVsZW1lbnRzV2l0aFN0YXRlLnJlbW92ZShjb250cm9sKTsgfQogICAgIFZlY3RvcjxTdHJp bmc+IGZvcm1FbGVtZW50c1N0YXRlKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRTdGF0ZUZvck5ld0Zv cm1FbGVtZW50cyhjb25zdCBWZWN0b3I8U3RyaW5nPiYpOwogICAgIGJvb2wgaGFzU3RhdGVGb3JO ZXdGb3JtRWxlbWVudHMoKSBjb25zdDsKICAgICBib29sIHRha2VTdGF0ZUZvckZvcm1FbGVtZW50 KEF0b21pY1N0cmluZ0ltcGwqIG5hbWUsIEF0b21pY1N0cmluZ0ltcGwqIHR5cGUsIFN0cmluZyYg c3RhdGUpOworICAgIHR5cGVkZWYgTGlzdEhhc2hTZXQ8SFRNTEZvcm1Db250cm9sRWxlbWVudFdp dGhTdGF0ZSosIDY0PiBGb3JtRWxlbWVudExpc3RIYXNoU2V0OworICAgIGNvbnN0IEZvcm1FbGVt ZW50TGlzdEhhc2hTZXQqIGZvcm1FbGVtZW50cygpIGNvbnN0IHsgcmV0dXJuICZtX2Zvcm1FbGVt ZW50c1dpdGhTdGF0ZTsgfQogCiAgICAgdm9pZCByZWdpc3RlckZvcm1FbGVtZW50V2l0aEZvcm1B dHRyaWJ1dGUoRm9ybUFzc29jaWF0ZWRFbGVtZW50Kik7CiAgICAgdm9pZCB1bnJlZ2lzdGVyRm9y bUVsZW1lbnRXaXRoRm9ybUF0dHJpYnV0ZShGb3JtQXNzb2NpYXRlZEVsZW1lbnQqKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5oCmluZGV4IDkyZDU5YzkxMTIwOTU1Njc4ZDQ3MTlhMzRlMjJlZTk2MTJkMzQ1ZGUu LjBlNmZlMGE3ZTJkNmQ1MjJkNzgzMjFmZDExYzg3YjUxNDMxYjg4ZGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1l bnQuaApAQCAtMzM1LDEwICszMzUsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBjb25zdCBBdG9t aWNTdHJpbmcmIGZvcm1Db250cm9sTmFtZSgpIGNvbnN0IHsgcmV0dXJuIG51bGxBdG9tOyB9CiAg ICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIGZvcm1Db250cm9sVHlwZSgpIGNvbnN0IHsg cmV0dXJuIG51bGxBdG9tOyB9CiAKLSAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU2F2ZUFuZFJlc3Rv cmVGb3JtQ29udHJvbFN0YXRlKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQotICAgIHZpcnR1YWwg Ym9vbCBzYXZlRm9ybUNvbnRyb2xTdGF0ZShTdHJpbmcmKSBjb25zdCB7IHJldHVybiBmYWxzZTsg fQotICAgIHZpcnR1YWwgdm9pZCByZXN0b3JlRm9ybUNvbnRyb2xTdGF0ZShjb25zdCBTdHJpbmcm KSB7IH0KLQogICAgIHZpcnR1YWwgYm9vbCB3YXNDaGFuZ2VkU2luY2VMYXN0Rm9ybUNvbnRyb2xD aGFuZ2VFdmVudCgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBzZXRDaGFuZ2VkU2luY2VMYXN0 Rm9ybUNvbnRyb2xDaGFuZ2VFdmVudChib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hG b3JtQ29udHJvbENoYW5nZUV2ZW50KCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZv cm1Db250cm9sRWxlbWVudC5oCmluZGV4IGZkNTJjY2EwODk5MTI2NmJjZDJlYjVhMGRkNDYyYmI5 ZTYwYjFlNTguLjc4Yjc0NGQ1NWU3N2M2ZTU2MTg5MDA0MmQ3OWM2ZGIwN2NjOWU2MDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5oCkBAIC03NSw2ICs3 NSw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0TmFtZShjb25zdCBBdG9taWNTdHJpbmcmIG5h bWUpOwogCisgICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIGZvcm1Db250cm9sTmFtZSgp IGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBmb3JtQ29u dHJvbFR5cGUoKSBjb25zdCBPVkVSUklERSA9IDA7CiAgICAgdmlydHVhbCBib29sIGlzRW5hYmxl ZEZvcm1Db250cm9sKCkgY29uc3QgeyByZXR1cm4gIWRpc2FibGVkKCk7IH0KICAgICB2aXJ0dWFs IGJvb2wgaXNSZWFkT25seUZvcm1Db250cm9sKCkgY29uc3QgeyByZXR1cm4gcmVhZE9ubHkoKTsg fQogCkBAIC0xMjAsNyArMTIyLDYgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCByZW1v dmVkRnJvbURvY3VtZW50KCk7CiAgICAgdmlydHVhbCB2b2lkIHdpbGxNb3ZlVG9OZXdPd25lckRv Y3VtZW50KCk7CiAKLSAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgZm9ybUNvbnRyb2xO YW1lKCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzRm9jdXMoKSBjb25zdDsKICAg ICB2aXJ0dWFsIGJvb2wgaXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50KikgY29uc3Q7 CiAgICAgdmlydHVhbCBib29sIGlzTW91c2VGb2N1c2FibGUoKSBjb25zdDsKQEAgLTEzNSw4ICsx MzYsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29sIHJlY2FsY1dpbGxWYWxpZGF0ZSgp IGNvbnN0OwogCiBwcml2YXRlOgotICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBmb3Jt Q29udHJvbFR5cGUoKSBjb25zdCA9IDA7Ci0KICAgICB2aXJ0dWFsIHZvaWQgcmVmRm9ybUFzc29j aWF0ZWRFbGVtZW50KCkgeyByZWYoKTsgfQogICAgIHZpcnR1YWwgdm9pZCBkZXJlZkZvcm1Bc3Nv Y2lhdGVkRWxlbWVudCgpIHsgZGVyZWYoKTsgfQogCkBAIC0xNzcsNiArMTc2LDEwIEBAIHB1Ymxp YzoKIAogICAgIHZpcnR1YWwgYm9vbCBjYW5Db250YWluUmFuZ2VFbmRQb2ludCgpIGNvbnN0IHsg cmV0dXJuIGZhbHNlOyB9CiAKKyAgICBib29sIHNob3VsZFNhdmVBbmRSZXN0b3JlRm9ybUNvbnRy b2xTdGF0ZSgpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBzYXZlRm9ybUNvbnRyb2xTdGF0ZShT dHJpbmcmKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgdm9pZCByZXN0b3Jl Rm9ybUNvbnRyb2xTdGF0ZShjb25zdCBTdHJpbmcmKSB7IH0KKwogcHJvdGVjdGVkOgogICAgIEhU TUxGb3JtQ29udHJvbEVsZW1lbnRXaXRoU3RhdGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFt ZSwgRG9jdW1lbnQqLCBIVE1MRm9ybUVsZW1lbnQqKTsKIApAQCAtMTg0LDkgKzE4Nyw2IEBAIHBy b3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgZmluaXNoUGFyc2luZ0NoaWxkcmVuKCk7CiAgICAg dmlydHVhbCB2b2lkIHdpbGxNb3ZlVG9OZXdPd25lckRvY3VtZW50KCk7CiAgICAgdmlydHVhbCB2 b2lkIGRpZE1vdmVUb05ld093bmVyRG9jdW1lbnQoKTsKLQotcHJpdmF0ZToKLSAgICB2aXJ0dWFs IGJvb2wgc2hvdWxkU2F2ZUFuZFJlc3RvcmVGb3JtQ29udHJvbFN0YXRlKCkgY29uc3Q7CiB9Owog CiB9IC8vIG5hbWVzcGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5w dXRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAK aW5kZXggMTU5NmQ2OGI2YzgwMTExZmM2NzliNmViOWJmYTQ1ZTVkZTgzNDA4ZS4uMjE0ZTVjNGVl OWVkNjc4YTgwNWE3OTAwYTViMDQzYjYzODkxOWI3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxJbnB1dEVsZW1lbnQuY3BwCkBAIC0xOTYsMTQgKzE5NiwxMyBAQCB2b2lkIEhUTUxJbnB1dEVs ZW1lbnQ6OnVwZGF0ZUNoZWNrZWRSYWRpb0J1dHRvbnMoKQogICAgICAgICB9CiAgICAgfSBlbHNl IHsKICAgICAgICAgdHlwZWRlZiBEb2N1bWVudDo6Rm9ybUVsZW1lbnRMaXN0SGFzaFNldDo6Y29u c3RfaXRlcmF0b3IgSXRlcmF0b3I7Ci0gICAgICAgIEl0ZXJhdG9yIGVuZCA9IGRvY3VtZW50KCkt PmdldEZvcm1FbGVtZW50cygpLT5lbmQoKTsKLSAgICAgICAgZm9yIChJdGVyYXRvciBpdCA9IGRv Y3VtZW50KCktPmdldEZvcm1FbGVtZW50cygpLT5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsK LSAgICAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSAqaXQ7Ci0gICAgICAgICAgICBpZiAoZWxl bWVudC0+Zm9ybUNvbnRyb2xOYW1lKCkgIT0gbmFtZSgpKQorICAgICAgICBJdGVyYXRvciBlbmQg PSBkb2N1bWVudCgpLT5mb3JtRWxlbWVudHMoKS0+ZW5kKCk7CisgICAgICAgIGZvciAoSXRlcmF0 b3IgaXQgPSBkb2N1bWVudCgpLT5mb3JtRWxlbWVudHMoKS0+YmVnaW4oKTsgaXQgIT0gZW5kOyAr K2l0KSB7CisgICAgICAgICAgICBIVE1MRm9ybUNvbnRyb2xFbGVtZW50V2l0aFN0YXRlKiBjb250 cm9sID0gKml0OworICAgICAgICAgICAgaWYgKGNvbnRyb2wtPmZvcm1Db250cm9sTmFtZSgpICE9 IG5hbWUoKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGlmIChlbGVt ZW50LT5mb3JtQ29udHJvbFR5cGUoKSAhPSB0eXBlKCkpCisgICAgICAgICAgICBpZiAoY29udHJv bC0+Zm9ybUNvbnRyb2xUeXBlKCkgIT0gdHlwZSgpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICAgICAgSFRNTEZvcm1Db250cm9sRWxlbWVudCogY29udHJvbCA9IHN0YXRpY19j YXN0PEhUTUxGb3JtQ29udHJvbEVsZW1lbnQqPihlbGVtZW50KTsKICAgICAgICAgICAgIGlmIChj b250cm9sLT5mb3JtKCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICBj b250cm9sLT5zZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsK