6849 2006-01-26 13:36:13 -0800 absoluteRepaintRect needs to take filter rects into account 2006-01-29 06:40:37 -0800 1 1 1 Unclassified WebKit SVG 420+ Mac OS X 10.4 RESOLVED FIXED http://dev.outbreak.nl/webkitsite/indexsvg.xhtml P3 Normal --- 1 eric eric oldest_to_newest 30139 0 eric 2006-01-26 13:36:13 -0800 absoluteRepaintRect needs to take filter rects into account Notice how the image doesn't draw fully until the window is re-sized: http://dev.outbreak.nl/webkitsite/indexsvg.xhtml This is because the filter on the image has a effects region of -10%, -10%, 120%, 120% (the default) yet absoluteRepaintRect() doesn't notice the additional 10% margin caused by the filter and never paints it properly 30176 1 eric 2006-01-26 15:25:28 -0800 This could be a highly percievable bug, but I'm not sure that it would block us from ever shipping SVG. Bumping to P3, but not adding to Safari HitList for now. 30451 2 6059 eric 2006-01-28 20:02:31 -0800 Created attachment 6059 patch, includes various small fixes to the repainting systems (including images) 30506 3 eric 2006-01-29 06:40:37 -0800 Fixed in r12454. 6059 2006-01-28 20:02:31 -0800 2006-01-28 20:49:11 -0800 patch, includes various small fixes to the repainting systems (including images) filter-invalidate.patch text/plain 12637 eric SW5kZXg6IHBsYXRmb3JtL0Zsb2F0UmVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRmb3JtL0Zsb2F0 UmVjdC5oCShyZXZpc2lvbiAxMjQyOSkKKysrIHBsYXRmb3JtL0Zsb2F0UmVjdC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMTEsNyArMTExLDYgQEAgcHVibGljOgogICAgIG9wZXJhdG9yIENHUmVjdCgp IGNvbnN0OwogI2VuZGlmCiAKLSAgICBvcGVyYXRvciBJbnRSZWN0KCkgY29uc3Q7CiBwcml2YXRl OgogICAgIGZsb2F0IHhwOwogICAgIGZsb2F0IHlwOwpJbmRleDoga2NhbnZhcy9SZW5kZXJTVkdJ bWFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0ga2NhbnZhcy9SZW5kZXJTVkdJbWFnZS5jcHAJKHJldmlz aW9uIDEyNDI5KQorKysga2NhbnZhcy9SZW5kZXJTVkdJbWFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTY5LDcgKzY5LDcgQEAgdm9pZCBSZW5kZXJTVkdJbWFnZTo6cGFpbnQoUGFpbnRJbmZvJiBw YQogICAgIGNvbnRleHQtPmNvbmNhdENUTShsb2NhbFRyYW5zZm9ybSgpKTsKICAgICB0cmFuc2xh dGVGb3JBdHRyaWJ1dGVzKCk7CiAgICAgCi0gICAgRmxvYXRSZWN0IGJvdW5kaW5nQm94KDAsIDAs IHdpZHRoKCksIGhlaWdodCgpKTsKKyAgICBGbG9hdFJlY3QgYm91bmRpbmdCb3ggPSByZWxhdGl2 ZUJCb3godHJ1ZSk7CiAgICAgY29uc3QgS1NWRzo6U1ZHUmVuZGVyU3R5bGUgKnN2Z1N0eWxlID0g c3R5bGUoKS0+c3ZnU3R5bGUoKTsKICAgICAgICAgICAgIAogICAgIGlmIChLQ2FudmFzQ2xpcHBl ciAqY2xpcHBlciA9IGdldENsaXBwZXJCeUlkKGRvY3VtZW50KCksIHN2Z1N0eWxlLT5jbGlwUGF0 aCgpLm1pZCgxKSkpCkBAIC05NSw2ICs5NSwzMCBAQCB2b2lkIFJlbmRlclNWR0ltYWdlOjpwYWlu dChQYWludEluZm8mIHBhCiAgICAgICAgIHBhaW50SW5mby5wLT5yZXN0b3JlKCk7CiB9CiAKK0Zs b2F0UmVjdCBSZW5kZXJTVkdJbWFnZTo6cmVsYXRpdmVCQm94KGJvb2wgaW5jbHVkZVN0cm9rZSkg Y29uc3QKK3sKKyAgICByZXR1cm4gRmxvYXRSZWN0KDAsIDAsIHdpZHRoKCksIGhlaWdodCgpKTsK K30KKwordm9pZCBSZW5kZXJTVkdJbWFnZTo6c2V0SW1hZ2UoY29uc3QgSW1hZ2UmIGltYWdlLCBj b25zdCBJbnRSZWN0JiByZWN0LCBDYWNoZWRJbWFnZSogY2FjaGVkSW1hZ2UpCit7CisgICAgUmVu ZGVySW1hZ2U6OnNldEltYWdlKGltYWdlLCByZWN0LCBjYWNoZWRJbWFnZSk7CisgICAgLy8gV2Ug b3ZlcnJpZGUgdG8gaW52YWxpZGF0ZSBhIGxhcmdlciByZWN0LCBzaW5jZSBTVkcgaW1hZ2VzIGNh biBkcmF3IG91dHNpZGUgdGhlaXIgImJvdW5kcyIKKyAgICByZXBhaW50UmVjdGFuZ2xlKGdldEFi c29sdXRlUmVwYWludFJlY3QoKSk7Cit9CisKK0ludFJlY3QgUmVuZGVyU1ZHSW1hZ2U6OmdldEFi c29sdXRlUmVwYWludFJlY3QoKQoreworICAgIEZsb2F0UmVjdCByZXBhaW50UmVjdCA9IGFic29s dXRlVHJhbnNmb3JtKCkubWFwUmVjdChyZWxhdGl2ZUJCb3godHJ1ZSkpOworCisgICAgLy8gRmls dGVycyBjYW4gZXhwYW5kIHRoZSBib3VuZGluZyBib3gKKyAgICBLQ2FudmFzRmlsdGVyICpmaWx0 ZXIgPSBnZXRGaWx0ZXJCeUlkKGRvY3VtZW50KCksIHN0eWxlKCktPnN2Z1N0eWxlKCktPmZpbHRl cigpLm1pZCgxKSk7CisgICAgaWYgKGZpbHRlcikKKyAgICAgICAgcmVwYWludFJlY3QgPSByZXBh aW50UmVjdC51bml0ZShmaWx0ZXItPmZpbHRlckJCb3hGb3JJdGVtQkJveChyZXBhaW50UmVjdCkp OworCisgICAgcmV0dXJuIGVuY2xvc2luZ0ludFJlY3QocmVwYWludFJlY3QpOworfQorCiB2b2lk IFJlbmRlclNWR0ltYWdlOjp0cmFuc2xhdGVGb3JBdHRyaWJ1dGVzKCkKIHsKICAgICBLUmVuZGVy aW5nRGV2aWNlQ29udGV4dCAqY29udGV4dCA9IFFQYWludGVyOjpyZW5kZXJpbmdEZXZpY2UoKS0+ Y3VycmVudENvbnRleHQoKTsKQEAgLTEwMyw1ICsxMjcsNSBAQCB2b2lkIFJlbmRlclNWR0ltYWdl Ojp0cmFuc2xhdGVGb3JBdHRyaWJ1CiAgICAgZmxvYXQgeU9mZnNldCA9IGltYWdlLT55KCktPmJh c2VWYWwoKSA/IGltYWdlLT55KCktPmJhc2VWYWwoKS0+dmFsdWUoKSA6IDA7CiAgICAgY29udGV4 dC0+Y29uY2F0Q1RNKFFNYXRyaXgoKS50cmFuc2xhdGUoeE9mZnNldCwgeU9mZnNldCkpOwogfQot I2VuZGlmIC8vIFNWR19TVVBQT1JUCiAKKyNlbmRpZiAvLyBTVkdfU1VQUE9SVApJbmRleDoga2Nh bnZhcy9SZW5kZXJTVkdJbWFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtjYW52YXMvUmVuZGVyU1ZHSW1h Z2UuaAkocmV2aXNpb24gMTI0MjkpCisrKyBrY2FudmFzL1JlbmRlclNWR0ltYWdlLmgJKHdvcmtp bmcgY29weSkKQEAgLTM4LDYgKzM4LDEyIEBAIG5hbWVzcGFjZSBLU1ZHCiAgICAgICAgIHZpcnR1 YWwgUU1hdHJpeCBsb2NhbFRyYW5zZm9ybSgpIGNvbnN0IHsgcmV0dXJuIG1fdHJhbnNmb3JtOyB9 CiAgICAgICAgIHZpcnR1YWwgdm9pZCBzZXRMb2NhbFRyYW5zZm9ybShjb25zdCBRTWF0cml4JiB0 cmFuc2Zvcm0pIHsgbV90cmFuc2Zvcm0gPSB0cmFuc2Zvcm07IH0KICAgICAgICAgCisgICAgICAg IHZpcnR1YWwgRmxvYXRSZWN0IHJlbGF0aXZlQkJveChib29sIGluY2x1ZGVTdHJva2UgPSB0cnVl KSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBJbnRSZWN0IGdldEFic29sdXRlUmVwYWludFJlY3Qo KTsKKyAgICAgICAgCisgICAgICAgIHZvaWQgc2V0SW1hZ2UoQ2FjaGVkSW1hZ2UqIG5ld0ltYWdl KSB7IFJlbmRlckltYWdlOjpzZXRJbWFnZShuZXdJbWFnZSk7IH0KKyAgICAgICAgdmlydHVhbCB2 b2lkIHNldEltYWdlKGNvbnN0IEltYWdlJiwgY29uc3QgSW50UmVjdCYsIENhY2hlZEltYWdlKik7 CisgICAgICAgIAogICAgICAgICB2aXJ0dWFsIHZvaWQgcGFpbnQoUGFpbnRJbmZvJiBwYWludElu Zm8sIGludCBwYXJlbnRYLCBpbnQgcGFyZW50WSk7CiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9p ZCB0cmFuc2xhdGVGb3JBdHRyaWJ1dGVzKCk7CkluZGV4OiBrY2FudmFzL2RldmljZS9xdWFydHov S0NhbnZhc0l0ZW1RdWFydHoubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2NhbnZhcy9kZXZpY2UvcXVhcnR6 L0tDYW52YXNJdGVtUXVhcnR6Lm1tCShyZXZpc2lvbiAxMjQyOSkKKysrIGtjYW52YXMvZGV2aWNl L3F1YXJ0ei9LQ2FudmFzSXRlbVF1YXJ0ei5tbQkod29ya2luZyBjb3B5KQpAQCAtNTksNiArNTks OSBAQCB2b2lkIEtDYW52YXNJdGVtUXVhcnR6OjpsYXlvdXQoKQogICAgIC8vIHByZXRlbmQgdGhh dCBvbmUgb2YgdGhlIGF0dHJpYnV0ZXMgb2YgdGhlIGVsZW1lbnQgaGFzIGNoYW5nZWQgb24gdGhl IERPTQogICAgIC8vIHRvIGZvcmNlIHRoZSBET00gb2JqZWN0IHRvIHVwZGF0ZSB0aGlzIHJlbmRl ciBvYmplY3Qgd2l0aCBuZXcgYWJvc2x1dGUgcG9zaXRpb24gdmFsdWVzLgogICAgIHN0YXRpY19j YXN0PEtTVkc6OlNWR1N0eWxlZEVsZW1lbnRJbXBsKj4oZWxlbWVudCgpKS0+bm90aWZ5QXR0cmli dXRlQ2hhbmdlKCk7CisgICAgSW50UmVjdCBsYXlvdXRSZWN0ID0gZ2V0QWJzb2x1dGVSZXBhaW50 UmVjdCgpOworICAgIHNldFdpZHRoKGxheW91dFJlY3Qud2lkdGgoKSk7CisgICAgc2V0SGVpZ2h0 KGxheW91dFJlY3QuaGVpZ2h0KCkpOwogICAgIHNldE5lZWRzTGF5b3V0KGZhbHNlKTsKIH0KIApA QCAtMTk2LDcgKzE5OSwzMSBAQCB2b2lkIEtDYW52YXNJdGVtUXVhcnR6OjpkcmF3TWFya2Vyc0lm TmVlCiAKIEludFJlY3QgS0NhbnZhc0l0ZW1RdWFydHo6OmdldEFic29sdXRlUmVwYWludFJlY3Qo KQogewotICAgIHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KGFic29sdXRlVHJhbnNmb3JtKCkubWFw UmVjdChyZWxhdGl2ZUJCb3godHJ1ZSkpKTsKKyAgICBGbG9hdFJlY3QgcmVwYWludFJlY3QgPSBh YnNvbHV0ZVRyYW5zZm9ybSgpLm1hcFJlY3QocmVsYXRpdmVCQm94KHRydWUpKTsKKyAgICAKKyAg ICAvLyBGaWx0ZXJzIGNhbiBleHBhbmQgdGhlIGJvdW5kaW5nIGJveAorICAgIEtDYW52YXNGaWx0 ZXIgKmZpbHRlciA9IGdldEZpbHRlckJ5SWQoZG9jdW1lbnQoKSwgc3R5bGUoKS0+c3ZnU3R5bGUo KS0+ZmlsdGVyKCkubWlkKDEpKTsKKyAgICBpZiAoZmlsdGVyKQorICAgICAgICByZXBhaW50UmVj dCA9IHJlcGFpbnRSZWN0LnVuaXRlKGZpbHRlci0+ZmlsdGVyQkJveEZvckl0ZW1CQm94KHJlcGFp bnRSZWN0KSk7CisgICAgCisgICAgaWYgKCFyZXBhaW50UmVjdC5pc0VtcHR5KCkpCisgICAgICAg IHJlcGFpbnRSZWN0LmluZmxhdGUoMSk7IC8vIGluZmxhdGUgMSBwaXhlbCBmb3IgYW50aWFsaWFz aW5nCisgICAgcmV0dXJuIGVuY2xvc2luZ0ludFJlY3QocmVwYWludFJlY3QpOworfQorCitib29s IEtDYW52YXNJdGVtUXVhcnR6OjpyZXF1aXJlc0xheWVyKCkKK3sKKyAgICByZXR1cm4gZmFsc2U7 Cit9CisKK3Nob3J0IEtDYW52YXNJdGVtUXVhcnR6OjpsaW5lSGVpZ2h0KGJvb2wgYiwgYm9vbCBp c1Jvb3RMaW5lQm94KSBjb25zdAoreworICAgIHJldHVybiBzdGF0aWNfY2FzdDxzaG9ydD4oYmJv eEZvclBhdGgodHJ1ZSkuaGVpZ2h0KCkpOworfQorCitzaG9ydCBLQ2FudmFzSXRlbVF1YXJ0ejo6 YmFzZWxpbmVQb3NpdGlvbihib29sIGIsIGJvb2wgaXNSb290TGluZUJveCkgY29uc3QKK3sKKyAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8c2hvcnQ+KGJib3hGb3JQYXRoKHRydWUpLmhlaWdodCgpKTsK IH0KIAogdm9pZCBLQ2FudmFzSXRlbVF1YXJ0ejo6cGFpbnQoUGFpbnRJbmZvICZwYWludEluZm8s IGludCBwYXJlbnRYLCBpbnQgcGFyZW50WSkKSW5kZXg6IGtjYW52YXMvZGV2aWNlL3F1YXJ0ei9L Q2FudmFzRmlsdGVyUXVhcnR6LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2NhbnZhcy9kZXZpY2UvcXVhcnR6 L0tDYW52YXNGaWx0ZXJRdWFydHouaAkocmV2aXNpb24gMTI0MjkpCisrKyBrY2FudmFzL2Rldmlj ZS9xdWFydHovS0NhbnZhc0ZpbHRlclF1YXJ0ei5oCSh3b3JraW5nIGNvcHkpCkBAIC01Myw4ICs1 Myw2IEBAIHB1YmxpYzoKICAgICAKIHByaXZhdGU6CiAgICAgTlNBcnJheSAqZ2V0Q0lGaWx0ZXJT dGFjayhDSUltYWdlICppbnB1dEltYWdlKTsKLSAgICAKLSAgICBDR1JlY3QgZmlsdGVyQkJveEZv ckl0ZW1CQm94KENHUmVjdCBpdGVtQkJveCkgY29uc3Q7CiAKICAgICBDSUNvbnRleHQgKm1fZmls dGVyQ0lDb250ZXh0OwogICAgIENHTGF5ZXJSZWYgbV9maWx0ZXJDR0xheWVyOwpJbmRleDoga2Nh bnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFydHoubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0ga2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFydHoubW0JKHJldmlz aW9uIDEyNDI5KQorKysga2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNRdWFy dHoubW0JKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDI2IEBACiAKICNpbXBvcnQgPGt4bWxj b3JlL0Fzc2VydGlvbnMuaD4KIAorYm9vbCBLQ2FudmFzQ29udGFpbmVyUXVhcnR6OjpjYW5IYXZl Q2hpbGRyZW4oKSBjb25zdAoreworICAgIHJldHVybiB0cnVlOworfQorICAgIAorYm9vbCBLQ2Fu dmFzQ29udGFpbmVyUXVhcnR6OjpyZXF1aXJlc0xheWVyKCkKK3sKKyAgICByZXR1cm4gZmFsc2U7 Cit9CisKK3Nob3J0IEtDYW52YXNDb250YWluZXJRdWFydHo6OmxpbmVIZWlnaHQoYm9vbCBiLCBi b29sIGlzUm9vdExpbmVCb3gpIGNvbnN0Cit7CisgICAgcmV0dXJuIGhlaWdodCgpICsgbWFyZ2lu VG9wKCkgKyBtYXJnaW5Cb3R0b20oKTsKK30KKworc2hvcnQgS0NhbnZhc0NvbnRhaW5lclF1YXJ0 ejo6YmFzZWxpbmVQb3NpdGlvbihib29sIGIsIGJvb2wgaXNSb290TGluZUJveCkgY29uc3QKK3sK KyAgICByZXR1cm4gaGVpZ2h0KCkgKyBtYXJnaW5Ub3AoKSArIG1hcmdpbkJvdHRvbSgpOworfQor CiB2b2lkIEtDYW52YXNDb250YWluZXJRdWFydHo6OmNhbGNNaW5NYXhXaWR0aCgpCiB7CiAgICAg S0hUTUxBc3NlcnQoICFtaW5NYXhLbm93bigpKTsKQEAgLTEyNSwxMiArMTQ1LDggQEAgdm9pZCBL Q2FudmFzQ29udGFpbmVyUXVhcnR6OjpwYWludChQYWludAogICAgIGlmIChmaWx0ZXIpCiAgICAg ICAgIGZpbHRlci0+cHJlcGFyZUZpbHRlcihyZWxhdGl2ZUJCb3godHJ1ZSkpOwogICAgIAotICAg IGlmICghdmlld0JveCgpLmlzTnVsbCgpKSB7Ci0gICAgICAgIEZsb2F0UmVjdCB2aWV3cG9ydFJl Y3QgPSB2aWV3cG9ydCgpOwotICAgICAgICBpZiAoIXBhcmVudCgpLT5pc0tDYW52YXNDb250YWlu ZXIoKSkKLSAgICAgICAgICAgIHZpZXdwb3J0UmVjdCA9IEZsb2F0UmVjdCh2aWV3cG9ydCgpLngo KSwgdmlld3BvcnQoKS55KCksIHdpZHRoKCksIGhlaWdodCgpKTsKLSAgICAgICAgZGV2aWNlQ29u dGV4dC0+Y29uY2F0Q1RNKGdldEFzcGVjdFJhdGlvKHZpZXdCb3goKSwgdmlld3BvcnRSZWN0KSk7 Ci0gICAgfQorICAgIGlmICghdmlld0JveCgpLmlzTnVsbCgpKQorICAgICAgICBkZXZpY2VDb250 ZXh0LT5jb25jYXRDVE0odmlld3BvcnRUcmFuc2Zvcm0oKSk7CiAgICAgCiAgICAgUmVuZGVyQ29u dGFpbmVyOjpwYWludChwYWludEluZm8sIDAsIDApOwogICAgIApAQCAtMTc4LDE2ICsxOTQsMzUg QEAgS0NBbGlnbiBLQ2FudmFzQ29udGFpbmVyUXVhcnR6OjphbGlnbigpIAogICAgIHJldHVybiBt X2FsaWduOwogfQogCi1RTWF0cml4IEtDYW52YXNDb250YWluZXJRdWFydHo6OmFic29sdXRlVHJh bnNmb3JtKCkgY29uc3QKK1FNYXRyaXggS0NhbnZhc0NvbnRhaW5lclF1YXJ0ejo6dmlld3BvcnRU cmFuc2Zvcm0oKSBjb25zdAogewotICAgIFFNYXRyaXggdHJhbnNmb3JtID0gS0NhbnZhc0NvbnRh aW5lcjo6YWJzb2x1dGVUcmFuc2Zvcm0oKTsKICAgICBpZiAoIXZpZXdCb3goKS5pc051bGwoKSkg ewogICAgICAgICBGbG9hdFJlY3Qgdmlld3BvcnRSZWN0ID0gdmlld3BvcnQoKTsKICAgICAgICAg aWYgKCFwYXJlbnQoKS0+aXNLQ2FudmFzQ29udGFpbmVyKCkpCiAgICAgICAgICAgICB2aWV3cG9y dFJlY3QgPSBGbG9hdFJlY3Qodmlld3BvcnQoKS54KCksIHZpZXdwb3J0KCkueSgpLCB3aWR0aCgp LCBoZWlnaHQoKSk7Ci0gICAgICAgIHRyYW5zZm9ybSAqPSBnZXRBc3BlY3RSYXRpbyh2aWV3Qm94 KCksIHZpZXdwb3J0UmVjdCkucW1hdHJpeCgpOworICAgICAgICByZXR1cm4gZ2V0QXNwZWN0UmF0 aW8odmlld0JveCgpLCB2aWV3cG9ydFJlY3QpLnFtYXRyaXgoKTsKICAgICB9Ci0gICAgcmV0dXJu IHRyYW5zZm9ybTsKKyAgICByZXR1cm4gUU1hdHJpeCgpOworfQorCitJbnRSZWN0IEtDYW52YXND b250YWluZXJRdWFydHo6OmdldEFic29sdXRlUmVwYWludFJlY3QoKQoreworICAgIEludFJlY3Qg cmVwYWludFJlY3Q7CisgICAgCisgICAgZm9yIChXZWJDb3JlOjpSZW5kZXJPYmplY3QgKmN1cnJl bnQgPSBmaXJzdENoaWxkKCk7IGN1cnJlbnQgIT0gMDsgY3VycmVudCA9IGN1cnJlbnQtPm5leHRT aWJsaW5nKCkpCisgICAgICAgIHJlcGFpbnRSZWN0ID0gcmVwYWludFJlY3QudW5pdGUoY3VycmVu dC0+Z2V0QWJzb2x1dGVSZXBhaW50UmVjdCgpKTsKKyAgICAKKyAgICAvLyBGaWx0ZXJzIGNhbiBl eHBhbmQgdGhlIGJvdW5kaW5nIGJveAorICAgIEtDYW52YXNGaWx0ZXIgKmZpbHRlciA9IGdldEZp bHRlckJ5SWQoZG9jdW1lbnQoKSwgc3R5bGUoKS0+c3ZnU3R5bGUoKS0+ZmlsdGVyKCkubWlkKDEp KTsKKyAgICBpZiAoZmlsdGVyKQorICAgICAgICByZXBhaW50UmVjdCA9IHJlcGFpbnRSZWN0LnVu aXRlKGVuY2xvc2luZ0ludFJlY3QoZmlsdGVyLT5maWx0ZXJCQm94Rm9ySXRlbUJCb3gocmVwYWlu dFJlY3QpKSk7CisKKyAgICByZXR1cm4gcmVwYWludFJlY3Q7Cit9CisKK1FNYXRyaXggS0NhbnZh c0NvbnRhaW5lclF1YXJ0ejo6YWJzb2x1dGVUcmFuc2Zvcm0oKSBjb25zdAoreworICAgIHJldHVy biB2aWV3cG9ydFRyYW5zZm9ybSgpICogS0NhbnZhc0NvbnRhaW5lcjo6YWJzb2x1dGVUcmFuc2Zv cm0oKTsKIH0KIAogdm9pZCBLQ2FudmFzQ2xpcHBlclF1YXJ0ejo6YXBwbHlDbGlwKGNvbnN0IEZs b2F0UmVjdCYgYm91bmRpbmdCb3gpIGNvbnN0CkluZGV4OiBrY2FudmFzL2RldmljZS9xdWFydHov S0NhbnZhc0ZpbHRlclF1YXJ0ei5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrY2FudmFzL2RldmljZS9xdWFy dHovS0NhbnZhc0ZpbHRlclF1YXJ0ei5tbQkocmV2aXNpb24gMTI0MjkpCisrKyBrY2FudmFzL2Rl dmljZS9xdWFydHovS0NhbnZhc0ZpbHRlclF1YXJ0ei5tbQkod29ya2luZyBjb3B5KQpAQCAtMTE2 LDcgKzExNiw3IEBAIHZvaWQgS0NhbnZhc0ZpbHRlclF1YXJ0ejo6YXBwbHlGaWx0ZXIoY28KICAg ICBpZiAoW2ZpbHRlclN0YWNrIGNvdW50XSkgewogICAgICAgICBDSUltYWdlICpvdXRwdXRJbWFn ZSA9IFtbZmlsdGVyU3RhY2sgbGFzdE9iamVjdF0gdmFsdWVGb3JLZXk6QCJvdXRwdXRJbWFnZSJd OwogICAgICAgICBpZiAob3V0cHV0SW1hZ2UpIHsKLSAgICAgICAgICAgIENHUmVjdCBmaWx0ZXJS ZWN0ID0gZmlsdGVyQkJveEZvckl0ZW1CQm94KENHUmVjdChiYm94KSk7CisgICAgICAgICAgICBD R1JlY3QgZmlsdGVyUmVjdCA9IENHUmVjdChmaWx0ZXJCQm94Rm9ySXRlbUJCb3goYmJveCkpOwog ICAgICAgICAgICAgQ0dSZWN0IHRyYW5zbGF0ZWQgPSBmaWx0ZXJSZWN0OwogICAgICAgICAgICAg Q0dQb2ludCBiYm94T3JpZ2luID0gQ0dSZWN0KGJib3gpLm9yaWdpbjsKICAgICAgICAgICAgIENH UmVjdCBzb3VyY2VSZWN0ID0gQ0dSZWN0SW50ZXJzZWN0aW9uKHRyYW5zbGF0ZWQsW291dHB1dElt YWdlIGV4dGVudF0pOwpAQCAtMTMzLDE4ICsxMzMsNiBAQCB2b2lkIEtDYW52YXNGaWx0ZXJRdWFy dHo6OmFwcGx5RmlsdGVyKGNvCiAgICAgW21fZmlsdGVyQ0lDb250ZXh0IHJlbGVhc2VdOwogfQog Ci1DR1JlY3QgS0NhbnZhc0ZpbHRlclF1YXJ0ejo6ZmlsdGVyQkJveEZvckl0ZW1CQm94KENHUmVj dCBpdGVtQkJveCkgY29uc3QKLXsKLSAgICAvLyBGSVhNRTogaGFjayBmb3Igbm93Ci0gICAgQ0dS ZWN0IGZpbHRlckJCb3ggPSBDR1JlY3QoZmlsdGVyUmVjdCgpKTsKLSAgICBpZihmaWx0ZXJCb3Vu ZGluZ0JveE1vZGUoKSkKLSAgICAgICAgZmlsdGVyQkJveCA9IENHUmVjdE1ha2UoKGZpbHRlckJC b3gub3JpZ2luLngvMTAwLmYgKiBpdGVtQkJveC5zaXplLndpZHRoKSwgCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChmaWx0ZXJCQm94Lm9yaWdpbi55LzEwMC5mICogaXRlbUJCb3gu c2l6ZS5oZWlnaHQpLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbHRlckJC b3guc2l6ZS53aWR0aC8xMDAuZiAqIGl0ZW1CQm94LnNpemUud2lkdGgpLCAKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGZpbHRlckJCb3guc2l6ZS5oZWlnaHQvMTAwLmYgKiBpdGVt QkJveC5zaXplLmhlaWdodCkpOwotICAgIHJldHVybiBmaWx0ZXJCQm94OwotfQotCiBOU0FycmF5 ICpLQ2FudmFzRmlsdGVyUXVhcnR6OjpnZXRDSUZpbHRlclN0YWNrKENJSW1hZ2UgKmlucHV0SW1h Z2UpCiB7CiAgICAgTlNNdXRhYmxlQXJyYXkgKmZpbHRlckVmZmVjdHMgPSBbTlNNdXRhYmxlQXJy YXkgYXJyYXldOwpJbmRleDoga2NhbnZhcy9kZXZpY2UvcXVhcnR6L0tDYW52YXNSZXNvdXJjZXNR dWFydHouaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBrY2FudmFzL2RldmljZS9xdWFydHovS0NhbnZhc1Jlc291 cmNlc1F1YXJ0ei5oCShyZXZpc2lvbiAxMjQyOSkKKysrIGtjYW52YXMvZGV2aWNlL3F1YXJ0ei9L Q2FudmFzUmVzb3VyY2VzUXVhcnR6LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDE0ICszNSwxNyBA QCBjbGFzcyBLQ2FudmFzQ29udGFpbmVyUXVhcnR6IDogcHVibGljIEtDCiBwdWJsaWM6CiAgICAg S0NhbnZhc0NvbnRhaW5lclF1YXJ0eihLU1ZHOjpTVkdTdHlsZWRFbGVtZW50SW1wbCAqbm9kZSkg OiBLQ2FudmFzQ29udGFpbmVyKG5vZGUpIHsgfQogICAgIAotICAgIHZpcnR1YWwgYm9vbCBjYW5I YXZlQ2hpbGRyZW4oKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CisgICAgdmlydHVhbCBib29sIGNh bkhhdmVDaGlsZHJlbigpIGNvbnN0OworICAgIAorICAgIHZpcnR1YWwgYm9vbCByZXF1aXJlc0xh eWVyKCk7CisgICAgdmlydHVhbCBzaG9ydCBsaW5lSGVpZ2h0KGJvb2wgYiwgYm9vbCBpc1Jvb3RM aW5lQm94ID0gZmFsc2UpIGNvbnN0OworICAgIHZpcnR1YWwgc2hvcnQgYmFzZWxpbmVQb3NpdGlv bihib29sIGIsIGJvb2wgaXNSb290TGluZUJveCA9IGZhbHNlKSBjb25zdDsKICAgICAKLSAgICB2 aXJ0dWFsIGJvb2wgcmVxdWlyZXNMYXllcigpIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVh bCB2b2lkIGNhbGNNaW5NYXhXaWR0aCgpOwogICAgIHZpcnR1YWwgdm9pZCBsYXlvdXQoKTsKICAg ICB2aXJ0dWFsIHZvaWQgcGFpbnQoUGFpbnRJbmZvICZwYWludEluZm8sIGludCBwYXJlbnRYLCBp bnQgcGFyZW50WSk7CiAgICAgCi0gICAgdmlydHVhbCBJbnRSZWN0IGdldEFic29sdXRlUmVwYWlu dFJlY3QoKSB7IHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KGFic29sdXRlVHJhbnNmb3JtKCkubWFw UmVjdChyZWxhdGl2ZUJCb3godHJ1ZSkpKTsgfQorICAgIHZpcnR1YWwgSW50UmVjdCBnZXRBYnNv bHV0ZVJlcGFpbnRSZWN0KCk7CiAgICAgdmlydHVhbCBRTWF0cml4IGFic29sdXRlVHJhbnNmb3Jt KCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld3BvcnQoY29uc3QgRmxvYXRSZWN0 Jik7CkBAIC01NSw2ICs1OCw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEtDQWxpZ24gYWxpZ24o KSBjb25zdDsKICAgICAKIHByaXZhdGU6CisgICAgUU1hdHJpeCB2aWV3cG9ydFRyYW5zZm9ybSgp IGNvbnN0OworCiAgICAgRmxvYXRSZWN0IG1fdmlld3BvcnQ7CiAgICAgRmxvYXRSZWN0IG1fdmll d0JveDsKICAgICBLQ0FsaWduIG1fYWxpZ247CkluZGV4OiBrY2FudmFzL0tDYW52YXNGaWx0ZXJz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBrY2FudmFzL0tDYW52YXNGaWx0ZXJzLmNwcAkocmV2aXNpb24g MTI0MjkpCisrKyBrY2FudmFzL0tDYW52YXNGaWx0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDYsNiArNDYsMTcgQEAgdm9pZCBLQ2FudmFzRmlsdGVyOjphZGRGaWx0ZXJFZmZlY3QoS0Nhbgog ICAgICAgICBtX2VmZmVjdHMuYXBwZW5kKGVmZmVjdCk7CiB9CiAKK0Zsb2F0UmVjdCBLQ2FudmFz RmlsdGVyOjpmaWx0ZXJCQm94Rm9ySXRlbUJCb3goRmxvYXRSZWN0IGl0ZW1CQm94KSBjb25zdAor eworICAgIEZsb2F0UmVjdCBmaWx0ZXJCQm94ID0gZmlsdGVyUmVjdCgpOworICAgIGlmIChmaWx0 ZXJCb3VuZGluZ0JveE1vZGUoKSkKKyAgICAgICAgZmlsdGVyQkJveCA9IEZsb2F0UmVjdCgoZmls dGVyQkJveC54KCkvMTAwLmYgKiBpdGVtQkJveC53aWR0aCgpKSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGZpbHRlckJCb3gueSgpLzEwMC5mICogaXRlbUJCb3guaGVpZ2h0KCkp LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZmlsdGVyQkJveC53aWR0aCgpLzEw MC5mICogaXRlbUJCb3gud2lkdGgoKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChmaWx0ZXJCQm94LmhlaWdodCgpLzEwMC5mICogaXRlbUJCb3guaGVpZ2h0KCkpKTsKKyAgICBy ZXR1cm4gZmlsdGVyQkJveDsKK30KKwogUVRleHRTdHJlYW0gJktDYW52YXNGaWx0ZXI6OmV4dGVy bmFsUmVwcmVzZW50YXRpb24oUVRleHRTdHJlYW0gJnRzKSBjb25zdAogewogICAgIHRzIDw8ICJb dHlwZT1GSUxURVJdICIKSW5kZXg6IGtjYW52YXMvS0NhbnZhc0ZpbHRlcnMuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBrY2FudmFzL0tDYW52YXNGaWx0ZXJzLmgJKHJldmlzaW9uIDEyNDI5KQorKysga2NhbnZh cy9LQ2FudmFzRmlsdGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDMsNiArMTAzLDggQEAgcHVi bGljOgogCiAgICAgRmxvYXRSZWN0IGZpbHRlclJlY3QoKSBjb25zdCB7IHJldHVybiBtX2ZpbHRl clJlY3Q7IH0KICAgICB2b2lkIHNldEZpbHRlclJlY3QoY29uc3QgRmxvYXRSZWN0ICZyZWN0KSB7 IG1fZmlsdGVyUmVjdCA9IHJlY3Q7IH0KKyAgICAKKyAgICBGbG9hdFJlY3QgZmlsdGVyQkJveEZv ckl0ZW1CQm94KEZsb2F0UmVjdCBpdGVtQkJveCkgY29uc3Q7CiAKICAgICB2b2lkIGFkZEZpbHRl ckVmZmVjdChLQ2FudmFzRmlsdGVyRWZmZWN0ICplZmZlY3QpOwogCg==