99342 2012-10-15 11:17:55 -0700 [CSS Exclusions] Handle special case "empty" shapes 2012-10-18 10:08:49 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98548 1 giles_joplin giles_joplin eric mihnea webkit.review.bot oldest_to_newest 742208 0 giles_joplin 2012-10-15 11:17:55 -0700 The following special case shapes will be considered "empty" in the sense that ExclusionShape::getIncludedIntervals() and ExclusionShape::getExcludedIntervals() will always return empty lists of intervals: rectangles of zero width or height, circles with 0 radius, ellipses with 0 radiusX or radiusY, polygons with less than 3 vertices. Note that this isn't an exhaustive list of special cases. Still remaining: polygons with less than three vertices that are not coincident or colinear, rectangles whose corner radiusX is greater than the rectangle's width/2, rectangles whose corner radiusY is greater than the rectangle's height/2, scenarios where shape-padding and shape-padding exceeds the shape's interior space. 742518 1 giles_joplin 2012-10-15 15:35:04 -0700 Fixing bug https://bugs.webkit.org/show_bug.cgi?id=99343, which adds support for spanning colinear vertices, will correct one of the special "empty" cases not covered here. 742533 2 168794 giles_joplin 2012-10-15 15:53:05 -0700 Created attachment 168794 Patch 745347 3 168794 webkit.review.bot 2012-10-18 10:08:46 -0700 Comment on attachment 168794 Patch Clearing flags on attachment: 168794 Committed r131766: <http://trac.webkit.org/changeset/131766> 745348 4 webkit.review.bot 2012-10-18 10:08:49 -0700 All reviewed patches have been landed. Closing bug. 168794 2012-10-15 15:53:05 -0700 2012-10-18 10:08:46 -0700 Patch tmp.patch text/plain 12192 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNWMyN2ZiLi43MzU5MDM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMTAt MTUgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBFeGNs dXNpb25zXSBIYW5kbGUgc3BlY2lhbCBjYXNlICJlbXB0eSIgc2hhcGVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTM0MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZlcmlmeSB0aGF0ICJlbXB0eSIgc2hh cGUtaW5zaWRlIHNoYXBlcyBkbyBub3QgY29uc3RyYWluIHRoZSB0ZXh0IHRoZWlyIGVsZW1lbnQg Y29udGFpbnMuCisKKyAgICAgICAgKiBmYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBl LWluc2lkZS1lbXB0eS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V4Y2x1 c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1lbXB0eS5odG1sOiBBZGRlZC4KKwogMjAx Mi0xMC0xNSAgSm9zaHVhIEJlbGwgIDxqc2JlbGxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIElu ZGV4ZWREQjogUGFzcyB0eXBlIG9mIGVycm9yIGNhdXNpbmcgYWJvcnQgdG8gSURCVHJhbnNhY3Rp b246Om9uQWJvcnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXhjbHVzaW9ucy9zaGFw ZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWVtcHR5LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1lbXB0eS1leHBlY3RlZC5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA2NTBmMWYKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBl LWluc2lkZS1lbXB0eS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsNDIgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMp CisgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0dGluZ3Muc2V0Q1NTRXhjbHVzaW9uc0VuYWJs ZWQodHJ1ZSk7Cis8L3NjcmlwdD4KKzxzdHlsZT4KKyAgICAuc2hhcGUtaW5zaWRlIHsKKyAgICAg ICAgd2lkdGg6IDgwMHB4OworICAgICAgICBoZWlnaHQ6IDJlbTsKKyAgICAgICAgYm9yZGVyOiBz b2xpZCBncmVlbjsKKyAgICB9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHAgY2xh c3M9InNoYXBlLWluc2lkZSI+CisgICAgICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgdW5jb25zdHJh aW5lZCBieSB0aGUgcmVjdGFuZ2xlKDBweCwgMHB4LCAwcHgsIDEwMHB4KSBzaGFwZS1pbnNpZGUg Q1NTIHByb3BlcnR5LgorICAgIDwvcD4KKyAgICA8cCBjbGFzcz0ic2hhcGUtaW5zaWRlIj4KKyAg ICAgICAgVGhpcyB0ZXh0IHNob3VsZCBiZSB1bmNvbnN0cmFpbmVkIGJ5IHRoZSByZWN0YW5nbGUo MHB4LCAwcHgsIDEwMHB4LCAwcHgpIHNoYXBlLWluc2lkZSBDU1MgcHJvcGVydHkuCisgICAgPC9w PgorICAgIDxwIGNsYXNzPSJzaGFwZS1pbnNpZGUiPgorICAgICAgICBUaGlzIHRleHQgc2hvdWxk IGJlIHVuY29uc3RyYWluZWQgYnkgdGhlIGNpcmNsZSgwcHgsIDBweCwgMHB4KSBzaGFwZS1pbnNp ZGUgQ1NTIHByb3BlcnR5LgorICAgIDwvcD4KKyAgICA8cCBjbGFzcz0ic2hhcGUtaW5zaWRlIj4K KyAgICAgICAgVGhpcyB0ZXh0IHNob3VsZCBiZSB1bmNvbnN0cmFpbmVkIGJ5IHRoZSBlbGxpcHNl WDAoMHB4LCAwcHgsIDBweCwgMTAwcHgpIHNoYXBlLWluc2lkZSBDU1MgcHJvcGVydHkuCisgICAg PC9wPgorICAgIDxwIGNsYXNzPSJzaGFwZS1pbnNpZGUiPgorICAgICAgICBUaGlzIHRleHQgc2hv dWxkIGJlIHVuY29uc3RyYWluZWQgYnkgdGhlIGVsbGlwc2UoMHB4LCAwcHgsIDEwMHB4LCAwcHgp IHNoYXBlLWluc2lkZSBDU1MgcHJvcGVydHkuCisgICAgPC9wPgorICAgIDxwIGNsYXNzPSJzaGFw ZS1pbnNpZGUiPgorICAgICAgICBUaGlzIHRleHQgc2hvdWxkIGJlIHVuY29uc3RyYWluZWQgYnkg dGhlIHBvbHlnb24oKSBzaGFwZS1pbnNpZGUgQ1NTIHByb3BlcnR5LgorICAgIDwvcD4KKyAgICA8 cCBjbGFzcz0ic2hhcGUtaW5zaWRlIj4KKyAgICAgICAgVGhpcyB0ZXh0IHNob3VsZCBiZSB1bmNv bnN0cmFpbmVkIGJ5IHRoZSBwb2x5Z29uKDBweCAwcHgpIHNoYXBlLWluc2lkZSBDU1MgcHJvcGVy dHkuCisgICAgPC9wPgorICAgIDxwIGNsYXNzPSJzaGFwZS1pbnNpZGUiPgorICAgICAgICBUaGlz IHRleHQgc2hvdWxkIGJlIHVuY29uc3RyYWluZWQgYnkgdGhlIHBvbHlnb24oMHB4IDBweCwgMTBw eCAwcHgpIHNoYXBlLWluc2lkZSBDU1MgcHJvcGVydHkuCisgICAgPC9wPgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9leGNsdXNpb25zL3NoYXBlLWluc2lk ZS9zaGFwZS1pbnNpZGUtZW1wdHkuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZXhjbHVzaW9ucy9z aGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWVtcHR5Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uM2M5ODIzZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWVtcHR5Lmh0bWwKQEAgLTAs MCArMSw3NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KKyAg ICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgd2luZG93LmludGVybmFscy5zZXR0aW5n cy5zZXRDU1NFeGNsdXNpb25zRW5hYmxlZCh0cnVlKTsKKzwvc2NyaXB0PgorPHN0eWxlPgorICAg IC5zaGFwZS1pbnNpZGUgeworICAgICAgICB3aWR0aDogODAwcHg7CisgICAgICAgIGhlaWdodDog MmVtOworICAgICAgICBib3JkZXI6IHNvbGlkIGdyZWVuOworICAgIH0KKworICAgICNzaGFwZS1p bnNpZGUtcmVjdGFuZ2xlLXdpZHRoMCB7CisgICAgICAgIC13ZWJraXQtc2hhcGUtaW5zaWRlOiBy ZWN0YW5nbGUoMHB4LCAwcHgsIDBweCwgMTAwcHgpOworICAgIH0KKworICAgICNzaGFwZS1pbnNp ZGUtcmVjdGFuZ2xlLWhlaWdodDAgeworICAgICAgICAtd2Via2l0LXNoYXBlLWluc2lkZTogcmVj dGFuZ2xlKDBweCwgMHB4LCAxMDBweCwgMHB4KTsKKyAgICB9CisKKyAgICAjc2hhcGUtaW5zaWRl LWNpcmNsZS1yYWRpdXMwIHsKKyAgICAgICAgLXdlYmtpdC1zaGFwZS1pbnNpZGU6IGNpcmNsZSgw cHgsIDBweCwgMHB4KTsKKyAgICB9CisKKyAgICAjc2hhcGUtaW5zaWRlLWVsbGlwc2UtcmFkaXVz WDAgeworICAgICAgICAtd2Via2l0LXNoYXBlLWluc2lkZTogZWxsaXBzZSgwcHgsIDBweCwgMHB4 LCAxMDBweCk7CisgICAgfQorCisgICAgI3NoYXBlLWluc2lkZS1lbGxpcHNlLXJhZGl1c1kwIHsK KyAgICAgICAgLXdlYmtpdC1zaGFwZS1pbnNpZGU6IGVsbGlwc2UoMHB4LCAwcHgsIDEwMHB4LCAw cHgpOworICAgIH0KKworICAgICNzaGFwZS1pbnNpZGUtcG9seWdvbi0wdmVydGljZXMgeworICAg ICAgICAtd2Via2l0LXNoYXBlLWluc2lkZTogcG9seWdvbigpOworICAgIH0KKworICAgICNzaGFw ZS1pbnNpZGUtcG9seWdvbi0xdmVydGV4IHsKKyAgICAgICAgLXdlYmtpdC1zaGFwZS1pbnNpZGU6 IHBvbHlnb24oMHB4IDBweCk7CisgICAgfQorCisgICAgI3NoYXBlLWluc2lkZS1wb2x5Z29uLTJ2 ZXJ0aWNlcyB7CisgICAgICAgIC13ZWJraXQtc2hhcGUtaW5zaWRlOiBwb2x5Z29uKDBweCAwcHgs IDEwcHggMHB4KTsKKyAgICB9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHAgY2xh c3M9InNoYXBlLWluc2lkZSIgaWQ9InNoYXBlLWluc2lkZS1yZWN0YW5nbGUtd2lkdGgwIj4KKyAg ICAgICAgVGhpcyB0ZXh0IHNob3VsZCBiZSB1bmNvbnN0cmFpbmVkIGJ5IHRoZSByZWN0YW5nbGUo MHB4LCAwcHgsIDBweCwgMTAwcHgpIHNoYXBlLWluc2lkZSBDU1MgcHJvcGVydHkuCisgICAgPC9w PgorICAgIDxwIGNsYXNzPSJzaGFwZS1pbnNpZGUiIGlkPSJzaGFwZS1pbnNpZGUtcmVjdGFuZ2xl LWhlaWdodDAiPgorICAgICAgICBUaGlzIHRleHQgc2hvdWxkIGJlIHVuY29uc3RyYWluZWQgYnkg dGhlIHJlY3RhbmdsZSgwcHgsIDBweCwgMTAwcHgsIDBweCkgc2hhcGUtaW5zaWRlIENTUyBwcm9w ZXJ0eS4KKyAgICA8L3A+CisgICAgPHAgY2xhc3M9InNoYXBlLWluc2lkZSIgaWQ9InNoYXBlLWlu c2lkZS1jaXJjbGUtcmFkaXVzMCI+CisgICAgICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgdW5jb25z dHJhaW5lZCBieSB0aGUgY2lyY2xlKDBweCwgMHB4LCAwcHgpIHNoYXBlLWluc2lkZSBDU1MgcHJv cGVydHkuCisgICAgPC9wPgorICAgIDxwIGNsYXNzPSJzaGFwZS1pbnNpZGUiIGlkPSJzaGFwZS1p bnNpZGUtZWxsaXBzZS1yYWRpdXNYMCI+CisgICAgICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgdW5j b25zdHJhaW5lZCBieSB0aGUgZWxsaXBzZVgwKDBweCwgMHB4LCAwcHgsIDEwMHB4KSBzaGFwZS1p bnNpZGUgQ1NTIHByb3BlcnR5LgorICAgIDwvcD4KKyAgICA8cCBjbGFzcz0ic2hhcGUtaW5zaWRl IiBpZD0ic2hhcGUtaW5zaWRlLWVsbGlwc2UtcmFkaXVzWTAiPgorICAgICAgICBUaGlzIHRleHQg c2hvdWxkIGJlIHVuY29uc3RyYWluZWQgYnkgdGhlIGVsbGlwc2UoMHB4LCAwcHgsIDEwMHB4LCAw cHgpIHNoYXBlLWluc2lkZSBDU1MgcHJvcGVydHkuCisgICAgPC9wPgorICAgIDxwIGNsYXNzPSJz aGFwZS1pbnNpZGUiIGlkPSJzaGFwZS1pbnNpZGUtcG9seWdvbi0wdmVydGljZXMiPgorICAgICAg ICBUaGlzIHRleHQgc2hvdWxkIGJlIHVuY29uc3RyYWluZWQgYnkgdGhlIHBvbHlnb24oKSBzaGFw ZS1pbnNpZGUgQ1NTIHByb3BlcnR5LgorICAgIDwvcD4KKyAgICA8cCBjbGFzcz0ic2hhcGUtaW5z aWRlIiBpZD0ic2hhcGUtaW5zaWRlLXBvbHlnb24tMXZlcnRleCI+CisgICAgICAgIFRoaXMgdGV4 dCBzaG91bGQgYmUgdW5jb25zdHJhaW5lZCBieSB0aGUgcG9seWdvbigwcHggMHB4KSBzaGFwZS1p bnNpZGUgQ1NTIHByb3BlcnR5LgorICAgIDwvcD4KKyAgICA8cCBjbGFzcz0ic2hhcGUtaW5zaWRl IiBpZD0ic2hhcGUtaW5zaWRlLXBvbHlnb24tMnZlcnRpY2VzIj4KKyAgICAgICAgVGhpcyB0ZXh0 IHNob3VsZCBiZSB1bmNvbnN0cmFpbmVkIGJ5IHRoZSBwb2x5Z29uKDBweCAwcHgsIDEwcHggMHB4 KSBzaGFwZS1pbnNpZGUgQ1NTIHByb3BlcnR5LgorICAgIDwvcD4KKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZTcyODNiLi5jZjFlYTE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMTAtMTUgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAg ICAgW0NTUyBFeGNsdXNpb25zXSBIYW5kbGUgc3BlY2lhbCBjYXNlICJlbXB0eSIgc2hhcGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTM0MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgZXhw Y2xpdCBjb3ZlcmFnZSBvZiB0aGUgc2ltcGxlICJlbXB0eSIgc2hhcGUtaW5zaWRlIHNoYXBlcy4K KyAgICAgICAgU2hhcGVzIHdpbGwgYmUgY29uc2lkZXJlZCAiZW1wdHkiIGluIHRoZSBzZW5zZSB0 aGF0IEV4Y2x1c2lvblNoYXBlOjpnZXRJbmNsdWRlZEludGVydmFscygpCisgICAgICAgIGFuZCBF eGNsdXNpb25TaGFwZTo6Z2V0RXhjbHVkZWRJbnRlcnZhbHMoKSB3aWxsIGFsd2F5cyByZXR1cm4g ZW1wdHkgbGlzdHMgb2YgaW50ZXJ2YWxzLgorICAgICAgICBUaGlzIHBhdGNoIGNvdmVycyByZWN0 YW5nbGVzIG9mIHplcm8gd2lkdGggb3IgaGVpZ2h0LCBjaXJjbGVzIHdpdGggMCByYWRpdXMsIGVs bGlwc2VzCisgICAgICAgIHdpdGggMCByYWRpdXNYIG9yIHJhZGl1c1ksIHBvbHlnb25zIHdpdGgg bGVzcyB0aGFuIDMgdmVydGljZXMuCisKKyAgICAgICAgVGVzdDogZmFzdC9leGNsdXNpb25zL3No YXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtZW1wdHkuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5n L0V4Y2x1c2lvblBvbHlnb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXhjbHVzaW9uUG9seWdv bjo6RXhjbHVzaW9uUG9seWdvbik6IEluaXRpYWxpemUgdGhlIG1fZW1wdHkgZmxhZy4KKyAgICAg ICAgKFdlYkNvcmU6OkV4Y2x1c2lvblBvbHlnb246OmdldEV4Y2x1ZGVkSW50ZXJ2YWxzKTogQWRk ZWQgc2hvcnQtY2lyY3VpdCByZXR1cm4gd2hlbiB0aGUgcG9seWdvbiBpcyBlbXB0eS4KKyAgICAg ICAgKFdlYkNvcmU6OkV4Y2x1c2lvblBvbHlnb246OmdldEluY2x1ZGVkSW50ZXJ2YWxzKTogQWRk ZWQgc2hvcnQtY2lyY3VpdCByZXR1cm4gd2hlbiB0aGUgcG9seWdvbiBpcyBlbXB0eS4KKyAgICAg ICAgKiByZW5kZXJpbmcvRXhjbHVzaW9uUG9seWdvbi5oOiBBZGRlZCB0aGUgaXNFbXB0eSgpIG1l dGhvZC4KKyAgICAgICAgKiByZW5kZXJpbmcvRXhjbHVzaW9uUmVjdGFuZ2xlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkV4Y2x1c2lvblJlY3RhbmdsZTo6Z2V0RXhjbHVkZWRJbnRlcnZhbHMpOiBB ZGRlZCBzaG9ydC1jaXJjdWl0IHJldHVybiB3aGVuIHRoZSByZWN0YW5nbGUgaXMgZW1wdHkuCisg ICAgICAgIChXZWJDb3JlOjpFeGNsdXNpb25SZWN0YW5nbGU6OmdldEluY2x1ZGVkSW50ZXJ2YWxz KTogQWRkZWQgc2hvcnQtY2lyY3VpdCByZXR1cm4gd2hlbiB0aGUgcmVjdGFuZ2xlIGlzIGVtcHR5 LgorICAgICAgICAqIHJlbmRlcmluZy9FeGNsdXNpb25SZWN0YW5nbGUuaDogQWRkZWQgdGhlIGlz RW1wdHkoKSBtZXRob2QuCisgICAgICAgICogcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlLmg6IEFk ZGVkIGEgdmlydHVhbCBpc0VtcHR5KCkgRXhjbHVzaW9uU2hhcGUgbWV0aG9kLgorICAgICAgICAo RXhjbHVzaW9uU2hhcGUpOgorCiAyMDEyLTEwLTE1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBs ZS5jb20+CiAKICAgICAgICAgVHJ5IHRvIGZpeCB0aGUgQ2hyb21pdW0gTWFjIGJ1aWxkIGFmdGVy IHIxMzEzNjUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9u UG9seWdvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uUG9seWdvbi5j cHAKaW5kZXggZTcwNGFiZi4uMTY3MjY4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0V4Y2x1c2lvblBvbHlnb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9FeGNsdXNpb25Qb2x5Z29uLmNwcApAQCAtNTcsMTAgKzU3LDkgQEAgRXhjbHVzaW9uUG9seWdv bjo6RXhjbHVzaW9uUG9seWdvbihQYXNzT3duUHRyPFZlY3RvcjxGbG9hdFBvaW50PiA+IHZlcnRp Y2VzLCBXaW4KICAgICAsIG1fdmVydGljZXModmVydGljZXMpCiAgICAgLCBtX2ZpbGxSdWxlKGZp bGxSdWxlKQogewotICAgIC8vIEZJWE1FOiBIYW5kbGUgcG9seWdvbnMgZGVmaW5lZCB3aXRoIGxl c3MgdGhhbiAzIG5vbi1jb2xpbmVhciB2ZXJ0aWNlcy4KLQogICAgIHVuc2lnbmVkIG5WZXJ0aWNl cyA9IG51bWJlck9mVmVydGljZXMoKTsKICAgICBtX2VkZ2VzLnJlc2l6ZShuVmVydGljZXMpOwor ICAgIG1fZW1wdHkgPSBuVmVydGljZXMgPCAzOwogICAgIFZlY3RvcjxFeGNsdXNpb25Qb2x5Z29u RWRnZSo+IHNvcnRlZEVkZ2VzTWluWShuVmVydGljZXMpOwogCiAgICAgY29uc3QgRmxvYXRQb2lu dCYgdmVydGV4MCA9IHZlcnRleEF0KDApOwpAQCAtMjU3LDYgKzI1Niw5IEBAIHZvaWQgRXhjbHVz aW9uUG9seWdvbjo6Y29tcHV0ZUVkZ2VJbnRlcnNlY3Rpb25zKGZsb2F0IHkxLCBmbG9hdCB5Miwg VmVjdG9yPEV4Y2x1CiAKIHZvaWQgRXhjbHVzaW9uUG9seWdvbjo6Z2V0RXhjbHVkZWRJbnRlcnZh bHMoZmxvYXQgbG9naWNhbFRvcCwgZmxvYXQgbG9naWNhbEJvdHRvbSwgU2VnbWVudExpc3QmIHJl c3VsdCkgY29uc3QKIHsKKyAgICBpZiAoaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKICAg ICBmbG9hdCB5MSA9IG1pbllGb3JMb2dpY2FsTGluZShsb2dpY2FsVG9wLCBsb2dpY2FsQm90dG9t KTsKICAgICBmbG9hdCB5MiA9IG1heFlGb3JMb2dpY2FsTGluZShsb2dpY2FsVG9wLCBsb2dpY2Fs Qm90dG9tKTsKIApAQCAtMjgxLDYgKzI4Myw5IEBAIHZvaWQgRXhjbHVzaW9uUG9seWdvbjo6Z2V0 RXhjbHVkZWRJbnRlcnZhbHMoZmxvYXQgbG9naWNhbFRvcCwgZmxvYXQgbG9naWNhbEJvdHRvCiAK IHZvaWQgRXhjbHVzaW9uUG9seWdvbjo6Z2V0SW5jbHVkZWRJbnRlcnZhbHMoZmxvYXQgbG9naWNh bFRvcCwgZmxvYXQgbG9naWNhbEJvdHRvbSwgU2VnbWVudExpc3QmIHJlc3VsdCkgY29uc3QKIHsK KyAgICBpZiAoaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKICAgICBmbG9hdCB5MSA9IG1p bllGb3JMb2dpY2FsTGluZShsb2dpY2FsVG9wLCBsb2dpY2FsQm90dG9tKTsKICAgICBmbG9hdCB5 MiA9IG1heFlGb3JMb2dpY2FsTGluZShsb2dpY2FsVG9wLCBsb2dpY2FsQm90dG9tKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblBvbHlnb24uaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25Qb2x5Z29uLmgKaW5kZXggNjM5N2QwZS4u NTdlMzU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblBv bHlnb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uUG9seWdvbi5o CkBAIC02Miw2ICs2Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEZsb2F0UmVjdCBzaGFwZUxv Z2ljYWxCb3VuZGluZ0JveCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIGludGVybmFsVG9Mb2dp Y2FsQm91bmRpbmdCb3gobV9ib3VuZGluZ0JveCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgZ2V0RXhj bHVkZWRJbnRlcnZhbHMoZmxvYXQgbG9naWNhbFRvcCwgZmxvYXQgbG9naWNhbEJvdHRvbSwgU2Vn bWVudExpc3QmKSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0SW5jbHVkZWRJ bnRlcnZhbHMoZmxvYXQgbG9naWNhbFRvcCwgZmxvYXQgbG9naWNhbEJvdHRvbSwgU2VnbWVudExp c3QmKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNFbXB0eSgpIGNvbnN0IE9W RVJSSURFIHsgcmV0dXJuIG1fZW1wdHk7IH0KIAogcHJpdmF0ZToKICAgICBmbG9hdCByaWdodFZl cnRleFkodW5zaWduZWQpIGNvbnN0OwpAQCAtNzYsNiArNzcsNyBAQCBwcml2YXRlOgogICAgIEZs b2F0UmVjdCBtX2JvdW5kaW5nQm94OwogICAgIFZlY3RvcjxFeGNsdXNpb25Qb2x5Z29uRWRnZT4g bV9lZGdlczsKICAgICBFZGdlSW50ZXJ2YWxUcmVlIG1fZWRnZVRyZWU7CisgICAgYm9vbCBtX2Vt cHR5OwogfTsKIAogLy8gRWRnZUludGVydmFsVHJlZSBub2RlcyBzdG9yZSBtaW5ZLCBtYXhZLCBh bmQgYSAoIlVzZXJEYXRhIikgcG9pbnRlciB0byBhbiBFeGNsdXNpb25Qb2x5Z29uRWRnZS4gRWRn ZSB2ZXJ0ZXgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25S ZWN0YW5nbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblJlY3Rhbmds ZS5jcHAKaW5kZXggM2JkZGUwYS4uMGNjZjYyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0V4Y2x1c2lvblJlY3RhbmdsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0V4Y2x1c2lvblJlY3RhbmdsZS5jcHAKQEAgLTQyLDYgKzQyLDkgQEAgc3RhdGljIGlu bGluZSBmbG9hdCBlbGxpcHNlWEludGVyY2VwdChmbG9hdCB5LCBmbG9hdCByeCwgZmxvYXQgcnkp CiAKIHZvaWQgRXhjbHVzaW9uUmVjdGFuZ2xlOjpnZXRFeGNsdWRlZEludGVydmFscyhmbG9hdCBs b2dpY2FsVG9wLCBmbG9hdCBsb2dpY2FsQm90dG9tLCBTZWdtZW50TGlzdCYgcmVzdWx0KSBjb25z dAogeworICAgIGlmIChpc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIGZsb2F0IHkx ID0gbWluWUZvckxvZ2ljYWxMaW5lKGxvZ2ljYWxUb3AsIGxvZ2ljYWxCb3R0b20pOwogICAgIGZs b2F0IHkyID0gbWF4WUZvckxvZ2ljYWxMaW5lKGxvZ2ljYWxUb3AsIGxvZ2ljYWxCb3R0b20pOwog CkBAIC03MCw2ICs3Myw5IEBAIHZvaWQgRXhjbHVzaW9uUmVjdGFuZ2xlOjpnZXRFeGNsdWRlZElu dGVydmFscyhmbG9hdCBsb2dpY2FsVG9wLCBmbG9hdCBsb2dpY2FsQm90CiAKIHZvaWQgRXhjbHVz aW9uUmVjdGFuZ2xlOjpnZXRJbmNsdWRlZEludGVydmFscyhmbG9hdCBsb2dpY2FsVG9wLCBmbG9h dCBsb2dpY2FsQm90dG9tLCBTZWdtZW50TGlzdCYgcmVzdWx0KSBjb25zdAogeworICAgIGlmIChp c0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIGZsb2F0IHkxID0gbWluWUZvckxvZ2lj YWxMaW5lKGxvZ2ljYWxUb3AsIGxvZ2ljYWxCb3R0b20pOwogICAgIGZsb2F0IHkyID0gbWF4WUZv ckxvZ2ljYWxMaW5lKGxvZ2ljYWxUb3AsIGxvZ2ljYWxCb3R0b20pOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uUmVjdGFuZ2xlLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uUmVjdGFuZ2xlLmgKaW5kZXggNWNhMjg5ZC4uMDA3ODI2 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblJlY3Rhbmds ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25SZWN0YW5nbGUuaApA QCAtNTMsNiArNTMsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBGbG9hdFJlY3Qgc2hhcGVMb2dp Y2FsQm91bmRpbmdCb3goKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBpbnRlcm5hbFRvTG9naWNh bEJvdW5kaW5nQm94KEZsb2F0UmVjdChtX3gsIG1feSwgbV93aWR0aCwgbV9oZWlnaHQpKTsgfQog ICAgIHZpcnR1YWwgdm9pZCBnZXRFeGNsdWRlZEludGVydmFscyhmbG9hdCBsb2dpY2FsVG9wLCBm bG9hdCBsb2dpY2FsQm90dG9tLCBTZWdtZW50TGlzdCYpIGNvbnN0IE9WRVJSSURFOwogICAgIHZp cnR1YWwgdm9pZCBnZXRJbmNsdWRlZEludGVydmFscyhmbG9hdCBsb2dpY2FsVG9wLCBmbG9hdCBs b2dpY2FsQm90dG9tLCBTZWdtZW50TGlzdCYpIGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwg Ym9vbCBpc0VtcHR5KCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gbV93aWR0aCA8PSAwIHx8IG1f aGVpZ2h0IDw9IDA7IH0KIAogcHJpdmF0ZToKICAgICBmbG9hdCBtX3g7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGUuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZS5oCmluZGV4IGJiMWVkYzYuLmVmNTdlZDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FeGNsdXNpb25TaGFwZS5oCkBAIC02Niw2ICs2Niw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIEZsb2F0UmVjdCBzaGFwZUxvZ2ljYWxCb3VuZGluZ0JveCgp IGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZ2V0SW5jbHVkZWRJbnRlcnZhbHMoZmxvYXQg bG9naWNhbFRvcCwgZmxvYXQgbG9naWNhbEJvdHRvbSwgU2VnbWVudExpc3QmKSBjb25zdCA9IDA7 CiAgICAgdmlydHVhbCB2b2lkIGdldEV4Y2x1ZGVkSW50ZXJ2YWxzKGZsb2F0IGxvZ2ljYWxUb3As IGZsb2F0IGxvZ2ljYWxCb3R0b20sIFNlZ21lbnRMaXN0JikgY29uc3QgPSAwOworICAgIHZpcnR1 YWwgYm9vbCBpc0VtcHR5KCkgY29uc3QgPSAwOwogCiBwcm90ZWN0ZWQ6CiAgICAgZmxvYXQgbWlu WUZvckxvZ2ljYWxMaW5lKGZsb2F0IGxvZ2ljYWxUb3AsIGZsb2F0IGxvZ2ljYWxCb3R0b20pIGNv bnN0IHsgcmV0dXJuIChtX3dyaXRpbmdNb2RlID09IFJpZ2h0VG9MZWZ0V3JpdGluZ01vZGUpID8g bV9sb2dpY2FsQm94SGVpZ2h0IC0gbG9naWNhbEJvdHRvbSA6IGxvZ2ljYWxUb3A7IH0K