113459 2013-03-27 17:11:32 -0700 Add a way to update GraphicsLayerCA visibleRects without having to do a flush 2013-03-27 22:17:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dino simon.fraser thorton oldest_to_newest 865018 0 simon.fraser 2013-03-27 17:11:32 -0700 Add a way to update GraphicsLayerCA visibleRects without having to do a flush 865028 1 195443 simon.fraser 2013-03-27 17:15:32 -0700 Created attachment 195443 Patch 865167 2 simon.fraser 2013-03-27 22:17:32 -0700 http://trac.webkit.org/changeset/147058 195443 2013-03-27 17:15:32 -0700 2013-03-27 18:00:27 -0700 Patch bug-113459-20130327171533.patch text/plain 12732 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjYwZjljMDY2ZWRjYWI5 OTViZjIwYWFjNWU1ZWM2ZjJjMzY0OTIzNi4uNzZiYTEzMTYwMTA4NjMzYmQ0MDg2ODUyNmZhODA4 YjlkMGQ4NDExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAzLTI3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIHdheSB0 byB1cGRhdGUgR3JhcGhpY3NMYXllckNBIHZpc2libGVSZWN0cyB3aXRob3V0IGhhdmluZyB0byBk byBhIGZsdXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTM0NTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAg CisgICAgICAgIFNvbWUgcGxhdGZvcm1zIG5lZWQgdG8gdXBkYXRlIFRpbGVkQmFja2luZyB2aXNp YmxlIHJlY3RzIGZyb20KKyAgICAgICAgb3V0c2lkZSBvZiBXZWJLaXQsIGZvciBleGFtcGxlIGlm IHRoZXkgdXNlIGRlbGVnYXRlZCBzY3JvbGxpbmcuCisgICAgICAgIFRoZXkgd2FudCB0byBhdm9p ZCBmb3JjaW5nIGxheW91dCB0byBiZSB1cC10by1kYXRlIHdoZW4gZG9pbmcgdGhpcy4KKyAgICAg ICAgCisgICAgICAgIEN1cnJlbnRseSwgdXBkYXRpbmcgdGhlIHZpc2libGVSZWN0IGhhcHBlbnMg d2hlbiB0aGUgR3JhcGhpY3NMYXllckNBCisgICAgICAgIGxheWVyIGFyZSBiZWluZyBmbHVzaGVk LCBidXQgdGhhdCBtYWtlcyBzb21lIGFzc3VtcHRpb25zIGFib3V0CisgICAgICAgIGxheW91dCBi ZWluZyB1cC10by1kYXRlLgorICAgICAgICAKKyAgICAgICAgVG8gZml4IHRoaXMsIGFkZCBhIGxp Z2h0LXdlaWdodCBwYXNzIG92ZXIgdGhlIGxheWVyIHRyZWUgdGhhdAorICAgICAgICB1c2VzIFRy YW5zZm9ybVN0YXRlIHRvIGNvbXB1dGUgdGhlIHZpc2libGVSZWN0IGZvciBlYWNoCisgICAgICAg IGxheWVyLCBhbmQgb25seSBpZiB0aGUgdmlzaWJsZVJlY3Qgd291bGQgY2F1c2UgYSBjaGFuZ2Ug aW4gdGhlCisgICAgICAgIHRpbGVzIGluIGEgVGlsZWRCYWNraW5nIHRyaWdnZXIgYSBsYXllciBm bHVzaC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OnJlY29tcHV0ZVZpc2libGVSZWN0cyk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nLmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXJDQTo6cmVjdXJzaXZlQ29tcHV0ZVZpc2libGVSZWN0KToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6cmVjb21wdXRlVmlzaWJsZVJlY3RzKToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Y29tcHV0ZVZpc2libGVSZWN0KToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNvbnRyb2xsZXIubW06CisgICAgICAgIChXZWJDb3Jl OjpUaWxlQ29udHJvbGxlcjo6dGlsZXNXb3VsZENoYW5nZUZvclZpc2libGVSZWN0KToKKyAgICAg ICAgKFdlYkNvcmU6OlRpbGVDb250cm9sbGVyOjpjb21wdXRlVGlsZUNvdmVyYWdlUmVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpUaWxlQ29udHJvbGxlcjo6cmV2YWxpZGF0ZVRpbGVzKToKKwogMjAx My0wMy0yNiAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEF1dG9n ZW5lcmF0ZSB0aGUgc2Nyb2xsQW5pbWF0b3JFbmFibGVkIHNldHRpbmcgaW4gU2V0dGluZ3MuaW4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5 ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaApp bmRleCA4YTAyMmZiMzk2NmM3NjBmNzk1ODk2ZGEwM2ZjZDY3Yzk3N2Y3OTc1Li41ZDM0N2UyNTk3 YTFmNzk2NDdmNjJlM2M3OTIzM2IyNjlkZDQyYmJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCkBAIC00MDgsOCArNDA4LDExIEBAIHB1 YmxpYzoKICAgICAvLyBhbmQgZGVzY2VuZGFudCBsYXllcnMsIGFuZCB0aGlzIGxheWVyIG9ubHku CiAgICAgdmlydHVhbCB2b2lkIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZShjb25zdCBGbG9hdFJlY3Qm IC8qIGNsaXBSZWN0ICovKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZmx1c2hDb21wb3NpdGluZ1N0 YXRlRm9yVGhpc0xheWVyT25seSgpIHsgfQotICAgIAotICAgIC8vIFJldHVybiBhIHN0cmluZyB3 aXRoIGEgaHVtYW4gcmVhZGFibGUgZm9ybSBvZiB0aGUgbGF5ZXIgdHJlZSwgSWYgZGVidWcgaXMg dHJ1ZSAKKworICAgIC8vIFdhbGsgdGhlIGxheWVyIHRyZWUsIHJlY29tcHV0aW5nIHRoZSB2aXNp YmxlIHJlY3RzIG9mIGxheWVyIHdpdGggVGlsZWRCYWNraW5nLCBvbiBwbGF0Zm9ybXMgdGhhdCB1 c2UgaXQuCisgICAgdmlydHVhbCB2b2lkIHJlY29tcHV0ZVZpc2libGVSZWN0cyhjb25zdCBGbG9h dFJlY3QmIC8qIGNsaXBSZWN0ICovKSB7IH0KKworICAgIC8vIFJldHVybiBhIHN0cmluZyB3aXRo IGEgaHVtYW4gcmVhZGFibGUgZm9ybSBvZiB0aGUgbGF5ZXIgdHJlZSwgSWYgZGVidWcgaXMgdHJ1 ZQogICAgIC8vIHBvaW50ZXJzIGZvciB0aGUgbGF5ZXJzIGFuZCB0aW1pbmcgZGF0YSB3aWxsIGJl IGluY2x1ZGVkIGluIHRoZSByZXR1cm5lZCBzdHJpbmcuCiAgICAgU3RyaW5nIGxheWVyVHJlZUFz VGV4dChMYXllclRyZWVBc1RleHRCZWhhdmlvciA9IExheWVyVHJlZUFzVGV4dEJlaGF2aW9yTm9y bWFsKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvVGlsZWRCYWNraW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxl ZEJhY2tpbmcuaAppbmRleCBmZmE5YmE5NTNlNzA3YTg1MmE4MWUxMDYxZTUyZmY2OTA3MmNmMmYx Li4yZTY2ZjYwODY1MTA5MGI0YjUxZjIzYmU4MTJiODFmYzFiODc3NWZmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmcuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmcuaApAQCAtNDYsNiArNDYs NyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZVJlY3QoY29uc3QgRmxv YXRSZWN0JikgPSAwOwogICAgIHZpcnR1YWwgRmxvYXRSZWN0IHZpc2libGVSZWN0KCkgY29uc3Qg PSAwOworICAgIHZpcnR1YWwgYm9vbCB0aWxlc1dvdWxkQ2hhbmdlRm9yVmlzaWJsZVJlY3QoY29u c3QgRmxvYXRSZWN0JikgY29uc3QgPSAwOwogCiAgICAgdmlydHVhbCB2b2lkIHNldEV4cG9zZWRS ZWN0KGNvbnN0IEZsb2F0UmVjdCYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q2xpcHNUb0V4 cG9zZWRSZWN0KGJvb2wpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCmluZGV4IGUxZmM1MDU3NGQ0YjhkZmMy ZDU0MzBmOWRkNjVjNjVjYzIxZGExOTUuLmI1NmQ0NGM4MTJlMTMzMTQ0MTIyZDUwN2ExMzQ4ZTdi ZjIwYWFlMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh L0dyYXBoaWNzTGF5ZXJDQS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcApAQCAtOTA3LDI1ICs5MDcsNjYgQEAgdm9pZCBHcmFw aGljc0xheWVyQ0E6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQogICAg ICAgICBjbGllbnQoKS0+ZGlkQ29tbWl0Q2hhbmdlc0ZvckxheWVyKHRoaXMpOwogfQogCit2b2lk IEdyYXBoaWNzTGF5ZXJDQTo6cmVjdXJzaXZlQ29tcHV0ZVZpc2libGVSZWN0KGNvbnN0IFRyYW5z Zm9ybVN0YXRlJiBzdGF0ZSkKK3sKKyAgICBUcmFuc2Zvcm1TdGF0ZSBsb2NhbFN0YXRlID0gc3Rh dGU7CisgICAgCisgICAgLy8gVGhpcyBtYXkgYmUgY2FsbGVkIGF0IHRpbWVzIHdoZW4gbGF5b3V0 IGhhcyBub3QgYmVlbiB1cGRhdGVkLCBzbyB3ZSB3YW50IHRvIGF2b2lkIGNhbGxpbmcgb3V0IHRv IHRoZSBjbGllbnQKKyAgICAvLyBmb3IgYW5pbWF0aW5nIHRyYW5zZm9ybXMuCisgICAgRmxvYXRS ZWN0IHZpc2libGVSZWN0ID0gY29tcHV0ZVZpc2libGVSZWN0KGxvY2FsU3RhdGUsIDApOworICAg IGlmICh2aXNpYmxlUmVjdCAhPSBtX3Zpc2libGVSZWN0KSB7CisgICAgICAgIG1fdmlzaWJsZVJl Y3QgPSB2aXNpYmxlUmVjdDsKKyAgICAgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5n ID0gdGhpcy0+dGlsZWRCYWNraW5nKCkpIHsKKyAgICAgICAgICAgIGlmICh0aWxlZEJhY2tpbmct PnRpbGVzV291bGRDaGFuZ2VGb3JWaXNpYmxlUmVjdChtX3Zpc2libGVSZWN0KSkKKyAgICAgICAg ICAgICAgICBub3RlTGF5ZXJQcm9wZXJ0eUNoYW5nZWQoVmlzaWJsZVJlY3RDaGFuZ2VkKTsKKyAg ICAgICAgfQorICAgIH0KKworICAgIGlmIChtX21hc2tMYXllcikgeworICAgICAgICBHcmFwaGlj c0xheWVyQ0EqIG1hc2tMYXllckNBID0gc3RhdGljX2Nhc3Q8R3JhcGhpY3NMYXllckNBKj4obV9t YXNrTGF5ZXIpOworICAgICAgICBtYXNrTGF5ZXJDQS0+cmVjdXJzaXZlQ29tcHV0ZVZpc2libGVS ZWN0KGxvY2FsU3RhdGUpOworICAgIH0KKworICAgIGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVy Kj4mIGNoaWxkTGF5ZXJzID0gY2hpbGRyZW4oKTsKKyAgICBzaXplX3QgbnVtQ2hpbGRyZW4gPSBj aGlsZExheWVycy5zaXplKCk7CisgICAgCisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1D aGlsZHJlbjsgKytpKSB7CisgICAgICAgIEdyYXBoaWNzTGF5ZXJDQSogY3VyQ2hpbGQgPSBzdGF0 aWNfY2FzdDxHcmFwaGljc0xheWVyQ0EqPihjaGlsZExheWVyc1tpXSk7CisgICAgICAgIGN1ckNo aWxkLT5yZWN1cnNpdmVDb21wdXRlVmlzaWJsZVJlY3QobG9jYWxTdGF0ZSk7CisgICAgfQorCisg ICAgaWYgKG1fcmVwbGljYUxheWVyKQorICAgICAgICBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVy Q0EqPihtX3JlcGxpY2FMYXllciktPnJlY3Vyc2l2ZUNvbXB1dGVWaXNpYmxlUmVjdChsb2NhbFN0 YXRlKTsKK30KKwordm9pZCBHcmFwaGljc0xheWVyQ0E6OnJlY29tcHV0ZVZpc2libGVSZWN0cyhj b25zdCBGbG9hdFJlY3QmIGNsaXBSZWN0KQoreworICAgIFRyYW5zZm9ybVN0YXRlIHN0YXRlKFRy YW5zZm9ybVN0YXRlOjpVbmFwcGx5SW52ZXJzZVRyYW5zZm9ybURpcmVjdGlvbiwgRmxvYXRRdWFk KGNsaXBSZWN0KSk7CisgICAgcmVjdXJzaXZlQ29tcHV0ZVZpc2libGVSZWN0KHN0YXRlKTsKK30K KwogVGlsZWRCYWNraW5nKiBHcmFwaGljc0xheWVyQ0E6OnRpbGVkQmFja2luZygpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIG1fbGF5ZXItPnRpbGVkQmFja2luZygpOwogfQogCi1GbG9hdFJlY3QgR3Jh cGhpY3NMYXllckNBOjpjb21wdXRlVmlzaWJsZVJlY3QoVHJhbnNmb3JtU3RhdGUmIHN0YXRlKSBj b25zdAorRmxvYXRSZWN0IEdyYXBoaWNzTGF5ZXJDQTo6Y29tcHV0ZVZpc2libGVSZWN0KFRyYW5z Zm9ybVN0YXRlJiBzdGF0ZSwgQ29tcHV0ZVZpc2libGVSZWN0RmxhZ3MgZmxhZ3MpIGNvbnN0CiB7 CiAgICAgYm9vbCBwcmVzZXJ2ZTNEID0gcHJlc2VydmVzM0QoKSB8fCAocGFyZW50KCkgPyBwYXJl bnQoKS0+cHJlc2VydmVzM0QoKSA6IGZhbHNlKTsKICAgICBUcmFuc2Zvcm1TdGF0ZTo6VHJhbnNm b3JtQWNjdW11bGF0aW9uIGFjY3VtdWxhdGlvbiA9IHByZXNlcnZlM0QgPyBUcmFuc2Zvcm1TdGF0 ZTo6QWNjdW11bGF0ZVRyYW5zZm9ybSA6IFRyYW5zZm9ybVN0YXRlOjpGbGF0dGVuVHJhbnNmb3Jt OwogCiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggbGF5ZXJUcmFuc2Zvcm07CiAgICAgRmxvYXRQ b2ludCBwb3NpdGlvbiA9IG1fcG9zaXRpb247Ci0gICAgaWYgKG1fY2xpZW50KQotICAgICAgICBt X2NsaWVudC0+Y3VzdG9tUG9zaXRpb25Gb3JWaXNpYmxlUmVjdENvbXB1dGF0aW9uKHRoaXMsIHBv c2l0aW9uKTsKKyAgICBpZiAoY2xpZW50KCkpCisgICAgICAgIGNsaWVudCgpLT5jdXN0b21Qb3Np dGlvbkZvclZpc2libGVSZWN0Q29tcHV0YXRpb24odGhpcywgcG9zaXRpb24pOwogCiAgICAgbGF5 ZXJUcmFuc2Zvcm0udHJhbnNsYXRlKHBvc2l0aW9uLngoKSwgcG9zaXRpb24ueSgpKTsKIAogICAg IFRyYW5zZm9ybWF0aW9uTWF0cml4IGN1cnJlbnRUcmFuc2Zvcm07Ci0gICAgaWYgKGNsaWVudCgp ICYmIGNsaWVudCgpLT5nZXRDdXJyZW50VHJhbnNmb3JtKHRoaXMsIGN1cnJlbnRUcmFuc2Zvcm0p ICYmICFjdXJyZW50VHJhbnNmb3JtLmlzSWRlbnRpdHkoKSkgeworICAgIGlmICghKGZsYWdzICYg UmVzcGVjdEFuaW1hdGluZ1RyYW5zZm9ybXMpIHx8ICFjbGllbnQoKSB8fCAhY2xpZW50KCktPmdl dEN1cnJlbnRUcmFuc2Zvcm0odGhpcywgY3VycmVudFRyYW5zZm9ybSkpCisgICAgICAgIGN1cnJl bnRUcmFuc2Zvcm0gPSBtX3RyYW5zZm9ybTsKKyAgICAKKyAgICBpZiAoIWN1cnJlbnRUcmFuc2Zv cm0uaXNJZGVudGl0eSgpKSB7CiAgICAgICAgIEZsb2F0UG9pbnQzRCBhYnNvbHV0ZUFuY2hvclBv aW50KGFuY2hvclBvaW50KCkpOwogICAgICAgICBhYnNvbHV0ZUFuY2hvclBvaW50LnNjYWxlKHNp emUoKS53aWR0aCgpLCBzaXplKCkuaGVpZ2h0KCksIDEpOwogICAgICAgICBsYXllclRyYW5zZm9y bS50cmFuc2xhdGUzZChhYnNvbHV0ZUFuY2hvclBvaW50LngoKSwgYWJzb2x1dGVBbmNob3JQb2lu dC55KCksIGFic29sdXRlQW5jaG9yUG9pbnQueigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKaW5kZXggMmFhZjZhOTli MjIyZjMxZWNmNWJiY2MxNDFiZDY4MGZhZjE4YzY2ZC4uNzY5NWFlNTcwZTI1MDAyODQ3MDA4NmY5 ZmQ2OTU1MDUxZDA4ZGI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKQEAgLTE0Miw2ICsxNDIsOSBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCB2b2lkIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZShjb25zdCBGbG9hdFJlY3Qm KTsKICAgICB2aXJ0dWFsIHZvaWQgZmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25s eSgpOwogCisgICAgdm9pZCByZWN1cnNpdmVDb21wdXRlVmlzaWJsZVJlY3QoY29uc3QgVHJhbnNm b3JtU3RhdGUmKTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVjb21wdXRlVmlzaWJsZVJlY3RzKGNvbnN0 IEZsb2F0UmVjdCYgY2xpcFJlY3QpOworCiAgICAgdmlydHVhbCBUaWxlZEJhY2tpbmcqIHRpbGVk QmFja2luZygpIGNvbnN0IE9WRVJSSURFOwogCiAgICAgYm9vbCBhbGxvd1RpbGVkTGF5ZXIoKSBj b25zdCB7IHJldHVybiBtX2FsbG93VGlsZWRMYXllcjsgfQpAQCAtMjQzLDcgKzI0Niw5IEBAIHBy aXZhdGU6CiAKICAgICB2b2lkIGNvbXB1dGVQaXhlbEFsaWdubWVudChmbG9hdCBwaXhlbEFsaWdu bWVudFNjYWxlLCBjb25zdCBGbG9hdFBvaW50JiBwb3NpdGlvblJlbGF0aXZlVG9CYXNlLAogICAg ICAgICBGbG9hdFBvaW50JiBwb3NpdGlvbiwgRmxvYXRTaXplJiwgRmxvYXRQb2ludDNEJiBhbmNo b3JQb2ludCwgRmxvYXRTaXplJiBhbGlnbm1lbnRPZmZzZXQpIGNvbnN0OwotICAgIEZsb2F0UmVj dCBjb21wdXRlVmlzaWJsZVJlY3QoVHJhbnNmb3JtU3RhdGUmKSBjb25zdDsKKyAgICBlbnVtIENv bXB1dGVWaXNpYmxlUmVjdEZsYWcgeyBSZXNwZWN0QW5pbWF0aW5nVHJhbnNmb3JtcyA9IDEgPDwg MCB9OworICAgIHR5cGVkZWYgdW5zaWduZWQgQ29tcHV0ZVZpc2libGVSZWN0RmxhZ3M7CisgICAg RmxvYXRSZWN0IGNvbXB1dGVWaXNpYmxlUmVjdChUcmFuc2Zvcm1TdGF0ZSYsIENvbXB1dGVWaXNp YmxlUmVjdEZsYWdzID0gUmVzcGVjdEFuaW1hdGluZ1RyYW5zZm9ybXMpIGNvbnN0OwogICAgIGNv bnN0IEZsb2F0UmVjdCYgdmlzaWJsZVJlY3QoKSBjb25zdCB7IHJldHVybiBtX3Zpc2libGVSZWN0 OyB9CiAgICAgCiAgICAgRmxvYXRSZWN0IGFkanVzdFRpbGVkTGF5ZXJWaXNpYmxlUmVjdChUaWxl ZEJhY2tpbmcqLCBjb25zdCBGbG9hdFJlY3QmIG9sZFZpc2libGVSZWN0LCBjb25zdCBGbG9hdFNp emUmIG9sZFNpemUpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1RpbGVDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9tYWMvVGlsZUNvbnRyb2xsZXIuaAppbmRleCA3YWQ3YTQ2MjRlNmY2ZTMw N2Q4OGQyMTQ2NWViMDhlY2U2NGYzN2E2Li42NWQ5OWI3MDY3MDQzMDdjMzgxNTVhZTJkNGQ4NDdk YTJkMGU0ZWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9tYWMvVGlsZUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYS9tYWMvVGlsZUNvbnRyb2xsZXIuaApAQCAtMTA3LDYgKzEwNyw3IEBAIHByaXZhdGU6 CiAKICAgICAvLyBUaWxlZEJhY2tpbmcgbWVtYmVyIGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIHZv aWQgc2V0VmlzaWJsZVJlY3QoY29uc3QgRmxvYXRSZWN0JikgT1ZFUlJJREU7CisgICAgdmlydHVh bCBib29sIHRpbGVzV291bGRDaGFuZ2VGb3JWaXNpYmxlUmVjdChjb25zdCBGbG9hdFJlY3QmKSBj b25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RXhwb3NlZFJlY3QoY29uc3QgRmxv YXRSZWN0JikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIGNsaXBzVG9FeHBvc2VkUmVjdCgp IE9WRVJSSURFIHsgcmV0dXJuIG1fY2xpcHNUb0V4cG9zZWRSZWN0OyB9CiAgICAgdmlydHVhbCB2 b2lkIHNldENsaXBzVG9FeHBvc2VkUmVjdChib29sKSBPVkVSUklERTsKQEAgLTEzMyw3ICsxMzQs NyBAQCBwcml2YXRlOgogICAgIEludFJlY3QgcmVjdEZvclRpbGVJbmRleChjb25zdCBUaWxlSW5k ZXgmKSBjb25zdDsKICAgICB2b2lkIGdldFRpbGVJbmRleFJhbmdlRm9yUmVjdChjb25zdCBJbnRS ZWN0JiwgVGlsZUluZGV4JiB0b3BMZWZ0LCBUaWxlSW5kZXgmIGJvdHRvbVJpZ2h0KSBjb25zdDsK IAotICAgIEZsb2F0UmVjdCBjb21wdXRlVGlsZUNvdmVyYWdlUmVjdChjb25zdCBGbG9hdFJlY3Qm IHByZXZpb3VzVmlzaWJsZVJlY3QpIGNvbnN0OworICAgIEZsb2F0UmVjdCBjb21wdXRlVGlsZUNv dmVyYWdlUmVjdChjb25zdCBGbG9hdFJlY3QmIHByZXZpb3VzVmlzaWJsZVJlY3QsIGNvbnN0IEZs b2F0UmVjdCYgY3VycmVudFZpc2libGVSZWN0KSBjb25zdDsKICAgICBJbnRTaXplIHRpbGVTaXpl Rm9yQ292ZXJhZ2VSZWN0KGNvbnN0IEZsb2F0UmVjdCYpIGNvbnN0OwogCiAgICAgdm9pZCBzY2hl ZHVsZVRpbGVSZXZhbGlkYXRpb24oZG91YmxlIGludGVydmFsKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5tbQpp bmRleCA4NjQzYzllMjg2OTUyNWFmYmQ0NDM3MWVkZWZkMDNkY2FhMDRlN2RmLi4wYWQxMjM5ZTA1 MDc2MTc3YjVjNGQyYzNkNzM0ZmYwYWFiNDZlNDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNvbnRyb2xsZXIubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250cm9sbGVyLm1tCkBAIC0z MDYsNiArMzA2LDM1IEBAIHZvaWQgVGlsZUNvbnRyb2xsZXI6OnNldFZpc2libGVSZWN0KGNvbnN0 IEZsb2F0UmVjdCYgdmlzaWJsZVJlY3QpCiAgICAgcmV2YWxpZGF0ZVRpbGVzKCk7CiB9CiAKK2Jv b2wgVGlsZUNvbnRyb2xsZXI6OnRpbGVzV291bGRDaGFuZ2VGb3JWaXNpYmxlUmVjdChjb25zdCBG bG9hdFJlY3QmIG5ld1Zpc2libGVSZWN0KSBjb25zdAoreworICAgIEZsb2F0UmVjdCB2aXNpYmxl UmVjdCA9IG5ld1Zpc2libGVSZWN0OworCisgICAgaWYgKG1fY2xpcHNUb0V4cG9zZWRSZWN0KQor ICAgICAgICB2aXNpYmxlUmVjdC5pbnRlcnNlY3QobV9leHBvc2VkUmVjdCk7CisKKyAgICBpZiAo dmlzaWJsZVJlY3QuaXNFbXB0eSgpIHx8IGJvdW5kcygpLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICAKKyAgICBGbG9hdFJlY3QgY3VycmVudFRpbGVDb3ZlcmFnZVJl Y3QgPSBjb21wdXRlVGlsZUNvdmVyYWdlUmVjdChtX3Zpc2libGVSZWN0LCBuZXdWaXNpYmxlUmVj dCk7CisgICAgRmxvYXRSZWN0IHNjYWxlZFJlY3QoY3VycmVudFRpbGVDb3ZlcmFnZVJlY3QpOwor ICAgIHNjYWxlZFJlY3Quc2NhbGUobV9zY2FsZSk7CisgICAgSW50UmVjdCBjdXJyZW50Q292ZXJh Z2VSZWN0SW5UaWxlQ29vcmRzKGVuY2xvc2luZ0ludFJlY3Qoc2NhbGVkUmVjdCkpOworCisgICAg SW50U2l6ZSBuZXdUaWxlU2l6ZSA9IHRpbGVTaXplRm9yQ292ZXJhZ2VSZWN0KGN1cnJlbnRUaWxl Q292ZXJhZ2VSZWN0KTsKKyAgICBib29sIHRpbGVTaXplQ2hhbmdlZCA9IG5ld1RpbGVTaXplICE9 IG1fdGlsZVNpemU7CisgICAgaWYgKHRpbGVTaXplQ2hhbmdlZCkKKyAgICAgICAgcmV0dXJuIHRy dWU7CisKKyAgICBUaWxlSW5kZXggdG9wTGVmdDsKKyAgICBUaWxlSW5kZXggYm90dG9tUmlnaHQ7 CisgICAgZ2V0VGlsZUluZGV4UmFuZ2VGb3JSZWN0KGN1cnJlbnRDb3ZlcmFnZVJlY3RJblRpbGVD b29yZHMsIHRvcExlZnQsIGJvdHRvbVJpZ2h0KTsKKworICAgIEludFJlY3QgY292ZXJhZ2VSZWN0 ID0gcmVjdEZvclRpbGVJbmRleCh0b3BMZWZ0KTsKKyAgICBjb3ZlcmFnZVJlY3QudW5pdGUocmVj dEZvclRpbGVJbmRleChib3R0b21SaWdodCkpOworICAgIHJldHVybiBjb3ZlcmFnZVJlY3QgIT0g bV9wcmltYXJ5VGlsZUNvdmVyYWdlUmVjdDsKK30KKwogdm9pZCBUaWxlQ29udHJvbGxlcjo6c2V0 RXhwb3NlZFJlY3QoY29uc3QgRmxvYXRSZWN0JiBleHBvc2VkUmVjdCkKIHsKICAgICBpZiAobV9l eHBvc2VkUmVjdCA9PSBleHBvc2VkUmVjdCkKQEAgLTQxNyw5ICs0NDYsOSBAQCB2b2lkIFRpbGVD b250cm9sbGVyOjpnZXRUaWxlSW5kZXhSYW5nZUZvclJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwg VGlsZUluZGV4JiB0bwogICAgIGJvdHRvbVJpZ2h0LnNldFkobWF4KGJvdHRvbVlSYXRpbyAtIDEs IDApKTsKIH0KIAotRmxvYXRSZWN0IFRpbGVDb250cm9sbGVyOjpjb21wdXRlVGlsZUNvdmVyYWdl UmVjdChjb25zdCBGbG9hdFJlY3QmIHByZXZpb3VzVmlzaWJsZVJlY3QpIGNvbnN0CitGbG9hdFJl Y3QgVGlsZUNvbnRyb2xsZXI6OmNvbXB1dGVUaWxlQ292ZXJhZ2VSZWN0KGNvbnN0IEZsb2F0UmVj dCYgcHJldmlvdXNWaXNpYmxlUmVjdCwgY29uc3QgRmxvYXRSZWN0JiBjdXJyZW50VmlzaWJsZVJl Y3QpIGNvbnN0CiB7Ci0gICAgRmxvYXRSZWN0IHZpc2libGVSZWN0ID0gbV92aXNpYmxlUmVjdDsK KyAgICBGbG9hdFJlY3QgdmlzaWJsZVJlY3QgPSBjdXJyZW50VmlzaWJsZVJlY3Q7CiAKICAgICBp ZiAobV9jbGlwc1RvRXhwb3NlZFJlY3QpCiAgICAgICAgIHZpc2libGVSZWN0LmludGVyc2VjdCht X2V4cG9zZWRSZWN0KTsKQEAgLTU5MSw3ICs2MjAsNyBAQCB2b2lkIFRpbGVDb250cm9sbGVyOjpy ZXZhbGlkYXRlVGlsZXMoVGlsZVZhbGlkYXRpb25Qb2xpY3lGbGFncyBmb3JlZ3JvdW5kVmFsaWRh dAogICAgIAogICAgIFRpbGVWYWxpZGF0aW9uUG9saWN5RmxhZ3MgdmFsaWRhdGlvblBvbGljeSA9 IG1faXNJbldpbmRvdyA/IGZvcmVncm91bmRWYWxpZGF0aW9uUG9saWN5IDogYmFja2dyb3VuZFZh bGlkYXRpb25Qb2xpY3k7CiAgICAgCi0gICAgRmxvYXRSZWN0IHRpbGVDb3ZlcmFnZVJlY3QgPSBj b21wdXRlVGlsZUNvdmVyYWdlUmVjdChtX3Zpc2libGVSZWN0QXRMYXN0UmV2YWxpZGF0ZSk7Cisg ICAgRmxvYXRSZWN0IHRpbGVDb3ZlcmFnZVJlY3QgPSBjb21wdXRlVGlsZUNvdmVyYWdlUmVjdCht X3Zpc2libGVSZWN0QXRMYXN0UmV2YWxpZGF0ZSwgbV92aXNpYmxlUmVjdCk7CiAgICAgRmxvYXRS ZWN0IHNjYWxlZFJlY3QodGlsZUNvdmVyYWdlUmVjdCk7CiAgICAgc2NhbGVkUmVjdC5zY2FsZSht X3NjYWxlKTsKICAgICBJbnRSZWN0IGNvdmVyYWdlUmVjdEluVGlsZUNvb3JkcyhlbmNsb3NpbmdJ bnRSZWN0KHNjYWxlZFJlY3QpKTsK