120433 2013-08-28 11:45:23 -0700 Document::elementSheet() should return a reference 2013-08-28 12:23:51 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 psolanki psolanki commit-queue esprehn+autocc glenn kangil.han kling macpherson menard psolanki oldest_to_newest 922132 0 psolanki 2013-08-28 11:45:23 -0700 elementSheet() always returns a valid pointer. We can just make it return a reference. While at it, we should rename m_elemSheet to m_elementSheet. 922135 1 209912 psolanki 2013-08-28 11:50:13 -0700 Created attachment 209912 Patch 922148 2 209912 commit-queue 2013-08-28 12:23:48 -0700 Comment on attachment 209912 Patch Clearing flags on attachment: 209912 Committed r154766: <http://trac.webkit.org/changeset/154766> 922149 3 commit-queue 2013-08-28 12:23:51 -0700 All reviewed patches have been landed. Closing bug. 209912 2013-08-28 11:50:13 -0700 2013-08-28 12:23:48 -0700 Patch bug-120433-20130828115012.patch text/plain 9966 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0NzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWE4ZDNhNzhlMWIzZTVk M2Y2NzUxNTk2MjFjMTE2YmMxYzk0YjIyYi4uMzkzZWY5OTg2ZTY5ZGJiNzYyNWRlMjQ2NjgxMWQ0 NzgzOThkOGEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTA4LTI4ICBQcmF0 aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KKworICAgICAgICBEb2N1bWVudDo6ZWxl bWVudFNoZWV0KCkgc2hvdWxkIHJldHVybiBhIHJlZmVyZW5jZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwNDMzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2UgZWxlbWVudFNoZWV0KCkgYWx3YXlz IHJldHJ1bnMgYSB2YWxpZCBwb2ludGVyLCB3ZSBjYW4gc2ltcGx5IHJldHVybiBhIHJlZmVyZW5j ZQorICAgICAgICBpbnN0ZWFkLiBBbHNvIHJlbmFtZSBtX2VsZW1TaGVldCB0byBtX2VsZW1lbnRT aGVldC4KKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTUGFyc2VyOjpwYXJzZUlubGluZVN0eWxlRGVjbGFyYXRpb24pOgorICAgICAgICAqIGNzcy9Q cm9wZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5s aW5lQ1NTU3R5bGVEZWNsYXJhdGlvbjo6cGFyZW50U3R5bGVTaGVldCk6CisgICAgICAgICogZG9t L0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp+RG9jdW1lbnQpOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlY2FsY1N0eWxlKToKKyAgICAgICAgKFdlYkNv cmU6OkRvY3VtZW50Ojp1cGRhdGVCYXNlVVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50 OjplbGVtZW50U2hlZXQpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAqIGRv bS9TdHlsZWRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlZEVsZW1lbnQ6OnNl dElubGluZVN0eWxlRnJvbVN0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRFbGVtZW50 OjpzZXRJbmxpbmVTdHlsZVByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlZEVsZW1l bnQ6OmFkZFN1YnJlc291cmNlQXR0cmlidXRlVVJMcyk6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZWRFbGVtZW50OjphZGRQcm9wZXJ0eVRvUHJlc2VudGF0aW9uQXR0cmlidXRlU3R5bGUpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZTo6Z2V0U3R5bGVBdHRyaWJ1dGVS YW5nZXMpOgorCiAyMDEzLTA4LTI4ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29t PgogCiAgICAgICAgIENvZGUgY2xlYW51cDogcmVuYW1lIEZsb2F0SW50ZXJ2YWxTZWFyY2hBZGFw dGVyIGFuZCByZW1vdmUgdW5uZWNlc3NhcnkgaW5saW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNw cAppbmRleCAxMGEwNDUwYTY0NGI4MjY0Y2I5ODYwMWE1MmU0ODRkMjU5YWE0OTVhLi43ZWJhMDBm MDkyNmQzMWU2MjY5MjM1MDMzNTA2ZWViOTA0NTM0MmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2Vy LmNwcApAQCAtMTQyMyw5ICsxNDIzLDkgQEAgdm9pZCBDU1NQYXJzZXI6OnBhcnNlU2VsZWN0b3Io Y29uc3QgU3RyaW5nJiBzdHJpbmcsIENTU1NlbGVjdG9yTGlzdCYgc2VsZWN0b3JMaXMKIAogUGFz c1JlZlB0cjxJbW11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBDU1NQYXJzZXI6OnBhcnNlSW5saW5l U3R5bGVEZWNsYXJhdGlvbihjb25zdCBTdHJpbmcmIHN0cmluZywgRWxlbWVudCogZWxlbWVudCkK IHsKLSAgICBDU1NQYXJzZXJDb250ZXh0IGNvbnRleHQgPSBlbGVtZW50LT5kb2N1bWVudCgpLT5l bGVtZW50U2hlZXQoKS0+Y29udGVudHMoKS0+cGFyc2VyQ29udGV4dCgpOworICAgIENTU1BhcnNl ckNvbnRleHQgY29udGV4dCA9IGVsZW1lbnQtPmRvY3VtZW50KCktPmVsZW1lbnRTaGVldCgpLmNv bnRlbnRzKCktPnBhcnNlckNvbnRleHQoKTsKICAgICBjb250ZXh0Lm1vZGUgPSBzdHJpY3RUb0NT U1BhcnNlck1vZGUoZWxlbWVudC0+aXNIVE1MRWxlbWVudCgpICYmICFlbGVtZW50LT5kb2N1bWVu dCgpLT5pblF1aXJrc01vZGUoKSk7Ci0gICAgcmV0dXJuIENTU1BhcnNlcihjb250ZXh0KS5wYXJz ZURlY2xhcmF0aW9uKHN0cmluZywgZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZWxlbWVudFNoZWV0KCkt PmNvbnRlbnRzKCkpOworICAgIHJldHVybiBDU1NQYXJzZXIoY29udGV4dCkucGFyc2VEZWNsYXJh dGlvbihzdHJpbmcsIGVsZW1lbnQtPmRvY3VtZW50KCktPmVsZW1lbnRTaGVldCgpLmNvbnRlbnRz KCkpOwogfQogCiBQYXNzUmVmUHRyPEltbXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IENTU1BhcnNl cjo6cGFyc2VEZWNsYXJhdGlvbihjb25zdCBTdHJpbmcmIHN0cmluZywgU3R5bGVTaGVldENvbnRl bnRzKiBjb250ZXh0U3R5bGVTaGVldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9Q cm9wZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1By b3BlcnR5U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggZWFhMjRiMjFmMTRkZmViYzcy NTc4ZWEwZDNiNGYwYjk1YTQzNGQzOS4uNWI4NmFjM2Y5OGIxOWRlODY5YzNlOTZhYzk2MDQ4ZmUz ZDFlZDI2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1Byb3BlcnR5U2V0Q1NTU3R5 bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1Byb3BlcnR5U2V0Q1NT U3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTM2Niw3ICszNjYsNyBAQCB2b2lkIElubGluZUNTU1N0 eWxlRGVjbGFyYXRpb246OmRpZE11dGF0ZShNdXRhdGlvblR5cGUgdHlwZSkKIAogQ1NTU3R5bGVT aGVldCogSW5saW5lQ1NTU3R5bGVEZWNsYXJhdGlvbjo6cGFyZW50U3R5bGVTaGVldCgpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIG1fcGFyZW50RWxlbWVudCA/IG1fcGFyZW50RWxlbWVudC0+ZG9jdW1l bnQoKS0+ZWxlbWVudFNoZWV0KCkgOiAwOworICAgIHJldHVybiBtX3BhcmVudEVsZW1lbnQgPyAm bV9wYXJlbnRFbGVtZW50LT5kb2N1bWVudCgpLT5lbGVtZW50U2hlZXQoKSA6IDA7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDMxODA3ZGJl M2RhNzJiZjBjNGUwNjcxOTY3NzgxZGRhNzc3OWM4MWMuLjJiOTY4MWUwNDdlMGFhNWQ2YzI5OWQx ZGYyZDMwYTQ5MjcyOTQ3MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNTkzLDggKzU5 Myw4IEBAIERvY3VtZW50Ojp+RG9jdW1lbnQoKQogCiAgICAgbV9zdHlsZVNoZWV0Q29sbGVjdGlv bi5jbGVhcigpOwogCi0gICAgaWYgKG1fZWxlbVNoZWV0KQotICAgICAgICBtX2VsZW1TaGVldC0+ Y2xlYXJPd25lck5vZGUoKTsKKyAgICBpZiAobV9lbGVtZW50U2hlZXQpCisgICAgICAgIG1fZWxl bWVudFNoZWV0LT5jbGVhck93bmVyTm9kZSgpOwogCiAgICAgY2xlYXJTdHlsZVJlc29sdmVyKCk7 IC8vIFdlIG5lZWQgdG8gZGVzdHJveSBDU1NGb250U2VsZWN0b3IgYmVmb3JlIGRlc3Ryb3lpbmcg bV9jYWNoZWRSZXNvdXJjZUxvYWRlci4KIApAQCAtMTc1Myw3ICsxNzUzLDcgQEAgdm9pZCBEb2N1 bWVudDo6cmVjYWxjU3R5bGUoU3R5bGU6OkNoYW5nZSBjaGFuZ2UpCiAKICAgICBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb25Db29raWUgY29va2llID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3 aWxsUmVjYWxjdWxhdGVTdHlsZSh0aGlzKTsKIAotICAgIGlmIChtX2VsZW1TaGVldCAmJiBtX2Vs ZW1TaGVldC0+Y29udGVudHMoKS0+dXNlc1JlbVVuaXRzKCkpCisgICAgaWYgKG1fZWxlbWVudFNo ZWV0ICYmIG1fZWxlbWVudFNoZWV0LT5jb250ZW50cygpLT51c2VzUmVtVW5pdHMoKSkKICAgICAg ICAgbV9zdHlsZVNoZWV0Q29sbGVjdGlvbi0+c2V0VXNlc1JlbVVuaXQodHJ1ZSk7CiAKICAgICBt X2luU3R5bGVSZWNhbGMgPSB0cnVlOwpAQCAtMjY0NywxMyArMjY0NywxMyBAQCB2b2lkIERvY3Vt ZW50Ojp1cGRhdGVCYXNlVVJMKCkKICAgICBpZiAoIW1fYmFzZVVSTC5pc1ZhbGlkKCkpCiAgICAg ICAgIG1fYmFzZVVSTCA9IEtVUkwoKTsKIAotICAgIGlmIChtX2VsZW1TaGVldCkgeworICAgIGlm IChtX2VsZW1lbnRTaGVldCkgewogICAgICAgICAvLyBFbGVtZW50IHNoZWV0IGlzIHNpbGx5LiBJ dCBuZXZlciBjb250YWlucyBhbnl0aGluZy4KLSAgICAgICAgQVNTRVJUKCFtX2VsZW1TaGVldC0+ Y29udGVudHMoKS0+cnVsZUNvdW50KCkpOwotICAgICAgICBib29sIHVzZXNSZW1Vbml0cyA9IG1f ZWxlbVNoZWV0LT5jb250ZW50cygpLT51c2VzUmVtVW5pdHMoKTsKLSAgICAgICAgbV9lbGVtU2hl ZXQgPSBDU1NTdHlsZVNoZWV0OjpjcmVhdGVJbmxpbmUodGhpcywgbV9iYXNlVVJMKTsKKyAgICAg ICAgQVNTRVJUKCFtX2VsZW1lbnRTaGVldC0+Y29udGVudHMoKS0+cnVsZUNvdW50KCkpOworICAg ICAgICBib29sIHVzZXNSZW1Vbml0cyA9IG1fZWxlbWVudFNoZWV0LT5jb250ZW50cygpLT51c2Vz UmVtVW5pdHMoKTsKKyAgICAgICAgbV9lbGVtZW50U2hlZXQgPSBDU1NTdHlsZVNoZWV0OjpjcmVh dGVJbmxpbmUodGhpcywgbV9iYXNlVVJMKTsKICAgICAgICAgLy8gRklYTUU6IFNvIHdlIGFyZSBu b3QgcmVhbGx5IHRoZSBwYXJzZXIuIFRoZSByaWdodCBmaXggaXMgdG8gZWxpbWluYXRlIHRoZSBl bGVtZW50IHNoZWV0IGNvbXBsZXRlbHkuCi0gICAgICAgIG1fZWxlbVNoZWV0LT5jb250ZW50cygp LT5wYXJzZXJTZXRVc2VzUmVtVW5pdHModXNlc1JlbVVuaXRzKTsKKyAgICAgICAgbV9lbGVtZW50 U2hlZXQtPmNvbnRlbnRzKCktPnBhcnNlclNldFVzZXNSZW1Vbml0cyh1c2VzUmVtVW5pdHMpOwog ICAgIH0KIAogICAgIGlmICghZXF1YWxJZ25vcmluZ0ZyYWdtZW50SWRlbnRpZmllcihvbGRCYXNl VVJMLCBtX2Jhc2VVUkwpKSB7CkBAIC0yODE0LDExICsyODE0LDExIEBAIHZvaWQgRG9jdW1lbnQ6 OmRpZFJlbW92ZUFsbFBlbmRpbmdTdHlsZXNoZWV0KCkKICAgICAgICAgdmlldygpLT5zY3JvbGxU b0ZyYWdtZW50KG1fdXJsKTsKIH0KIAotQ1NTU3R5bGVTaGVldCogRG9jdW1lbnQ6OmVsZW1lbnRT aGVldCgpCitDU1NTdHlsZVNoZWV0JiBEb2N1bWVudDo6ZWxlbWVudFNoZWV0KCkKIHsKLSAgICBp ZiAoIW1fZWxlbVNoZWV0KQotICAgICAgICBtX2VsZW1TaGVldCA9IENTU1N0eWxlU2hlZXQ6OmNy ZWF0ZUlubGluZSh0aGlzLCBtX2Jhc2VVUkwpOwotICAgIHJldHVybiBtX2VsZW1TaGVldC5nZXQo KTsKKyAgICBpZiAoIW1fZWxlbWVudFNoZWV0KQorICAgICAgICBtX2VsZW1lbnRTaGVldCA9IENT U1N0eWxlU2hlZXQ6OmNyZWF0ZUlubGluZSh0aGlzLCBtX2Jhc2VVUkwpOworICAgIHJldHVybiAq bV9lbGVtZW50U2hlZXQ7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnByb2Nlc3NIdHRwRXF1aXYoY29u c3QgU3RyaW5nJiBlcXVpdiwgY29uc3QgU3RyaW5nJiBjb250ZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu aAppbmRleCA1YWMwMzg1ZDJiMDdlNmJhNDQwMDliNTVlZmYyMTgzY2JiNDI3MTBkLi5kYTZiYWEw NjRhNDYwYzExZDFlYzg0OTgyMzk4N2ZkMDg0NGU4ZGY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApA QCAtNTk3LDcgKzU5Nyw3IEBAIHB1YmxpYzoKICAgICBib29sIGNhbk5hdmlnYXRlKEZyYW1lKiB0 YXJnZXRGcmFtZSk7CiAgICAgRnJhbWUqIGZpbmRVbnNhZmVQYXJlbnRTY3JvbGxQcm9wYWdhdGlv bkJvdW5kYXJ5KCk7CiAKLSAgICBDU1NTdHlsZVNoZWV0KiBlbGVtZW50U2hlZXQoKTsKKyAgICBD U1NTdHlsZVNoZWV0JiBlbGVtZW50U2hlZXQoKTsKICAgICAKICAgICB2aXJ0dWFsIFBhc3NSZWZQ dHI8RG9jdW1lbnRQYXJzZXI+IGNyZWF0ZVBhcnNlcigpOwogICAgIERvY3VtZW50UGFyc2VyKiBw YXJzZXIoKSBjb25zdCB7IHJldHVybiBtX3BhcnNlci5nZXQoKTsgfQpAQCAtMTMxNiw3ICsxMzE2 LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8RG9jdW1lbnRUeXBlPiBtX2RvY1R5cGU7CiAgICAg T3duUHRyPERPTUltcGxlbWVudGF0aW9uPiBtX2ltcGxlbWVudGF0aW9uOwogCi0gICAgUmVmUHRy PENTU1N0eWxlU2hlZXQ+IG1fZWxlbVNoZWV0OworICAgIFJlZlB0cjxDU1NTdHlsZVNoZWV0PiBt X2VsZW1lbnRTaGVldDsKIAogICAgIGJvb2wgbV9wcmludGluZzsKICAgICBib29sIG1fcGFnaW5h dGVkRm9yU2NyZWVuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1N0eWxlZEVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuY3BwCmluZGV4IDMwMDNk ZDViMDQ1NzRjNjM4MzcxNDQ1YmQwOWY3NzcwMWFhODQ0YjEuLjg1OTA2ZTVkOWEwYWZkZGMxOGJh MWM1M2ExMzZiODhhY2EyOTU5Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TdHls ZWRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVudC5jcHAK QEAgLTE5NSw3ICsxOTUsNyBAQCBpbmxpbmUgdm9pZCBTdHlsZWRFbGVtZW50OjpzZXRJbmxpbmVT dHlsZUZyb21TdHJpbmcoY29uc3QgQXRvbWljU3RyaW5nJiBuZXdTdHlsZQogICAgICAgICBpbmxp bmVTdHlsZSA9IENTU1BhcnNlcjo6cGFyc2VJbmxpbmVTdHlsZURlY2xhcmF0aW9uKG5ld1N0eWxl U3RyaW5nLCB0aGlzKTsKICAgICBlbHNlIHsKICAgICAgICAgQVNTRVJUKGlubGluZVN0eWxlLT5p c011dGFibGUoKSk7Ci0gICAgICAgIHN0YXRpY19wb2ludGVyX2Nhc3Q8TXV0YWJsZVN0eWxlUHJv cGVydHlTZXQ+KGlubGluZVN0eWxlKS0+cGFyc2VEZWNsYXJhdGlvbihuZXdTdHlsZVN0cmluZywg ZG9jdW1lbnQoKS0+ZWxlbWVudFNoZWV0KCktPmNvbnRlbnRzKCkpOworICAgICAgICBzdGF0aWNf cG9pbnRlcl9jYXN0PE11dGFibGVTdHlsZVByb3BlcnR5U2V0PihpbmxpbmVTdHlsZSktPnBhcnNl RGVjbGFyYXRpb24obmV3U3R5bGVTdHJpbmcsIGRvY3VtZW50KCktPmVsZW1lbnRTaGVldCgpLmNv bnRlbnRzKCkpOwogICAgIH0KIH0KIApAQCAtMjQ5LDcgKzI0OSw3IEBAIGJvb2wgU3R5bGVkRWxl bWVudDo6c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIGRv dWJsZSB2YWx1CiAKIGJvb2wgU3R5bGVkRWxlbWVudDo6c2V0SW5saW5lU3R5bGVQcm9wZXJ0eShD U1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYgdmFsdWUsIGJvb2wgaW1wb3J0 YW50KQogewotICAgIGJvb2wgY2hhbmdlcyA9IGVuc3VyZU11dGFibGVJbmxpbmVTdHlsZSgpLnNl dFByb3BlcnR5KHByb3BlcnR5SUQsIHZhbHVlLCBpbXBvcnRhbnQsIGRvY3VtZW50KCktPmVsZW1l bnRTaGVldCgpLT5jb250ZW50cygpKTsKKyAgICBib29sIGNoYW5nZXMgPSBlbnN1cmVNdXRhYmxl SW5saW5lU3R5bGUoKS5zZXRQcm9wZXJ0eShwcm9wZXJ0eUlELCB2YWx1ZSwgaW1wb3J0YW50LCBk b2N1bWVudCgpLT5lbGVtZW50U2hlZXQoKS5jb250ZW50cygpKTsKICAgICBpZiAoY2hhbmdlcykK ICAgICAgICAgaW5saW5lU3R5bGVDaGFuZ2VkKCk7CiAgICAgcmV0dXJuIGNoYW5nZXM7CkBAIC0y NzYsNyArMjc2LDcgQEAgdm9pZCBTdHlsZWRFbGVtZW50OjpyZW1vdmVBbGxJbmxpbmVTdHlsZVBy b3BlcnRpZXMoKQogdm9pZCBTdHlsZWRFbGVtZW50OjphZGRTdWJyZXNvdXJjZUF0dHJpYnV0ZVVS THMoTGlzdEhhc2hTZXQ8S1VSTD4mIHVybHMpIGNvbnN0CiB7CiAgICAgaWYgKGNvbnN0IFN0eWxl UHJvcGVydHlTZXQqIGlubGluZVN0eWxlID0gZWxlbWVudERhdGEoKSA/IGVsZW1lbnREYXRhKCkt PmlubGluZVN0eWxlKCkgOiAwKQotICAgICAgICBpbmxpbmVTdHlsZS0+YWRkU3VicmVzb3VyY2VT dHlsZVVSTHModXJscywgZG9jdW1lbnQoKS0+ZWxlbWVudFNoZWV0KCktPmNvbnRlbnRzKCkpOwor ICAgICAgICBpbmxpbmVTdHlsZS0+YWRkU3VicmVzb3VyY2VTdHlsZVVSTHModXJscywgZG9jdW1l bnQoKS0+ZWxlbWVudFNoZWV0KCkuY29udGVudHMoKSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgYm9v bCBhdHRyaWJ1dGVOYW1lU29ydChjb25zdCBwYWlyPEF0b21pY1N0cmluZ0ltcGwqLCBBdG9taWNT dHJpbmc+JiBwMSwgY29uc3QgcGFpcjxBdG9taWNTdHJpbmdJbXBsKiwgQXRvbWljU3RyaW5nPiYg cDIpCkBAIC0zODQsNyArMzg0LDcgQEAgdm9pZCBTdHlsZWRFbGVtZW50OjphZGRQcm9wZXJ0eVRv UHJlc2VudGF0aW9uQXR0cmlidXRlU3R5bGUoTXV0YWJsZVN0eWxlUHJvcGVydHkKICAgICAKIHZv aWQgU3R5bGVkRWxlbWVudDo6YWRkUHJvcGVydHlUb1ByZXNlbnRhdGlvbkF0dHJpYnV0ZVN0eWxl KE11dGFibGVTdHlsZVByb3BlcnR5U2V0KiBzdHlsZSwgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlE LCBjb25zdCBTdHJpbmcmIHZhbHVlKQogewotICAgIHN0eWxlLT5zZXRQcm9wZXJ0eShwcm9wZXJ0 eUlELCB2YWx1ZSwgZmFsc2UsIGRvY3VtZW50KCktPmVsZW1lbnRTaGVldCgpLT5jb250ZW50cygp KTsKKyAgICBzdHlsZS0+c2V0UHJvcGVydHkocHJvcGVydHlJRCwgdmFsdWUsIGZhbHNlLCBkb2N1 bWVudCgpLT5lbGVtZW50U2hlZXQoKS5jb250ZW50cygpKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCmluZGV4IDJjOTg4ODY4 NmJjMmY0YjY4ZjBkY2MyMzM4YjRhZTc3MzJkZjM5OGEuLjA3NTkxOTlkNDQ3MGI0MjA1YWI0ZTI1 YTRmZjI4NTA3ZGJlNWU0N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JTdHlsZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yU3R5bGVTaGVldC5jcHAKQEAgLTE1NDgsNyArMTU0OCw3IEBAIGJvb2wgSW5zcGVjdG9y U3R5bGVTaGVldEZvcklubGluZVN0eWxlOjpnZXRTdHlsZUF0dHJpYnV0ZVJhbmdlcyhDU1NSdWxl U291cmNlRGF0CiAgICAgfQogCiAgICAgUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiB0 ZW1wRGVjbGFyYXRpb24gPSBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldDo6Y3JlYXRlKCk7Ci0gICAg Y3JlYXRlQ1NTUGFyc2VyKG1fZWxlbWVudC0+ZG9jdW1lbnQoKSktPnBhcnNlRGVjbGFyYXRpb24o dGVtcERlY2xhcmF0aW9uLmdldCgpLCBtX3N0eWxlVGV4dCwgcmVzdWx0LCBtX2VsZW1lbnQtPmRv Y3VtZW50KCktPmVsZW1lbnRTaGVldCgpLT5jb250ZW50cygpKTsKKyAgICBjcmVhdGVDU1NQYXJz ZXIobV9lbGVtZW50LT5kb2N1bWVudCgpKS0+cGFyc2VEZWNsYXJhdGlvbih0ZW1wRGVjbGFyYXRp b24uZ2V0KCksIG1fc3R5bGVUZXh0LCByZXN1bHQsIG1fZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZWxl bWVudFNoZWV0KCkuY29udGVudHMoKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAK