154107 2016-02-11 06:42:01 -0800 Rename Element::style() to Element::cssomStyle() 2016-02-11 12:34:00 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned oldest_to_newest 1163744 0 koivisto 2016-02-11 06:42:01 -0800 It implements the IDL "style" attribute that returns a CSSOM object. Inside WebCore "style" generally refers to a RenderStyle. 1163746 1 271059 koivisto 2016-02-11 07:09:29 -0800 Created attachment 271059 patch 1163819 2 koivisto 2016-02-11 12:34:00 -0800 http://trac.webkit.org/changeset/196430 271059 2016-02-11 07:09:29 -0800 2016-02-11 08:56:24 -0800 patch element-style-rename.patch text/plain 11181 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjQyMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDE2LTAyLTExICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgRWxlbWVudDo6c3R5 bGUoKSB0byBFbGVtZW50Ojpjc3NvbVN0eWxlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDEwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEl0IGltcGxlbWVudHMgdGhlIElETCAic3R5bGUiIGF0dHJp YnV0ZSB0aGF0IHJldHVybnMgYSBDU1NPTSBvYmplY3QuCisgICAgICAgIEluc2lkZSBXZWJDb3Jl ICJzdHlsZSIgZ2VuZXJhbGx5IHJlZmVycyB0byBhIFJlbmRlclN0eWxlLgorCisgICAgICAgICog ZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6aGFzQXR0cmlidXRl TlMpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Y3Nzb21TdHlsZSk6CisgICAgICAgIChX ZWJDb3JlOjpFbGVtZW50Ojpmb2N1cyk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpzdHls ZSk6IERlbGV0ZWQuCisgICAgICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkVsZW1lbnQ6OnRhZ1FOYW1lKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5pZGw6CisgICAgICAg ICogZG9tL1N0eWxlZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkRWxlbWVu dDo6flN0eWxlZEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkRWxlbWVudDo6Y3Nz b21TdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRFbGVtZW50OjpzdHlsZSk6IERlbGV0 ZWQuCisgICAgICAgICogZG9tL1N0eWxlZEVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlZEVsZW1lbnQ6OnN5bmNocm9uaXplU3R5bGVBdHRyaWJ1dGVJbnRlcm5hbCk6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZWRFbGVtZW50Ojpjb2xsZWN0U3R5bGVGb3JQcmVzZW50YXRpb25BdHRy aWJ1dGUpOgorICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkVkaXRvcjo6YXBwbHlFZGl0aW5nU3R5bGVUb0VsZW1lbnQpOgorICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3JDU1NBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDU1NB Z2VudDo6Z2V0TWF0Y2hlZFN0eWxlc0Zvck5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ1NTQWdlbnQ6OmdldElubGluZVN0eWxlc0Zvck5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ1NTQWdlbnQ6OmFzSW5zcGVjdG9yU3R5bGVTaGVldCk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlOjpkaWRNb2RpZnlFbGVtZW50QXR0cmlidXRlKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZTo6aW5s aW5lU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGlu ZVN0eWxlOjplbGVtZW50U3R5bGVUZXh0KToKKyAgICAgICAgKiBzdmcvU1ZHRWxlbWVudC5pZGw6 CisKIDIwMTYtMDItMTAgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAg ICAgICAgVXBkYXRpbmcgYmluZGluZ3MgdGVzdCByZWZlcmVuY2UgZmlsZSBmb3IgSlNUZXN0RXZl bnRDb25zdHJ1Y3Rvci5jcHAgYWZ0ZXIgcjE5NjQwMApJbmRleDogU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNw cAkocmV2aXNpb24gMTk2MzgzKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yMjI4LDkgKzIyMjgsOSBAQCBib29sIEVsZW1lbnQ6Omhhc0F0dHJp YnV0ZU5TKGNvbnN0IEF0b21pCiAgICAgcmV0dXJuIGVsZW1lbnREYXRhKCktPmZpbmRBdHRyaWJ1 dGVCeU5hbWUocU5hbWUpOwogfQogCi1DU1NTdHlsZURlY2xhcmF0aW9uICpFbGVtZW50OjpzdHls ZSgpCitDU1NTdHlsZURlY2xhcmF0aW9uKiBFbGVtZW50Ojpjc3NvbVN0eWxlKCkKIHsKLSAgICBy ZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogdm9pZCBFbGVtZW50Ojpmb2N1cyhi b29sIHJlc3RvcmVQcmV2aW91c1NlbGVjdGlvbiwgRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uKQpJ bmRleDogU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5oCShyZXZpc2lvbiAxOTYyNjgpCisrKyBTb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzksNyArMTc5LDcgQEAgcHVibGlj OgogCiAgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxBdHRyPj4mIGF0dHJOb2RlTGlzdCgpOwogCi0g ICAgdmlydHVhbCBDU1NTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSgpOworICAgIHZpcnR1YWwgQ1NT U3R5bGVEZWNsYXJhdGlvbiogY3Nzb21TdHlsZSgpOwogCiAgICAgY29uc3QgUXVhbGlmaWVkTmFt ZSYgdGFnUU5hbWUoKSBjb25zdCB7IHJldHVybiBtX3RhZ05hbWU7IH0KICNpZiBFTkFCTEUoQ1NT X1NFTEVDVE9SX0pJVCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmlkbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5pZGwJKHJldmlzaW9uIDE5NjI2 OCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmlkbAkod29ya2luZyBjb3B5KQpAQCAt NjksNyArNjksNyBAQAogICAgIFtPYmpDTGVnYWN5VW5uYW1lZFBhcmFtZXRlcnNdIGJvb2xlYW4g aGFzQXR0cmlidXRlTlMoW1RyZWF0TnVsbEFzPU51bGxTdHJpbmcsIFRyZWF0VW5kZWZpbmVkQXM9 TnVsbFN0cmluZywgRGVmYXVsdD1VbmRlZmluZWRdIG9wdGlvbmFsIERPTVN0cmluZyBuYW1lc3Bh Y2VVUkksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbRGVmYXVs dD1VbmRlZmluZWRdIG9wdGlvbmFsIERPTVN0cmluZyBsb2NhbE5hbWUpOwogCi0gICAgcmVhZG9u bHkgYXR0cmlidXRlIENTU1N0eWxlRGVjbGFyYXRpb24gc3R5bGU7CisgICAgW0ltcGxlbWVudGVk QXM9Y3Nzb21TdHlsZV0gcmVhZG9ubHkgYXR0cmlidXRlIENTU1N0eWxlRGVjbGFyYXRpb24gc3R5 bGU7CiAKICAgICAvLyBET00gNAogI2lmICFkZWZpbmVkKExBTkdVQUdFX09CSkVDVElWRV9DKSB8 fCAhTEFOR1VBR0VfT0JKRUNUSVZFX0MKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRF bGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVu dC5jcHAJKHJldmlzaW9uIDE5NjI2OCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVt ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM3LDcgKzEzNyw3IEBAIFN0eWxlZEVsZW1lbnQ6 On5TdHlsZWRFbGVtZW50KCkKICAgICAgICAgY3Nzb21XcmFwcGVyLT5jbGVhclBhcmVudEVsZW1l bnQoKTsKIH0KIAotQ1NTU3R5bGVEZWNsYXJhdGlvbiogU3R5bGVkRWxlbWVudDo6c3R5bGUoKQor Q1NTU3R5bGVEZWNsYXJhdGlvbiogU3R5bGVkRWxlbWVudDo6Y3Nzb21TdHlsZSgpCiB7CiAgICAg cmV0dXJuIGVuc3VyZU11dGFibGVJbmxpbmVTdHlsZSgpLmVuc3VyZUlubGluZUNTU1N0eWxlRGVj bGFyYXRpb24odGhpcyk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVu dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmgJKHJl dmlzaW9uIDE5NjI2OCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmgJKHdv cmtpbmcgY29weSkKQEAgLTU4LDcgKzU4LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHN5 bmNocm9uaXplU3R5bGVBdHRyaWJ1dGVJbnRlcm5hbChTdHlsZWRFbGVtZW50Kik7CiAgICAgdm9p ZCBzeW5jaHJvbml6ZVN0eWxlQXR0cmlidXRlSW50ZXJuYWwoKSBjb25zdCB7IFN0eWxlZEVsZW1l bnQ6OnN5bmNocm9uaXplU3R5bGVBdHRyaWJ1dGVJbnRlcm5hbChjb25zdF9jYXN0PFN0eWxlZEVs ZW1lbnQqPih0aGlzKSk7IH0KICAgICAKLSAgICB2aXJ0dWFsIENTU1N0eWxlRGVjbGFyYXRpb24q IHN0eWxlKCkgb3ZlcnJpZGUgZmluYWw7CisgICAgdmlydHVhbCBDU1NTdHlsZURlY2xhcmF0aW9u KiBjc3NvbVN0eWxlKCkgb3ZlcnJpZGUgZmluYWw7CiAKICAgICBjb25zdCBTdHlsZVByb3BlcnRp ZXMqIHByZXNlbnRhdGlvbkF0dHJpYnV0ZVN0eWxlKCk7CiAgICAgdmlydHVhbCB2b2lkIGNvbGxl Y3RTdHlsZUZvclByZXNlbnRhdGlvbkF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiwgY29u c3QgQXRvbWljU3RyaW5nJiwgTXV0YWJsZVN0eWxlUHJvcGVydGllcyYpIHsgfQpJbmRleDogU291 cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkocmV2aXNpb24gMTk2MjY4KQorKysgU291cmNlL1dlYkNv cmUvZWRpdGluZy9FZGl0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDcxLDcgKzMwNzEsNyBA QCB2b2lkIEVkaXRvcjo6YXBwbHlFZGl0aW5nU3R5bGVUb0VsZW1lbnQoCiAgICAgICAgIHJldHVy bjsKIAogICAgIC8vIE11dGF0ZSB1c2luZyB0aGUgQ1NTT00gd3JhcHBlciBzbyB3ZSBnZXQgdGhl IHNhbWUgZXZlbnQgYmVoYXZpb3IgYXMgYSBzY3JpcHQuCi0gICAgQ1NTU3R5bGVEZWNsYXJhdGlv biogc3R5bGUgPSBkb3duY2FzdDxTdHlsZWRFbGVtZW50PigqZWxlbWVudCkuc3R5bGUoKTsKKyAg ICBDU1NTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSA9IGRvd25jYXN0PFN0eWxlZEVsZW1lbnQ+KCpl bGVtZW50KS5jc3NvbVN0eWxlKCk7CiAgICAgc3R5bGUtPnNldFByb3BlcnR5SW50ZXJuYWwoQ1NT UHJvcGVydHlXb3JkV3JhcCwgImJyZWFrLXdvcmQiLCBmYWxzZSwgSUdOT1JFX0VYQ0VQVElPTik7 CiAgICAgc3R5bGUtPnNldFByb3BlcnR5SW50ZXJuYWwoQ1NTUHJvcGVydHlXZWJraXROYnNwTW9k ZSwgInNwYWNlIiwgZmFsc2UsIElHTk9SRV9FWENFUFRJT04pOwogICAgIHN0eWxlLT5zZXRQcm9w ZXJ0eUludGVybmFsKENTU1Byb3BlcnR5V2Via2l0TGluZUJyZWFrLCAiYWZ0ZXItd2hpdGUtc3Bh Y2UiLCBmYWxzZSwgSUdOT1JFX0VYQ0VQVElPTik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1JlbW92ZUNTU1Byb3BlcnR5Q29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZWRpdGluZy9SZW1vdmVDU1NQcm9wZXJ0eUNvbW1hbmQuY3BwCShyZXZpc2lvbiAxOTYy NjgpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1JlbW92ZUNTU1Byb3BlcnR5Q29tbWFuZC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU1LDEyICs1NSwxMiBAQCB2b2lkIFJlbW92ZUNTU1Byb3Bl cnR5Q29tbWFuZDo6ZG9BcHBseSgpCiAKICAgICAvLyBNdXRhdGUgdXNpbmcgdGhlIENTU09NIHdy YXBwZXIgc28gd2UgZ2V0IHRoZSBzYW1lIGV2ZW50IGJlaGF2aW9yIGFzIGEgc2NyaXB0LgogICAg IC8vIFNldHRpbmcgdG8gbnVsbCBzdHJpbmcgcmVtb3ZlcyB0aGUgcHJvcGVydHkuIFdlIGRvbid0 IGhhdmUgaW50ZXJuYWwgdmVyc2lvbiBvZiByZW1vdmVQcm9wZXJ0eS4KLSAgICBtX2VsZW1lbnQt PnN0eWxlKCktPnNldFByb3BlcnR5SW50ZXJuYWwobV9wcm9wZXJ0eSwgU3RyaW5nKCksIGZhbHNl LCBJR05PUkVfRVhDRVBUSU9OKTsKKyAgICBtX2VsZW1lbnQtPmNzc29tU3R5bGUoKS0+c2V0UHJv cGVydHlJbnRlcm5hbChtX3Byb3BlcnR5LCBTdHJpbmcoKSwgZmFsc2UsIElHTk9SRV9FWENFUFRJ T04pOwogfQogCiB2b2lkIFJlbW92ZUNTU1Byb3BlcnR5Q29tbWFuZDo6ZG9VbmFwcGx5KCkKIHsK LSAgICBtX2VsZW1lbnQtPnN0eWxlKCktPnNldFByb3BlcnR5SW50ZXJuYWwobV9wcm9wZXJ0eSwg bV9vbGRWYWx1ZSwgbV9pbXBvcnRhbnQsIElHTk9SRV9FWENFUFRJT04pOworICAgIG1fZWxlbWVu dC0+Y3Nzb21TdHlsZSgpLT5zZXRQcm9wZXJ0eUludGVybmFsKG1fcHJvcGVydHksIG1fb2xkVmFs dWUsIG1faW1wb3J0YW50LCBJR05PUkVfRVhDRVBUSU9OKTsKIH0KIAogI2lmbmRlZiBOREVCVUcK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNv bW1hbmQuY3BwCShyZXZpc2lvbiAxOTYyNjgpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Jl cGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTU2LDkgKzU1Niw5 IEBAIHZvaWQgUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OnJlbW92ZVJlZHUKIAogICAgICAgICAg ICAgLy8gTXV0YXRlIHVzaW5nIHRoZSBDU1NPTSB3cmFwcGVyIHNvIHdlIGdldCB0aGUgc2FtZSBl dmVudCBiZWhhdmlvciBhcyBhIHNjcmlwdC4KICAgICAgICAgICAgIGlmIChpc0Jsb2NrKGVsZW1l bnQpKQotICAgICAgICAgICAgICAgIGVsZW1lbnQtPnN0eWxlKCktPnNldFByb3BlcnR5SW50ZXJu YWwoQ1NTUHJvcGVydHlEaXNwbGF5LCAiaW5saW5lIiwgZmFsc2UsIElHTk9SRV9FWENFUFRJT04p OworICAgICAgICAgICAgICAgIGVsZW1lbnQtPmNzc29tU3R5bGUoKS0+c2V0UHJvcGVydHlJbnRl cm5hbChDU1NQcm9wZXJ0eURpc3BsYXksICJpbmxpbmUiLCBmYWxzZSwgSUdOT1JFX0VYQ0VQVElP Tik7CiAgICAgICAgICAgICBpZiAoZWxlbWVudC0+cmVuZGVyZXIoKSAmJiBlbGVtZW50LT5yZW5k ZXJlcigpLT5zdHlsZSgpLmlzRmxvYXRpbmcoKSkKLSAgICAgICAgICAgICAgICBlbGVtZW50LT5z dHlsZSgpLT5zZXRQcm9wZXJ0eUludGVybmFsKENTU1Byb3BlcnR5RmxvYXQsICJub25lIiwgZmFs c2UsIElHTk9SRV9FWENFUFRJT04pOworICAgICAgICAgICAgICAgIGVsZW1lbnQtPmNzc29tU3R5 bGUoKS0+c2V0UHJvcGVydHlJbnRlcm5hbChDU1NQcm9wZXJ0eUZsb2F0LCAibm9uZSIsIGZhbHNl LCBJR05PUkVfRVhDRVBUSU9OKTsKICAgICAgICAgfQogICAgIH0KIH0KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAkocmV2aXNpb24gMTk2 MjY4KQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjA2LDcgKzYwNiw3IEBAIHZvaWQgSW5zcGVjdG9yQ1NTQWdlbnQ6 OmdldE1hdGNoZWRTdHlsZXMKICAgICAgICAgICAgICAgICBhdXRvIGVudHJ5ID0gSW5zcGVjdG9y OjpQcm90b2NvbDo6Q1NTOjpJbmhlcml0ZWRTdHlsZUVudHJ5OjpjcmVhdGUoKQogICAgICAgICAg ICAgICAgICAgICAuc2V0TWF0Y2hlZENTU1J1bGVzKGJ1aWxkQXJyYXlGb3JNYXRjaGVkUnVsZUxp c3QocGFyZW50TWF0Y2hlZFJ1bGVzLCBzdHlsZVJlc29sdmVyLCBwYXJlbnRFbGVtZW50LCBOT1BT RVVETykpCiAgICAgICAgICAgICAgICAgICAgIC5yZWxlYXNlKCk7Ci0gICAgICAgICAgICAgICAg aWYgKHBhcmVudEVsZW1lbnQtPnN0eWxlKCkgJiYgcGFyZW50RWxlbWVudC0+c3R5bGUoKS0+bGVu Z3RoKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAocGFyZW50RWxlbWVudC0+Y3Nzb21TdHlsZSgp ICYmIHBhcmVudEVsZW1lbnQtPmNzc29tU3R5bGUoKS0+bGVuZ3RoKCkpIHsKICAgICAgICAgICAg ICAgICAgICAgaWYgKEluc3BlY3RvclN0eWxlU2hlZXRGb3JJbmxpbmVTdHlsZSogc3R5bGVTaGVl dCA9IGFzSW5zcGVjdG9yU3R5bGVTaGVldChwYXJlbnRFbGVtZW50KSkKICAgICAgICAgICAgICAg ICAgICAgICAgIGVudHJ5LT5zZXRJbmxpbmVTdHlsZShzdHlsZVNoZWV0LT5idWlsZE9iamVjdEZv clN0eWxlKHN0eWxlU2hlZXQtPnN0eWxlRm9ySWQoSW5zcGVjdG9yQ1NTSWQoc3R5bGVTaGVldC0+ aWQoKSwgMCkpKSk7CiAgICAgICAgICAgICAgICAgfQpAQCAtNjMwLDcgKzYzMCw3IEBAIHZvaWQg SW5zcGVjdG9yQ1NTQWdlbnQ6OmdldElubGluZVN0eWxlc0YKICAgICBpZiAoIXN0eWxlU2hlZXQp CiAgICAgICAgIHJldHVybjsKIAotICAgIGlubGluZVN0eWxlID0gc3R5bGVTaGVldC0+YnVpbGRP YmplY3RGb3JTdHlsZShlbGVtZW50LT5zdHlsZSgpKTsKKyAgICBpbmxpbmVTdHlsZSA9IHN0eWxl U2hlZXQtPmJ1aWxkT2JqZWN0Rm9yU3R5bGUoZWxlbWVudC0+Y3Nzb21TdHlsZSgpKTsKICAgICBS ZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6Q1NTOjpDU1NTdHlsZT4gYXR0cmlidXRlcyA9IGJ1 aWxkT2JqZWN0Rm9yQXR0cmlidXRlc1N0eWxlKGVsZW1lbnQpOwogICAgIGF0dHJpYnV0ZXNTdHls ZSA9IGF0dHJpYnV0ZXMgPyBhdHRyaWJ1dGVzLnJlbGVhc2UoKSA6IG51bGxwdHI7CiB9CkBAIC05 MTEsNyArOTExLDcgQEAgSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlKiBJbnNwZQog ewogICAgIE5vZGVUb0luc3BlY3RvclN0eWxlU2hlZXQ6Oml0ZXJhdG9yIGl0ID0gbV9ub2RlVG9J bnNwZWN0b3JTdHlsZVNoZWV0LmZpbmQoZWxlbWVudCk7CiAgICAgaWYgKGl0ID09IG1fbm9kZVRv SW5zcGVjdG9yU3R5bGVTaGVldC5lbmQoKSkgewotICAgICAgICBDU1NTdHlsZURlY2xhcmF0aW9u KiBzdHlsZSA9IGVsZW1lbnQtPmlzU3R5bGVkRWxlbWVudCgpID8gZWxlbWVudC0+c3R5bGUoKSA6 IG51bGxwdHI7CisgICAgICAgIENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlID0gZWxlbWVudC0+ Y3Nzb21TdHlsZSgpOwogICAgICAgICBpZiAoIXN0eWxlKQogICAgICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNo ZWV0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y U3R5bGVTaGVldC5jcHAJKHJldmlzaW9uIDE5NjI2OCkKKysrIFNvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI3Nyw3ICsx Mjc3LDcgQEAgSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlOjpJbnNwZQogdm9pZCBJ bnNwZWN0b3JTdHlsZVNoZWV0Rm9ySW5saW5lU3R5bGU6OmRpZE1vZGlmeUVsZW1lbnRBdHRyaWJ1 dGUoKQogewogICAgIG1faXNTdHlsZVRleHRWYWxpZCA9IGZhbHNlOwotICAgIGlmIChtX2VsZW1l bnQtPmlzU3R5bGVkRWxlbWVudCgpICYmIG1fZWxlbWVudC0+c3R5bGUoKSAhPSBtX2luc3BlY3Rv clN0eWxlLT5jc3NTdHlsZSgpKQorICAgIGlmIChtX2VsZW1lbnQtPmlzU3R5bGVkRWxlbWVudCgp ICYmIG1fZWxlbWVudC0+Y3Nzb21TdHlsZSgpICE9IG1faW5zcGVjdG9yU3R5bGUtPmNzc1N0eWxl KCkpCiAgICAgICAgIG1faW5zcGVjdG9yU3R5bGUgPSBJbnNwZWN0b3JTdHlsZTo6Y3JlYXRlKElu c3BlY3RvckNTU0lkKGlkKCksIDApLCBpbmxpbmVTdHlsZSgpLCB0aGlzKTsKICAgICBtX3J1bGVT b3VyY2VEYXRhID0gbnVsbHB0cjsKIH0KQEAgLTEzNDYsNyArMTM0Niw3IEBAIFJlZlB0cjxJbnNw ZWN0b3JTdHlsZT4gSW5zcGVjdG9yU3R5bGVTaGUKIAogQ1NTU3R5bGVEZWNsYXJhdGlvbiogSW5z cGVjdG9yU3R5bGVTaGVldEZvcklubGluZVN0eWxlOjppbmxpbmVTdHlsZSgpIGNvbnN0CiB7Ci0g ICAgcmV0dXJuIG1fZWxlbWVudC0+c3R5bGUoKTsKKyAgICByZXR1cm4gbV9lbGVtZW50LT5jc3Nv bVN0eWxlKCk7CiB9CiAKIGNvbnN0IFN0cmluZyYgSW5zcGVjdG9yU3R5bGVTaGVldEZvcklubGlu ZVN0eWxlOjplbGVtZW50U3R5bGVUZXh0KCkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdFbGVtZW50LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxl bWVudC5pZGwJKHJldmlzaW9uIDE5NjI2OCkKKysrIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVt ZW50LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMsNyBAQAogICAgIGF0dHJpYnV0ZSBE T01TdHJpbmcgeG1sc3BhY2U7CiAKICAgICByZWFkb25seSBhdHRyaWJ1dGUgU1ZHQW5pbWF0ZWRT dHJpbmcgY2xhc3NOYW1lOwotICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBDU1NTdHlsZURlY2xhcmF0 aW9uIHN0eWxlOworICAgIFtJbXBsZW1lbnRlZEFzPWNzc29tU3R5bGVdIHJlYWRvbmx5IGF0dHJp YnV0ZSBDU1NTdHlsZURlY2xhcmF0aW9uIHN0eWxlOwogCiAgICAgYXR0cmlidXRlIGxvbmcgdGFi SW5kZXg7CiAK