7976 2006-03-25 02:49:28 -0800 Change the way RenderStyles are created to avoid floating objects 2009-01-02 00:06:06 -0800 1 1 1 Unclassified WebKit CSS 420+ Mac OS X 10.4 RESOLVED FIXED P4 Normal --- 1 eric eric adele oldest_to_newest 37542 0 eric 2006-03-25 02:49:28 -0800 This patch makes RenderStyles no longer float (with a ref count of 0) during the initial style resolve. 37543 1 7292 eric 2006-03-25 02:50:16 -0800 Created attachment 7292 Make RenderStyle objects no longer float 104032 2 ap 2009-01-02 00:06:06 -0800 *** Bug 9278 has been marked as a duplicate of this bug. *** 7292 2006-03-25 02:50:16 -0800 2006-03-25 03:14:15 -0800 Make RenderStyle objects no longer float float.patch text/plain 14856 eric SW5kZXg6IHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHJlbmRlcmlu Zy9SZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiAxMzQ3NykKKysrIHJlbmRlcmluZy9SZW5kZXJP YmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MCw3ICs4MCw3IEBAIHZvaWQgUmVuZGVyT2Jq ZWN0OjpvcGVyYXRvciBkZWxldGUodm9pZCoKICAgICAqKHNpemVfdCAqKXB0ciA9IHN6OwogfQog Ci1SZW5kZXJPYmplY3QgKlJlbmRlck9iamVjdDo6Y3JlYXRlT2JqZWN0KFdlYkNvcmU6Ok5vZGUq IG5vZGUsICBSZW5kZXJTdHlsZSogc3R5bGUpCitSZW5kZXJPYmplY3QgKlJlbmRlck9iamVjdDo6 Y3JlYXRlT2JqZWN0KE5vZGUqIG5vZGUsICBSZW5kZXJTdHlsZSogc3R5bGUpCiB7CiAgICAgUmVu ZGVyT2JqZWN0ICpvID0gMDsKICAgICBSZW5kZXJBcmVuYSogYXJlbmEgPSBub2RlLT5nZXREb2N1 bWVudCgpLT5yZW5kZXJBcmVuYSgpOwpAQCAtMTQzLDcgKzE0Myw3IEBAIGludCBSZW5kZXJPYmpl Y3RDb3VudGVyOjpjb3VudDsKIHN0YXRpYyBSZW5kZXJPYmplY3RDb3VudGVyIHJlbmRlck9iamVj dENvdW50ZXI7CiAjZW5kaWYgTkRFQlVHCiAKLVJlbmRlck9iamVjdDo6UmVuZGVyT2JqZWN0KFdl YkNvcmU6Ok5vZGUqIG5vZGUpCitSZW5kZXJPYmplY3Q6OlJlbmRlck9iamVjdChOb2RlKiBub2Rl KQogICAgIDogQ2FjaGVkT2JqZWN0Q2xpZW50KCksCiBtX3N0eWxlKCAwICksCiBtX25vZGUoIG5v ZGUgKSwKQEAgLTE1ODYsNyArMTU4Niw3IEBAIHZvaWQgc2hvd1RyZWUoY29uc3QgUmVuZGVyT2Jq ZWN0ICpybykKIAogc3RhdGljIE5vZGUgKnNlbGVjdFN0YXJ0Tm9kZShjb25zdCBSZW5kZXJPYmpl Y3QgKm9iamVjdCkKIHsKLSAgICBXZWJDb3JlOjpOb2RlICpub2RlID0gMDsKKyAgICBOb2RlICpu b2RlID0gMDsKICAgICBib29sIGZvcmNlZE9uID0gZmFsc2U7CiAKICAgICBmb3IgKGNvbnN0IFJl bmRlck9iamVjdCAqY3VyciA9IG9iamVjdDsgY3VycjsgY3VyciA9IGN1cnItPnBhcmVudCgpKSB7 CkBAIC0xNjMyLDE0ICsxNjMyLDE0IEBAIENvbG9yIFJlbmRlck9iamVjdDo6c2VsZWN0aW9uQ29s b3IoR3JhcGgKICAgICByZXR1cm4gY29sb3I7CiB9CiAKLVdlYkNvcmU6Ok5vZGUqIFJlbmRlck9i amVjdDo6ZHJhZ2dhYmxlTm9kZShib29sIGRodG1sT0ssIGJvb2wgdWFPSywgaW50IHgsIGludCB5 LCBib29sJiBkaHRtbFdpbGxEcmFnKSBjb25zdAorTm9kZSogUmVuZGVyT2JqZWN0OjpkcmFnZ2Fi bGVOb2RlKGJvb2wgZGh0bWxPSywgYm9vbCB1YU9LLCBpbnQgeCwgaW50IHksIGJvb2wmIGRodG1s V2lsbERyYWcpIGNvbnN0CiB7CiAgICAgaWYgKCFkaHRtbE9LICYmICF1YU9LKQogICAgICAgICBy ZXR1cm4gMDsKIAogICAgIGNvbnN0IFJlbmRlck9iamVjdCogY3VyciA9IHRoaXM7CiAgICAgd2hp bGUgKGN1cnIpIHsKLSAgICAgICAgV2ViQ29yZTo6Tm9kZSAqZWx0ID0gY3Vyci0+ZWxlbWVudCgp OworICAgICAgICBOb2RlICplbHQgPSBjdXJyLT5lbGVtZW50KCk7CiAgICAgICAgIGlmIChlbHQg JiYgZWx0LT5ub2RlVHlwZSgpID09IE5vZGU6OlRFWFRfTk9ERSkgewogICAgICAgICAgICAgLy8g U2luY2UgdGhlcmUncyBubyB3YXkgZm9yIHRoZSBhdXRob3IgdG8gYWRkcmVzcyB0aGUgLWtodG1s LXVzZXItZHJhZyBzdHlsZSBmb3IgYSB0ZXh0IG5vZGUsCiAgICAgICAgICAgICAvLyB3ZSB1c2Ug b3VyIG93biBqdWRnZW1lbnQuCkBAIC0yMzQ2LDIxICsyMzQ2LDIzIEBAIFJlbmRlclN0eWxlKiBS ZW5kZXJPYmplY3Q6OmdldFBzZXVkb1N0eWwKICAgICAgICAgcGFyZW50U3R5bGUgPSBzdHlsZSgp OwogCiAgICAgUmVuZGVyU3R5bGUqIHJlc3VsdCA9IHN0eWxlKCktPmdldFBzZXVkb1N0eWxlKHBz ZXVkbyk7Ci0gICAgaWYgKHJlc3VsdCkgcmV0dXJuIHJlc3VsdDsKKyAgICBpZiAocmVzdWx0KQor ICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIAotICAgIFdlYkNvcmU6Ok5vZGUqIG5vZGUgPSBl bGVtZW50KCk7CisgICAgTm9kZSogbm9kZSA9IGVsZW1lbnQoKTsKICAgICBpZiAoaXNUZXh0KCkp CiAgICAgICAgIG5vZGUgPSBlbGVtZW50KCktPnBhcmVudE5vZGUoKTsKLSAgICBpZiAoIW5vZGUp IHJldHVybiAwOworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuIDA7CiAgICAgCiAgICAg aWYgKHBzZXVkbyA9PSBSZW5kZXJTdHlsZTo6RklSU1RfTElORV9JTkhFUklURUQpCi0gICAgICAg IHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0 YXRpY19jYXN0PFdlYkNvcmU6OkVsZW1lbnQqPihub2RlKSwgCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmVudFN0eWxlLCBm YWxzZSk7CisgICAgICAgIHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+Y3Jl YXRlU3R5bGVGb3JFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKSwgcGFyZW50U3R5 bGUsIGZhbHNlKTsKICAgICBlbHNlCi0gICAgICAgIHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxl U2VsZWN0b3IoKS0+cHNldWRvU3R5bGVGb3JFbGVtZW50KHBzZXVkbywgc3RhdGljX2Nhc3Q8V2Vi Q29yZTo6RWxlbWVudCo+KG5vZGUpLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyZW50U3R5bGUpOwotICAgIGlm IChyZXN1bHQpCisgICAgICAgIHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+ Y3JlYXRlUHNldWRvU3R5bGVGb3JFbGVtZW50KHBzZXVkbywgc3RhdGljX2Nhc3Q8RWxlbWVudCo+ KG5vZGUpLCBwYXJlbnRTdHlsZSk7CisgICAgaWYgKHJlc3VsdCkgewogICAgICAgICBzdHlsZSgp LT5hZGRQc2V1ZG9TdHlsZShyZXN1bHQpOworICAgICAgICByZXN1bHQtPmRlcmVmKGRvY3VtZW50 KCktPnJlbmRlckFyZW5hKCkpOworICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwogfQogCkluZGV4 OiBkb20vZG9tX2VsZW1lbnRpbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZG9tL2RvbV9lbGVtZW50aW1w bC5oCShyZXZpc2lvbiAxMzQ3NykKKysrIGRvbS9kb21fZWxlbWVudGltcGwuaAkod29ya2luZyBj b3B5KQpAQCAtMjMxLDcgKzIzMSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIERlcHJlY2F0ZWRT dHJpbmcgc3RhdGUoKSB7IHJldHVybiBEZXByZWNhdGVkU3RyaW5nOjpudWxsOyB9CiAKICAgICB2 aXJ0dWFsIHZvaWQgYXR0YWNoKCk7Ci0gICAgdmlydHVhbCBSZW5kZXJTdHlsZSAqc3R5bGVGb3JS ZW5kZXJlcihSZW5kZXJPYmplY3QgKnBhcmVudCk7CisgICAgdmlydHVhbCBSZW5kZXJTdHlsZSAq Y3JlYXRlU3R5bGVGb3JSZW5kZXJlcihSZW5kZXJPYmplY3QgKnBhcmVudCk7CiAgICAgdmlydHVh bCBSZW5kZXJPYmplY3QgKmNyZWF0ZVJlbmRlcmVyKFJlbmRlckFyZW5hICosIFJlbmRlclN0eWxl ICopOwogICAgIHZpcnR1YWwgdm9pZCByZWNhbGNTdHlsZSggU3R5bGVDaGFuZ2UgPSBOb0NoYW5n ZSApOwogCkluZGV4OiBkb20vTm9kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGRvbS9Ob2RlLmgJKHJldmlz aW9uIDEzNDc3KQorKysgZG9tL05vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzU3LDcgKzM1Nyw3 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVtb3ZlKCk7CiAgICAgdm9pZCBj cmVhdGVSZW5kZXJlcklmTmVlZGVkKCk7Ci0gICAgdmlydHVhbCBSZW5kZXJTdHlsZSogc3R5bGVG b3JSZW5kZXJlcihSZW5kZXJPYmplY3QqIHBhcmVudCk7CisgICAgdmlydHVhbCBSZW5kZXJTdHls ZSogY3JlYXRlU3R5bGVGb3JSZW5kZXJlcihSZW5kZXJPYmplY3QqIHBhcmVudCk7CiAgICAgdmly dHVhbCBib29sIHJlbmRlcmVySXNOZWVkZWQoUmVuZGVyU3R5bGUqKTsKICNpZiBTVkdfU1VQUE9S VAogICAgIHZpcnR1YWwgYm9vbCBjaGlsZFNob3VsZENyZWF0ZVJlbmRlcmVyKE5vZGUqKSBjb25z dCB7IHJldHVybiB0cnVlOyB9CkluZGV4OiBkb20vZG9tX2VsZW1lbnRpbXBsLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBkb20vZG9tX2VsZW1lbnRpbXBsLmNwcAkocmV2aXNpb24gMTM0NzcpCisrKyBkb20v ZG9tX2VsZW1lbnRpbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDk3LDkgKzQ5Nyw5IEBAIGJv b2wgRWxlbWVudDo6aXNVUkxBdHRyaWJ1dGUoQXR0cmlidXRlICoKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAKLVJlbmRlclN0eWxlICpFbGVtZW50OjpzdHlsZUZvclJlbmRlcmVyKFJlbmRlck9iamVj dCAqcGFyZW50UmVuZGVyZXIpCitSZW5kZXJTdHlsZSAqRWxlbWVudDo6Y3JlYXRlU3R5bGVGb3JS ZW5kZXJlcihSZW5kZXJPYmplY3QgKnBhcmVudFJlbmRlcmVyKQogewotICAgIHJldHVybiBnZXRE b2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCktPnN0eWxlRm9yRWxlbWVudCh0aGlzKTsKKyAgICBy ZXR1cm4gZ2V0RG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvcigpLT5jcmVhdGVTdHlsZUZvckVsZW1l bnQodGhpcyk7CiB9CiAKIFJlbmRlck9iamVjdCAqRWxlbWVudDo6Y3JlYXRlUmVuZGVyZXIoUmVu ZGVyQXJlbmEgKmFyZW5hLCBSZW5kZXJTdHlsZSAqc3R5bGUpCkBAIC01NTksOCArNTU5LDcgQEAg dm9pZCBFbGVtZW50OjpyZWNhbGNTdHlsZSggU3R5bGVDaGFuZ2UgYwogICAgIGJvb2wgaGFzUGFy ZW50UmVuZGVyZXIgPSBwYXJlbnQoKSA/IHBhcmVudCgpLT5yZW5kZXJlcigpIDogZmFsc2U7CiAg ICAgCiAgICAgaWYgKCBoYXNQYXJlbnRSZW5kZXJlciAmJiAoY2hhbmdlID49IEluaGVyaXQgfHwg Y2hhbmdlZCgpKSApIHsKLSAgICAgICAgUmVuZGVyU3R5bGUgKm5ld1N0eWxlID0gZ2V0RG9jdW1l bnQoKS0+c3R5bGVTZWxlY3RvcigpLT5zdHlsZUZvckVsZW1lbnQodGhpcyk7Ci0gICAgICAgIG5l d1N0eWxlLT5yZWYoKTsKKyAgICAgICAgUmVuZGVyU3R5bGUgKm5ld1N0eWxlID0gZ2V0RG9jdW1l bnQoKS0+c3R5bGVTZWxlY3RvcigpLT5jcmVhdGVTdHlsZUZvckVsZW1lbnQodGhpcyk7CiAgICAg ICAgIFN0eWxlQ2hhbmdlIGNoID0gZGlmZiggX3N0eWxlLCBuZXdTdHlsZSApOwogICAgICAgICBp ZiAoY2ggPT0gRGV0YWNoKSB7CiAgICAgICAgICAgICBpZiAoYXR0YWNoZWQoKSkgZGV0YWNoKCk7 CkluZGV4OiBkb20vTm9kZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZG9tL05vZGUuY3BwCShyZXZpc2lv biAxMzQ3NykKKysrIGRvbS9Ob2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODg1LDE1ICs4ODUs MTQgQEAgdm9pZCBOb2RlOjpjcmVhdGVSZW5kZXJlcklmTmVlZGVkKCkKICAgICAgICAgJiYgcGFy ZW50LT5jaGlsZFNob3VsZENyZWF0ZVJlbmRlcmVyKHRoaXMpCiAjZW5kaWYKICAgICAgICAgKSB7 Ci0gICAgICAgIFJlbmRlclN0eWxlKiBzdHlsZSA9IHN0eWxlRm9yUmVuZGVyZXIocGFyZW50UmVu ZGVyZXIpOwotICAgICAgICBzdHlsZS0+cmVmKCk7CisgICAgICAgIFJlbmRlclN0eWxlKiBzdHls ZSA9IGNyZWF0ZVN0eWxlRm9yUmVuZGVyZXIocGFyZW50UmVuZGVyZXIpOwogI2lmbmRlZiBLSFRN TF9OT19YQkwKICAgICAgICAgYm9vbCByZXNvbHZlU3R5bGUgPSBmYWxzZTsKICAgICAgICAgaWYg KGdldERvY3VtZW50KCktPmJpbmRpbmdNYW5hZ2VyKCktPmxvYWRCaW5kaW5ncyh0aGlzLCBzdHls ZS0+YmluZGluZ1VSSXMoKSwgdHJ1ZSwgJnJlc29sdmVTdHlsZSkgJiYgCiAgICAgICAgICAgICBy ZW5kZXJlcklzTmVlZGVkKHN0eWxlKSkgewogICAgICAgICAgICAgaWYgKHJlc29sdmVTdHlsZSkg ewotICAgICAgICAgICAgICAgIHN0eWxlLT5kZXJlZigpOwotICAgICAgICAgICAgICAgIHN0eWxl ID0gc3R5bGVGb3JSZW5kZXJlcihwYXJlbnRSZW5kZXJlcik7CisgICAgICAgICAgICAgICAgc3R5 bGUtPmRlcmVmKGRvY3VtZW50LT5yZW5kZXJBcmVuYSgpKTsKKyAgICAgICAgICAgICAgICBzdHls ZSA9IGNyZWF0ZVN0eWxlRm9yUmVuZGVyZXIocGFyZW50UmVuZGVyZXIpOwogICAgICAgICAgICAg fQogI2Vsc2UKICAgICAgICAgaWYgKHJlbmRlcmVySXNOZWVkZWQoc3R5bGUpKSB7CkBAIC05MTIs OSArOTExLDExIEBAIHZvaWQgTm9kZTo6Y3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgpCiAgICAgfQog fQogCi1SZW5kZXJTdHlsZSAqTm9kZTo6c3R5bGVGb3JSZW5kZXJlcihSZW5kZXJPYmplY3QgKnBh cmVudCkKK1JlbmRlclN0eWxlICpOb2RlOjpjcmVhdGVTdHlsZUZvclJlbmRlcmVyKFJlbmRlck9i amVjdCAqcGFyZW50KQogewotICAgIHJldHVybiBwYXJlbnQtPnN0eWxlKCk7CisgICAgUmVuZGVy U3R5bGUgKnN0eWxlID0gcGFyZW50LT5zdHlsZSgpOworICAgIHN0eWxlLT5yZWYoKTsKKyAgICBy ZXR1cm4gc3R5bGU7CiB9CiAKIGJvb2wgTm9kZTo6cmVuZGVyZXJJc05lZWRlZChSZW5kZXJTdHls ZSAqc3R5bGUpCkluZGV4OiBDaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gQ2hhbmdlTG9nCShyZXZp c2lvbiAxMzQ3OCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBA CisyMDA2LTAzLTI1ICBFcmljIFNlaWRlbCAgPGVzZWlkZWxAYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBSZW5kZXJTdHlsZSBj cmVhdGlvbiB0byBhdm9pZCBmbG9hdGluZyBSZW5kZXJTdHlsZSBvYmplY3RzLgorICAgICAgICBU aGlzIGFsc28gZml4ZXMgYSBidWcsIHdlcmUgU1ZHIHRvIGV2ZXIgc3RhcnQgc2hhcmluZyBSZW5k ZXJTdHlsZXMKKyAgICAgICAgYmV0d2VlbiBlbGVtZW50cywgY29kZSB3b3VsZCBoYXZlIGNyYXNo ZWQgYXMgdGhlcmUgd2VyZSBpbXByb3Blcmx5CisgICAgICAgIHBhaXJlZCBzdHlsZS0+ZGVyZWYo KSBzdGF0ZW1lbnRzIGluIFNWRyBjb2RlLgorCisgICAgICAgIE5vIHRlc3QgcG9zc2libGUgKG5v IGZ1bmN0aW9uYWxpdHkgY2hhbmdlKS4KKworICAgICAgICAqIGNzcy9jc3NzdHlsZXNlbGVjdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmNyZWF0ZVN0eWxlRm9y RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpjcmVhdGVQc2V1 ZG9TdHlsZUZvckVsZW1lbnQpOgorICAgICAgICAqIGNzcy9jc3NzdHlsZXNlbGVjdG9yLmg6Cisg ICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6Y3JlYXRlUmVu ZGVyZXJJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpjcmVhdGVTdHlsZUZvclJl bmRlcmVyKToKKyAgICAgICAgKiBkb20vTm9kZS5oOgorICAgICAgICAqIGRvbS9kb21fZWxlbWVu dGltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Y3JlYXRlU3R5bGVGb3JSZW5k ZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpyZWNhbGNTdHlsZSk6CisgICAgICAg ICogZG9tL2RvbV9lbGVtZW50aW1wbC5oOgorICAgICAgICAqIGtzdmcyL3N2Zy9TVkdDbGlwUGF0 aEVsZW1lbnQuY3BwOgorICAgICAgICAoU1ZHQ2xpcFBhdGhFbGVtZW50OjpjYW52YXNSZXNvdXJj ZSk6CisgICAgICAgICoga3N2ZzIvc3ZnL1NWR0ZFRmxvb2RFbGVtZW50LmNwcDoKKyAgICAgICAg KFNWR0ZFRmxvb2RFbGVtZW50OjpmaWx0ZXJFZmZlY3QpOgorICAgICAgICAqIGtzdmcyL3N2Zy9T VkdHcmFkaWVudEVsZW1lbnQuY3BwOgorICAgICAgICAoU1ZHR3JhZGllbnRFbGVtZW50OjpyZWJ1 aWxkU3RvcHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpjcmVhdGVPYmplY3QpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyT2JqZWN0OjpSZW5kZXJPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6c2VsZWN0 U3RhcnROb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6ZHJhZ2dhYmxlTm9k ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmdldFBzZXVkb1N0eWxlKToKKwog MjAwNi0wMy0yMyAgRXJpYyBTZWlkZWwgIDxlc2VpZGVsQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBtanMuCkluZGV4OiBjc3MvY3Nzc3R5bGVzZWxlY3Rvci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gY3NzL2Nzc3N0eWxlc2VsZWN0b3IuY3BwCShyZXZpc2lvbiAxMzQ3NykKKysrIGNzcy9j c3NzdHlsZXNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjkzLDcgKzY5Myw3IEBAIFJl bmRlclN0eWxlKiBDU1NTdHlsZVNlbGVjdG9yOjpsb2NhdGVTaGEKIH0KIAogCi1SZW5kZXJTdHls ZSogQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JFbGVtZW50KEVsZW1lbnQqIGUsIFJlbmRlclN0 eWxlKiBkZWZhdWx0UGFyZW50LCBib29sIGFsbG93U2hhcmluZykKK1JlbmRlclN0eWxlKiBDU1NT dHlsZVNlbGVjdG9yOjpjcmVhdGVTdHlsZUZvckVsZW1lbnQoRWxlbWVudCogZSwgUmVuZGVyU3R5 bGUqIGRlZmF1bHRQYXJlbnQsIGJvb2wgYWxsb3dTaGFyaW5nKQogewogICAgIGlmICghZS0+Z2V0 RG9jdW1lbnQoKS0+aGF2ZVN0eWxlc2hlZXRzTG9hZGVkKCkpIHsKICAgICAgICAgaWYgKCFzdHls ZU5vdFlldEF2YWlsYWJsZSkgewpAQCAtNzAxLDYgKzcwMSw3IEBAIFJlbmRlclN0eWxlKiBDU1NT dHlsZVNlbGVjdG9yOjpzdHlsZUZvckUKICAgICAgICAgICAgIHN0eWxlTm90WWV0QXZhaWxhYmxl LT5zZXREaXNwbGF5KE5PTkUpOwogICAgICAgICAgICAgc3R5bGVOb3RZZXRBdmFpbGFibGUtPnJl ZigpOwogICAgICAgICB9CisgICAgICAgIHN0eWxlTm90WWV0QXZhaWxhYmxlLT5yZWYoKTsKICAg ICAgICAgcmV0dXJuIHN0eWxlTm90WWV0QXZhaWxhYmxlOwogICAgIH0KICAgICAKQEAgLTcxMiwx MiArNzEzLDE1IEBAIFJlbmRlclN0eWxlKiBDU1NTdHlsZVNlbGVjdG9yOjpzdHlsZUZvckUKICAg ICAgICAgdG90YWwrKzsKICAgICAgICAgcHJpbnRmKCJTaGFyaW5nICVkIG91dCBvZiAlZFxuIiwg ZnJhY3Rpb24sIHRvdGFsKTsKICNlbmRpZgotICAgICAgICBpZiAoc3R5bGUpCisgICAgICAgIGlm IChzdHlsZSkgeworICAgICAgICAgICAgc3R5bGUtPnJlZigpOwogICAgICAgICAgICAgcmV0dXJu IHN0eWxlOworICAgICAgICB9CiAgICAgfQogICAgIGluaXRGb3JTdHlsZVJlc29sdmUoZSwgZGVm YXVsdFBhcmVudCk7CiAKICAgICBzdHlsZSA9IG5ldyAoZS0+Z2V0RG9jdW1lbnQoKS0+cmVuZGVy QXJlbmEoKSkgUmVuZGVyU3R5bGUoKTsKKyAgICBzdHlsZS0+cmVmKCk7CiAgICAgaWYgKHBhcmVu dFN0eWxlKQogICAgICAgICBzdHlsZS0+aW5oZXJpdEZyb20ocGFyZW50U3R5bGUpOwogICAgIGVs c2UKQEAgLTgzNSw4ICs4MzksNyBAQCBSZW5kZXJTdHlsZSogQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5 bGVGb3JFCiAgICAgcmV0dXJuIHN0eWxlOwogfQogCi1SZW5kZXJTdHlsZSogQ1NTU3R5bGVTZWxl Y3Rvcjo6cHNldWRvU3R5bGVGb3JFbGVtZW50KFJlbmRlclN0eWxlOjpQc2V1ZG9JZCBwc2V1ZG8s IAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBF bGVtZW50KiBlLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUpCitSZW5kZXJTdHlsZSogQ1NTU3R5 bGVTZWxlY3Rvcjo6Y3JlYXRlUHNldWRvU3R5bGVGb3JFbGVtZW50KFJlbmRlclN0eWxlOjpQc2V1 ZG9JZCBwc2V1ZG8sIEVsZW1lbnQqIGUsIFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSkKIHsKICAg ICBpZiAoIWUpCiAgICAgICAgIHJldHVybiAwOwpAQCAtODU4LDYgKzg2MSw3IEBAIFJlbmRlclN0 eWxlKiBDU1NTdHlsZVNlbGVjdG9yOjpwc2V1ZG9TdHkKICAgICAgICAgcmV0dXJuIDA7CiAgICAg CiAgICAgc3R5bGUgPSBuZXcgKGUtPmdldERvY3VtZW50KCktPnJlbmRlckFyZW5hKCkpIFJlbmRl clN0eWxlKCk7CisgICAgc3R5bGUtPnJlZigpOwogICAgIGlmIChwYXJlbnRTdHlsZSkKICAgICAg ICAgc3R5bGUtPmluaGVyaXRGcm9tKHBhcmVudFN0eWxlKTsKICAgICBlbHNlCkluZGV4OiBjc3Mv Y3Nzc3R5bGVzZWxlY3Rvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNzcy9jc3NzdHlsZXNlbGVjdG9yLmgJ KHJldmlzaW9uIDEzNDc3KQorKysgY3NzL2Nzc3N0eWxlc2VsZWN0b3IuaAkod29ya2luZyBjb3B5 KQpAQCAtODksOSArODksOCBAQCBjbGFzcyBTdHlsZWRFbGVtZW50OwogCiAgICAgICAgIHZvaWQg aW5pdEVsZW1lbnRBbmRQc2V1ZG9TdGF0ZShFbGVtZW50KiBlKTsKICAgICAgICAgdm9pZCBpbml0 Rm9yU3R5bGVSZXNvbHZlKEVsZW1lbnQqIGUsIFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSk7Ci0g ICAgICAgIFJlbmRlclN0eWxlICpzdHlsZUZvckVsZW1lbnQoRWxlbWVudCogZSwgUmVuZGVyU3R5 bGUqIHBhcmVudFN0eWxlPTAsIGJvb2wgYWxsb3dTaGFyaW5nPXRydWUpOwotICAgICAgICBSZW5k ZXJTdHlsZSogcHNldWRvU3R5bGVGb3JFbGVtZW50KFJlbmRlclN0eWxlOjpQc2V1ZG9JZCBwc2V1 ZG9TdHlsZSwgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRWxl bWVudCogZSwgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlPTApOworICAgICAgICBSZW5kZXJTdHls ZSAqY3JlYXRlU3R5bGVGb3JFbGVtZW50KEVsZW1lbnQqLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5 bGU9MCwgYm9vbCBhbGxvd1NoYXJpbmc9dHJ1ZSk7CisgICAgICAgIFJlbmRlclN0eWxlKiBjcmVh dGVQc2V1ZG9TdHlsZUZvckVsZW1lbnQoUmVuZGVyU3R5bGU6OlBzZXVkb0lkLCBFbGVtZW50Kiwg UmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlPTApOwogCiAgICAgICAgIFJlbmRlclN0eWxlKiBsb2Nh dGVTaGFyZWRTdHlsZSgpOwogICAgICAgICBOb2RlKiBsb2NhdGVDb3VzaW5MaXN0KEVsZW1lbnQq IHBhcmVudCk7CkluZGV4OiBrc3ZnMi9zdmcvU1ZHR3JhZGllbnRFbGVtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBrc3ZnMi9zdmcvU1ZHR3JhZGllbnRFbGVtZW50LmNwcAkocmV2aXNpb24gMTM0Nzcp CisrKyBrc3ZnMi9zdmcvU1ZHR3JhZGllbnRFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTQ1LDE0ICsxNDUsMTQgQEAgdm9pZCBTVkdHcmFkaWVudEVsZW1lbnQ6OnJlYnVpbGRTdG9wcygp IAogICAgIGlmIChtX3Jlc291cmNlICYmICFvd25lckRvY3VtZW50KCktPnBhcnNpbmcoKSkgewog ICAgICAgICBWZWN0b3I8S0NHcmFkaWVudFN0b3A+IHN0b3BzOwogICAgICAgICAgLy8gRklYTUU6 IE1hbnVhbCBzdHlsZSByZXNvbHV0aW9uIGlzIGEgaGFjawotICAgICAgICBSZW5kZXJTdHlsZSAq Z3JhZGllbnRTdHlsZSA9IGNvbnN0X2Nhc3Q8U1ZHR3JhZGllbnRFbGVtZW50ICo+KHRoaXMpLT5z dHlsZUZvclJlbmRlcmVyKHBhcmVudCgpLT5yZW5kZXJlcigpKTsKKyAgICAgICAgUmVuZGVyU3R5 bGUqIGdyYWRpZW50U3R5bGUgPSBjb25zdF9jYXN0PFNWR0dyYWRpZW50RWxlbWVudCo+KHRoaXMp LT5jcmVhdGVTdHlsZUZvclJlbmRlcmVyKHBhcmVudCgpLT5yZW5kZXJlcigpKTsKICAgICAgICAg Zm9yIChOb2RlICpuID0gZmlyc3RDaGlsZCgpOyBuOyBuID0gbi0+bmV4dFNpYmxpbmcoKSkgewog ICAgICAgICAgICAgU1ZHRWxlbWVudCAqZWxlbWVudCA9IHN2Z19keW5hbWljX2Nhc3Qobik7CiAg ICAgICAgICAgICBpZiAoZWxlbWVudCAmJiBlbGVtZW50LT5pc0dyYWRpZW50U3RvcCgpKSB7CiAg ICAgICAgICAgICAgICAgU1ZHU3RvcEVsZW1lbnQgKnN0b3AgPSBzdGF0aWNfY2FzdDxTVkdTdG9w RWxlbWVudCAqPihlbGVtZW50KTsKICAgICAgICAgICAgICAgICBmbG9hdCBzdG9wT2Zmc2V0ID0g c3RvcC0+b2Zmc2V0KCktPmJhc2VWYWwoKTsKICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAg ICAgICBSZW5kZXJTdHlsZSAqc3RvcFN0eWxlID0gZ2V0RG9jdW1lbnQoKS0+c3R5bGVTZWxlY3Rv cigpLT5zdHlsZUZvckVsZW1lbnQoc3RvcCwgZ3JhZGllbnRTdHlsZSk7CisgICAgICAgICAgICAg ICAgUmVuZGVyU3R5bGUgKnN0b3BTdHlsZSA9IGdldERvY3VtZW50KCktPnN0eWxlU2VsZWN0b3Io KS0+Y3JlYXRlU3R5bGVGb3JFbGVtZW50KHN0b3AsIGdyYWRpZW50U3R5bGUpOwogICAgICAgICAg ICAgICAgIENvbG9yIGMgPSBzdG9wU3R5bGUtPnN2Z1N0eWxlKCktPnN0b3BDb2xvcigpOwogICAg ICAgICAgICAgICAgIGZsb2F0IG9wYWNpdHkgPSBzdG9wU3R5bGUtPnN2Z1N0eWxlKCktPnN0b3BP cGFjaXR5KCk7CiAgICAgICAgICAgICAgICAgCkluZGV4OiBrc3ZnMi9zdmcvU1ZHRkVGbG9vZEVs ZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIGtzdmcyL3N2Zy9TVkdGRUZsb29kRWxlbWVudC5jcHAJ KHJldmlzaW9uIDEzNDc3KQorKysga3N2ZzIvc3ZnL1NWR0ZFRmxvb2RFbGVtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNzMsNyArNzMsNyBAQCBLQ2FudmFzRkVGbG9vZCAqU1ZHRkVGbG9vZEVs ZW1lbnQ6OmZpbHRlCiAgICAgICAgIHJldHVybiAwOwogICAgIG1fZmlsdGVyRWZmZWN0LT5zZXRJ bihTdHJpbmcoaW4xKCktPmJhc2VWYWwoKSkuZGVwcmVjYXRlZFN0cmluZygpKTsKICAgICBzZXRT dGFuZGFyZEF0dHJpYnV0ZXMobV9maWx0ZXJFZmZlY3QpOwotICAgIFJlbmRlclN0eWxlICpmaWx0 ZXJTdHlsZSA9IGNvbnN0X2Nhc3Q8U1ZHRkVGbG9vZEVsZW1lbnQgKj4odGhpcyktPnN0eWxlRm9y UmVuZGVyZXIocGFyZW50Tm9kZSgpLT5yZW5kZXJlcigpKTsKKyAgICBSZW5kZXJTdHlsZSAqZmls dGVyU3R5bGUgPSBjb25zdF9jYXN0PFNWR0ZFRmxvb2RFbGVtZW50ICo+KHRoaXMpLT5jcmVhdGVT dHlsZUZvclJlbmRlcmVyKHBhcmVudE5vZGUoKS0+cmVuZGVyZXIoKSk7CiAgICAgY29uc3QgU1ZH UmVuZGVyU3R5bGUgKnN2Z1N0eWxlID0gZmlsdGVyU3R5bGUtPnN2Z1N0eWxlKCk7CiAgICAgbV9m aWx0ZXJFZmZlY3QtPnNldEZsb29kQ29sb3Ioc3ZnU3R5bGUtPmZsb29kQ29sb3IoKSk7CiAgICAg bV9maWx0ZXJFZmZlY3QtPnNldEZsb29kT3BhY2l0eShzdmdTdHlsZS0+Zmxvb2RPcGFjaXR5KCkp OwpJbmRleDoga3N2ZzIvc3ZnL1NWR0NsaXBQYXRoRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g a3N2ZzIvc3ZnL1NWR0NsaXBQYXRoRWxlbWVudC5jcHAJKHJldmlzaW9uIDEzNDc3KQorKysga3N2 ZzIvc3ZnL1NWR0NsaXBQYXRoRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkxLDEzICs5 MSwxMiBAQCBLQ2FudmFzQ2xpcHBlciAqU1ZHQ2xpcFBhdGhFbGVtZW50OjpjYW52CiAKICAgICBi b29sIGJib3ggPSBjbGlwUGF0aFVuaXRzKCktPmJhc2VWYWwoKSA9PSBTVkdfVU5JVF9UWVBFX09C SkVDVEJPVU5ESU5HQk9YOwogCi0gICAgUmVuZGVyU3R5bGUgKmNsaXBQYXRoU3R5bGUgPSBzdHls ZUZvclJlbmRlcmVyKHBhcmVudCgpLT5yZW5kZXJlcigpKTsgLy8gRklYTUU6IE1hbnVhbCBzdHls ZSByZXNvbHV0aW9uIGlzIGEgaGFjawotICAgIGZvciAoTm9kZSAqbiA9IGZpcnN0Q2hpbGQoKTsg biAhPSAwOyBuID0gbi0+bmV4dFNpYmxpbmcoKSkKLSAgICB7CisgICAgUmVuZGVyU3R5bGUgKmNs aXBQYXRoU3R5bGUgPSBjcmVhdGVTdHlsZUZvclJlbmRlcmVyKHBhcmVudCgpLT5yZW5kZXJlcigp KTsgLy8gRklYTUU6IE1hbnVhbCBzdHlsZSByZXNvbHV0aW9uIGlzIGEgaGFjaworICAgIGZvciAo Tm9kZSAqbiA9IGZpcnN0Q2hpbGQoKTsgbiAhPSAwOyBuID0gbi0+bmV4dFNpYmxpbmcoKSkgewog ICAgICAgICBTVkdFbGVtZW50ICplID0gc3ZnX2R5bmFtaWNfY2FzdChuKTsKICAgICAgICAgaWYg KGUgJiYgZS0+aXNTdHlsZWQoKSkgewogICAgICAgICAgICAgU1ZHU3R5bGVkRWxlbWVudCAqc3R5 bGVkID0gc3RhdGljX2Nhc3Q8U1ZHU3R5bGVkRWxlbWVudCAqPihlKTsKLSAgICAgICAgICAgIFJl bmRlclN0eWxlICpwYXRoU3R5bGUgPSBnZXREb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCktPnN0 eWxlRm9yRWxlbWVudChzdHlsZWQsIGNsaXBQYXRoU3R5bGUpOworICAgICAgICAgICAgUmVuZGVy U3R5bGUgKnBhdGhTdHlsZSA9IGdldERvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+Y3JlYXRl U3R5bGVGb3JFbGVtZW50KHN0eWxlZCwgY2xpcFBhdGhTdHlsZSk7CiAgICAgICAgICAgICBpZiAo S0NhbnZhc1BhdGgqIHBhdGhEYXRhID0gc3R5bGVkLT50b1BhdGhEYXRhKCkpCiAgICAgICAgICAg ICAgICAgbV9jbGlwcGVyLT5hZGRDbGlwRGF0YShwYXRoRGF0YSwgKEtDV2luZFJ1bGUpIHBhdGhT dHlsZS0+c3ZnU3R5bGUoKS0+Y2xpcFJ1bGUoKSwgYmJveCk7CiAgICAgICAgICAgICBwYXRoU3R5 bGUtPmRlcmVmKGNhbnZhcygpLT5yZW5kZXJBcmVuYSgpKTsK