40579 2010-06-14 11:36:21 -0700 Fix clipping via CSS clip: with composited descendants 2010-06-16 12:16:40 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser oldest_to_newest 237943 0 simon.fraser 2010-06-14 11:36:21 -0700 Clipping via the CSS clip: property does not work correctly with composited descendants. 238479 1 58799 simon.fraser 2010-06-15 11:29:51 -0700 Created attachment 58799 Patch 238524 2 58799 mitz 2010-06-15 13:40:23 -0700 Comment on attachment 58799 Patch > + (WebCore::clipBox): Utility function that returns the union of the clip and overflow s/union/intersection/ 239020 3 simon.fraser 2010-06-16 12:16:40 -0700 http://trac.webkit.org/changeset/61275 58799 2010-06-15 11:29:51 -0700 2010-06-15 13:40:23 -0700 Patch bug-40579-20100615112950.patch text/plain 19034 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0YjU5ZWJkYThmNjBmZDEwNTY3MWIyMzgzMTQyNWI2NmFhNmFiNzZkLi42Y2E5YTg3 ZjRiODE0ODZjZTBlYmQxYmMyNTIxMjk2MWYwZTJjMDM5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMDYtMTUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGNsaXBwaW5n IHZpYSBDU1MgY2xpcDogd2l0aCBjb21wb3NpdGVkIGRlc2NlbmRhbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDU3OQorICAgICAgICAKKyAgICAg ICAgVGVzdHMgZm9yIGNvbXBvc2l0aW5nIHdpdGggQ1NTIGNsaXAuCisKKyAgICAgICAgKiBjb21w b3NpdGluZy9nZW9tZXRyeS9jbGlwLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY29t cG9zaXRpbmcvZ2VvbWV0cnkvY2xpcC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGlu Zy9vdmVyZmxvdy9jbGlwLWRlc2NlbmRlbnRzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogY29tcG9zaXRpbmcvb3ZlcmZsb3cvY2xpcC1kZXNjZW5kZW50cy5odG1sOiBBZGRlZC4KKwog MjAxMC0wNi0xNSAgWmhlbnlhbyBNbyAgPHptb0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0 aW5nL2dlb21ldHJ5L2NsaXAtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcv Z2VvbWV0cnkvY2xpcC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjYzZjk1MTI4MGY5MTIyYTdi ZDhlMDgzMDJmMDg2NjgyNDg3MDhhZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Nv bXBvc2l0aW5nL2dlb21ldHJ5L2NsaXAtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsODYgQEAKK1Rl c3QgQ1NTIGNsaXAgd2l0aCBjb21wb3NpdGVkIGxheWVycy4gTGVmdCBhbmQgcmlnaHQgc2lkZXMg c2hvdWxkIGxvb2sgdGhlIHNhbWUuCisKKyhHcmFwaGljc0xheWVyCisgIChwb3NpdGlvbiAwLjAw IDAuMDApCisgIChhbmNob3IgMC41MCAwLjUwKQorICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisg IChvcGFjaXR5IDEuMDApCisgICh1c2luZ1RpbGVkTGF5ZXIgMCkKKyAgKHByZXNlcnZlczNEIDAp CisgIChkcmF3c0NvbnRlbnQgMCkKKyAgKGJhY2tmYWNlVmlzaWJpbGl0eSB2aXNpYmxlKQorICAo YmFja2dyb3VuZENvbG9yIG5vbmUpCisgICh0cmFuc2Zvcm0gaWRlbnRpdHkpCisgIChjaGlsZHJl biAxCisgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgIChwb3NpdGlvbiAwLjAwIDAuMDApCisgICAg ICAoYW5jaG9yIDAuNTAgMC41MCkKKyAgICAgIChib3VuZHMgODAwLjAwIDYwMC4wMCkKKyAgICAg IChvcGFjaXR5IDEuMDApCisgICAgICAodXNpbmdUaWxlZExheWVyIDApCisgICAgICAocHJlc2Vy dmVzM0QgMCkKKyAgICAgIChkcmF3c0NvbnRlbnQgMCkKKyAgICAgIChiYWNrZmFjZVZpc2liaWxp dHkgdmlzaWJsZSkKKyAgICAgIChiYWNrZ3JvdW5kQ29sb3Igbm9uZSkKKyAgICAgICh0cmFuc2Zv cm0gaWRlbnRpdHkpCisgICAgICAoY2hpbGRyZW5UcmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAo Y2hpbGRyZW4gMworICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgIChwb3NpdGlvbiAx MC4wMCAxMC4wMCkKKyAgICAgICAgICAoYW5jaG9yIDAuNTAgMC41MCkKKyAgICAgICAgICAoYm91 bmRzIDEyMC4wMCAxMjAuMDApCisgICAgICAgICAgKG9wYWNpdHkgMS4wMCkKKyAgICAgICAgICAo dXNpbmdUaWxlZExheWVyIDApCisgICAgICAgICAgKHByZXNlcnZlczNEIDApCisgICAgICAgICAg KGRyYXdzQ29udGVudCAxKQorICAgICAgICAgIChiYWNrZmFjZVZpc2liaWxpdHkgdmlzaWJsZSkK KyAgICAgICAgICAoYmFja2dyb3VuZENvbG9yIG5vbmUpCisgICAgICAgICAgKHRyYW5zZm9ybSBp ZGVudGl0eSkKKyAgICAgICAgICAoY2hpbGRyZW5UcmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAg ICkKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAocG9zaXRpb24gMjIwLjAwIDIw LjAwKQorICAgICAgICAgIChhbmNob3IgMC41MCAwLjUwKQorICAgICAgICAgIChib3VuZHMgMTAw LjAwIDEwMC4wMCkKKyAgICAgICAgICAob3BhY2l0eSAxLjAwKQorICAgICAgICAgICh1c2luZ1Rp bGVkTGF5ZXIgMCkKKyAgICAgICAgICAocHJlc2VydmVzM0QgMCkKKyAgICAgICAgICAoZHJhd3ND b250ZW50IDEpCisgICAgICAgICAgKGJhY2tmYWNlVmlzaWJpbGl0eSB2aXNpYmxlKQorICAgICAg ICAgIChiYWNrZ3JvdW5kQ29sb3Igbm9uZSkKKyAgICAgICAgICAodHJhbnNmb3JtIGlkZW50aXR5 KQorICAgICAgICAgIChjaGlsZHJlblRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgKQorICAg ICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgIChwb3NpdGlvbiAyMTUuMDAgMTUuMDApCisg ICAgICAgICAgKGFuY2hvciAwLjUwIDAuNTApCisgICAgICAgICAgKGJvdW5kcyAxMTAuMDAgMTEw LjAwKQorICAgICAgICAgIChvcGFjaXR5IDEuMDApCisgICAgICAgICAgKHVzaW5nVGlsZWRMYXll ciAwKQorICAgICAgICAgIChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAgIChkcmF3c0NvbnRlbnQg MCkKKyAgICAgICAgICAoYmFja2ZhY2VWaXNpYmlsaXR5IHZpc2libGUpCisgICAgICAgICAgKGJh Y2tncm91bmRDb2xvciBub25lKQorICAgICAgICAgICh0cmFuc2Zvcm0gaWRlbnRpdHkpCisgICAg ICAgICAgKGNoaWxkcmVuVHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgIChjaGlsZHJlbiAx CisgICAgICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgICAgICAocG9zaXRpb24gLTUu MDAgLTUuMDApCisgICAgICAgICAgICAgIChhbmNob3IgMC41MCAwLjUwKQorICAgICAgICAgICAg ICAoYm91bmRzIDEyMC4wMCAxMjAuMDApCisgICAgICAgICAgICAgIChvcGFjaXR5IDEuMDApCisg ICAgICAgICAgICAgICh1c2luZ1RpbGVkTGF5ZXIgMCkKKyAgICAgICAgICAgICAgKHByZXNlcnZl czNEIDApCisgICAgICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAgICAgKGJh Y2tmYWNlVmlzaWJpbGl0eSB2aXNpYmxlKQorICAgICAgICAgICAgICAoYmFja2dyb3VuZENvbG9y IG5vbmUpCisgICAgICAgICAgICAgICh0cmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAgICAgICAg IChjaGlsZHJlblRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAgICkKKyAgICAgICAgICAp CisgICAgICAgICkKKyAgICAgICkKKyAgICApCisgICkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvY29tcG9zaXRpbmcvZ2VvbWV0cnkvY2xpcC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9z aXRpbmcvZ2VvbWV0cnkvY2xpcC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFmMDAwMzAyZmVlZGUzNmM2MGI5 Nzg3MjljNmUxYWUzNTc3NzMyOTEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21w b3NpdGluZy9nZW9tZXRyeS9jbGlwLmh0bWwKQEAgLTAsMCArMSw2OCBAQAorPCFET0NUWVBFIGh0 bWw+CisKKzxodG1sPgorPGhlYWQ+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNj cmVlbiI+CisgICAgCisgICAgLmJveCB7CisgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAg ICB3aWR0aDogMTAwcHg7CisgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgdG9wOiAyMHB4Owor ICAgICAgbGVmdDogMjBweDsKKyAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyYXk7CisgICAgICBj bGlwOiByZWN0KC01cHgsIDEwNXB4LCAxMDVweCwgLTVweCk7CisgICAgfQorICAgIAorICAgIC5p bm5lciB7CisgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgICB3aWR0aDogMTIwcHg7Cisg ICAgICBoZWlnaHQ6IDEyMHB4OworICAgICAgdG9wOiAtMTBweDsKKyAgICAgIGxlZnQ6IC0xMHB4 OworICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgwLCAwLCAwLCAwLjIpOworICAgIH0KKyAg ICAKKyAgICAuY29tcG9zaXRlZCB7CisgICAgICAtd2Via2l0LXRyYW5zZm9ybTogdHJhbnNsYXRl WigwKTsKKyAgICB9CisgICAgCisgICAgcCB7CisgICAgICBtYXJnaW4tdG9wOiAxNDBweDsKKyAg ICB9CisgIDwvc3R5bGU+CisgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBjaGFyc2V0 PSJ1dGYtOCI+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KKyAgICAgIAorICAgIGZ1bmN0aW9uIGRvVGVz dCgpIHsKKyAgICAgIHdpbmRvdy5zZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICBpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ2xheWVycycpLmlubmVyVGV4dCA9IGxheW91dFRlc3RDb250cm9sbGVyLmxheWVy VHJlZUFzVGV4dCgpOworICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUo KTsKKyAgICAgICAgfQorICAgICAgfSwgMCk7CisgICAgfQorICAgIHdpbmRvdy5hZGRFdmVudExp c3RlbmVyKCdsb2FkJywgZG9UZXN0LCBmYWxzZSk7CisgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJv ZHk+CisKKyAgPGRpdiBjbGFzcz0iY29tcG9zaXRlZCBib3giPgorICAgIDxkaXYgY2xhc3M9Imlu bmVyIj4KKyAgICA8L2Rpdj4KKyAgPC9kaXY+CisKKyAgPGRpdiBjbGFzcz0iYm94IiBzdHlsZT0i bGVmdDogMjIwcHg7Ij4KKyAgICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIGlubmVyIj4KKyAgICA8 L2Rpdj4KKyAgPC9kaXY+CisgIAorICA8cD5UZXN0IENTUyBjbGlwIHdpdGggY29tcG9zaXRlZCBs YXllcnMuIExlZnQgYW5kIHJpZ2h0IHNpZGVzIHNob3VsZCBsb29rIHRoZSBzYW1lLjwvcD4KKzxw cmUgaWQ9ImxheWVycyI+CisgIEluIERSVCwgbGF5ZXIgdHJlZSBnb2VzIGhlcmUuCis8L3ByZT4K KzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL292 ZXJmbG93L2NsaXAtZGVzY2VuZGVudHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY29tcG9z aXRpbmcvb3ZlcmZsb3cvY2xpcC1kZXNjZW5kZW50cy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u NDk1OTlhNjYzNjk1NTcwYTQyYTk3ZDM4MmJlNGM1NGY0MDViNmVkYgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL292ZXJmbG93L2NsaXAtZGVzY2VuZGVudHMtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjE1IEBACitUZXN0IG92ZXJmbG93IGNsaXBwaW5nIG9mIGNv bXBvc2l0ZWQgZWxlbWVudHMgaW4gdmFyaW91cyBjb25maWd1cmF0aW9ucy4KKworKEdyYXBoaWNz TGF5ZXIKKyAgKHBvc2l0aW9uIDAuMDAgMC4wMCkKKyAgKGFuY2hvciAwLjUwIDAuNTApCisgIChi b3VuZHMgODAwLjAwIDYwMC4wMCkKKyAgKG9wYWNpdHkgMS4wMCkKKyAgKHVzaW5nVGlsZWRMYXll ciAwKQorICAocHJlc2VydmVzM0QgMCkKKyAgKGRyYXdzQ29udGVudCAwKQorICAoYmFja2ZhY2VW aXNpYmlsaXR5IHZpc2libGUpCisgIChiYWNrZ3JvdW5kQ29sb3Igbm9uZSkKKyAgKHRyYW5zZm9y bSBpZGVudGl0eSkKKyAgKGNoaWxkcmVuIDEKKyAgICAoR3JhcGhpY3NMYXllcgorICAgICAgKHBv c2l0aW9uIDAuMDAgMC4wMCkKKyAgICAgIChhbmNob3IgMC41MCAwLjUwKQorICAgICAgKGJvdW5k cyA4MDAuMDAgNjAwLjAwKQorICAgICAgKG9wYWNpdHkgMS4wMCkKKyAgICAgICh1c2luZ1RpbGVk TGF5ZXIgMCkKKyAgICAgIChwcmVzZXJ2ZXMzRCAwKQorICAgICAgKGRyYXdzQ29udGVudCAwKQor ICAgICAgKGJhY2tmYWNlVmlzaWJpbGl0eSB2aXNpYmxlKQorICAgICAgKGJhY2tncm91bmRDb2xv ciBub25lKQorICAgICAgKHRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgIChjaGlsZHJlblRyYW5z Zm9ybSBpZGVudGl0eSkKKyAgICAgIChjaGlsZHJlbiA2CisgICAgICAgIChHcmFwaGljc0xheWVy CisgICAgICAgICAgKHBvc2l0aW9uIDQ4LjAwIDY0LjAwKQorICAgICAgICAgIChhbmNob3IgMC41 MCAwLjUwKQorICAgICAgICAgIChib3VuZHMgNjAuMDAgNzAuMDApCisgICAgICAgICAgKG9wYWNp dHkgMS4wMCkKKyAgICAgICAgICAodXNpbmdUaWxlZExheWVyIDApCisgICAgICAgICAgKHByZXNl cnZlczNEIDApCisgICAgICAgICAgKGRyYXdzQ29udGVudCAwKQorICAgICAgICAgIChiYWNrZmFj ZVZpc2liaWxpdHkgdmlzaWJsZSkKKyAgICAgICAgICAoYmFja2dyb3VuZENvbG9yIG5vbmUpCisg ICAgICAgICAgKHRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAoY2hpbGRyZW5UcmFuc2Zv cm0gaWRlbnRpdHkpCisgICAgICAgICAgKGNoaWxkcmVuIDEKKyAgICAgICAgICAgIChHcmFwaGlj c0xheWVyCisgICAgICAgICAgICAgIChwb3NpdGlvbiAyLjAwIDEyLjAwKQorICAgICAgICAgICAg ICAoYW5jaG9yIDAuNTAgMC41MCkKKyAgICAgICAgICAgICAgKGJvdW5kcyAxMDAuMDAgMTUwLjAw KQorICAgICAgICAgICAgICAob3BhY2l0eSAxLjAwKQorICAgICAgICAgICAgICAodXNpbmdUaWxl ZExheWVyIDApCisgICAgICAgICAgICAgIChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAgICAgICAo ZHJhd3NDb250ZW50IDEpCisgICAgICAgICAgICAgIChiYWNrZmFjZVZpc2liaWxpdHkgdmlzaWJs ZSkKKyAgICAgICAgICAgICAgKGJhY2tncm91bmRDb2xvciBub25lKQorICAgICAgICAgICAgICAo dHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgICAgICAoY2hpbGRyZW5UcmFuc2Zvcm0gaWRl bnRpdHkpCisgICAgICAgICAgICApCisgICAgICAgICAgKQorICAgICAgICApCisgICAgICAgIChH cmFwaGljc0xheWVyCisgICAgICAgICAgKHBvc2l0aW9uIDIyMC4wMCA1NC4wMCkKKyAgICAgICAg ICAoYW5jaG9yIDAuNTAgMC41MCkKKyAgICAgICAgICAoYm91bmRzIDE0Mi4wMCAxNDIuMDApCisg ICAgICAgICAgKG9wYWNpdHkgMS4wMCkKKyAgICAgICAgICAodXNpbmdUaWxlZExheWVyIDApCisg ICAgICAgICAgKHByZXNlcnZlczNEIDApCisgICAgICAgICAgKGRyYXdzQ29udGVudCAxKQorICAg ICAgICAgIChiYWNrZmFjZVZpc2liaWxpdHkgdmlzaWJsZSkKKyAgICAgICAgICAoYmFja2dyb3Vu ZENvbG9yIG5vbmUpCisgICAgICAgICAgKHRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAo Y2hpbGRyZW5UcmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAgICkKKyAgICAgICAgKEdyYXBoaWNz TGF5ZXIKKyAgICAgICAgICAocG9zaXRpb24gMjQwLjAwIDY0LjAwKQorICAgICAgICAgIChhbmNo b3IgMC41MCAwLjUwKQorICAgICAgICAgIChib3VuZHMgNjAuMDAgNzAuMDApCisgICAgICAgICAg KG9wYWNpdHkgMS4wMCkKKyAgICAgICAgICAodXNpbmdUaWxlZExheWVyIDApCisgICAgICAgICAg KHByZXNlcnZlczNEIDApCisgICAgICAgICAgKGRyYXdzQ29udGVudCAwKQorICAgICAgICAgIChi YWNrZmFjZVZpc2liaWxpdHkgdmlzaWJsZSkKKyAgICAgICAgICAoYmFja2dyb3VuZENvbG9yIG5v bmUpCisgICAgICAgICAgKHRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAoY2hpbGRyZW5U cmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAgICAgKGNoaWxkcmVuIDEKKyAgICAgICAgICAgIChH cmFwaGljc0xheWVyCisgICAgICAgICAgICAgIChwb3NpdGlvbiAtOS4wMCAxLjAwKQorICAgICAg ICAgICAgICAoYW5jaG9yIDAuNTAgMC41MCkKKyAgICAgICAgICAgICAgKGJvdW5kcyAxMjIuMDAg MTIyLjAwKQorICAgICAgICAgICAgICAob3BhY2l0eSAxLjAwKQorICAgICAgICAgICAgICAodXNp bmdUaWxlZExheWVyIDApCisgICAgICAgICAgICAgIChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAg ICAgICAoZHJhd3NDb250ZW50IDEpCisgICAgICAgICAgICAgIChiYWNrZmFjZVZpc2liaWxpdHkg dmlzaWJsZSkKKyAgICAgICAgICAgICAgKGJhY2tncm91bmRDb2xvciBub25lKQorICAgICAgICAg ICAgICAodHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgICAgICAoY2hpbGRyZW5UcmFuc2Zv cm0gaWRlbnRpdHkpCisgICAgICAgICAgICApCisgICAgICAgICAgKQorICAgICAgICApCisgICAg ICAgIChHcmFwaGljc0xheWVyCisgICAgICAgICAgKHBvc2l0aW9uIDI0MC4wMCA2NC4wMCkKKyAg ICAgICAgICAoYW5jaG9yIDAuNTAgMC41MCkKKyAgICAgICAgICAoYm91bmRzIDYwLjAwIDcwLjAw KQorICAgICAgICAgIChvcGFjaXR5IDEuMDApCisgICAgICAgICAgKHVzaW5nVGlsZWRMYXllciAw KQorICAgICAgICAgIChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAgIChkcmF3c0NvbnRlbnQgMCkK KyAgICAgICAgICAoYmFja2ZhY2VWaXNpYmlsaXR5IHZpc2libGUpCisgICAgICAgICAgKGJhY2tn cm91bmRDb2xvciBub25lKQorICAgICAgICAgICh0cmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAg ICAgKGNoaWxkcmVuVHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgIChjaGlsZHJlbiAxCisg ICAgICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgICAgICAocG9zaXRpb24gMi4wMCAx Mi4wMCkKKyAgICAgICAgICAgICAgKGFuY2hvciAwLjUwIDAuNTApCisgICAgICAgICAgICAgIChi b3VuZHMgMTAwLjAwIDE1MC4wMCkKKyAgICAgICAgICAgICAgKG9wYWNpdHkgMS4wMCkKKyAgICAg ICAgICAgICAgKHVzaW5nVGlsZWRMYXllciAwKQorICAgICAgICAgICAgICAocHJlc2VydmVzM0Qg MCkKKyAgICAgICAgICAgICAgKGRyYXdzQ29udGVudCAxKQorICAgICAgICAgICAgICAoYmFja2Zh Y2VWaXNpYmlsaXR5IHZpc2libGUpCisgICAgICAgICAgICAgIChiYWNrZ3JvdW5kQ29sb3Igbm9u ZSkKKyAgICAgICAgICAgICAgKHRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAgICAgKGNo aWxkcmVuVHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgICAgKQorICAgICAgICAgICkKKyAg ICAgICAgKQorICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgIChwb3NpdGlvbiAyOC4w MCAyMjAuMDApCisgICAgICAgICAgKGFuY2hvciAwLjUwIDAuNTApCisgICAgICAgICAgKGJvdW5k cyAxNDIuMDAgMTQyLjAwKQorICAgICAgICAgIChvcGFjaXR5IDEuMDApCisgICAgICAgICAgKHVz aW5nVGlsZWRMYXllciAwKQorICAgICAgICAgIChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAgIChk cmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAoYmFja2ZhY2VWaXNpYmlsaXR5IHZpc2libGUpCisg ICAgICAgICAgKGJhY2tncm91bmRDb2xvciBub25lKQorICAgICAgICAgICh0cmFuc2Zvcm0gaWRl bnRpdHkpCisgICAgICAgICAgKGNoaWxkcmVuVHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAg IChjaGlsZHJlbiAxCisgICAgICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgICAgICAo cG9zaXRpb24gMjAuMDAgMTAuMDApCisgICAgICAgICAgICAgIChhbmNob3IgMC41MCAwLjUwKQor ICAgICAgICAgICAgICAoYm91bmRzIDYwLjAwIDcwLjAwKQorICAgICAgICAgICAgICAob3BhY2l0 eSAxLjAwKQorICAgICAgICAgICAgICAodXNpbmdUaWxlZExheWVyIDApCisgICAgICAgICAgICAg IChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAgICAgICAoZHJhd3NDb250ZW50IDApCisgICAgICAg ICAgICAgIChiYWNrZmFjZVZpc2liaWxpdHkgdmlzaWJsZSkKKyAgICAgICAgICAgICAgKGJhY2tn cm91bmRDb2xvciBub25lKQorICAgICAgICAgICAgICAodHJhbnNmb3JtIGlkZW50aXR5KQorICAg ICAgICAgICAgICAoY2hpbGRyZW5UcmFuc2Zvcm0gaWRlbnRpdHkpCisgICAgICAgICAgICAgIChj aGlsZHJlbiAxCisgICAgICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAgICAg ICAgIChwb3NpdGlvbiAyLjAwIDEyLjAwKQorICAgICAgICAgICAgICAgICAgKGFuY2hvciAwLjUw IDAuNTApCisgICAgICAgICAgICAgICAgICAoYm91bmRzIDEwMC4wMCAxNTAuMDApCisgICAgICAg ICAgICAgICAgICAob3BhY2l0eSAxLjAwKQorICAgICAgICAgICAgICAgICAgKHVzaW5nVGlsZWRM YXllciAwKQorICAgICAgICAgICAgICAgICAgKHByZXNlcnZlczNEIDApCisgICAgICAgICAgICAg ICAgICAoZHJhd3NDb250ZW50IDEpCisgICAgICAgICAgICAgICAgICAoYmFja2ZhY2VWaXNpYmls aXR5IHZpc2libGUpCisgICAgICAgICAgICAgICAgICAoYmFja2dyb3VuZENvbG9yIG5vbmUpCisg ICAgICAgICAgICAgICAgICAodHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgICAgICAgICAg KGNoaWxkcmVuVHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICAgKQorICAgICAgICAgICAgKQorICAgICAgICAgICkKKyAgICAgICAgKQorICAgICAgICAo R3JhcGhpY3NMYXllcgorICAgICAgICAgIChwb3NpdGlvbiAyMjAuMDAgMjIwLjAwKQorICAgICAg ICAgIChhbmNob3IgMC41MCAwLjUwKQorICAgICAgICAgIChib3VuZHMgMTQyLjAwIDE0Mi4wMCkK KyAgICAgICAgICAob3BhY2l0eSAxLjAwKQorICAgICAgICAgICh1c2luZ1RpbGVkTGF5ZXIgMCkK KyAgICAgICAgICAocHJlc2VydmVzM0QgMCkKKyAgICAgICAgICAoZHJhd3NDb250ZW50IDEpCisg ICAgICAgICAgKGJhY2tmYWNlVmlzaWJpbGl0eSB2aXNpYmxlKQorICAgICAgICAgIChiYWNrZ3Jv dW5kQ29sb3Igbm9uZSkKKyAgICAgICAgICAodHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAg IChjaGlsZHJlblRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAoY2hpbGRyZW4gMQorICAg ICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAgICAgKHBvc2l0aW9uIDIwLjAwIDEw LjAwKQorICAgICAgICAgICAgICAoYW5jaG9yIDAuNTAgMC41MCkKKyAgICAgICAgICAgICAgKGJv dW5kcyA2MC4wMCA3MC4wMCkKKyAgICAgICAgICAgICAgKG9wYWNpdHkgMS4wMCkKKyAgICAgICAg ICAgICAgKHVzaW5nVGlsZWRMYXllciAwKQorICAgICAgICAgICAgICAocHJlc2VydmVzM0QgMCkK KyAgICAgICAgICAgICAgKGRyYXdzQ29udGVudCAwKQorICAgICAgICAgICAgICAoYmFja2ZhY2VW aXNpYmlsaXR5IHZpc2libGUpCisgICAgICAgICAgICAgIChiYWNrZ3JvdW5kQ29sb3Igbm9uZSkK KyAgICAgICAgICAgICAgKHRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAgICAgKGNoaWxk cmVuVHJhbnNmb3JtIGlkZW50aXR5KQorICAgICAgICAgICAgICAoY2hpbGRyZW4gMQorICAgICAg ICAgICAgICAgIChHcmFwaGljc0xheWVyCisgICAgICAgICAgICAgICAgICAocG9zaXRpb24gMi4w MCAxMi4wMCkKKyAgICAgICAgICAgICAgICAgIChhbmNob3IgMC41MCAwLjUwKQorICAgICAgICAg ICAgICAgICAgKGJvdW5kcyAxMDAuMDAgMTUwLjAwKQorICAgICAgICAgICAgICAgICAgKG9wYWNp dHkgMS4wMCkKKyAgICAgICAgICAgICAgICAgICh1c2luZ1RpbGVkTGF5ZXIgMCkKKyAgICAgICAg ICAgICAgICAgIChwcmVzZXJ2ZXMzRCAwKQorICAgICAgICAgICAgICAgICAgKGRyYXdzQ29udGVu dCAxKQorICAgICAgICAgICAgICAgICAgKGJhY2tmYWNlVmlzaWJpbGl0eSB2aXNpYmxlKQorICAg ICAgICAgICAgICAgICAgKGJhY2tncm91bmRDb2xvciBub25lKQorICAgICAgICAgICAgICAgICAg KHRyYW5zZm9ybSBpZGVudGl0eSkKKyAgICAgICAgICAgICAgICAgIChjaGlsZHJlblRyYW5zZm9y bSBpZGVudGl0eSkKKyAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICkKKyAgICAgICAgICApCisgICAgICAgICkKKyAgICAgICkKKyAgICApCisgICkKKykKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvb3ZlcmZsb3cvY2xpcC1kZXNjZW5k ZW50cy5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvb3ZlcmZsb3cvY2xpcC1kZXNjZW5k ZW50cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFjMTk3MGI4ZDgxMWVhODJkN2Q0ZjA3NWQ3MzczOTJjYjA4 YzU2NzQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9vdmVyZmxv dy9jbGlwLWRlc2NlbmRlbnRzLmh0bWwKQEAgLTAsMCArMSw4NyBAQAorPCFET0NUWVBFIGh0bWw+ CisKKzxodG1sPgorPGhlYWQ+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNjcmVl biI+CisgICAgLmNvbnRhaW5lciB7CisgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICBt YXJnaW46IDIwcHg7CisgICAgICB3aWR0aDogMTIwcHg7CisgICAgICBoZWlnaHQ6IDEyMHB4Owor ICAgICAgcGFkZGluZzogMTBweDsKKyAgICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOworICAg ICAgY2xpcDogcmVjdCgxMHB4LCA4MHB4LCA4MHB4LCAyMHB4KTsKKyAgICB9CisgICAgCisgICAg LmludGVybWVkaWF0ZSB7CisgICAgICB3aWR0aDogMTAwcHg7CisgICAgICBoZWlnaHQ6IDEwMHB4 OworICAgICAgcGFkZGluZzogMTBweDsKKyAgICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsdWU7Cisg ICAgfQorICAgIAorICAgIC5ib3ggeworICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgaGVpZ2h0 OiAxNTBweDsKKyAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyYXk7CisgICAgICAtd2Via2l0LXRy YW5zZm9ybTogdHJhbnNsYXRlWigwKTsKKyAgICB9CisgICAgCisgICAgcHJlIHsKKyAgICAgIG1h cmdpbi10b3A6IDM2MHB4OworICAgIH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKSB7CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Cisg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAgfQorICAgICAg CisgICAgZnVuY3Rpb24gZG9UZXN0KCkgeworICAgICAgd2luZG93LnNldFRpbWVvdXQoZnVuY3Rp b24oKSB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAg ICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbGF5ZXJzJykuaW5uZXJUZXh0ID0gbGF5b3V0 VGVzdENvbnRyb2xsZXIubGF5ZXJUcmVlQXNUZXh0KCk7CisgICAgICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIubm90aWZ5RG9uZSgpOworICAgICAgICB9CisgICAgICB9LCAwKTsKKyAgICB9Cisg ICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBkb1Rlc3QsIGZhbHNlKTsKKyAgPC9z Y3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKworPHA+VGVzdCBvdmVyZmxvdyBjbGlwcGluZyBvZiBj b21wb3NpdGVkIGVsZW1lbnRzIGluIHZhcmlvdXMgY29uZmlndXJhdGlvbnMuPC9wPgorPGRpdiBj bGFzcz0iY29udGFpbmVyIj4KKyAgPGRpdiBjbGFzcz0iaW50ZXJtZWRpYXRlIj4KKyAgICA8ZGl2 IGNsYXNzPSJib3giPgorICAgIDwvZGl2PgorICA8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNz PSJjb250YWluZXIiIHN0eWxlPSJsZWZ0OiAyMDBweDsiPgorICA8ZGl2IGNsYXNzPSJpbnRlcm1l ZGlhdGUiIHN0eWxlPSJwb3NpdGlvbjogYWJzb2x1dGUiPgorICAgIDxkaXYgY2xhc3M9ImJveCI+ CisgICAgPC9kaXY+CisgIDwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9ImNvbnRhaW5lciIg c3R5bGU9InotaW5kZXg6IDA7IHRvcDogMjAwcHg7Ij4KKyAgPGRpdiBjbGFzcz0iaW50ZXJtZWRp YXRlIj4KKyAgICA8ZGl2IGNsYXNzPSJib3giPgorICAgIDwvZGl2PgorICA8L2Rpdj4KKzwvZGl2 PgorCis8ZGl2IGNsYXNzPSJjb250YWluZXIiIHN0eWxlPSJ6LWluZGV4OiAwOyB0b3A6IDIwMHB4 OyBsZWZ0OiAyMDBweDsiPgorICA8ZGl2IGNsYXNzPSJpbnRlcm1lZGlhdGUiIHN0eWxlPSJwb3Np dGlvbjogYWJzb2x1dGU7IHotaW5kZXg6IDA7Ij4KKyAgICA8ZGl2IGNsYXNzPSJib3giPgorICAg IDwvZGl2PgorICA8L2Rpdj4KKzwvZGl2PgorCis8cHJlIGlkPSJsYXllcnMiPgorICBJbiBEUlQs IGxheWVyIHRyZWUgZ29lcyBoZXJlLgorPC9wcmU+CisKKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDliMDUz ZTgyZDBmNDM0OWQ2YjhhNGE5MzU5NGJiNTQyOWE5MGJmNi4uY2NlNmZkY2M3ZDE0YTJmNjdhODNk NDZkZWM0Yjc4Mjk5OGU5ZTk2ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0wNi0xNSAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggY2xpcHBpbmcgdmlhIENTUyBjbGlwOiB3aXRoIGNv bXBvc2l0ZWQgZGVzY2VuZGFudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQwNTc5CisgICAgICAgIAorICAgICAgICBDb25zdWx0IHRoZSAnY2xpcCcg c3R5bGUsIGFzIHdlbGwgYXMgb3ZlcmZsb3csIHdoZW4gY3JlYXRpbmcgY2xpcHBpbmcKKyAgICAg ICAgY29tcG9zaXRpbmcgbGF5ZXJzLgorCisgICAgICAgIFRlc3RzOiBjb21wb3NpdGluZy9nZW9t ZXRyeS9jbGlwLmh0bWwKKyAgICAgICAgICAgICAgIGNvbXBvc2l0aW5nL292ZXJmbG93L2NsaXAt ZGVzY2VuZGVudHMuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjbGlwQm94KTogVXRpbGl0eSBmdW5jdGlvbiB0aGF0 IHJldHVybnMgdGhlIHVuaW9uIG9mIHRoZSBjbGlwIGFuZCBvdmVyZmxvdworICAgICAgICBib3hl cy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NM YXllckdlb21ldHJ5KTogVXNlIGNsaXBCb3goKSB0bworICAgICAgICBnZXQgdGhlIGNvcnJlY3Qg Y2xpcHBpbmcgcmVjdGFuZ2xlLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjplbmNs b3NpbmdOb25TdGFja2luZ0NsaXBwaW5nTGF5ZXIpOiBMb29rIGZvcgorICAgICAgICBjbGlwIGFz IHdlbGwgYXMgb3ZlcmZsb3cuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmNsaXBzQ29tcG9zaXRpbmdEZXNjZW5kYW50cyk6IERpdHRvLgorCiAyMDEwLTA2LTE1ICBa aGVueWFvIE1vICA8em1vQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRy aSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXgg YjU1YTQ3NDZmYTZjNmMyNWE2NGU4MGU2ZDM3YWFmOWQ4YWFjZDI1Zi4uMTk2NjlmY2E1YmViMWY4 YTg1NjlhNDUyZDhjYzc4NmJjNGQ3ZTIxNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuY3BwCkBAIC0yMjcsNiArMjI3LDE4IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5n Ojp1cGRhdGVHcmFwaGljc0xheWVyQ29uZmlndXJhdGlvbigpCiAgICAgcmV0dXJuIGxheWVyQ29u ZmlnQ2hhbmdlZDsKIH0KIAorc3RhdGljIEludFJlY3QgY2xpcEJveChSZW5kZXJCb3gqIHJlbmRl cmVyKQoreworICAgIEludFJlY3QgcmVzdWx0ID0gQ2xpcFJlY3RzOjppbmZpbml0ZVJlY3QoKTsK KyAgICBpZiAocmVuZGVyZXItPmhhc092ZXJmbG93Q2xpcCgpKQorICAgICAgICByZXN1bHQgPSBy ZW5kZXJlci0+b3ZlcmZsb3dDbGlwUmVjdCgwLCAwKTsKKworICAgIGlmIChyZW5kZXJlci0+aGFz Q2xpcCgpKQorICAgICAgICByZXN1bHQuaW50ZXJzZWN0KHJlbmRlcmVyLT5jbGlwUmVjdCgwLCAw KSk7CisKKyAgICByZXR1cm4gcmVzdWx0OworfQorCiB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6 dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KCkKIHsKICAgICAvLyBJZiB3ZSBoYXZlbid0IGJ1 aWx0IHotb3JkZXIgbGlzdHMgeWV0LCB3YWl0IHVudGlsIGxhdGVyLgpAQCAtMjY2LDcgKzI3OCw4 IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVyR2VvbWV0cnko KQogICAgIGlmIChjb21wQW5jZXN0b3IgJiYgY29tcEFuY2VzdG9yLT5iYWNraW5nKCktPmhhc0Ns aXBwaW5nTGF5ZXIoKSkgewogICAgICAgICAvLyBJZiB0aGUgY29tcG9zaXRpbmcgYW5jZXN0b3Ig aGFzIGEgbGF5ZXIgdG8gY2xpcCBjaGlsZHJlbiwgd2UgcGFyZW50IGluIHRoYXQsIGFuZCB0aGVy ZWZvcmUKICAgICAgICAgLy8gcG9zaXRpb24gcmVsYXRpdmUgdG8gaXQuCi0gICAgICAgIGdyYXBo aWNzTGF5ZXJQYXJlbnRMb2NhdGlvbiA9IHRvUmVuZGVyQm94KGNvbXBBbmNlc3Rvci0+cmVuZGVy ZXIoKSktPm92ZXJmbG93Q2xpcFJlY3QoMCwgMCkubG9jYXRpb24oKTsKKyAgICAgICAgSW50UmVj dCBjbGlwcGluZ0JveCA9IGNsaXBCb3godG9SZW5kZXJCb3goY29tcEFuY2VzdG9yLT5yZW5kZXJl cigpKSk7CisgICAgICAgIGdyYXBoaWNzTGF5ZXJQYXJlbnRMb2NhdGlvbiA9IGNsaXBwaW5nQm94 LmxvY2F0aW9uKCk7CiAgICAgfSBlbHNlCiAgICAgICAgIGdyYXBoaWNzTGF5ZXJQYXJlbnRMb2Nh dGlvbiA9IGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMubG9jYXRpb24oKTsKICAgICAKQEAgLTMw Miw3ICszMTUsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhpY3NMYXll ckdlb21ldHJ5KCkKICAgICAvLyBJZiB3ZSBoYXZlIGEgbGF5ZXIgdGhhdCBjbGlwcyBjaGlsZHJl biwgcG9zaXRpb24gaXQuCiAgICAgSW50UmVjdCBjbGlwcGluZ0JveDsKICAgICBpZiAobV9jbGlw cGluZ0xheWVyKSB7Ci0gICAgICAgIGNsaXBwaW5nQm94ID0gdG9SZW5kZXJCb3gocmVuZGVyZXIo KSktPm92ZXJmbG93Q2xpcFJlY3QoMCwgMCk7CisgICAgICAgIGNsaXBwaW5nQm94ID0gY2xpcEJv eCh0b1JlbmRlckJveChyZW5kZXJlcigpKSk7CiAgICAgICAgIG1fY2xpcHBpbmdMYXllci0+c2V0 UG9zaXRpb24oRmxvYXRQb2ludCgpICsgKGNsaXBwaW5nQm94LmxvY2F0aW9uKCkgLSBsb2NhbENv bXBvc2l0aW5nQm91bmRzLmxvY2F0aW9uKCkpKTsKICAgICAgICAgbV9jbGlwcGluZ0xheWVyLT5z ZXRTaXplKGNsaXBwaW5nQm94LnNpemUoKSk7CiAgICAgICAgIG1fY2xpcHBpbmdMYXllci0+c2V0 T2Zmc2V0RnJvbVJlbmRlcmVyKGNsaXBwaW5nQm94LmxvY2F0aW9uKCkgLSBJbnRQb2ludCgpKTsK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAg Yi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDI5YTVk N2QyNjNkMDk5YWE1ZDlmZWQ5Y2I0YWMyNGFmMGZiODBlMmUuLjQ4Y2RhNTJmYTI4MjhkMjZjM2I3 MDQxZDRiNzg5YzkzYjU0ZDU1OWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmNwcApAQCAtNDYzLDcgKzQ2Myw3IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmVuY2xvc2luZ05vblN0YWNraW5nQ2xpcHBpbmdMYXllcihjb25zdCBSZW5k CiAgICAgICAgIGlmIChjdXJyLT5pc1N0YWNraW5nQ29udGV4dCgpKQogICAgICAgICAgICAgcmV0 dXJuIDA7CiAKLSAgICAgICAgaWYgKGN1cnItPnJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xpcCgp KQorICAgICAgICBpZiAoY3Vyci0+cmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dDbGlwKCkgfHwgY3Vy ci0+cmVuZGVyZXIoKS0+aGFzQ2xpcCgpKQogICAgICAgICAgICAgcmV0dXJuIGN1cnI7CiAgICAg fQogICAgIHJldHVybiAwOwpAQCAtMTEzMyw5ICsxMTMzLDggQEAgYm9vbCBSZW5kZXJMYXllckNv bXBvc2l0b3I6OmNsaXBwZWRCeUFuY2VzdG9yKFJlbmRlckxheWVyKiBsYXllcikgY29uc3QKIC8v IGludG8gdGhlIGhpZXJhcmNoeSBiZXR3ZWVuIHRoaXMgbGF5ZXIgYW5kIGl0cyBjaGlsZHJlbiBp biB0aGUgei1vcmRlciBoaWVyYXJjaHkuCiBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2xp cHNDb21wb3NpdGluZ0Rlc2NlbmRhbnRzKGNvbnN0IFJlbmRlckxheWVyKiBsYXllcikgY29uc3QK IHsKLSAgICAvLyBGSVhNRTogbmVlZCB0byBsb29rIGF0IGhhc0NsaXAoKSB0b28gZXZlbnR1YWxs eQogICAgIHJldHVybiBsYXllci0+aGFzQ29tcG9zaXRpbmdEZXNjZW5kYW50KCkgJiYKLSAgICAg ICAgICAgbGF5ZXItPnJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xpcCgpOworICAgICAgICAgICAo bGF5ZXItPnJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xpcCgpIHx8IGxheWVyLT5yZW5kZXJlcigp LT5oYXNDbGlwKCkpOwogfQogCiBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXND b21wb3NpdGluZ0ZvclRyYW5zZm9ybShSZW5kZXJPYmplY3QqIHJlbmRlcmVyKSBjb25zdAo=