41936 2010-07-09 00:42:57 -0700 Add new popUntilPopped functions to clean up code 2010-07-09 00:48:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth oldest_to_newest 248797 0 eric 2010-07-09 00:42:57 -0700 Add new popUntilPopped functions to clean up code 248798 1 61007 eric 2010-07-09 00:44:30 -0700 Created attachment 61007 Patch 248799 2 eric 2010-07-09 00:48:29 -0700 Committed r62909: <http://trac.webkit.org/changeset/62909> 61007 2010-07-09 00:44:30 -0700 2010-07-09 00:46:28 -0700 Patch bug-41936-20100709004429.patch text/plain 8786 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDY0MDIwMzJlMWJhZDRiOGQ0ODhlMTY0OWE5ODJmYzk4MDBhZjA4Yy4uMGRlNWVjMjY5NmY0MWEz YzJmZjI2ZDlhNDk3MTQzM2IzNDRkYmQ1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNyBAQAogMjAxMC0wNy0wOSAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIG5ldyBwb3BVbnRpbFBvcHBlZCBmdW5jdGlvbnMgdG8g Y2xlYW4gdXAgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDE5MzYKKworICAgICAgICBQcmV0dHkgc2VsZiBleHBsYW5hdG9yeS4gIE11Y2ggYXdl c29tZSBjb2RlIHJlZHVjdGlvbi4KKworICAgICAgICBObyBmdW5jdGlvbmFsIGNoYW5nZXMsIHRo dXMgbm8gdGVzdHMuCisKKyAgICAgICAgKiBodG1sL0hUTUxFbGVtZW50U3RhY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTEVsZW1lbnRTdGFjazo6cG9wVW50aWxQb3BwZWQpOgorICAgICAg ICAqIGh0bWwvSFRNTEVsZW1lbnRTdGFjay5oOgorICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWls ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0FueU90 aGVyRW5kVGFnRm9ySW5Cb2R5KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6 Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRl cjo6cHJvY2Vzc0VuZFRhZ0ZvckluQm9keSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1 aWxkZXI6OnByb2Nlc3NDYXB0aW9uRW5kVGFnRm9ySW5DYXB0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1RhYmxlRW5kVGFnRm9ySW5UYWJsZSk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcpOgorCisyMDEwLTA3 LTA5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBVbnJldmlld2Vk LiAgSnVzdCByZW5hbWluZyAoZGlzY3Vzc2VkIHdpdGggQWRhbSBCYXJ0aCkuCiAKICAgICAgICAg UmVuYW1lIGNyZWF0ZUVsZW1lbnQqIHRvIGNyZWF0ZUhUTUxFbGVtZW50KiB0byBiZXR0ZXIgcmVm bGVjdApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suY3BwIGIvV2Vi Q29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suY3BwCmluZGV4IDlmODE1YzliNTcwYWRkNDJkMTVm YzE3MzhkMWNiNjdkZDAwZWRlYmQuLmEyMDUyNWM2MTkyOWM1YWJlMmQ5YjU1OGZmMzdmNzI2MmQ5 ZTY0YjYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudFN0YWNrLmNwcAorKysg Yi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRTdGFjay5jcHAKQEAgLTE1MiwxMiArMTUyLDI0IEBA IHZvaWQgSFRNTEVsZW1lbnRTdGFjazo6cG9wVW50aWwoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdO YW1lKQogICAgIH0KIH0KIAordm9pZCBIVE1MRWxlbWVudFN0YWNrOjpwb3BVbnRpbFBvcHBlZChj b25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUpCit7CisgICAgcG9wVW50aWwodGFnTmFtZSk7Cisg ICAgcG9wKCk7Cit9CisKIHZvaWQgSFRNTEVsZW1lbnRTdGFjazo6cG9wVW50aWwoRWxlbWVudCog ZWxlbWVudCkKIHsKICAgICB3aGlsZSAodG9wKCkgIT0gZWxlbWVudCkKICAgICAgICAgcG9wKCk7 CiB9CiAKK3ZvaWQgSFRNTEVsZW1lbnRTdGFjazo6cG9wVW50aWxQb3BwZWQoRWxlbWVudCogZWxl bWVudCkKK3sKKyAgICBwb3BVbnRpbChlbGVtZW50KTsKKyAgICBwb3AoKTsKK30KKwogdm9pZCBI VE1MRWxlbWVudFN0YWNrOjpwb3BVbnRpbFRhYmxlU2NvcGVNYXJrZXIoKQogewogICAgIC8vIGh0 dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdl L3Rva2VuaXphdGlvbi5odG1sI2NsZWFyLXRoZS1zdGFjay1iYWNrLXRvLWEtdGFibGUtY29udGV4 dApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaCBiL1dlYkNvcmUv aHRtbC9IVE1MRWxlbWVudFN0YWNrLmgKaW5kZXggMDdmNmU2MDg3MTkzMjhiZjhhOGNmZGNlNjJm ZjRkMjZlNTQ4NGQ5Ny4uODZiNmIxYTczYzRlZGVkZjdmMGQ0ZDFlZDNhOTFhMGE0M2YzNDFkMiAx MDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaAorKysgYi9XZWJDb3Jl L2h0bWwvSFRNTEVsZW1lbnRTdGFjay5oCkBAIC04NCw2ICs4NCw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIHBvcCgpOwogICAgIHZvaWQgcG9wVW50aWwoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1l KTsKICAgICB2b2lkIHBvcFVudGlsKEVsZW1lbnQqKTsKKyAgICB2b2lkIHBvcFVudGlsUG9wcGVk KGNvbnN0IEF0b21pY1N0cmluZyYgdGFnTmFtZSk7CisgICAgdm9pZCBwb3BVbnRpbFBvcHBlZChF bGVtZW50Kik7CiAgICAgdm9pZCBwb3BVbnRpbFRhYmxlU2NvcGVNYXJrZXIoKTsgLy8gImNsZWFy IHRoZSBzdGFjayBiYWNrIHRvIGEgdGFibGUgY29udGV4dCIgaW4gdGhlIHNwZWMuCiAgICAgdm9p ZCBwb3BVbnRpbFRhYmxlQm9keVNjb3BlTWFya2VyKCk7IC8vICJjbGVhciB0aGUgc3RhY2sgYmFj ayB0byBhIHRhYmxlIGJvZHkgY29udGV4dCIgaW4gdGhlIHNwZWMuCiAgICAgdm9pZCBwb3BVbnRp bFRhYmxlUm93U2NvcGVNYXJrZXIoKTsgLy8gImNsZWFyIHRoZSBzdGFjayBiYWNrIHRvIGEgdGFi bGUgcm93IGNvbnRleHQiIGluIHRoZSBzcGVjLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hU TUxUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAppbmRl eCBlYmYyNGFkMTZkMGE3NjdlNjU3YTY0ZDhmM2MxMTMwYjhjNzllNmVhLi4zNTMxZTZjNmM3YzNh MTRmYjI1NzU5YjM3ODJiN2Q4YjAzNWRhMDUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRN TFRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcApA QCAtMTMwMiw4ICsxMzAyLDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NBbnlPdGhl ckVuZFRhZ0ZvckluQm9keShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICAgICAgICAg IGlmICghbV90cmVlLm9wZW5FbGVtZW50cygpLT5jb250YWlucyhub2RlKSkKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgbV90cmVlLm9wZW5F bGVtZW50cygpLT5wb3BVbnRpbChub2RlKTsKLSAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVu dHMoKS0+cG9wKCk7CisgICAgICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGls UG9wcGVkKG5vZGUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlm IChpc05vdEZvcm1hdHRpbmdBbmROb3RQaHJhc2luZyhub2RlKSkgewpAQCAtMTM2Niw4ICsxMzY1 LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OmNhbGxUaGVBZG9wdGlvbkFnZW5jeShBdG9taWNI VE1MVG9rZW4mIHRva2VuKQogICAgICAgICBIVE1MRWxlbWVudFN0YWNrOjpFbGVtZW50UmVjb3Jk KiBmdXJ0aGVzdEJsb2NrID0gZnVydGhlc3RCbG9ja0ZvckZvcm1hdHRpbmdFbGVtZW50KGZvcm1h dHRpbmdFbGVtZW50KTsKICAgICAgICAgLy8gMy4KICAgICAgICAgaWYgKCFmdXJ0aGVzdEJsb2Nr KSB7Ci0gICAgICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsKGZvcm1hdHRp bmdFbGVtZW50KTsKLSAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wKCk7Cisg ICAgICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsUG9wcGVkKGZvcm1hdHRp bmdFbGVtZW50KTsKICAgICAgICAgICAgIG1fdHJlZS5hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMo KS0+cmVtb3ZlKGZvcm1hdHRpbmdFbGVtZW50KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQpAQCAtMTU1Nyw4ICsxNTU1LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NF bmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgbV90cmVlLmdl bmVyYXRlSW1wbGllZEVuZFRhZ3MoKTsKICAgICAgICAgaWYgKCFtX3RyZWUuY3VycmVudEVsZW1l bnQoKS0+aGFzTG9jYWxOYW1lKHRva2VuLm5hbWUoKSkpCiAgICAgICAgICAgICBwYXJzZUVycm9y KHRva2VuKTsKLSAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BVbnRpbCh0b2tlbi5u YW1lKCkpOwotICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcCgpOworICAgICAgICBt X3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsUG9wcGVkKHRva2VuLm5hbWUoKSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBmb3JtVGFnKSB7CkBA IC0xNTgzLDggKzE1ODAsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZ0Zv ckluQm9keShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBtX3RyZWUuZ2VuZXJhdGVJ bXBsaWVkRW5kVGFnc1dpdGhFeGNsdXNpb24odG9rZW4ubmFtZSgpKTsKICAgICAgICAgaWYgKCFt X3RyZWUuY3VycmVudEVsZW1lbnQoKS0+aGFzTG9jYWxOYW1lKHRva2VuLm5hbWUoKSkpCiAgICAg ICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKLSAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygp LT5wb3BVbnRpbCh0b2tlbi5uYW1lKCkpOwotICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCkt PnBvcCgpOworICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsUG9wcGVkKHRv a2VuLm5hbWUoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKHRva2VuLm5hbWUo KSA9PSBsaVRhZykgewpAQCAtMTU5NSw4ICsxNTkxLDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6 OnByb2Nlc3NFbmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAg bV90cmVlLmdlbmVyYXRlSW1wbGllZEVuZFRhZ3NXaXRoRXhjbHVzaW9uKHRva2VuLm5hbWUoKSk7 CiAgICAgICAgIGlmICghbV90cmVlLmN1cnJlbnRFbGVtZW50KCktPmhhc0xvY2FsTmFtZSh0b2tl bi5uYW1lKCkpKQogICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7Ci0gICAgICAgIG1fdHJl ZS5vcGVuRWxlbWVudHMoKS0+cG9wVW50aWwodG9rZW4ubmFtZSgpKTsKLSAgICAgICAgbV90cmVl Lm9wZW5FbGVtZW50cygpLT5wb3AoKTsKKyAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5w b3BVbnRpbFBvcHBlZCh0b2tlbi5uYW1lKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAg IGlmICh0b2tlbi5uYW1lKCkgPT0gZGRUYWcKQEAgLTE2MDgsOCArMTYwMyw3IEBAIHZvaWQgSFRN TFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnRm9ySW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9r ZW4pCiAgICAgICAgIG1fdHJlZS5nZW5lcmF0ZUltcGxpZWRFbmRUYWdzV2l0aEV4Y2x1c2lvbih0 b2tlbi5uYW1lKCkpOwogICAgICAgICBpZiAoIW1fdHJlZS5jdXJyZW50RWxlbWVudCgpLT5oYXNM b2NhbE5hbWUodG9rZW4ubmFtZSgpKSkKICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwot ICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsKHRva2VuLm5hbWUoKSk7Ci0g ICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wKCk7CisgICAgICAgIG1fdHJlZS5vcGVu RWxlbWVudHMoKS0+cG9wVW50aWxQb3BwZWQodG9rZW4ubmFtZSgpKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KICAgICBpZiAoaXNOdW1iZXJlZEhlYWRlclRhZyh0b2tlbi5uYW1lKCkpKSB7CkBA IC0xNjIwLDggKzE2MTQsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZ0Zv ckluQm9keShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICBtX3RyZWUuZ2VuZXJhdGVJ bXBsaWVkRW5kVGFncygpOwogICAgICAgICBpZiAoIW1fdHJlZS5jdXJyZW50RWxlbWVudCgpLT5o YXNMb2NhbE5hbWUodG9rZW4ubmFtZSgpKSkKICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4p OwotICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsKHRva2VuLm5hbWUoKSk7 Ci0gICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wKCk7CisgICAgICAgIG1fdHJlZS5v cGVuRWxlbWVudHMoKS0+cG9wVW50aWxQb3BwZWQodG9rZW4ubmFtZSgpKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KICAgICBpZiAodG9rZW4ubmFtZSgpID09ICJzYXJjYXNtIikgewpAQCAtMTY0 Miw4ICsxNjM1LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJbkJv ZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgbV90cmVlLmdlbmVyYXRlSW1wbGll ZEVuZFRhZ3MoKTsKICAgICAgICAgaWYgKCFtX3RyZWUuY3VycmVudEVsZW1lbnQoKS0+aGFzTG9j YWxOYW1lKHRva2VuLm5hbWUoKSkpCiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKLSAg ICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BVbnRpbCh0b2tlbi5uYW1lKCkpOwotICAg ICAgICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcCgpOworICAgICAgICBtX3RyZWUub3BlbkVs ZW1lbnRzKCktPnBvcFVudGlsUG9wcGVkKHRva2VuLm5hbWUoKSk7CiAgICAgICAgIG1fdHJlZS5h Y3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKS0+Y2xlYXJUb0xhc3RNYXJrZXIoKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KQEAgLTE2NjQsOCArMTY1Niw3IEBAIGJvb2wgSFRNTFRyZWVCdWlsZGVy Ojpwcm9jZXNzQ2FwdGlvbkVuZFRhZ0ZvckluQ2FwdGlvbigpCiAgICAgfQogICAgIG1fdHJlZS5n ZW5lcmF0ZUltcGxpZWRFbmRUYWdzKCk7CiAgICAgLy8gRklYTUU6IHBhcnNlIGVycm9yIGlmICgh bV90cmVlLmN1cnJlbnRFbGVtZW50KCktPmhhc1RhZ05hbWUoY2FwdGlvblRhZykpCi0gICAgbV90 cmVlLm9wZW5FbGVtZW50cygpLT5wb3BVbnRpbChjYXB0aW9uVGFnLmxvY2FsTmFtZSgpKTsKLSAg ICBtX3RyZWUub3BlbkVsZW1lbnRzKCktPnBvcCgpOworICAgIG1fdHJlZS5vcGVuRWxlbWVudHMo KS0+cG9wVW50aWxQb3BwZWQoY2FwdGlvblRhZy5sb2NhbE5hbWUoKSk7CiAgICAgbV90cmVlLmFj dGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpLT5jbGVhclRvTGFzdE1hcmtlcigpOwogICAgIG1faW5z ZXJ0aW9uTW9kZSA9IEluVGFibGVNb2RlOwogICAgIHJldHVybiB0cnVlOwpAQCAtMTY5Miw4ICsx NjgzLDcgQEAgYm9vbCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NUYWJsZUVuZFRhZ0ZvckluVGFi bGUoKQogICAgICAgICAvLyBGSVhNRTogcGFyc2UgZXJyb3IuCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9Ci0gICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BVbnRpbCh0YWJsZVRhZy5s b2NhbE5hbWUoKSk7Ci0gICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3AoKTsKKyAgICBtX3Ry ZWUub3BlbkVsZW1lbnRzKCktPnBvcFVudGlsUG9wcGVkKHRhYmxlVGFnLmxvY2FsTmFtZSgpKTsK ICAgICByZXNldEluc2VydGlvbk1vZGVBcHByb3ByaWF0ZWx5KCk7CiAgICAgcmV0dXJuIHRydWU7 CiB9CkBAIC0xODU5LDggKzE4NDksNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0Vu ZFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICAgICAgbV90cmVlLmdlbmVyYXRl SW1wbGllZEVuZFRhZ3MoKTsKICAgICAgICAgICAgIGlmICghbV90cmVlLmN1cnJlbnRFbGVtZW50 KCktPmhhc0xvY2FsTmFtZSh0b2tlbi5uYW1lKCkpKQogICAgICAgICAgICAgICAgIHBhcnNlRXJy b3IodG9rZW4pOwotICAgICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BVbnRpbCh0 b2tlbi5uYW1lKCkpOwotICAgICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3AoKTsK KyAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wVW50aWxQb3BwZWQodG9rZW4u bmFtZSgpKTsKICAgICAgICAgICAgIG1fdHJlZS5hY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKS0+ Y2xlYXJUb0xhc3RNYXJrZXIoKTsKICAgICAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluUm93 TW9kZTsKICAgICAgICAgICAgIEFTU0VSVChtX3RyZWUuY3VycmVudEVsZW1lbnQoKS0+aGFzVGFn TmFtZSh0clRhZykpOwpAQCAtMjAzMSw4ICsyMDIwLDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6 OnByb2Nlc3NFbmRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgfQogICAgICAg ICBpZiAodG9rZW4ubmFtZSgpID09IHNlbGVjdFRhZykgewogICAgICAgICAgICAgbm90SW1wbGVt ZW50ZWQoKTsgLy8gZnJhZ21lbnQgY2FzZQotICAgICAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50 cygpLT5wb3BVbnRpbChzZWxlY3RUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICAgICAgbV90cmVl Lm9wZW5FbGVtZW50cygpLT5wb3AoKTsKKyAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMo KS0+cG9wVW50aWxQb3BwZWQoc2VsZWN0VGFnLmxvY2FsTmFtZSgpKTsKICAgICAgICAgICAgIHJl c2V0SW5zZXJ0aW9uTW9kZUFwcHJvcHJpYXRlbHkoKTsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQo=