157229 2016-04-29 21:01:41 -0700 Make clipToRect() and restoreClip() have similar signatures 2016-04-29 21:13:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1188989 0 simon.fraser 2016-04-29 21:01:41 -0700 Make clipToRect() and restoreClip() have similar signatures 1188990 1 277791 simon.fraser 2016-04-29 21:03:18 -0700 Created attachment 277791 Patch 1188997 2 simon.fraser 2016-04-29 21:13:48 -0700 https://trac.webkit.org/r200284 277791 2016-04-29 21:03:18 -0700 2016-04-29 21:04:27 -0700 Patch bug-157229-20160429210351.patch text/plain 13828 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwMjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTlhNDExMzJlMzdjYjEy ZjZlMmE1MTk5MWZhMjU2Y2E3NjNiMTQzMy4uNTg1YzQzZTQzYjA2N2UzMzRmZmU0NDdhYjA1NmU1 NjI2NGMxNTczNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE2LTA0LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIE1ha2UgY2xpcFRv UmVjdCgpIGFuZCByZXN0b3JlQ2xpcCgpIGhhdmUgc2ltaWxhciBzaWduYXR1cmVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTcyMjkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjbGlwVG9SZWN0KCkgYW5k IHJlc3RvcmVDbGlwKCkgYXJlIGFsd2F5cyBjYWxsZWQgaW4gcGFpcnMsIGJ1dCBoYWQgZGlmZmVy ZW50CisgICAgICAgIHBhcmFtZXRlciBvcmRlciwgYW5kIHBhcmFtZXRlciB0eXBlcy4gU28gbWFr ZSB0aGVtIG1vcmUgc2ltaWxhci4KKyAgICAgICAgCisgICAgICAgIEluIGZ1dHVyZSB3ZSBjb3Vs ZCB1c2UgdGhlbSBpbiBhIHN0YWNrLWJhc2VkIGNsYXNzLgorCisgICAgICAgIE5vIGJlaGF2aW9y IGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllcjo6cmVzdG9yZUNsaXApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OnBhaW50TGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmFwcGx5RmlsdGVy cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRUcmFuc2Zvcm1lZExheWVy SW50b0ZyYWdtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRCYWNr Z3JvdW5kRm9yRnJhZ21lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWlu dEZvcmVncm91bmRGb3JGcmFnbWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OnBhaW50Rm9yZWdyb3VuZEZvckZyYWdtZW50c1dpdGhQaGFzZSk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6cGFpbnRPdXRsaW5lRm9yRnJhZ21lbnRzKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyOjpwYWludE1hc2tGb3JGcmFnbWVudHMpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXI6OnBhaW50Q2hpbGRDbGlwcGluZ01hc2tGb3JGcmFnbWVudHMpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmZsb3dDb250cm9sc0ZvckZyYWdt ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3Rz KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKworMjAxNi0wNC0yOSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBCbHVyIGZpbHRl ciBlc2NhcGVzIGFuIGVuY2xvc2luZyBvdmVyZmxvdzpoaWRkZW4KICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTAyOQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA1MDRjODVjMDk0MGQ3YmYyYzJkYmQwZDkxNTRk N2EyNDFhMDYxNjA4Li44YTdmMmU1ZWMwODA5MGExY2MzNWI0NzQxM2ZhNWU2YjUzZDRkMjE2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTM4MjcsNyArMzgy Nyw3IEBAIHN0YXRpYyBib29sIGluQ29udGFpbmluZ0Jsb2NrQ2hhaW4oUmVuZGVyTGF5ZXIqIHN0 YXJ0TGF5ZXIsIFJlbmRlckxheWVyKiBlbmRMYXllCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12 b2lkIFJlbmRlckxheWVyOjpjbGlwVG9SZWN0KGNvbnN0IExheWVyUGFpbnRpbmdJbmZvJiBwYWlu dGluZ0luZm8sIEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgQ2xpcFJlY3QmIGNsaXBS ZWN0LCBCb3JkZXJSYWRpdXNDbGlwcGluZ1J1bGUgcnVsZSkKK3ZvaWQgUmVuZGVyTGF5ZXI6OmNs aXBUb1JlY3QoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBMYXllclBhaW50aW5nSW5m byYgcGFpbnRpbmdJbmZvLCBjb25zdCBDbGlwUmVjdCYgY2xpcFJlY3QsIEJvcmRlclJhZGl1c0Ns aXBwaW5nUnVsZSBydWxlKQogewogICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0gcmVuZGVy ZXIoKS5kb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCk7CiAgICAgYm9vbCBuZWVkc0NsaXBw aW5nID0gIWNsaXBSZWN0LmlzSW5maW5pdGUoKSAmJiBjbGlwUmVjdC5yZWN0KCkgIT0gcGFpbnRp bmdJbmZvLnBhaW50RGlydHlSZWN0OwpAQCAtMzg2MSw5ICszODYxLDkgQEAgdm9pZCBSZW5kZXJM YXllcjo6Y2xpcFRvUmVjdChjb25zdCBMYXllclBhaW50aW5nSW5mbyYgcGFpbnRpbmdJbmZvLCBH cmFwaGljc0NvbnQKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OnJlc3RvcmVDbGlwKEdy YXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5b3V0UmVjdCYgcGFpbnREaXJ0eVJlY3Qs IGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCkKK3ZvaWQgUmVuZGVyTGF5ZXI6OnJlc3RvcmVDbGlw KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mIHBhaW50 aW5nSW5mbywgY29uc3QgQ2xpcFJlY3QmIGNsaXBSZWN0KQogewotICAgIGlmICgoIWNsaXBSZWN0 LmlzSW5maW5pdGUoKSAmJiBjbGlwUmVjdC5yZWN0KCkgIT0gcGFpbnREaXJ0eVJlY3QpIHx8IGNs aXBSZWN0LmFmZmVjdGVkQnlSYWRpdXMoKSkKKyAgICBpZiAoKCFjbGlwUmVjdC5pc0luZmluaXRl KCkgJiYgY2xpcFJlY3QucmVjdCgpICE9IHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCkgfHwg Y2xpcFJlY3QuYWZmZWN0ZWRCeVJhZGl1cygpKQogICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsK IH0KIApAQCAtMzk4MiwxNCArMzk4MiwxNCBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVy KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5ZXJQYWludGluZ0luZm8mCiAgICAg ICAgICAgICBjbGlwUmVjdC5pbnRlcnNlY3QocGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0KTsK ICAgICAgICAgCiAgICAgICAgICAgICAvLyBQdXNoIHRoZSBwYXJlbnQgY29vcmRpbmF0ZSBzcGFj ZSdzIGNsaXAuCi0gICAgICAgICAgICBwYXJlbnQoKS0+Y2xpcFRvUmVjdChwYWludGluZ0luZm8s IGNvbnRleHQsIGNsaXBSZWN0KTsKKyAgICAgICAgICAgIHBhcmVudCgpLT5jbGlwVG9SZWN0KGNv bnRleHQsIHBhaW50aW5nSW5mbywgY2xpcFJlY3QpOwogICAgICAgICB9CiAKICAgICAgICAgcGFp bnRMYXllckJ5QXBwbHlpbmdUcmFuc2Zvcm0oY29udGV4dCwgcGFpbnRpbmdJbmZvLCBwYWludEZs YWdzKTsKIAogICAgICAgICAvLyBSZXN0b3JlIHRoZSBjbGlwLgogICAgICAgICBpZiAocGFyZW50 KCkpCi0gICAgICAgICAgICBwYXJlbnQoKS0+cmVzdG9yZUNsaXAoY29udGV4dCwgcGFpbnRpbmdJ bmZvLnBhaW50RGlydHlSZWN0LCBjbGlwUmVjdCk7CisgICAgICAgICAgICBwYXJlbnQoKS0+cmVz dG9yZUNsaXAoY29udGV4dCwgcGFpbnRpbmdJbmZvLCBjbGlwUmVjdCk7CiAKICAgICAgICAgcmV0 dXJuOwogICAgIH0KQEAgLTQyMDIsOSArNDIwMiw5IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmFwcGx5 RmlsdGVycyhGaWx0ZXJFZmZlY3RSZW5kZXJlckhlbHBlciogZmlsdGVyUGFpbnRlciwgR3JhcGhp CiAKICAgICAvLyBGSVhNRTogSGFuZGxlIG1vcmUgdGhhbiBvbmUgZnJhZ21lbnQuCiAgICAgQ2xp cFJlY3QgYmFja2dyb3VuZFJlY3QgPSBsYXllckZyYWdtZW50cy5pc0VtcHR5KCkgPyBDbGlwUmVj dCgpIDogbGF5ZXJGcmFnbWVudHNbMF0uYmFja2dyb3VuZFJlY3Q7Ci0gICAgY2xpcFRvUmVjdChw YWludGluZ0luZm8sIG9yaWdpbmFsQ29udGV4dCwgYmFja2dyb3VuZFJlY3QpOworICAgIGNsaXBU b1JlY3Qob3JpZ2luYWxDb250ZXh0LCBwYWludGluZ0luZm8sIGJhY2tncm91bmRSZWN0KTsKICAg ICBmaWx0ZXJQYWludGVyLT5hcHBseUZpbHRlckVmZmVjdChvcmlnaW5hbENvbnRleHQpOwotICAg IHJlc3RvcmVDbGlwKG9yaWdpbmFsQ29udGV4dCwgcGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0 LCBiYWNrZ3JvdW5kUmVjdCk7CisgICAgcmVzdG9yZUNsaXAob3JpZ2luYWxDb250ZXh0LCBwYWlu dGluZ0luZm8sIGJhY2tncm91bmRSZWN0KTsKIH0KIAogLy8gSGVscGVyIGZvciB0aGUgc29ydGlu ZyBvZiBsYXllcnMgYnkgei1pbmRleC4KQEAgLTQ2NjMsOSArNDY2Myw5IEBAIHZvaWQgUmVuZGVy TGF5ZXI6OnBhaW50VHJhbnNmb3JtZWRMYXllckludG9GcmFnbWVudHMoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBjCiAgICAgICAgICAgICBjbGlwUmVjdC5pbnRlcnNlY3QocGFyZW50Q2xpcFJl Y3QpOwogICAgICAgICB9CiAKLSAgICAgICAgcGFyZW50KCktPmNsaXBUb1JlY3QocGFpbnRpbmdJ bmZvLCBjb250ZXh0LCBjbGlwUmVjdCk7CisgICAgICAgIHBhcmVudCgpLT5jbGlwVG9SZWN0KGNv bnRleHQsIHBhaW50aW5nSW5mbywgY2xpcFJlY3QpOwogICAgICAgICBwYWludExheWVyQnlBcHBs eWluZ1RyYW5zZm9ybShjb250ZXh0LCBwYWludGluZ0luZm8sIHBhaW50RmxhZ3MsIGZyYWdtZW50 LnBhZ2luYXRpb25PZmZzZXQpOwotICAgICAgICBwYXJlbnQoKS0+cmVzdG9yZUNsaXAoY29udGV4 dCwgcGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBjbGlwUmVjdCk7CisgICAgICAgIHBhcmVu dCgpLT5yZXN0b3JlQ2xpcChjb250ZXh0LCBwYWludGluZ0luZm8sIGNsaXBSZWN0KTsKICAgICB9 CiB9CiAKQEAgLTQ2ODQsNyArNDY4NCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50QmFja2dy b3VuZEZvckZyYWdtZW50cyhjb25zdCBMYXllckZyYWdtZW50cyYgbGF5ZXJGcmFnbWVuCiAgICAg ICAgIGlmIChsb2NhbFBhaW50aW5nSW5mby5jbGlwVG9EaXJ0eVJlY3QpIHsKICAgICAgICAgICAg IC8vIFBhaW50IG91ciBiYWNrZ3JvdW5kIGZpcnN0LCBiZWZvcmUgcGFpbnRpbmcgYW55IGNoaWxk IGxheWVycy4KICAgICAgICAgICAgIC8vIEVzdGFibGlzaCB0aGUgY2xpcCB1c2VkIHRvIHBhaW50 IG91ciBiYWNrZ3JvdW5kLgotICAgICAgICAgICAgY2xpcFRvUmVjdChsb2NhbFBhaW50aW5nSW5m bywgY29udGV4dCwgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QsIERvTm90SW5jbHVkZVNlbGZGb3JC b3JkZXJSYWRpdXMpOyAvLyBCYWNrZ3JvdW5kIHBhaW50aW5nIHdpbGwgaGFuZGxlIGNsaXBwaW5n IHRvIHNlbGYuCisgICAgICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJ bmZvLCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdCwgRG9Ob3RJbmNsdWRlU2VsZkZvckJvcmRlclJh ZGl1cyk7IC8vIEJhY2tncm91bmQgcGFpbnRpbmcgd2lsbCBoYW5kbGUgY2xpcHBpbmcgdG8gc2Vs Zi4KICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgLy8gUGFpbnQgdGhlIGJhY2tncm91bmQu CkBAIC00NjkzLDcgKzQ2OTMsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludEJhY2tncm91bmRG b3JGcmFnbWVudHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyRnJhZ21lbgogICAgICAgICBy ZW5kZXJlcigpLnBhaW50KHBhaW50SW5mbywgdG9MYXlvdXRQb2ludChmcmFnbWVudC5sYXllckJv dW5kcy5sb2NhdGlvbigpIC0gcmVuZGVyQm94TG9jYXRpb24oKSArIGxvY2FsUGFpbnRpbmdJbmZv LnN1YnBpeGVsQWNjdW11bGF0aW9uKSk7CiAKICAgICAgICAgaWYgKGxvY2FsUGFpbnRpbmdJbmZv LmNsaXBUb0RpcnR5UmVjdCkKLSAgICAgICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIGxvY2Fs UGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdCk7Cisg ICAgICAgICAgICByZXN0b3JlQ2xpcChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywgZnJhZ21l bnQuYmFja2dyb3VuZFJlY3QpOwogICAgIH0KIH0KIApAQCAtNDcyNCw3ICs0NzI0LDcgQEAgdm9p ZCBSZW5kZXJMYXllcjo6cGFpbnRGb3JlZ3JvdW5kRm9yRnJhZ21lbnRzKGNvbnN0IExheWVyRnJh Z21lbnRzJiBsYXllckZyYWdtZW4KICAgICBDbGlwUmVjdCBjbGlwcGVkUmVjdDsKICAgICBpZiAo c2hvdWxkQ2xpcCkgewogICAgICAgICBjbGlwcGVkUmVjdCA9IGxheWVyRnJhZ21lbnRzWzBdLmZv cmVncm91bmRSZWN0OwotICAgICAgICBjbGlwVG9SZWN0KGxvY2FsUGFpbnRpbmdJbmZvLCBjb250 ZXh0LCBjbGlwcGVkUmVjdCk7CisgICAgICAgIGNsaXBUb1JlY3QoY29udGV4dCwgbG9jYWxQYWlu dGluZ0luZm8sIGNsaXBwZWRSZWN0KTsKICAgICB9CiAgICAgCiAgICAgLy8gV2UgaGF2ZSB0byBs b29wIHRocm91Z2ggZXZlcnkgZnJhZ21lbnQgbXVsdGlwbGUgdGltZXMsIHNpbmNlIHdlIGhhdmUg dG8gcmVwYWludCBpbiBlYWNoIHNwZWNpZmljIHBoYXNlIGluIG9yZGVyIGZvcgpAQCAtNDczOSw3 ICs0NzM5LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRGb3JlZ3JvdW5kRm9yRnJhZ21lbnRz KGNvbnN0IExheWVyRnJhZ21lbnRzJiBsYXllckZyYWdtZW4KICAgICB9CiAgICAgCiAgICAgaWYg KHNob3VsZENsaXApCi0gICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJ bmZvLnBhaW50RGlydHlSZWN0LCBjbGlwcGVkUmVjdCk7CisgICAgICAgIHJlc3RvcmVDbGlwKGNv bnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBjbGlwcGVkUmVjdCk7CiB9CiAKIHZvaWQgUmVuZGVy TGF5ZXI6OnBhaW50Rm9yZWdyb3VuZEZvckZyYWdtZW50c1dpdGhQaGFzZShQYWludFBoYXNlIHBo YXNlLCBjb25zdCBMYXllckZyYWdtZW50cyYgbGF5ZXJGcmFnbWVudHMsIEdyYXBoaWNzQ29udGV4 dCYgY29udGV4dCwKQEAgLTQ3NTIsNyArNDc1Miw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50 Rm9yZWdyb3VuZEZvckZyYWdtZW50c1dpdGhQaGFzZShQYWludFBoYXNlIHBoYXNlLCBjb25zdCBM CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgCiAgICAgICAgIGlmIChzaG91bGRDbGlw KQotICAgICAgICAgICAgY2xpcFRvUmVjdChsb2NhbFBhaW50aW5nSW5mbywgY29udGV4dCwgZnJh Z21lbnQuZm9yZWdyb3VuZFJlY3QpOworICAgICAgICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBs b2NhbFBhaW50aW5nSW5mbywgZnJhZ21lbnQuZm9yZWdyb3VuZFJlY3QpOwogICAgIAogICAgICAg ICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIGZyYWdtZW50LmZvcmVncm91bmRSZWN0LnJl Y3QoKSwgcGhhc2UsIHBhaW50QmVoYXZpb3IsIHN1YnRyZWVQYWludFJvb3RGb3JSZW5kZXJlciwg bnVsbHB0ciwgbnVsbHB0ciwgJmxvY2FsUGFpbnRpbmdJbmZvLnJvb3RMYXllci0+cmVuZGVyZXIo KSk7CiAgICAgICAgIGlmIChwaGFzZSA9PSBQYWludFBoYXNlRm9yZWdyb3VuZCkKQEAgLTQ3NjAs NyArNDc2MCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50Rm9yZWdyb3VuZEZvckZyYWdtZW50 c1dpdGhQaGFzZShQYWludFBoYXNlIHBoYXNlLCBjb25zdCBMCiAgICAgICAgIHJlbmRlcmVyKCku cGFpbnQocGFpbnRJbmZvLCB0b0xheW91dFBvaW50KGZyYWdtZW50LmxheWVyQm91bmRzLmxvY2F0 aW9uKCkgLSByZW5kZXJCb3hMb2NhdGlvbigpICsgbG9jYWxQYWludGluZ0luZm8uc3VicGl4ZWxB Y2N1bXVsYXRpb24pKTsKICAgICAgICAgCiAgICAgICAgIGlmIChzaG91bGRDbGlwKQotICAgICAg ICAgICAgcmVzdG9yZUNsaXAoY29udGV4dCwgbG9jYWxQYWludGluZ0luZm8ucGFpbnREaXJ0eVJl Y3QsIGZyYWdtZW50LmZvcmVncm91bmRSZWN0KTsKKyAgICAgICAgICAgIHJlc3RvcmVDbGlwKGNv bnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBmcmFnbWVudC5mb3JlZ3JvdW5kUmVjdCk7CiAgICAg fQogfQogCkBAIC00NzczLDkgKzQ3NzMsOSBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludE91dGxp bmVGb3JGcmFnbWVudHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyRnJhZ21lbnRzLAogICAg IAogICAgICAgICAvLyBQYWludCBvdXIgb3duIG91dGxpbmUKICAgICAgICAgUGFpbnRJbmZvIHBh aW50SW5mbyhjb250ZXh0LCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdC5yZWN0KCksIFBhaW50UGhh c2VTZWxmT3V0bGluZSwgcGFpbnRCZWhhdmlvciwgc3VidHJlZVBhaW50Um9vdEZvclJlbmRlcmVy LCBudWxscHRyLCBudWxscHRyLCAmbG9jYWxQYWludGluZ0luZm8ucm9vdExheWVyLT5yZW5kZXJl cigpKTsKLSAgICAgICAgY2xpcFRvUmVjdChsb2NhbFBhaW50aW5nSW5mbywgY29udGV4dCwgZnJh Z21lbnQuYmFja2dyb3VuZFJlY3QsIERvTm90SW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOwor ICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBmcmFnbWVudC5i YWNrZ3JvdW5kUmVjdCwgRG9Ob3RJbmNsdWRlU2VsZkZvckJvcmRlclJhZGl1cyk7CiAgICAgICAg IHJlbmRlcmVyKCkucGFpbnQocGFpbnRJbmZvLCB0b0xheW91dFBvaW50KGZyYWdtZW50LmxheWVy Qm91bmRzLmxvY2F0aW9uKCkgLSByZW5kZXJCb3hMb2NhdGlvbigpICsgbG9jYWxQYWludGluZ0lu Zm8uc3VicGl4ZWxBY2N1bXVsYXRpb24pKTsKLSAgICAgICAgcmVzdG9yZUNsaXAoY29udGV4dCwg bG9jYWxQYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QsIGZyYWdtZW50LmJhY2tncm91bmRSZWN0 KTsKKyAgICAgICAgcmVzdG9yZUNsaXAoY29udGV4dCwgbG9jYWxQYWludGluZ0luZm8sIGZyYWdt ZW50LmJhY2tncm91bmRSZWN0KTsKICAgICB9CiB9CiAKQEAgLTQ3ODcsNyArNDc4Nyw3IEBAIHZv aWQgUmVuZGVyTGF5ZXI6OnBhaW50TWFza0ZvckZyYWdtZW50cyhjb25zdCBMYXllckZyYWdtZW50 cyYgbGF5ZXJGcmFnbWVudHMsIEdyCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBp ZiAobG9jYWxQYWludGluZ0luZm8uY2xpcFRvRGlydHlSZWN0KQotICAgICAgICAgICAgY2xpcFRv UmVjdChsb2NhbFBhaW50aW5nSW5mbywgY29udGV4dCwgZnJhZ21lbnQuYmFja2dyb3VuZFJlY3Qs IERvTm90SW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAvLyBNYXNrIHBhaW50aW5nIHdpbGwg aGFuZGxlIGNsaXBwaW5nIHRvIHNlbGYuCisgICAgICAgICAgICBjbGlwVG9SZWN0KGNvbnRleHQs IGxvY2FsUGFpbnRpbmdJbmZvLCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdCwgRG9Ob3RJbmNsdWRl U2VsZkZvckJvcmRlclJhZGl1cyk7IC8vIE1hc2sgcGFpbnRpbmcgd2lsbCBoYW5kbGUgY2xpcHBp bmcgdG8gc2VsZi4KICAgICAgICAgCiAgICAgICAgIC8vIFBhaW50IHRoZSBtYXNrLgogICAgICAg ICAvLyBGSVhNRTogRXZlbnR1YWxseSB3ZSB3aWxsIGNvbGxlY3QgdGhlIHJlZ2lvbiBmcm9tIHRo ZSBmcmFnbWVudCBpdHNlbGYgaW5zdGVhZCBvZiBqdXN0IGZyb20gdGhlIHBhaW50IGluZm8uCkBA IC00Nzk1LDcgKzQ3OTUsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludE1hc2tGb3JGcmFnbWVu dHMoY29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyRnJhZ21lbnRzLCBHcgogICAgICAgICByZW5k ZXJlcigpLnBhaW50KHBhaW50SW5mbywgdG9MYXlvdXRQb2ludChmcmFnbWVudC5sYXllckJvdW5k cy5sb2NhdGlvbigpIC0gcmVuZGVyQm94TG9jYXRpb24oKSArIGxvY2FsUGFpbnRpbmdJbmZvLnN1 YnBpeGVsQWNjdW11bGF0aW9uKSk7CiAgICAgICAgIAogICAgICAgICBpZiAobG9jYWxQYWludGlu Z0luZm8uY2xpcFRvRGlydHlSZWN0KQotICAgICAgICAgICAgcmVzdG9yZUNsaXAoY29udGV4dCwg bG9jYWxQYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QsIGZyYWdtZW50LmJhY2tncm91bmRSZWN0 KTsKKyAgICAgICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBm cmFnbWVudC5iYWNrZ3JvdW5kUmVjdCk7CiAgICAgfQogfQogCkBAIC00ODA3LDE0ICs0ODA3LDE0 IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50Q2hpbGRDbGlwcGluZ01hc2tGb3JGcmFnbWVudHMo Y29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAg ICAgICBpZiAobG9jYWxQYWludGluZ0luZm8uY2xpcFRvRGlydHlSZWN0KQotICAgICAgICAgICAg Y2xpcFRvUmVjdChsb2NhbFBhaW50aW5nSW5mbywgY29udGV4dCwgZnJhZ21lbnQuZm9yZWdyb3Vu ZFJlY3QsIEluY2x1ZGVTZWxmRm9yQm9yZGVyUmFkaXVzKTsgLy8gQ2hpbGQgY2xpcHBpbmcgbWFz ayBwYWludGluZyB3aWxsIGhhbmRsZSBjbGlwcGluZyB0byBzZWxmLgorICAgICAgICAgICAgY2xp cFRvUmVjdChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywgZnJhZ21lbnQuZm9yZWdyb3VuZFJl Y3QsIEluY2x1ZGVTZWxmRm9yQm9yZGVyUmFkaXVzKTsgLy8gQ2hpbGQgY2xpcHBpbmcgbWFzayBw YWludGluZyB3aWxsIGhhbmRsZSBjbGlwcGluZyB0byBzZWxmLgogCiAgICAgICAgIC8vIFBhaW50 IHRoZSBjbGlwcGVkIG1hc2suCiAgICAgICAgIFBhaW50SW5mbyBwYWludEluZm8oY29udGV4dCwg ZnJhZ21lbnQuYmFja2dyb3VuZFJlY3QucmVjdCgpLCBQYWludFBoYXNlQ2xpcHBpbmdNYXNrLCBQ YWludEJlaGF2aW9yTm9ybWFsLCBzdWJ0cmVlUGFpbnRSb290Rm9yUmVuZGVyZXIsIG51bGxwdHIs IG51bGxwdHIsICZsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXItPnJlbmRlcmVyKCkpOwogICAg ICAgICByZW5kZXJlcigpLnBhaW50KHBhaW50SW5mbywgdG9MYXlvdXRQb2ludChmcmFnbWVudC5s YXllckJvdW5kcy5sb2NhdGlvbigpIC0gcmVuZGVyQm94TG9jYXRpb24oKSArIGxvY2FsUGFpbnRp bmdJbmZvLnN1YnBpeGVsQWNjdW11bGF0aW9uKSk7CiAKICAgICAgICAgaWYgKGxvY2FsUGFpbnRp bmdJbmZvLmNsaXBUb0RpcnR5UmVjdCkKLSAgICAgICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQs IGxvY2FsUGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBmcmFnbWVudC5mb3JlZ3JvdW5kUmVj dCk7CisgICAgICAgICAgICByZXN0b3JlQ2xpcChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywg ZnJhZ21lbnQuZm9yZWdyb3VuZFJlY3QpOwogICAgIH0KIH0KIApAQCAtNDgyMywxMCArNDgyMywx MCBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludE92ZXJmbG93Q29udHJvbHNGb3JGcmFnbWVudHMo Y29uc3QgTGF5ZXJGcmFnbWVudHMmIGxheWVyRgogICAgIGZvciAoY29uc3QgYXV0byYgZnJhZ21l bnQgOiBsYXllckZyYWdtZW50cykgewogICAgICAgICBpZiAoZnJhZ21lbnQuYmFja2dyb3VuZFJl Y3QuaXNFbXB0eSgpKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIGNsaXBUb1JlY3Qo bG9jYWxQYWludGluZ0luZm8sIGNvbnRleHQsIGZyYWdtZW50LmJhY2tncm91bmRSZWN0KTsKKyAg ICAgICAgY2xpcFRvUmVjdChjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5mbywgZnJhZ21lbnQuYmFj a2dyb3VuZFJlY3QpOwogICAgICAgICBwYWludE92ZXJmbG93Q29udHJvbHMoY29udGV4dCwgcm91 bmRlZEludFBvaW50KHRvTGF5b3V0UG9pbnQoZnJhZ21lbnQubGF5ZXJCb3VuZHMubG9jYXRpb24o KSAtIHJlbmRlckJveExvY2F0aW9uKCkgKyBsb2NhbFBhaW50aW5nSW5mby5zdWJwaXhlbEFjY3Vt dWxhdGlvbikpLAogICAgICAgICAgICAgc25hcHBlZEludFJlY3QoZnJhZ21lbnQuYmFja2dyb3Vu ZFJlY3QucmVjdCgpKSwgdHJ1ZSk7Ci0gICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIGxvY2Fs UGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0LCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdCk7Cisg ICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBmcmFnbWVudC5i YWNrZ3JvdW5kUmVjdCk7CiAgICAgfQogfQogCkBAIC03MDA0LDEzICs3MDA0LDEzIEBAIHZvaWQg UmVuZGVyTGF5ZXI6OnBhaW50Rmxvd1RocmVhZElmUmVnaW9uRm9yRnJhZ21lbnRzKGNvbnN0IExh eWVyRnJhZ21lbnRzJiBmcmFnCiAgICAgICAgIGJvb2wgc2hvdWxkQ2xpcCA9ICFjbGlwUmVjdC5p c0luZmluaXRlKCk7CiAgICAgICAgIC8vIE9wdGltaXplIGNsaXBwaW5nIGZvciB0aGUgc2luZ2xl IGZyYWdtZW50IGNhc2UuCiAgICAgICAgIGlmIChzaG91bGRDbGlwKQotICAgICAgICAgICAgY2xp cFRvUmVjdChwYWludGluZ0luZm8sIGNvbnRleHQsIGNsaXBSZWN0KTsKKyAgICAgICAgICAgIGNs aXBUb1JlY3QoY29udGV4dCwgcGFpbnRpbmdJbmZvLCBjbGlwUmVjdCk7CiAKICAgICAgICAgZmxv d1RocmVhZExheWVyLT5wYWludE5hbWVkRmxvd1RocmVhZEluc2lkZVJlZ2lvbihjb250ZXh0LCBm bG93RnJhZ21lbnQsIHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgZnJhZ21lbnQubGF5ZXJC b3VuZHMubG9jYXRpb24oKSArIHBhaW50aW5nSW5mby5zdWJwaXhlbEFjY3VtdWxhdGlvbiwKICAg ICAgICAgICAgIHBhaW50aW5nSW5mby5wYWludEJlaGF2aW9yLCBwYWludEZsYWdzKTsKIAogICAg ICAgICBpZiAoc2hvdWxkQ2xpcCkKLSAgICAgICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIHBh aW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgY2xpcFJlY3QpOworICAgICAgICAgICAgcmVzdG9y ZUNsaXAoY29udGV4dCwgcGFpbnRpbmdJbmZvLCBjbGlwUmVjdCk7CiAgICAgfQogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IDJjOGRlMjM1NzViMDM4YTY2Yjc5 Y2FkMTYxNGMyMzkyYWU1NGRmOWMuLjE4ZGI2NjU4OWI4Mjc0MWEzMDgxMzU2YzA2OWY2YzU2OTY4 YWU1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC03MjYsOCAr NzI2LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVSZXBhaW50UmVjdHNJbmNsdWRpbmdE ZXNjZW5kYW50cygpOwogICAgIHZvaWQgY2xlYXJSZXBhaW50UmVjdHMoKTsKIAotICAgIHZvaWQg Y2xpcFRvUmVjdChjb25zdCBMYXllclBhaW50aW5nSW5mbyYsIEdyYXBoaWNzQ29udGV4dCYsIGNv bnN0IENsaXBSZWN0JiwgQm9yZGVyUmFkaXVzQ2xpcHBpbmdSdWxlID0gSW5jbHVkZVNlbGZGb3JC b3JkZXJSYWRpdXMpOwotICAgIHZvaWQgcmVzdG9yZUNsaXAoR3JhcGhpY3NDb250ZXh0JiwgY29u c3QgTGF5b3V0UmVjdCYgcGFpbnREaXJ0eVJlY3QsIGNvbnN0IENsaXBSZWN0Jik7CisgICAgdm9p ZCBjbGlwVG9SZWN0KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IExheWVyUGFpbnRpbmdJbmZvJiwg Y29uc3QgQ2xpcFJlY3QmLCBCb3JkZXJSYWRpdXNDbGlwcGluZ1J1bGUgPSBJbmNsdWRlU2VsZkZv ckJvcmRlclJhZGl1cyk7CisgICAgdm9pZCByZXN0b3JlQ2xpcChHcmFwaGljc0NvbnRleHQmLCBj b25zdCBMYXllclBhaW50aW5nSW5mbyYsIGNvbnN0IENsaXBSZWN0Jik7CiAKICAgICBib29sIHNo b3VsZFJlcGFpbnRBZnRlckxheW91dCgpIGNvbnN0OwogCg==