115001 2013-04-22 17:04:25 -0700 [CSS Regions][CSS Exclusions] Multiple regions with shape-insides should respect positioned shapes and overflow 2013-05-21 14:04:05 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114526 116252 89256 1 zoltan zoltan commit-queue esprehn+autocc glenn WebkitBugTracker oldest_to_newest 879530 0 zoltan 2013-04-22 17:04:25 -0700 The new behavior should work with shape-inside on regions as well. Details: bug #114526 891334 1 202316 zoltan 2013-05-20 13:47:52 -0700 Created attachment 202316 proposed patch 891982 2 202316 hyatt 2013-05-21 13:34:15 -0700 Comment on attachment 202316 proposed patch r=me 891990 3 202316 zoltan 2013-05-21 13:42:56 -0700 Comment on attachment 202316 proposed patch Thanks for the review! 891997 4 202316 commit-queue 2013-05-21 14:04:02 -0700 Comment on attachment 202316 proposed patch Clearing flags on attachment: 202316 Committed r150478: <http://trac.webkit.org/changeset/150478> 891998 5 commit-queue 2013-05-21 14:04:05 -0700 All reviewed patches have been landed. Closing bug. 202316 2013-05-20 13:47:52 -0700 2013-05-21 14:04:02 -0700 proposed patch multiple_regions_overflow.patch text/plain 15198 zoltan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2YmNmZGE5Li40ODQxYjQzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTMtMDUt MjAgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgW0NTUyBS ZWdpb25zXVtDU1MgRXhjbHVzaW9uc10gTXVsdGlwbGUgcmVnaW9ucyB3aXRoIHNoYXBlLWluc2lk ZXMgc2hvdWxkIHJlc3BlY3QgcG9zaXRpb25lZCBzaGFwZXMgYW5kIG92ZXJmbG93CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUwMDEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiByMTUwMzc1IEkgaW1w bGVtZW50ZWQgdGhlIG5ldyBvdmVyZmxvdyBiZWhhdmlvciBmb3Igc2hhcGUtaW5zaWRlIG9uIHJl Z2lvbnMsIGJ1dCBpdCBjb3ZlcmVkIG9ubHkgdGhlIHNpbXBsZSBjYXNlcworICAgICAgICB3aGVu IHlvdSBoYWQgb25seSBvbmUgcmVnaW9uLiBUaGlzIHBhdGNoIGFkZHMgc3VwcG9ydCBmb3IgdGhl IG5ldyBvdmVyZmxvdyBiZWhhdmlvciBmb3IgbXVsdGlwbGUgcmVnaW9ucyB3aXRoIG11bHRpcGxl CisgICAgICAgIHBvc2l0aW9uZWQgc2hhcGUtaW5zaWRlcyBhbmQgb3ZlcmZsb3cuCisKKyAgICAg ICAgKiBmYXN0L3JlZ2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vbi1yZWdpb25zLWJs b2NrLWNvbnRlbnQtb3ZlcmZsb3ctbXVsdGlwbGUtc2hhcGVzLWV4cGVjdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJl Z2lvbnMtYmxvY2stY29udGVudC1vdmVyZmxvdy1tdWx0aXBsZS1zaGFwZXMuaHRtbDogQWRkZWQu CisgICAgICAgICogZmFzdC9yZWdpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb24tcmVn aW9ucy1pbmxpbmUtY29udGVudC1vdmVyZmxvdy1tdWx0aXBsZS1zaGFwZXMtZXhwZWN0ZWQuaHRt bDogQWRkZWQuCisgICAgICAgICogZmFzdC9yZWdpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNp ZGUtb24tcmVnaW9ucy1pbmxpbmUtY29udGVudC1vdmVyZmxvdy1tdWx0aXBsZS1zaGFwZXMuaHRt bDogQWRkZWQuCisKKzIwMTMtMDUtMjAgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5v cmc+CisKICAgICAgICAgW0NTUyBSZWdpb25zXVtDU1MgRXhjbHVzaW9uc10gc2hhcGUtaW5zaWRl IG9uIHJlZ2lvbnMgc2hvdWxkIHJlc3BlY3QgcG9zaXRpb25lZCBzaGFwZXMgYW5kIG92ZXJmbG93 CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYyNTIK IApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3NoYXBlLWluc2lkZS9zaGFw ZS1pbnNpZGUtb24tcmVnaW9ucy1ibG9jay1jb250ZW50LW92ZXJmbG93LW11bHRpcGxlLXNoYXBl cy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3NoYXBlLWluc2lkZS9z aGFwZS1pbnNpZGUtb24tcmVnaW9ucy1ibG9jay1jb250ZW50LW92ZXJmbG93LW11bHRpcGxlLXNo YXBlcy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNj ZWY5MGIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2hhcGUt aW5zaWRlL3NoYXBlLWluc2lkZS1vbi1yZWdpb25zLWJsb2NrLWNvbnRlbnQtb3ZlcmZsb3ctbXVs dGlwbGUtc2hhcGVzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw0OSBAQAorPCFET0NUWVBFIEhU TUw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgI3BhZ2UgeworICAgICAg ICAgICAgZm9udDogMjBweCBBaGVtLCBzYW5zLXNlcmlmOworICAgICAgICAgICAgbGluZS1oZWln aHQ6IDIwcHg7CisgICAgICAgIH0KKyAgICAgICAgLnJlZ2lvbiB7CisgICAgICAgICAgICB3aWR0 aDogMjAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAgYm9yZGVy OiAycHggc29saWQgZ3JlZW47CisgICAgICAgIH0KKyAgICAgICAgI3JlZ2lvbjIgeyBtYXJnaW4t dG9wOiAxMHB4OyB9CisgICAgICAgICNib3JkZXIxIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBh YnNvbHV0ZTsKKyAgICAgICAgICAgIHRvcDogNThweDsKKyAgICAgICAgICAgIGxlZnQ6IDU4cHg7 CisgICAgICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMHB4Owor ICAgICAgICAgICAgYm9yZGVyOiAycHggc29saWQgYmx1ZTsKKyAgICAgICAgfQorICAgICAgICAj Ym9yZGVyMiB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAgICB0 b3A6IDI3MnB4OworICAgICAgICAgICAgbGVmdDogMzNweDsKKyAgICAgICAgICAgIHdpZHRoOiAx NDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDJw eCBzb2xpZCBibHVlOworICAgICAgICB9CisgICAgICAgICNvdmVyZmxvdyB7CisgICAgICAgICAg ICB3aWR0aDogMjAwcHg7CisgICAgICAgICAgICBtYXJnaW4tbGVmdDogMnB4OworICAgICAgICAg ICAgbWFyZ2luLXRvcDogLTJweDsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8 Ym9keT4KKyAgICA8ZGl2IGlkPSJwYWdlIj4KKyAgICAgICAgPGRpdiBpZD0iYm9yZGVyMSI+WCBY IDxwPlggWCBYIFggWDxwPjwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJyZWdpb24xIiBjbGFzcz0i cmVnaW9uIj48L2Rpdj4KKyAgICAgICAgPGRpdiBpZD0iYm9yZGVyMiI+WDxwPlggWCBYIFg8L3A+ PHA+WCBYIFggWDwvcD48L2Rpdj4KKyAgICAgICAgPGRpdiBpZD0icmVnaW9uMiIgY2xhc3M9InJl Z2lvbiI+PC9kaXY+CisgICAgICAgIDxkaXYgaWQ9Im92ZXJmbG93Ij5YIFggWCBYIFggWCBYPC9k aXY+CisgICAgPC9kaXY+CisgICAgPHAgc3R5bGU9Im1hcmdpbi10b3A6IDEycHg7Ij5SZXF1aXJl cyBBaGVtIGZvbnQuIFRoZXJlIGFyZSB0d28gcmVnaW9ucyB3aXRoIHR3byByYWN0YW5nbGUgc2hh cGUtaW5zaWRlcywgdGhlIHNoYXBlLWluc2lkZXMgYXJlIHNtYWxsZXIgYW5kIGhhdmUgdG9wIGFu ZCBsZWZ0IG9mZnNldHMgaW5zaWRlIHRoZSBjb250ZW50IGJveC4gVGhlIHJlY3Rhbmd1bGFyIHNo YXBlcyBib3VuZGFyaWVzIGFyZSByZXByZXNlbnRlZCBieSB0aGUgYmx1ZSByZWN0YW5nbGVzLiBU aGUgYmxvY2sgY29udGVudCBzaG91bGQgZmxvdyBpbnNpZGUgdGhlIGJsdWUgcmFjdGFuZ2xlcywg dGhlIG92ZXJmbG93IHNob3VsZCBiZSBwdXNoZWQgZG93biBiZWxvdyB0aGUgbGFzdCByZWdpb24n cyBjb250ZW50IGJveC48L3A+CisgICAgPHA+QnVnIDxhIGhyZWY9Imh0dHA6Ly93ZWJraXQub3Jn L2IvMTE2MjUyIj4xMTYyNTI8L2E+IFtDU1MgUmVnaW9uc11bQ1NTIEV4Y2x1c2lvbnNdIHNoYXBl LWluc2lkZSBvbiByZWdpb25zIHNob3VsZCByZXNwZWN0IHBvc2l0aW9uZWQgc2hhcGVzIGFuZCBv dmVyZmxvdzwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvcmVnaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtYmxvY2stY29u dGVudC1vdmVyZmxvdy1tdWx0aXBsZS1zaGFwZXMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvcmVn aW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtYmxvY2stY29udGVudC1v dmVyZmxvdy1tdWx0aXBsZS1zaGFwZXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi4zNmQ5NTNmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdp b25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb24tcmVnaW9ucy1ibG9jay1jb250ZW50LW92 ZXJmbG93LW11bHRpcGxlLXNoYXBlcy5odG1sCkBAIC0wLDAgKzEsNTcgQEAKKzwhRE9DVFlQRSBI VE1MPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAod2luZG93Lmlu dGVybmFscykKKyAgICAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0Q1NTRXhj bHVzaW9uc0VuYWJsZWQodHJ1ZSk7CisgICAgPC9zY3JpcHQ+CisgICAgPHN0eWxlPgorICAgICAg ICAjcmVjdGFuZ2xlIHsKKyAgICAgICAgICAgIGZvbnQ6IDIwcHggQWhlbSwgc2Fucy1zZXJpZjsK KyAgICAgICAgICAgIGxpbmUtaGVpZ2h0OiAyMHB4OworICAgICAgICAgICAgLXdlYmtpdC1mbG93 LWludG86IGZsb3c7CisgICAgICAgIH0KKyAgICAgICAgLnJlZ2lvbiB7CisgICAgICAgICAgICAt d2Via2l0LWZsb3ctZnJvbTogZmxvdzsKKyAgICAgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAg ICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDJweCBzb2xpZCBncmVl bjsKKyAgICAgICAgfQorICAgICAgICAjcmVnaW9uMSB7IC13ZWJraXQtc2hhcGUtaW5zaWRlOiBy ZWN0YW5nbGUoNTBweCwgNTBweCwgMTAwcHgsIDEwMHB4KTsgfQorICAgICAgICAjcmVnaW9uMiB7 CisgICAgICAgICAgICBtYXJnaW4tdG9wOiAxMHB4OworICAgICAgICAgICAgLXdlYmtpdC1zaGFw ZS1pbnNpZGU6IHJlY3RhbmdsZSgyNXB4LCA1MHB4LCAxNTBweCwgMTAwcHgpOworICAgICAgICB9 CisgICAgICAgICNib3JkZXIxIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAg ICAgICAgICAgIHRvcDogNThweDsKKyAgICAgICAgICAgIGxlZnQ6IDU4cHg7CisgICAgICAgICAg ICB3aWR0aDogMTAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICAgICAg Ym9yZGVyOiAycHggc29saWQgYmx1ZTsKKyAgICAgICAgfQorICAgICAgICAjYm9yZGVyMiB7Cisg ICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAgICB0b3A6IDI3MnB4Owor ICAgICAgICAgICAgbGVmdDogMzNweDsKKyAgICAgICAgICAgIHdpZHRoOiAxNDBweDsKKyAgICAg ICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDJweCBzb2xpZCBibHVl OworICAgICAgICB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgaWQ9 InJlY3RhbmdsZSI+CisgICAgICAgWCBYIDxwPlggWCBYIFggWDxwPiBYPC9wPjwvcD4gWCBYIFgg WDxwPiBYIFggWCBYIFggWCBYIFggWCBYIFgKKyAgICA8L2Rpdj4KKworICAgIDxkaXYgaWQ9InBh Z2UiPgorICAgICAgICA8ZGl2IGlkPSJib3JkZXIxIj48L2Rpdj4KKyAgICAgICAgPGRpdiBpZD0i cmVnaW9uMSIgY2xhc3M9InJlZ2lvbiI+PC9kaXY+CisgICAgICAgIDxkaXYgaWQ9ImJvcmRlcjIi PjwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJyZWdpb24yIiBjbGFzcz0icmVnaW9uIj48L2Rpdj4K KyAgICA8L2Rpdj4KKyAgICA8cCBzdHlsZT0ibWFyZ2luLXRvcDogNTBweDsiPlJlcXVpcmVzIEFo ZW0gZm9udC4gVGhlcmUgYXJlIHR3byByZWdpb25zIHdpdGggdHdvIHJhY3RhbmdsZSBzaGFwZS1p bnNpZGVzLCB0aGUgc2hhcGUtaW5zaWRlcyBhcmUgc21hbGxlciBhbmQgaGF2ZSB0b3AgYW5kIGxl ZnQgb2Zmc2V0cyBpbnNpZGUgdGhlIGNvbnRlbnQgYm94LiBUaGUgcmVjdGFuZ3VsYXIgc2hhcGVz IGJvdW5kYXJpZXMgYXJlIHJlcHJlc2VudGVkIGJ5IHRoZSBibHVlIHJlY3RhbmdsZXMuIFRoZSBi bG9jayBjb250ZW50IHNob3VsZCBmbG93IGluc2lkZSB0aGUgYmx1ZSByYWN0YW5nbGVzLCB0aGUg b3ZlcmZsb3cgc2hvdWxkIGJlIHB1c2hlZCBkb3duIGJlbG93IHRoZSBsYXN0IHJlZ2lvbidzIGNv bnRlbnQgYm94LjwvcD4KKyAgICA8cD5CdWcgPGEgaHJlZj0iaHR0cDovL3dlYmtpdC5vcmcvYi8x MTYyNTIiPjExNjI1MjwvYT4gW0NTUyBSZWdpb25zXVtDU1MgRXhjbHVzaW9uc10gc2hhcGUtaW5z aWRlIG9uIHJlZ2lvbnMgc2hvdWxkIHJlc3BlY3QgcG9zaXRpb25lZCBzaGFwZXMgYW5kIG92ZXJm bG93PC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9y ZWdpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb24tcmVnaW9ucy1pbmxpbmUtY29udGVu dC1vdmVyZmxvdy1tdWx0aXBsZS1zaGFwZXMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zh c3QvcmVnaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtaW5saW5lLWNv bnRlbnQtb3ZlcmZsb3ctbXVsdGlwbGUtc2hhcGVzLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTgzOThlNgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvcmVnaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMt aW5saW5lLWNvbnRlbnQtb3ZlcmZsb3ctbXVsdGlwbGUtc2hhcGVzLWV4cGVjdGVkLmh0bWwKQEAg LTAsMCArMSw0OSBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHls ZT4KKyAgICAgICAgI3BhZ2UgeworICAgICAgICAgICAgZm9udDogMjBweCBBaGVtLCBzYW5zLXNl cmlmOworICAgICAgICAgICAgbGluZS1oZWlnaHQ6IDIwcHg7CisgICAgICAgIH0KKyAgICAgICAg LnJlZ2lvbiB7CisgICAgICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6 IDIwMHB4OworICAgICAgICAgICAgYm9yZGVyOiAycHggc29saWQgZ3JlZW47CisgICAgICAgIH0K KyAgICAgICAgI3JlZ2lvbjIgeyBtYXJnaW4tdG9wOiAxMHB4OyB9CisgICAgICAgICNib3JkZXIx IHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHRvcDogNThw eDsKKyAgICAgICAgICAgIGxlZnQ6IDU4cHg7CisgICAgICAgICAgICB3aWR0aDogMTAwcHg7Cisg ICAgICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICAgICAgYm9yZGVyOiAycHggc29saWQg Ymx1ZTsKKyAgICAgICAgfQorICAgICAgICAjYm9yZGVyMiB7CisgICAgICAgICAgICBwb3NpdGlv bjogYWJzb2x1dGU7CisgICAgICAgICAgICB0b3A6IDI3MnB4OworICAgICAgICAgICAgbGVmdDog MzNweDsKKyAgICAgICAgICAgIHdpZHRoOiAxNDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMTAw cHg7CisgICAgICAgICAgICBib3JkZXI6IDJweCBzb2xpZCBibHVlOworICAgICAgICB9CisgICAg ICAgICNvdmVyZmxvdyB7CisgICAgICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgICAgICBt YXJnaW4tbGVmdDogMnB4OworICAgICAgICAgICAgbWFyZ2luLXRvcDogLTJweDsKKyAgICAgICAg fQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPSJwYWdlIj4KKyAg ICAgICAgPGRpdiBpZD0iYm9yZGVyMSI+WCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFg8L2Rp dj4KKyAgICAgICAgPGRpdiBpZD0icmVnaW9uMSIgY2xhc3M9InJlZ2lvbiI+PC9kaXY+CisgICAg ICAgIDxkaXYgaWQ9ImJvcmRlcjIiPlggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBY IFggWDwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJyZWdpb24yIiBjbGFzcz0icmVnaW9uIj48L2Rp dj4KKyAgICAgICAgPGRpdiBpZD0ib3ZlcmZsb3ciPlggWCBYIFggWCBYIFg8L2Rpdj4KKyAgICA8 L2Rpdj4KKyAgICA8cCBzdHlsZT0ibWFyZ2luLXRvcDogMTJweDsiPlJlcXVpcmVzIEFoZW0gZm9u dC4gVGhlcmUgYXJlIHR3byByZWdpb25zIHdpdGggdHdvIHJhY3RhbmdsZSBzaGFwZS1pbnNpZGVz LCB0aGUgc2hhcGUtaW5zaWRlcyBhcmUgc21hbGxlciBhbmQgaGF2ZSB0b3AgYW5kIGxlZnQgb2Zm c2V0cyBpbnNpZGUgdGhlIGNvbnRlbnQgYm94LiBUaGUgcmVjdGFuZ3VsYXIgc2hhcGVzIGJvdW5k YXJpZXMgYXJlIHJlcHJlc2VudGVkIGJ5IHRoZSBibHVlIHJlY3RhbmdsZXMuIFRoZSBpbmxpbmUg Y29udGVudCBzaG91bGQgZmxvdyBpbnNpZGUgdGhlIGJsdWUgcmFjdGFuZ2xlcywgdGhlIG92ZXJm bG93IHNob3VsZCBiZSBwdXNoZWQgZG93biBiZWxvdyB0aGUgbGFzdCByZWdpb24ncyBjb250ZW50 IGJveDwvcD4KKyAgICA8cD5CdWcgPGEgaHJlZj0iaHR0cDovL3dlYmtpdC5vcmcvYi8xMTYyNTIi PjExNjI1MjwvYT4gW0NTUyBSZWdpb25zXVtDU1MgRXhjbHVzaW9uc10gc2hhcGUtaW5zaWRlIG9u IHJlZ2lvbnMgc2hvdWxkIHJlc3BlY3QgcG9zaXRpb25lZCBzaGFwZXMgYW5kIG92ZXJmbG93PC9w PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25z L3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb24tcmVnaW9ucy1pbmxpbmUtY29udGVudC1vdmVy Zmxvdy1tdWx0aXBsZS1zaGFwZXMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zaGFw ZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtaW5saW5lLWNvbnRlbnQtb3ZlcmZsb3ct bXVsdGlwbGUtc2hhcGVzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4u ZjM2MWY5NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zaGFw ZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtaW5saW5lLWNvbnRlbnQtb3ZlcmZsb3ct bXVsdGlwbGUtc2hhcGVzLmh0bWwKQEAgLTAsMCArMSw1NyBAQAorPCFET0NUWVBFIEhUTUw+Cis8 aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQ+CisgICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxz KQorICAgICAgICAgICAgd2luZG93LmludGVybmFscy5zZXR0aW5ncy5zZXRDU1NFeGNsdXNpb25z RW5hYmxlZCh0cnVlKTsKKyAgICA8L3NjcmlwdD4KKyAgICA8c3R5bGU+CisgICAgICAgICNyZWN0 YW5nbGUgeworICAgICAgICAgICAgZm9udDogMjBweCBBaGVtLCBzYW5zLXNlcmlmOworICAgICAg ICAgICAgbGluZS1oZWlnaHQ6IDIwcHg7CisgICAgICAgICAgICAtd2Via2l0LWZsb3ctaW50bzog ZmxvdzsKKyAgICAgICAgfQorICAgICAgICAucmVnaW9uIHsKKyAgICAgICAgICAgIC13ZWJraXQt Zmxvdy1mcm9tOiBmbG93OworICAgICAgICAgICAgd2lkdGg6IDIwMHB4OworICAgICAgICAgICAg aGVpZ2h0OiAyMDBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMnB4IHNvbGlkIGdyZWVuOworICAg ICAgICB9CisgICAgICAgICNyZWdpb24xIHsgLXdlYmtpdC1zaGFwZS1pbnNpZGU6IHJlY3Rhbmds ZSg1MHB4LCA1MHB4LCAxMDBweCwgMTAwcHgpOyB9CisgICAgICAgICNyZWdpb24yIHsKKyAgICAg ICAgICAgIG1hcmdpbi10b3A6IDEwcHg7CisgICAgICAgICAgICAtd2Via2l0LXNoYXBlLWluc2lk ZTogcmVjdGFuZ2xlKDI1cHgsIDUwcHgsIDE0MHB4LCAxMDBweCk7CisgICAgICAgIH0KKyAgICAg ICAgI2JvcmRlcjEgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAg ICAgdG9wOiA1OHB4OworICAgICAgICAgICAgbGVmdDogNThweDsKKyAgICAgICAgICAgIHdpZHRo OiAxMDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgICBib3JkZXI6 IDJweCBzb2xpZCBibHVlOworICAgICAgICB9CisgICAgICAgICNib3JkZXIyIHsKKyAgICAgICAg ICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHRvcDogMjcycHg7CisgICAgICAg ICAgICBsZWZ0OiAzM3B4OworICAgICAgICAgICAgd2lkdGg6IDE0MHB4OworICAgICAgICAgICAg aGVpZ2h0OiAxMDBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMnB4IHNvbGlkIGJsdWU7CisgICAg ICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBpZD0icmVjdGFu Z2xlIj4KKyAgICAgICBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBY IFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWAorICAgIDwvZGl2PgorCisg ICAgPGRpdiBpZD0icGFnZSI+CisgICAgICAgIDxkaXYgaWQ9ImJvcmRlcjEiPjwvZGl2PgorICAg ICAgICA8ZGl2IGlkPSJyZWdpb24xIiBjbGFzcz0icmVnaW9uIj48L2Rpdj4KKyAgICAgICAgPGRp diBpZD0iYm9yZGVyMiI+PC9kaXY+CisgICAgICAgIDxkaXYgaWQ9InJlZ2lvbjIiIGNsYXNzPSJy ZWdpb24iPjwvZGl2PgorICAgIDwvZGl2PgorICAgIDxwIHN0eWxlPSJtYXJnaW4tdG9wOiA1MHB4 OyI+UmVxdWlyZXMgQWhlbSBmb250LiBUaGVyZSBhcmUgdHdvIHJlZ2lvbnMgd2l0aCB0d28gcmFj dGFuZ2xlIHNoYXBlLWluc2lkZXMsIHRoZSBzaGFwZS1pbnNpZGVzIGFyZSBzbWFsbGVyIGFuZCBo YXZlIHRvcCBhbmQgbGVmdCBvZmZzZXRzIGluc2lkZSB0aGUgY29udGVudCBib3guIFRoZSByZWN0 YW5ndWxhciBzaGFwZXMgYm91bmRhcmllcyBhcmUgcmVwcmVzZW50ZWQgYnkgdGhlIGJsdWUgcmVj dGFuZ2xlcy4gVGhlIGlubGluZSBjb250ZW50IHNob3VsZCBmbG93IGluc2lkZSB0aGUgYmx1ZSBy YWN0YW5nbGVzLCB0aGUgb3ZlcmZsb3cgc2hvdWxkIGJlIHB1c2hlZCBkb3duIGJlbG93IHRoZSBs YXN0IHJlZ2lvbidzIGNvbnRlbnQgYm94PC9wPgorICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwOi8v d2Via2l0Lm9yZy9iLzExNjI1MiI+MTE2MjUyPC9hPiBbQ1NTIFJlZ2lvbnNdW0NTUyBFeGNsdXNp b25zXSBzaGFwZS1pbnNpZGUgb24gcmVnaW9ucyBzaG91bGQgcmVzcGVjdCBwb3NpdGlvbmVkIHNo YXBlcyBhbmQgb3ZlcmZsb3c8L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWM1 NGU5NS4uZDNhNjk4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEzLTA1LTIwICBa b2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgogCisgICAgICAgIFtDU1MgUmVnaW9u c11bQ1NTIEV4Y2x1c2lvbnNdIE11bHRpcGxlIHJlZ2lvbnMgd2l0aCBzaGFwZS1pbnNpZGVzIHNo b3VsZCByZXNwZWN0IHBvc2l0aW9uZWQgc2hhcGVzIGFuZCBvdmVyZmxvdworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1MDAxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gcjE1MDM3NSBJIGltcGxlbWVu dGVkIHRoZSBuZXcgb3ZlcmZsb3cgYmVoYXZpb3IgZm9yIHNoYXBlLWluc2lkZSBvbiByZWdpb25z LCBidXQgaXQgY292ZXJlZCBvbmx5IHRoZSBzaW1wbGUgY2FzZXMKKyAgICAgICAgd2hlbiB5b3Ug aGFkIG9ubHkgb25lIHJlZ2lvbi4gVGhpcyBwYXRjaCBhZGRzIHN1cHBvcnQgZm9yIHRoZSBuZXcg b3ZlcmZsb3cgYmVoYXZpb3IgZm9yIG11bHRpcGxlIHJlZ2lvbnMgd2l0aCBtdWx0aXBsZQorICAg ICAgICBwb3NpdGlvbmVkIHNoYXBlLWluc2lkZXMgYW5kIG92ZXJmbG93LgorCisgICAgICAgIFRl c3RzOiBmYXN0L3JlZ2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vbi1yZWdpb25zLWJs b2NrLWNvbnRlbnQtb3ZlcmZsb3ctbXVsdGlwbGUtc2hhcGVzLmh0bWwKKyAgICAgICAgICAgICAg IGZhc3QvcmVnaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtaW5saW5l LWNvbnRlbnQtb3ZlcmZsb3ctbXVsdGlwbGUtc2hhcGVzLmh0bWwKKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy QmxvY2s6OnVwZGF0ZUxpbmVCb3VuZGFyaWVzRm9yRXhjbHVzaW9ucyk6IENvdmVyIGNhc2VzIHdo ZW4gY29udGVudCBmbG93cyBpbnRvIHRoZSBuZXh0IHJlZ2lvbiwgdXBkYXRlIHRoZQorICAgICAg ICBsaW5lIHNlZ21lbnRzIGZvciB0aGUgb3ZlcmZsb3cuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCbG9jazo6YWRqdXN0TG9naWNhbExpbmVUb3BBbmRMb2dpY2FsSGVpZ2h0SWZOZWVkZWQpOiBJ biBmbG93IHRocmVhZCBjYXNlIHdlIGRvbid0IHdhbnQgdG8gYWRqdXN0IHRoZSBoZWlnaHQKKyAg ICAgICAgaW4gdHdvIHBsYWNlcy4KKworMjAxMy0wNS0yMCAgWm9sdGFuIEhvcnZhdGggIDx6b2x0 YW5Ad2Via2l0Lm9yZz4KKwogICAgICAgICBbQ1NTIFJlZ2lvbnNdW0NTUyBFeGNsdXNpb25zXSBz aGFwZS1pbnNpZGUgb24gcmVnaW9ucyBzaG91bGQgcmVzcGVjdCBwb3NpdGlvbmVkIHNoYXBlcyBh bmQgb3ZlcmZsb3cKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNjI1MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwCmluZGV4IDhiNzc0NWIuLjQwMzU0ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBAIC0xNjczLDE2 ICsxNjczLDMzIEBAIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZUxpbmVCb3VuZGFyaWVzRm9yRXhj bHVzaW9ucyhFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIGV4CiAgICAgLy8gVGhlIG92ZXJmbG93 IHNob3VsZCBiZSBwdXNoZWQgYmVsb3cgdGhlIGNvbnRlbnQgYm94CiAgICAgTGF5b3V0VW5pdCBz aGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCA9IGV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mby0+c2hh cGVDb250YWluaW5nQmxvY2tIZWlnaHQoKTsKICAgICBpZiAoIWV4Y2x1c2lvblNoYXBlSW5zaWRl SW5mby0+bGluZVdpdGhpblNoYXBlQm91bmRzKCkgJiYgIWxpbmVPdmVyZmxvd3NGcm9tU2hhcGVJ bnNpZGUgJiYgc2hhcGVDb250YWluaW5nQmxvY2tIZWlnaHQpIHsKLSAgICAgICAgTGF5b3V0VW5p dCBuZXdIZWlnaHQgPSBzaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodDsKKyAgICAgICAgbGluZU92 ZXJmbG93c0Zyb21TaGFwZUluc2lkZSA9IHRydWU7CisgICAgICAgIExheW91dFVuaXQgbmV3TG9n aWNhbEhlaWdodCA9IHNoYXBlQ29udGFpbmluZ0Jsb2NrSGVpZ2h0OwogCiAgICAgICAgIGlmIChs YXlvdXRTdGF0ZS5mbG93VGhyZWFkKCkpIHsKICAgICAgICAgICAgIC8vIElmIGJsb2NrIGNvbnRl bnRzIGZsb3duIGFjcm9zcyBtdWx0aXBsZSByZWdpb25zIGFuZCB0aGUgc2hhcGUtaW5zaWRlIHdh cyBhcHBsaWVkIG9uIHRoZSBzZWNvbmQgcmVnaW9uIHdlIGNhbiBlbmQgdXAgd2l0aCBuZWdhdGl2 ZSBsaW5lVG9wCiAgICAgICAgICAgICBpZiAobGluZVRvcCA8IDApCiAgICAgICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICAgICAgbmV3SGVpZ2h0ID0gbG9naWNhbEhlaWdodCArIHNoYXBlQ29u dGFpbmluZ0Jsb2NrSGVpZ2h0IC0gbGluZVRvcCAtIGN1cnJlbnRSZWdpb24tPmJvcmRlckFuZFBh ZGRpbmdCZWZvcmUoKTsKKworICAgICAgICAgICAgbmV3TG9naWNhbEhlaWdodCA9IGxvZ2ljYWxI ZWlnaHQgKyBzaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCAtIGxpbmVUb3AgLSBjdXJyZW50UmVn aW9uLT5ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCk7CisKKyAgICAgICAgICAgIFJlbmRlclJlZ2lv biogbmV4dFJlZ2lvbiA9IHJlZ2lvbkF0QmxvY2tPZmZzZXQobmV3TG9naWNhbEhlaWdodCk7Cisg ICAgICAgICAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIG5leHRTaGFwZUluZm8gPSAwOwor ICAgICAgICAgICAgaWYgKG5leHRSZWdpb24pCisgICAgICAgICAgICAgICAgbmV4dFNoYXBlSW5m byA9IG5leHRSZWdpb24tPmV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbygpOworCisgICAgICAgICAg ICAvLyBUaGUgb3ZlcmZsb3cgZmxvd3MgaW50byBhbm90aGVyIHJlZ2lvbiB3aXRoIHNoYXBlLWlu c2lkZQorICAgICAgICAgICAgaWYgKGN1cnJlbnRSZWdpb24gIT0gbmV4dFJlZ2lvbiAmJiBuZXh0 U2hhcGVJbmZvKSB7CisgICAgICAgICAgICAgICAgbmV3TG9naWNhbEhlaWdodCArPSBuZXh0U2hh cGVJbmZvLT5zaGFwZUxvZ2ljYWxUb3AoKSAtIG5leHRSZWdpb24tPmJvcmRlckFuZFBhZGRpbmdC ZWZvcmUoKTsKKworICAgICAgICAgICAgICAgIExheW91dFVuaXQgb2Zmc2V0ID0gbmV4dFNoYXBl SW5mby0+c2hhcGVMb2dpY2FsVG9wKCkgLSBuZXh0UmVnaW9uLT5ib3JkZXJBbmRQYWRkaW5nQmVm b3JlKCk7CisgICAgICAgICAgICAgICAgbmV4dFNoYXBlSW5mby0+Y29tcHV0ZVNlZ21lbnRzRm9y TGluZShvZmZzZXQsIGxpbmVIZWlnaHQpOworCisgICAgICAgICAgICAgICAgZXhjbHVzaW9uU2hh cGVJbnNpZGVJbmZvID0gbmV4dFNoYXBlSW5mbzsKKyAgICAgICAgICAgICAgICBsaW5lT3ZlcmZs b3dzRnJvbVNoYXBlSW5zaWRlID0gZmFsc2U7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAg ICAgICAgc2V0TG9naWNhbEhlaWdodChuZXdIZWlnaHQpOwotICAgICAgICBsaW5lT3ZlcmZsb3dz RnJvbVNoYXBlSW5zaWRlID0gdHJ1ZTsKKyAgICAgICAgc2V0TG9naWNhbEhlaWdodChuZXdMb2dp Y2FsSGVpZ2h0KTsKICAgICB9CiB9CiAKQEAgLTE2OTMsOSArMTcxMCw4IEBAIGJvb2wgUmVuZGVy QmxvY2s6OmFkanVzdExvZ2ljYWxMaW5lVG9wQW5kTG9naWNhbEhlaWdodElmTmVlZGVkKEV4Y2x1 c2lvblNoYXBlSW5zCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIExheW91dFVuaXQgbmV3 TG9naWNhbEhlaWdodCA9IGFkanVzdGVkTG9naWNhbExpbmVUb3AgLSBhYnNvbHV0ZUxvZ2ljYWxU b3A7Ci0gICAgUmVuZGVyUmVnaW9uKiBjdXJyZW50UmVnaW9uID0gcmVnaW9uQXRCbG9ja09mZnNl dChsb2dpY2FsSGVpZ2h0KCkpOwogICAgIGlmIChsYXlvdXRTdGF0ZS5mbG93VGhyZWFkKCkpCi0g ICAgICAgIG5ld0xvZ2ljYWxIZWlnaHQgLT0gY3VycmVudFJlZ2lvbi0+bG9naWNhbFRvcEZvckZs b3dUaHJlYWRDb250ZW50KCk7CisgICAgICAgIG5ld0xvZ2ljYWxIZWlnaHQgPSBsb2dpY2FsSGVp Z2h0KCk7CiAKICAgICBlbmQgPSByZXN0YXJ0TGF5b3V0UnVuc0FuZEZsb2F0c0luUmFuZ2UobG9n aWNhbEhlaWdodCgpLCBuZXdMb2dpY2FsSGVpZ2h0LCBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5l LCByZXNvbHZlciwgZW5kKTsKICAgICByZXR1cm4gdHJ1ZTsK