77475 2012-01-31 13:59:12 -0800 Make CSSOM style() return CSSStyleDeclaration* 2012-02-03 09:39:39 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77745 1 koivisto webkit-unassigned kling macpherson menard webkit.review.bot oldest_to_newest 546466 0 koivisto 2012-01-31 13:59:12 -0800 CSSStyleRule::style() and some other places return CSSMutableStyleDeclaration. They should return the plain CSSOM type instead. 546491 1 124820 koivisto 2012-01-31 14:24:34 -0800 Created attachment 124820 patch 546503 2 koivisto 2012-01-31 14:31:52 -0800 http://trac.webkit.org/changeset/106393 124820 2012-01-31 14:24:34 -0800 2012-01-31 14:26:47 -0800 patch cssom-style-type.patch text/plain 10783 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNjM5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACistMDEtMzEgIEFudHRpIEtvaXZp c3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgQ1NTT00gc3R5bGUoKSByZXR1 cm4gQ1NTU3R5bGVEZWNsYXJhdGlvbioKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc3NDc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ1NTU3R5bGVSdWxlOjpzdHlsZSgpIGFuZCBzb21lIG90aGVyIHBsYWNl cyByZXR1cm4gQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uIAorICAgICAgICBUaGV5IHNob3Vs ZCByZXR1cm4gdGhlIHBsYWluIENTU09NIHR5cGUgaW5zdGVhZC4KKyAgICAgICAgCisgICAgICAg IENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiBzaG91bGQgYmUgYXZhaWxhYmxlIHRocm91Z2gg bm9uLUNTU09NIGZ1bmN0aW9uLgorCisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlUnVsZS5oOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZhY2VSdWxlOjpzdHlsZSk6CisgICAgICAgIChXZWJD b3JlOjpDU1NGb250RmFjZVJ1bGU6OmRlY2xhcmF0aW9uKToKKyAgICAgICAgKiBjc3MvQ1NTRm9u dFNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6YWRkRm9u dEZhY2VSdWxlKToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVSdWxlLmg6CisgICAgICAgIChXZWJD b3JlOjpDU1NTdHlsZVJ1bGU6OnN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlUnVs ZTo6ZGVjbGFyYXRpb24pOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OnN0eWxlRm9yS2V5ZnJhbWUpOgorICAg ICAgICAqIGNzcy9XZWJLaXRDU1NLZXlmcmFtZVJ1bGUuaDoKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAoV2ViQ29yZTo6V2ViS2l0Q1NTS2V5ZnJhbWVSdWxlOjpzdHlsZSk6CisgICAgICAg IChXZWJDb3JlOjpXZWJLaXRDU1NLZXlmcmFtZVJ1bGU6OmRlY2xhcmF0aW9uKToKKyAgICAgICAg KFdlYktpdENTU0tleWZyYW1lUnVsZSk6CisgICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6c3R5bGVGcm9tTWF0Y2hlZFJ1bGVzRm9yRWxlbWVudCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yU3R5bGVTaGVldDo6cmV2YWxpZGF0ZVN0eWxlKToKKyAgICAgICAg KiBwYWdlL1BhZ2VTZXJpYWxpemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VTZXJpYWxp emVyOjpyZXRyaWV2ZVJlc291cmNlc0ZvckNTU1J1bGUpOgorICAgICAgICAqIHN2Zy9TVkdGb250 RmFjZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRm9udEZhY2VFbGVtZW50Ojpw YXJzZU1hcHBlZEF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdGb250RmFjZUVsZW1l bnQ6OmZvbnRGYW1pbHkpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRm9udEZhY2VFbGVtZW50Ojpy ZWJ1aWxkRm9udEZhY2UpOgorCiAyMDEyLTAxLTMxICBTY290dCBHcmFoYW0gIDxzY290dG1nQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFJlbW92ZSByZWZlcmVuY2VzIHRvIGd5 cCBjeWd3aW4gYnVpbGQgdGFyZ2V0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZh Y2VSdWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlUnVs ZS5oCShyZXZpc2lvbiAxMDYzNjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VS dWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDEwICs0MiwxMSBAQCBwdWJsaWM6CiAKICAgICB+ Q1NTRm9udEZhY2VSdWxlKCk7CiAKLSAgICBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogc3R5 bGUoKSBjb25zdCB7IHJldHVybiBtX3N0eWxlLmdldCgpOyB9CisgICAgQ1NTU3R5bGVEZWNsYXJh dGlvbiogc3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3N0eWxlLmdldCgpOyB9CiAKICAgICBTdHJp bmcgY3NzVGV4dCgpIGNvbnN0OwogCisgICAgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIGRl Y2xhcmF0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zdHlsZS5nZXQoKTsgfQogICAgIHZvaWQgc2V0 RGVjbGFyYXRpb24oUGFzc1JlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gc3R5bGUp IHsgbV9zdHlsZSA9IHN0eWxlOyB9CiAKICAgICB2b2lkIGFkZFN1YnJlc291cmNlU3R5bGVVUkxz KExpc3RIYXNoU2V0PEtVUkw+JiB1cmxzKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NG b250U2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250 U2VsZWN0b3IuY3BwCShyZXZpc2lvbiAxMDYzNjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Rm9udFNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODYsNyArODYsNyBAQCBib29sIENT U0ZvbnRTZWxlY3Rvcjo6aXNFbXB0eSgpIGNvbnN0CiB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6YWRk Rm9udEZhY2VSdWxlKGNvbnN0IENTU0ZvbnRGYWNlUnVsZSogZm9udEZhY2VSdWxlKQogewogICAg IC8vIE9idGFpbiB0aGUgZm9udC1mYW1pbHkgcHJvcGVydHkgYW5kIHRoZSBzcmMgcHJvcGVydHku ICBCb3RoIG11c3QgYmUgZGVmaW5lZC4KLSAgICBjb25zdCBDU1NNdXRhYmxlU3R5bGVEZWNsYXJh dGlvbiogc3R5bGUgPSBmb250RmFjZVJ1bGUtPnN0eWxlKCk7CisgICAgY29uc3QgQ1NTTXV0YWJs ZVN0eWxlRGVjbGFyYXRpb24qIHN0eWxlID0gZm9udEZhY2VSdWxlLT5kZWNsYXJhdGlvbigpOwog ICAgIFJlZlB0cjxDU1NWYWx1ZT4gZm9udEZhbWlseSA9IHN0eWxlLT5nZXRQcm9wZXJ0eUNTU1Zh bHVlKENTU1Byb3BlcnR5Rm9udEZhbWlseSk7CiAgICAgUmVmUHRyPENTU1ZhbHVlPiBzcmMgPSBz dHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eVNyYyk7CiAgICAgUmVmUHRyPENT U1ZhbHVlPiB1bmljb2RlUmFuZ2UgPSBzdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9w ZXJ0eVVuaWNvZGVSYW5nZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVSdWxl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlUnVsZS5oCShyZXZp c2lvbiAxMDYzNjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVSdWxlLmgJKHdvcmtp bmcgY29weSkKQEAgLTQzLDcgKzQzLDcgQEAgcHVibGljOgogICAgIFN0cmluZyBzZWxlY3RvclRl eHQoKSBjb25zdDsKICAgICB2b2lkIHNldFNlbGVjdG9yVGV4dChjb25zdCBTdHJpbmcmKTsKIAot ICAgIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1f c3R5bGUuZ2V0KCk7IH0KKyAgICBDU1NTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSgpIGNvbnN0IHsg cmV0dXJuIG1fc3R5bGUuZ2V0KCk7IH0KIAogICAgIFN0cmluZyBjc3NUZXh0KCkgY29uc3Q7CiAK QEAgLTUxLDcgKzUxLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RGVjbGFyYXRpb24oUGFzc1Jl ZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbj4gc3R5bGUpIHsgQVNTRVJUKHN0eWxlLT5w YXJlbnRSdWxlKCkgPT0gdGhpcyk7IG1fc3R5bGUgPSBzdHlsZTsgfQogCiAgICAgY29uc3QgQ1NT U2VsZWN0b3JMaXN0JiBzZWxlY3Rvckxpc3QoKSBjb25zdCB7IHJldHVybiBtX3NlbGVjdG9yTGlz dDsgfQotICAgIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiBkZWNsYXJhdGlvbigpIHsgcmV0 dXJuIG1fc3R5bGUuZ2V0KCk7IH0KKyAgICBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZGVj bGFyYXRpb24oKSBjb25zdCB7IHJldHVybiBtX3N0eWxlLmdldCgpOyB9CiAKICAgICB2b2lkIGFk ZFN1YnJlc291cmNlU3R5bGVVUkxzKExpc3RIYXNoU2V0PEtVUkw+JiB1cmxzKTsKIApJbmRleDog U291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gMTA2MzYzKQor KysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNTI5LDcgKzE1MjksNyBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHlsZVNl bGVjdG9yCiBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yOjpzdHlsZUZv cktleWZyYW1lKGNvbnN0IFJlbmRlclN0eWxlKiBlbGVtZW50U3R5bGUsIGNvbnN0IFdlYktpdENT U0tleWZyYW1lUnVsZSoga2V5ZnJhbWVSdWxlLCBLZXlmcmFtZVZhbHVlJiBrZXlmcmFtZSkKIHsK ICAgICBpZiAoa2V5ZnJhbWVSdWxlLT5zdHlsZSgpKQotICAgICAgICBhZGRNYXRjaGVkRGVjbGFy YXRpb24oa2V5ZnJhbWVSdWxlLT5zdHlsZSgpKTsKKyAgICAgICAgYWRkTWF0Y2hlZERlY2xhcmF0 aW9uKGtleWZyYW1lUnVsZS0+ZGVjbGFyYXRpb24oKSk7CiAKICAgICBBU1NFUlQoIW1fc3R5bGUp OwogCkBAIC0xNTY4LDcgKzE1NjgsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHls ZVNlbGVjdG9yCiAjZW5kaWYKIAogICAgIC8vIEFkZCBhbGwgdGhlIGFuaW1hdGluZyBwcm9wZXJ0 aWVzIHRvIHRoZSBrZXlmcmFtZS4KLSAgICBpZiAoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24q IHN0eWxlRGVjbGFyYXRpb24gPSBrZXlmcmFtZVJ1bGUtPnN0eWxlKCkpIHsKKyAgICBpZiAoQ1NT TXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIHN0eWxlRGVjbGFyYXRpb24gPSBrZXlmcmFtZVJ1bGUt PmRlY2xhcmF0aW9uKCkpIHsKICAgICAgICAgdW5zaWduZWQgcHJvcGVydHlDb3VudCA9IHN0eWxl RGVjbGFyYXRpb24tPnByb3BlcnR5Q291bnQoKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IHByb3BlcnR5Q291bnQ7ICsraSkgewogICAgICAgICAgICAgaW50IHByb3BlcnR5ID0g c3R5bGVEZWNsYXJhdGlvbi0+cHJvcGVydHlBdChpKS5pZCgpOwpJbmRleDogU291cmNlL1dlYkNv cmUvY3NzL1dlYktpdENTU0tleWZyYW1lUnVsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9XZWJLaXRDU1NLZXlmcmFtZVJ1bGUuaAkocmV2aXNpb24gMTA2MzYzKQorKysgU291 cmNlL1dlYkNvcmUvY3NzL1dlYktpdENTU0tleWZyYW1lUnVsZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0yNiwxNCArMjYsMTMgQEAKICNpZm5kZWYgV2ViS2l0Q1NTS2V5ZnJhbWVSdWxlX2gKICNkZWZp bmUgV2ViS2l0Q1NTS2V5ZnJhbWVSdWxlX2gKIAorI2luY2x1ZGUgIkNTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uLmgiCiAjaW5jbHVkZSAiQ1NTUnVsZS5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVm UHRyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LWNsYXNzIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOwotCiB0eXBlZGVmIGludCBFeGNlcHRp b25Db2RlOwogCiBjbGFzcyBXZWJLaXRDU1NLZXlmcmFtZVJ1bGUgOiBwdWJsaWMgQ1NTUnVsZSB7 CkBAIC01NCwxNSArNTMsMTMgQEAgcHVibGljOgogCiAgICAgdm9pZCBnZXRLZXlzKFZlY3Rvcjxm bG9hdD4mIGtleXMpIGNvbnN0ICAgeyBwYXJzZUtleVN0cmluZyhtX2tleSwga2V5cyk7IH0KIAot ICAgIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1f c3R5bGUuZ2V0KCk7IH0KKyAgICBDU1NTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSgpIGNvbnN0IHsg cmV0dXJuIG1fc3R5bGUuZ2V0KCk7IH0KIAogICAgIFN0cmluZyBjc3NUZXh0KCkgY29uc3Q7CiAK KyAgICBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogZGVjbGFyYXRpb24oKSBjb25zdCB7IHJl dHVybiBtX3N0eWxlLmdldCgpOyB9CiAgICAgdm9pZCBzZXREZWNsYXJhdGlvbihQYXNzUmVmUHRy PENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPik7CiAKLSAgICBDU1NNdXRhYmxlU3R5bGVEZWNs YXJhdGlvbiogICAgICAgICBkZWNsYXJhdGlvbigpICAgICAgIHsgcmV0dXJuIG1fc3R5bGUuZ2V0 KCk7IH0KLSAgICBjb25zdCBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbiogICBkZWNsYXJhdGlv bigpIGNvbnN0IHsgcmV0dXJuIG1fc3R5bGUuZ2V0KCk7IH0KLQogcHJpdmF0ZToKICAgICBzdGF0 aWMgdm9pZCBwYXJzZUtleVN0cmluZyhjb25zdCBTdHJpbmcmIHMsIFZlY3RvcjxmbG9hdD4mIGtl eXMpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCShyZXZp c2lvbiAxMDYzNjMpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTEwMTgsNyArMTAxOCw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPENT U011dGFibGVTdHlsZURlY2xhcmEKICAgICBpZiAobWF0Y2hlZFJ1bGVzKSB7CiAgICAgICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBtYXRjaGVkUnVsZXMtPmxlbmd0aCgpOyBpKyspIHsKICAg ICAgICAgICAgIGlmIChtYXRjaGVkUnVsZXMtPml0ZW0oaSktPnR5cGUoKSA9PSBDU1NSdWxlOjpT VFlMRV9SVUxFKSB7Ci0gICAgICAgICAgICAgICAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xh cmF0aW9uPiBzID0gc3RhdGljX2Nhc3Q8Q1NTU3R5bGVSdWxlKj4obWF0Y2hlZFJ1bGVzLT5pdGVt KGkpKS0+c3R5bGUoKTsKKyAgICAgICAgICAgICAgICBSZWZQdHI8Q1NTTXV0YWJsZVN0eWxlRGVj bGFyYXRpb24+IHMgPSBzdGF0aWNfY2FzdDxDU1NTdHlsZVJ1bGUqPihtYXRjaGVkUnVsZXMtPml0 ZW0oaSkpLT5kZWNsYXJhdGlvbigpOwogICAgICAgICAgICAgICAgIHN0eWxlLT5tZXJnZShzLmdl dCgpLCB0cnVlKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpJbmRleDogU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcAkocmV2aXNpb24gMTA2 MzYzKQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMDg1LDcgKzEwODUsNyBAQCB2b2lkIEluc3BlY3RvclN0eWxl U2hlZXQ6OnJldmFsaWRhdGVTdHlsCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMCwgc2l6ZSA9IG1f ZmxhdFJ1bGVzLnNpemUoKTsgaSA8IHNpemU7ICsraSkgewogICAgICAgICBDU1NTdHlsZVJ1bGUq IHBhcnNlZFJ1bGUgPSBtX2ZsYXRSdWxlcy5hdChpKTsKICAgICAgICAgaWYgKHBhcnNlZFJ1bGUt PnN0eWxlKCkgPT0gcGFnZVN0eWxlKSB7Ci0gICAgICAgICAgICBpZiAocGFyc2VkUnVsZS0+c3R5 bGUoKS0+YXNUZXh0KCkgIT0gcGFnZVN0eWxlLT5jc3NUZXh0KCkpIHsKKyAgICAgICAgICAgIGlm IChwYXJzZWRSdWxlLT5kZWNsYXJhdGlvbigpLT5hc1RleHQoKSAhPSBwYWdlU3R5bGUtPmNzc1Rl eHQoKSkgewogICAgICAgICAgICAgICAgIC8vIENsZWFyIHRoZSBkaXNhYmxlZCBwcm9wZXJ0aWVz IGZvciB0aGUgaW52YWxpZCBzdHlsZSBoZXJlLgogICAgICAgICAgICAgICAgIG1faW5zcGVjdG9y U3R5bGVzLnJlbW92ZShwYWdlU3R5bGUpOwogICAgICAgICAgICAgICAgIHNldFN0eWxlVGV4dChw YWdlU3R5bGUsIHBhZ2VTdHlsZS0+Y3NzVGV4dCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZVNlcmlhbGl6ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZVNlcmlhbGl6ZXIuY3BwCShyZXZpc2lvbiAxMDYzNjMpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL1BhZ2VTZXJpYWxpemVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAzLDcgKzMwMyw3IEBA IHZvaWQgUGFnZVNlcmlhbGl6ZXI6OmFkZEltYWdlVG9SZXNvdXJjZXMKIAogdm9pZCBQYWdlU2Vy aWFsaXplcjo6cmV0cmlldmVSZXNvdXJjZXNGb3JDU1NSdWxlKENTU1N0eWxlUnVsZSogcnVsZSkK IHsKLSAgICByZXRyaWV2ZVJlc291cmNlc0ZvckNTU0RlY2xhcmF0aW9uKHJ1bGUtPnN0eWxlKCkp OworICAgIHJldHJpZXZlUmVzb3VyY2VzRm9yQ1NTRGVjbGFyYXRpb24ocnVsZS0+ZGVjbGFyYXRp b24oKSk7CiB9CiAKIHZvaWQgUGFnZVNlcmlhbGl6ZXI6OnJldHJpZXZlUmVzb3VyY2VzRm9yQ1NT RGVjbGFyYXRpb24oQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIHN0eWxlRGVjbGFyYXRpb24p CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRm9udEZhY2VFbGVtZW50LmNwcAkocmV2aXNp b24gMTA2MzYzKQorKysgU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZvbnRGYWNlRWxlbWVudC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTExMyw3ICsxMTMsNyBAQCB2b2lkIFNWR0ZvbnRGYWNlRWxlbWVu dDo6cGFyc2VNYXBwZWRBdHRyCiB7ICAgIAogICAgIGludCBwcm9wSWQgPSBjc3NQcm9wZXJ0eUlk Rm9yU1ZHQXR0cmlidXRlTmFtZShhdHRyLT5uYW1lKCkpOwogICAgIGlmIChwcm9wSWQgPiAwKSB7 Ci0gICAgICAgIG1fZm9udEZhY2VSdWxlLT5zdHlsZSgpLT5zZXRQcm9wZXJ0eShwcm9wSWQsIGF0 dHItPnZhbHVlKCksIGZhbHNlKTsKKyAgICAgICAgbV9mb250RmFjZVJ1bGUtPmRlY2xhcmF0aW9u KCktPnNldFByb3BlcnR5KHByb3BJZCwgYXR0ci0+dmFsdWUoKSwgZmFsc2UpOwogICAgICAgICBy ZWJ1aWxkRm9udEZhY2UoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTI1OCw3ICsyNTgs NyBAQCBpbnQgU1ZHRm9udEZhY2VFbGVtZW50OjpkZXNjZW50KCkgY29uc3QKIAogU3RyaW5nIFNW R0ZvbnRGYWNlRWxlbWVudDo6Zm9udEZhbWlseSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fZm9u dEZhY2VSdWxlLT5zdHlsZSgpLT5nZXRQcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5Rm9udEZhbWls eSk7CisgICAgcmV0dXJuIG1fZm9udEZhY2VSdWxlLT5kZWNsYXJhdGlvbigpLT5nZXRQcm9wZXJ0 eVZhbHVlKENTU1Byb3BlcnR5Rm9udEZhbWlseSk7CiB9CiAKIFNWR0ZvbnRFbGVtZW50KiBTVkdG b250RmFjZUVsZW1lbnQ6OmFzc29jaWF0ZWRGb250RWxlbWVudCgpIGNvbnN0CkBAIC0yOTksMTEg KzI5OSwxMSBAQCB2b2lkIFNWR0ZvbnRGYWNlRWxlbWVudDo6cmVidWlsZEZvbnRGYWNlCiAgICAg Ly8gUGFyc2UgaW4tbWVtb3J5IENTUyBydWxlcwogICAgIENTU1Byb3BlcnR5IHNyY1Byb3BlcnR5 KENTU1Byb3BlcnR5U3JjLCBsaXN0KTsKICAgICBjb25zdCBDU1NQcm9wZXJ0eSogc3JjUHJvcGVy dHlSZWYgPSAmc3JjUHJvcGVydHk7Ci0gICAgbV9mb250RmFjZVJ1bGUtPnN0eWxlKCktPmFkZFBh cnNlZFByb3BlcnRpZXMoJnNyY1Byb3BlcnR5UmVmLCAxKTsKKyAgICBtX2ZvbnRGYWNlUnVsZS0+ ZGVjbGFyYXRpb24oKS0+YWRkUGFyc2VkUHJvcGVydGllcygmc3JjUHJvcGVydHlSZWYsIDEpOwog CiAgICAgaWYgKGRlc2NyaWJlc1BhcmVudEZvbnQpIHsgICAgCiAgICAgICAgIC8vIFRyYXZlcnNl IHBhcnNlZCBDU1MgdmFsdWVzIGFuZCBhc3NvY2lhdGUgQ1NTRm9udEZhY2VTcmNWYWx1ZSBlbGVt ZW50cyB3aXRoIG91cnNlbHZlcy4KLSAgICAgICAgUmVmUHRyPENTU1ZhbHVlPiBzcmMgPSBtX2Zv bnRGYWNlUnVsZS0+c3R5bGUoKS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eVNyYyk7 CisgICAgICAgIFJlZlB0cjxDU1NWYWx1ZT4gc3JjID0gbV9mb250RmFjZVJ1bGUtPmRlY2xhcmF0 aW9uKCktPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlTcmMpOwogICAgICAgICBDU1NW YWx1ZUxpc3QqIHNyY0xpc3QgPSBzdGF0aWNfY2FzdDxDU1NWYWx1ZUxpc3QqPihzcmMuZ2V0KCkp OwogCiAgICAgICAgIHVuc2lnbmVkIHNyY0xlbmd0aCA9IHNyY0xpc3QgPyBzcmNMaXN0LT5sZW5n dGgoKSA6IDA7Cg==