124788 2013-11-22 13:10:31 -0800 [CSS Shapes] Support for shape-margin in BoxShape 2013-11-26 11:17:05 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 124173 1 giles_joplin giles_joplin commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 953661 0 giles_joplin 2013-11-22 13:10:31 -0800 Currently specifying shape-margin for box shapes (http://dev.w3.org/csswg/css-shapes/#typedef-box) has no effect. 954163 1 217848 giles_joplin 2013-11-25 16:50:18 -0800 Created attachment 217848 Patch Just giving the bots a crack at an incomplete version of this patch. 954289 2 217885 giles_joplin 2013-11-26 09:58:25 -0800 Created attachment 217885 Patch Corrected BoxShape's internal shape-margin/paddding bounds FloatRoundedRect initialization. Tests for the padding bounds will be added when the rest of shape-padding for box shapes implementation is ready. 954299 3 217885 kling 2013-11-26 10:44:32 -0800 Comment on attachment 217885 Patch Nice catch. r=me 954310 4 217885 commit-queue 2013-11-26 11:17:03 -0800 Comment on attachment 217885 Patch Clearing flags on attachment: 217885 Committed r159787: <http://trac.webkit.org/changeset/159787> 954311 5 commit-queue 2013-11-26 11:17:05 -0800 All reviewed patches have been landed. Closing bug. 217848 2013-11-25 16:50:18 -0800 2013-11-26 09:58:25 -0800 Patch tmp.patch text/plain 6487 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRz L3NoYXBlLW91dHNpZGUtbWFyZ2luLWJveGVzLTAwMS1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1tYXJnaW4t Ym94ZXMtMDAxLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uODM0ZjY3MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3No YXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbWFyZ2luLWJveGVzLTAwMS1leHBlY3Rl ZC5odG1sCkBAIC0wLDAgKzEsMzcgQEAKKzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+CisuY29udGFp bmVyIHsKKyAgICB3aWR0aDogOTBweDsKKyAgICBoZWlnaHQ6IDkwcHg7CisgICAgY29sb3I6IGdy ZWVuOworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgIG1hcmdpbjogMTBweDsKKyAg ICBwb3NpdGlvbjogcmVsYXRpdmU7Cit9CisKKyNzaGFwZS1tYXJnaW4tYm9yZGVyIHsKKyAgICBw b3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAzMHB4OworICAgIHdpZHRoOiAyNXB4OworICAg IGhlaWdodDogMjBweDsKKyAgICBib3JkZXI6IHNvbGlkIDVweCBibHVlOworICAgIGJvcmRlci1s ZWZ0LXdpZHRoOiAwcHg7Cit9CisKKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8cD5z aGFwZS1vdXRzaWRlOiBjb250ZW50LWJveDwvcD4KKyAgICA8ZGl2IGNsYXNzPSdjb250YWluZXIn PjwvZGl2PgorCisgICAgPHA+c2hhcGUtb3V0c2lkZTogcGFkZGluZy1ib3g8L3A+CisgICAgPGRp diBjbGFzcz0nY29udGFpbmVyJz48L2Rpdj4KKworICAgIDxwPnNoYXBlLW91dHNpZGU6IGJvcmRl ci1ib3g8L3A+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgIDxkaXYgaWQ9InNo YXBlLW1hcmdpbi1ib3JkZXIiPjwvZGl2PgorICAgIDwvZGl2PgorCis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0 cy9zaGFwZS1vdXRzaWRlLW1hcmdpbi1ib3hlcy0wMDEuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv c2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbWFyZ2luLWJveGVzLTAw MS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg4YmRjN2UKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0 cy9zaGFwZS1vdXRzaWRlLW1hcmdpbi1ib3hlcy0wMDEuaHRtbApAQCAtMCwwICsxLDc0IEBACis8 aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLmNvbnRhaW5lciB7CisgICAgd2lkdGg6IDkwcHg7Cisg ICAgaGVpZ2h0OiA5MHB4OworICAgIGNvbG9yOiBncmVlbjsKKyAgICBiYWNrZ3JvdW5kLWNvbG9y OiByZWQ7CisgICAgZm9udDogMzBweC8xIEFoZW0sIHNhbnMtc2VyaWY7CisgICAgbWFyZ2luOiAx MHB4OworICAgIC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IGFudGlhbGlhc2VkOworICAgIHBvc2l0 aW9uOiByZWxhdGl2ZTsKK30KKworLmNvbnRlbnQtYm94IHsKKyAgICAtd2Via2l0LXNoYXBlLW91 dHNpZGU6IGNvbnRlbnQtYm94OworICAgIC13ZWJraXQtc2hhcGUtbWFyZ2luOiA1cHg7CisgICAg YmFja2dyb3VuZC1jbGlwOiBwYWRkaW5nLWJveDsgIC8qIHBhZGRpbmcgYm94IG1hdGNoZXMgc2hh cGUtb3V0c2lkZSArIHNoYXBlLW1hcmdpbiAqLworICAgIHdpZHRoOiAyNXB4OworICAgIGhlaWdo dDogMjBweDsKKyAgICBwYWRkaW5nOiA1cHg7CisgICAgbWFyZ2luOiAzMHB4IDYwcHg7Cit9CisK Ky5wYWRkaW5nLWJveCB7CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBwYWRkaW5nLWJveDsK KyAgICAtd2Via2l0LXNoYXBlLW1hcmdpbjogNXB4OworICAgIGJhY2tncm91bmQtY2xpcDogYm9y ZGVyLWJveDsgLyogYm9yZGVyIGJveCBtYXRjaGVzIHNoYXBlLW91dHNpZGUgKyBzaGFwZS1tYXJn aW4gKi8KKyAgICB3aWR0aDogMjBweDsKKyAgICBoZWlnaHQ6IDEwcHg7CisgICAgcGFkZGluZzog NXB4OworICAgIGJvcmRlcjogNXB4IHNvbGlkIHRyYW5zcGFyZW50OworICAgIG1hcmdpbjogMzBw eCA2MHB4OworfQorCisuYm9yZGVyLWJveCB7CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBi b3JkZXItYm94OworICAgIC13ZWJraXQtc2hhcGUtbWFyZ2luOiA1cHg7CisgICAgYmFja2dyb3Vu ZC1jbGlwOiBib3JkZXItYm94OyAvKiBzaGFwZS1vdXRzaWRlIGlzIDUgcGl4ZWxzIGZyb20gdGhl IGJvcmRlci1ib3ggKi8KKyAgICB3aWR0aDogMjBweDsKKyAgICBoZWlnaHQ6IDEwcHg7CisgICAg Ym9yZGVyOiA1cHggc29saWQgdHJhbnNwYXJlbnQ7CisgICAgbWFyZ2luOiAzNXB4IDY1cHg7Cit9 CisKKy5zaGFwZSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgICAgZmxvYXQ6IGxl ZnQ7CisgICAgcGFkZGluZy1sZWZ0OiAwcHg7CisgICAgYm9yZGVyLWxlZnQ6IDBweDsKKyAgICBt YXJnaW4tbGVmdDogMHB4OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxwPnNo YXBlLW91dHNpZGU6IGNvbnRlbnQtYm94PC9wPgorICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+ CisgICAgICAgIDxkaXYgY2xhc3M9J3NoYXBlIGNvbnRlbnQtYm94Jz48L2Rpdj4KKyAgICAgICAg eHh4IHh4IHh4eAorICAgIDwvZGl2PgorCisgICAgPHA+c2hhcGUtb3V0c2lkZTogcGFkZGluZy1i b3g8L3A+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4KKyAgICAgICAgPGRpdiBjbGFzcz0n c2hhcGUgcGFkZGluZy1ib3gnPjwvZGl2PgorICAgICAgICB4eHggeHggeHh4CisgICAgPC9kaXY+ CisKKyAgICA8cD5zaGFwZS1vdXRzaWRlOiBib3JkZXItYm94PC9wPgorICAgIDxkaXYgY2xhc3M9 J2NvbnRhaW5lcicgc3R5bGU9ImJhY2tncm91bmQ6IGJsdWUiPgorICAgICAgICA8ZGl2IGNsYXNz PSdzaGFwZSBib3JkZXItYm94Jz48L2Rpdj4KKyAgICAgICAgeHh4IHh4IHh4eAorICAgIDwvZGl2 PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3NoYXBlcy9Cb3hTaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL0Jv eFNoYXBlLmNwcAppbmRleCBiYmRkMWM2Li4wMTFjY2M5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBlLmNwcApAQCAtMzQsMTkgKzM0LDE5IEBACiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAotQm94U2hhcGU6OkJveFNoYXBlKGNvbnN0IEZsb2F0Um91bmRlZFJl Y3QmIGJvdW5kcykKK0JveFNoYXBlOjpCb3hTaGFwZShjb25zdCBGbG9hdFJvdW5kZWRSZWN0JiBi b3VuZHMsIGZsb2F0IHNoYXBlTWFyZ2luLCBmbG9hdCBzaGFwZVBhZGRpbmcpCiAgICAgOiBTaGFw ZSgpCiAgICAgLCBtX2JvdW5kcyhib3VuZHMpCiAgICAgLCBtX21hcmdpbkJvdW5kcyhib3VuZHMp CiAgICAgLCBtX3BhZGRpbmdCb3VuZHMoYm91bmRzKQogewotICAgIGlmIChzaGFwZU1hcmdpbigp ID4gMCkgewotICAgICAgICBtX21hcmdpbkJvdW5kcy5pbmZsYXRlKHNoYXBlTWFyZ2luKCkpOwot ICAgICAgICBtX21hcmdpbkJvdW5kcy5leHBhbmRSYWRpaShzaGFwZU1hcmdpbigpKTsKKyAgICBp ZiAoc2hhcGVNYXJnaW4gPiAwKSB7CisgICAgICAgIG1fbWFyZ2luQm91bmRzLmluZmxhdGUoc2hh cGVNYXJnaW4pOworICAgICAgICBtX21hcmdpbkJvdW5kcy5leHBhbmRSYWRpaShzaGFwZU1hcmdp bik7CiAgICAgfQotICAgIGlmIChzaGFwZVBhZGRpbmcoKSA+IDApIHsKLSAgICAgICAgbV9wYWRk aW5nQm91bmRzLmluZmxhdGUoLXNoYXBlUGFkZGluZygpKTsKLSAgICAgICAgbV9wYWRkaW5nQm91 bmRzLmV4cGFuZFJhZGlpKC1zaGFwZVBhZGRpbmcoKSk7CisgICAgaWYgKHNoYXBlUGFkZGluZyA+ IDApIHsKKyAgICAgICAgbV9wYWRkaW5nQm91bmRzLmluZmxhdGUoLXNoYXBlUGFkZGluZyk7Cisg ICAgICAgIG1fcGFkZGluZ0JvdW5kcy5leHBhbmRSYWRpaSgtc2hhcGVQYWRkaW5nKTsKICAgICB9 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvQm94U2hh cGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvQm94U2hhcGUuaAppbmRleCAy ZGFlODZmLi42YWQ4YzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hh cGVzL0JveFNoYXBlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9Cb3hT aGFwZS5oCkBAIC0zNyw3ICszNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQm94 U2hhcGUgOiBwdWJsaWMgU2hhcGUgewogcHVibGljOgotICAgIEJveFNoYXBlKGNvbnN0IEZsb2F0 Um91bmRlZFJlY3QmIGJvdW5kcyk7CisgICAgQm94U2hhcGUoY29uc3QgRmxvYXRSb3VuZGVkUmVj dCYgYm91bmRzLCBmbG9hdCBzaGFwZU1hcmdpbiwgZmxvYXQgc2hhcGVQYWRkaW5nKTsKIAogICAg IHZpcnR1YWwgTGF5b3V0UmVjdCBzaGFwZU1hcmdpbkxvZ2ljYWxCb3VuZGluZ0JveCgpIGNvbnN0 IE9WRVJSSURFIHsgcmV0dXJuIHN0YXRpY19jYXN0PExheW91dFJlY3Q+KG1fbWFyZ2luQm91bmRz LnJlY3QoKSk7IH0KICAgICB2aXJ0dWFsIExheW91dFJlY3Qgc2hhcGVQYWRkaW5nTG9naWNhbEJv dW5kaW5nQm94KCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gc3RhdGljX2Nhc3Q8TGF5b3V0UmVj dD4obV9wYWRkaW5nQm91bmRzLnJlY3QoKSk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3No YXBlcy9TaGFwZS5jcHAKaW5kZXggYzhmYmI4Zi4uMzQwMDUwNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKQEAgLTQ2LDEwICs0NiwxMCBAQAogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBQYXNzT3duUHRyPFNoYXBlPiBjcmVhdGVCb3hTaGFwZShj b25zdCBGbG9hdFJvdW5kZWRSZWN0JiBib3VuZHMpCitzdGF0aWMgUGFzc093blB0cjxTaGFwZT4g Y3JlYXRlQm94U2hhcGUoY29uc3QgRmxvYXRSb3VuZGVkUmVjdCYgYm91bmRzLCBmbG9hdCBzaGFw ZU1hcmdpbiwgZmxvYXQgc2hhcGVQYWRkaW5nKQogewogICAgIEFTU0VSVChib3VuZHMucmVjdCgp LndpZHRoKCkgPj0gMCAmJiBib3VuZHMucmVjdCgpLmhlaWdodCgpID49IDApOwotICAgIHJldHVy biBhZG9wdFB0cihuZXcgQm94U2hhcGUoYm91bmRzKSk7CisgICAgcmV0dXJuIGFkb3B0UHRyKG5l dyBCb3hTaGFwZShib3VuZHMsIHNoYXBlTWFyZ2luLCBzaGFwZVBhZGRpbmcpKTsKIH0KIAogc3Rh dGljIFBhc3NPd25QdHI8U2hhcGU+IGNyZWF0ZVJlY3RhbmdsZVNoYXBlKGNvbnN0IEZsb2F0UmVj dCYgYm91bmRzLCBjb25zdCBGbG9hdFNpemUmIHJhZGlpKQpAQCAtMjYzLDExICsyNjMsMTMgQEAg UGFzc093blB0cjxTaGFwZT4gU2hhcGU6OmNyZWF0ZVNoYXBlKGNvbnN0IFJvdW5kZWRSZWN0JiBy b3VuZGVkUmVjdCwgV3JpdGluZ01vZGUKIHsKICAgICBGbG9hdFJlY3QgcmVjdCgwLCAwLCByb3Vu ZGVkUmVjdC5yZWN0KCkud2lkdGgoKSwgcm91bmRlZFJlY3QucmVjdCgpLmhlaWdodCgpKTsKICAg ICBGbG9hdFJvdW5kZWRSZWN0IGJvdW5kcyhyZWN0LCByb3VuZGVkUmVjdC5yYWRpaSgpLnRvcExl ZnQoKSwgcm91bmRlZFJlY3QucmFkaWkoKS50b3BSaWdodCgpLCByb3VuZGVkUmVjdC5yYWRpaSgp LmJvdHRvbUxlZnQoKSwgcm91bmRlZFJlY3QucmFkaWkoKS5ib3R0b21SaWdodCgpKTsKKyAgICBm bG9hdCBzaGFwZU1hcmdpbiA9IGZsb2F0VmFsdWVGb3JMZW5ndGgobWFyZ2luLCAwKTsKKyAgICBm bG9hdCBzaGFwZVBhZGRpbmcgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKHBhZGRpbmcsIDApOwogCi0g ICAgT3duUHRyPFNoYXBlPiBzaGFwZSA9IGNyZWF0ZUJveFNoYXBlKGJvdW5kcyk7CisgICAgT3du UHRyPFNoYXBlPiBzaGFwZSA9IGNyZWF0ZUJveFNoYXBlKGJvdW5kcywgc2hhcGVNYXJnaW4sIHNo YXBlUGFkZGluZyk7CiAgICAgc2hhcGUtPm1fd3JpdGluZ01vZGUgPSB3cml0aW5nTW9kZTsKLSAg ICBzaGFwZS0+bV9tYXJnaW4gPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKG1hcmdpbiwgMCk7Ci0gICAg c2hhcGUtPm1fcGFkZGluZyA9IGZsb2F0VmFsdWVGb3JMZW5ndGgocGFkZGluZywgMCk7CisgICAg c2hhcGUtPm1fbWFyZ2luID0gc2hhcGVNYXJnaW47CisgICAgc2hhcGUtPm1fcGFkZGluZyA9IHNo YXBlUGFkZGluZzsKIAogICAgIHJldHVybiBzaGFwZS5yZWxlYXNlKCk7CiB9Cg== 217885 2013-11-26 09:58:25 -0800 2013-11-26 11:17:03 -0800 Patch tmp.patch text/plain 13734 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNDIyNGY4Li5iNmIyY2JlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTMtMTEt MjYgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIFN1cHBvcnQgZm9yIHNoYXBlLW1hcmdpbiBpbiBCb3hTaGFwZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0Nzg4CisKKyAgICAgICAgVmVyaWZ5 IHRoYXQgc2hhcGUtbWFyZ2luIGhhcyB0aGUgZXhwZWN0ZWQgZWZmZWN0IG9uIHRoZSBmb3VyIHBv c3NpYmxlIHNoYXBlLW91dHNpZGUgYm94IHZhbHVlcworICAgICAgICBmb3IgbGVmdCBhbmQgcmln aHQgZmxvYXRzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1tYXJn aW4tYm94ZXMtMDAxLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2hhcGVz L3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbWFyZ2luLWJveGVzLTAwMS5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFw ZS1vdXRzaWRlLW1hcmdpbi1ib3hlcy0wMDItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAg ICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1tYXJnaW4t Ym94ZXMtMDAyLmh0bWw6IEFkZGVkLgorCiAyMDEzLTExLTI1ICBEZWFuIEphY2tzb24gIDxkaW5v QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5kZXJUYWJsZVNlY3Rpb24gQmxpbmsgbWVyZ2UgYXNz ZXJ0aW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRl LWZsb2F0cy9zaGFwZS1vdXRzaWRlLW1hcmdpbi1ib3hlcy0wMDEtZXhwZWN0ZWQuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUt bWFyZ2luLWJveGVzLTAwMS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjMyYTY1MDcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3No YXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLW1hcmdpbi1ib3hlcy0wMDEt ZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDUxIEBACis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgor LmNvbnRhaW5lciB7CisgICAgd2lkdGg6IDkwcHg7CisgICAgaGVpZ2h0OiA5MHB4OworICAgIGNv bG9yOiBncmVlbjsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBtYXJnaW46IDEw cHg7CisgICAgcG9zaXRpb246IHJlbGF0aXZlOworfQorCisjc2hhcGUtbWFyZ2luLWJvcmRlci1i b3ggeworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDMwcHg7CisgICAgd2lkdGg6 IDI1cHg7CisgICAgaGVpZ2h0OiAyMHB4OworICAgIGJvcmRlcjogc29saWQgNXB4IGJsdWU7Cisg ICAgYm9yZGVyLWxlZnQtd2lkdGg6IDBweDsKK30KKworI3NoYXBlLW1hcmdpbi1tYXJnaW4tYm94 IHsKKyAgICB3aWR0aDogMjVweDsKKyAgICBoZWlnaHQ6IDIwcHg7CisgICAgYm9yZGVyOiBzb2xp ZCA1cHggYmx1ZTsKKyAgICBib3JkZXItbGVmdC13aWR0aDogMHB4OworfQorCis8L3N0eWxlPgor PC9oZWFkPgorPGJvZHk+CisgICAgPHA+VmVyaWZ5IHRoYXQgc2hhcGUtbWFyZ2luIGhhcyB0aGUg ZXhwZWN0ZWQgZWZmZWN0IG9uIHRoZSBmb3VyIHBvc3NpYmxlIHNoYXBlLW91dHNpZGUgYm94IHZh bHVlcyBmb3IgbGVmdCBmbG9hdHMuPC9wPgorCisgICAgPHA+c2hhcGUtb3V0c2lkZTogY29udGVu dC1ib3g8L3A+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz48L2Rpdj4KKworICAgIDxwPnNo YXBlLW91dHNpZGU6IHBhZGRpbmctYm94PC9wPgorICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+ PC9kaXY+CisKKyAgICA8cD5zaGFwZS1vdXRzaWRlOiBib3JkZXItYm94PC9wPgorICAgIDxkaXYg Y2xhc3M9J2NvbnRhaW5lcic+CisgICAgICA8ZGl2IGlkPSJzaGFwZS1tYXJnaW4tYm9yZGVyLWJv eCI+PC9kaXY+CisgICAgPC9kaXY+CisKKyAgICA8cD5zaGFwZS1vdXRzaWRlOiBtYXJnaW4tYm94 PC9wPgorICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+CisgICAgICAgIDxkaXYgaWQ9InNoYXBl LW1hcmdpbi1tYXJnaW4tYm94Ij48L2Rpdj4KKyAgICA8L2Rpdj4KKworPC9ib2R5PgorPC9odG1s PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1tYXJnaW4tYm94ZXMtMDAxLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLW1hcmdpbi1ib3hlcy0w MDEuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kMjg2ZDFiCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1tYXJnaW4tYm94ZXMtMDAxLmh0bWwKQEAgLTAsMCArMSw5MCBAQAor PGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIHdpZHRoOiA5MHB4Owor ICAgIGhlaWdodDogOTBweDsKKyAgICBjb2xvcjogZ3JlZW47CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmVkOworICAgIGZvbnQ6IDMwcHgvMSBBaGVtLCBzYW5zLXNlcmlmOworICAgIG1hcmdpbjog MTBweDsKKyAgICAtd2Via2l0LWZvbnQtc21vb3RoaW5nOiBhbnRpYWxpYXNlZDsKK30KKworLmNv bnRlbnQtYm94IHsKKyAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IGNvbnRlbnQtYm94OworICAg IC13ZWJraXQtc2hhcGUtbWFyZ2luOiA1cHg7CisgICAgYmFja2dyb3VuZC1jbGlwOiBwYWRkaW5n LWJveDsgIC8qIHBhZGRpbmcgYm94IG1hdGNoZXMgc2hhcGUtb3V0c2lkZSArIHNoYXBlLW1hcmdp biAqLworICAgIHdpZHRoOiAyNXB4OworICAgIGhlaWdodDogMjBweDsKKyAgICBwYWRkaW5nOiA1 cHg7CisgICAgbWFyZ2luOiAzMHB4IDYwcHg7Cit9CisKKy5wYWRkaW5nLWJveCB7CisgICAgLXdl YmtpdC1zaGFwZS1vdXRzaWRlOiBwYWRkaW5nLWJveDsKKyAgICAtd2Via2l0LXNoYXBlLW1hcmdp bjogNXB4OworICAgIGJhY2tncm91bmQtY2xpcDogYm9yZGVyLWJveDsgLyogYm9yZGVyIGJveCBt YXRjaGVzIHNoYXBlLW91dHNpZGUgKyBzaGFwZS1tYXJnaW4gKi8KKyAgICB3aWR0aDogMjBweDsK KyAgICBoZWlnaHQ6IDEwcHg7CisgICAgcGFkZGluZzogNXB4OworICAgIGJvcmRlcjogNXB4IHNv bGlkIHRyYW5zcGFyZW50OworICAgIG1hcmdpbjogMzBweCA2MHB4OworfQorCisuYm9yZGVyLWJv eCB7CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBib3JkZXItYm94OworICAgIC13ZWJraXQt c2hhcGUtbWFyZ2luOiA1cHg7CisgICAgYmFja2dyb3VuZC1jbGlwOiBib3JkZXItYm94OyAvKiBz aGFwZS1vdXRzaWRlIGlzIDUgcGl4ZWxzIGZyb20gdGhlIGJvcmRlci1ib3ggKi8KKyAgICB3aWR0 aDogMjBweDsKKyAgICBoZWlnaHQ6IDEwcHg7CisgICAgYm9yZGVyOiA1cHggc29saWQgdHJhbnNw YXJlbnQ7CisgICAgbWFyZ2luOiAzNXB4IDY1cHg7Cit9CisKKy5tYXJnaW4tYm94IHsKKyAgICAt d2Via2l0LXNoYXBlLW91dHNpZGU6IG1hcmdpbi1ib3g7CisgICAgLXdlYmtpdC1zaGFwZS1tYXJn aW46IDVweDsgLyogaGFzIG5vIGVmZmVjdCwgc2hhcGUgaXMgY2xpcHBlZCB0byB0aGUgbWFyZ2lu LWJveCAqLworICAgIGJhY2tncm91bmQtY2xpcDogY29udGVudC1ib3g7IAorICAgIHdpZHRoOiAy NXB4OworICAgIGhlaWdodDogMjBweDsKKyAgICBtYXJnaW46IDVweDsKK30KKworLnNoYXBlIHsK KyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBmbG9hdDogbGVmdDsKKyAgICBwYWRk aW5nLWxlZnQ6IDBweDsKKyAgICBib3JkZXItbGVmdDogMHB4OworICAgIG1hcmdpbi1sZWZ0OiAw cHg7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHA+VmVyaWZ5IHRoYXQgc2hh cGUtbWFyZ2luIGhhcyB0aGUgZXhwZWN0ZWQgZWZmZWN0IG9uIHRoZSBmb3VyIHBvc3NpYmxlIHNo YXBlLW91dHNpZGUgYm94IHZhbHVlcyBmb3IgbGVmdCBmbG9hdHMuPC9wPgorCisgICAgPHA+c2hh cGUtb3V0c2lkZTogY29udGVudC1ib3g8L3A+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz4K KyAgICAgICAgPGRpdiBjbGFzcz0nc2hhcGUgY29udGVudC1ib3gnPjwvZGl2PgorICAgICAgICB4 eHggeHggeHh4CisgICAgPC9kaXY+CisKKyAgICA8cD5zaGFwZS1vdXRzaWRlOiBwYWRkaW5nLWJv eDwvcD4KKyAgICA8ZGl2IGNsYXNzPSdjb250YWluZXInPgorICAgICAgICA8ZGl2IGNsYXNzPSdz aGFwZSBwYWRkaW5nLWJveCc+PC9kaXY+CisgICAgICAgIHh4eCB4eCB4eHgKKyAgICA8L2Rpdj4K KworICAgIDxwPnNoYXBlLW91dHNpZGU6IGJvcmRlci1ib3g8L3A+CisgICAgPGRpdiBjbGFzcz0n Y29udGFpbmVyJyBzdHlsZT0iYmFja2dyb3VuZDogYmx1ZSI+CisgICAgICAgIDxkaXYgY2xhc3M9 J3NoYXBlIGJvcmRlci1ib3gnPjwvZGl2PgorICAgICAgICB4eHggeHggeHh4CisgICAgPC9kaXY+ CisKKyAgICA8cD5zaGFwZS1vdXRzaWRlOiBtYXJnaW4tYm94PC9wPgorICAgIDxkaXYgY2xhc3M9 J2NvbnRhaW5lcicgc3R5bGU9ImJhY2tncm91bmQ6IGJsdWUiPgorICAgICAgICA8ZGl2IGNsYXNz PSdzaGFwZSBtYXJnaW4tYm94Jz48L2Rpdj4KKyAgICAgICAgeHggeHh4IHh4eAorICAgIDwvZGl2 PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMv c2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1tYXJnaW4tYm94ZXMtMDAyLWV4cGVj dGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9z aGFwZS1vdXRzaWRlLW1hcmdpbi1ib3hlcy0wMDItZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5iODQ3NDg5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1tYXJn aW4tYm94ZXMtMDAyLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw1NCBAQAorPGh0bWw+Cis8aGVh ZD4KKzxzdHlsZT4KKy5jb250YWluZXIgeworICAgIHdpZHRoOiA5MHB4OworICAgIGhlaWdodDog OTBweDsKKyAgICBjb2xvcjogZ3JlZW47CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cisg ICAgbWFyZ2luOiAxMHB4OworICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKK30KKworI3NoYXBlLW1h cmdpbi1ib3JkZXItYm94IHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAzMHB4 OworICAgIGxlZnQ6IDYwcHg7CisgICAgd2lkdGg6IDI1cHg7CisgICAgaGVpZ2h0OiAyMHB4Owor ICAgIGJvcmRlcjogc29saWQgNXB4IGJsdWU7CisgICAgYm9yZGVyLXJpZ2h0LXdpZHRoOiAwcHg7 Cit9CisKKyNzaGFwZS1tYXJnaW4tbWFyZ2luLWJveCB7CisgICAgcG9zaXRpb246IGFic29sdXRl OworICAgIGxlZnQ6IDYwcHg7CisgICAgd2lkdGg6IDI1cHg7CisgICAgaGVpZ2h0OiAyMHB4Owor ICAgIGJvcmRlcjogc29saWQgNXB4IGJsdWU7CisgICAgYm9yZGVyLXJpZ2h0LXdpZHRoOiAwcHg7 Cit9CisKKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8cD5WZXJpZnkgdGhhdCBzaGFw ZS1tYXJnaW4gaGFzIHRoZSBleHBlY3RlZCBlZmZlY3Qgb24gdGhlIGZvdXIgcG9zc2libGUgc2hh cGUtb3V0c2lkZSBib3ggdmFsdWVzIGZvciByaWdodCBmbG9hdHMuPC9wPgorCisgICAgPHA+c2hh cGUtb3V0c2lkZTogY29udGVudC1ib3g8L3A+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJz48 L2Rpdj4KKworICAgIDxwPnNoYXBlLW91dHNpZGU6IHBhZGRpbmctYm94PC9wPgorICAgIDxkaXYg Y2xhc3M9J2NvbnRhaW5lcic+PC9kaXY+CisKKyAgICA8cD5zaGFwZS1vdXRzaWRlOiBib3JkZXIt Ym94PC9wPgorICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+CisgICAgICA8ZGl2IGlkPSJzaGFw ZS1tYXJnaW4tYm9yZGVyLWJveCI+PC9kaXY+CisgICAgPC9kaXY+CisKKyAgICA8cD5zaGFwZS1v dXRzaWRlOiBtYXJnaW4tYm94PC9wPgorICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+CisgICAg ICAgIDxkaXYgaWQ9InNoYXBlLW1hcmdpbi1tYXJnaW4tYm94Ij48L2Rpdj4KKyAgICA8L2Rpdj4K KworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMv c2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1tYXJnaW4tYm94ZXMtMDAyLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRz aWRlLW1hcmdpbi1ib3hlcy0wMDIuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi4yZmVjODJmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMv c2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1tYXJnaW4tYm94ZXMtMDAyLmh0bWwK QEAgLTAsMCArMSw5MCBAQAorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy5jb250YWluZXIgewor ICAgIHdpZHRoOiA5MHB4OworICAgIGhlaWdodDogOTBweDsKKyAgICBjb2xvcjogZ3JlZW47Cisg ICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgIGZvbnQ6IDMwcHgvMSBBaGVtLCBzYW5zLXNl cmlmOworICAgIG1hcmdpbjogMTBweDsKKyAgICAtd2Via2l0LWZvbnQtc21vb3RoaW5nOiBhbnRp YWxpYXNlZDsKK30KKworLmNvbnRlbnQtYm94IHsKKyAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6 IGNvbnRlbnQtYm94OworICAgIC13ZWJraXQtc2hhcGUtbWFyZ2luOiA1cHg7CisgICAgYmFja2dy b3VuZC1jbGlwOiBwYWRkaW5nLWJveDsgIC8qIHBhZGRpbmcgYm94IG1hdGNoZXMgc2hhcGUtb3V0 c2lkZSArIHNoYXBlLW1hcmdpbiAqLworICAgIHdpZHRoOiAyNXB4OworICAgIGhlaWdodDogMjBw eDsKKyAgICBwYWRkaW5nOiA1cHg7CisgICAgbWFyZ2luOiAzMHB4IDYwcHg7Cit9CisKKy5wYWRk aW5nLWJveCB7CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBwYWRkaW5nLWJveDsKKyAgICAt d2Via2l0LXNoYXBlLW1hcmdpbjogNXB4OworICAgIGJhY2tncm91bmQtY2xpcDogYm9yZGVyLWJv eDsgLyogYm9yZGVyIGJveCBtYXRjaGVzIHNoYXBlLW91dHNpZGUgKyBzaGFwZS1tYXJnaW4gKi8K KyAgICB3aWR0aDogMjBweDsKKyAgICBoZWlnaHQ6IDEwcHg7CisgICAgcGFkZGluZzogNXB4Owor ICAgIGJvcmRlcjogNXB4IHNvbGlkIHRyYW5zcGFyZW50OworICAgIG1hcmdpbjogMzBweCA2MHB4 OworfQorCisuYm9yZGVyLWJveCB7CisgICAgLXdlYmtpdC1zaGFwZS1vdXRzaWRlOiBib3JkZXIt Ym94OworICAgIC13ZWJraXQtc2hhcGUtbWFyZ2luOiA1cHg7CisgICAgYmFja2dyb3VuZC1jbGlw OiBib3JkZXItYm94OyAvKiBzaGFwZS1vdXRzaWRlIGlzIDUgcGl4ZWxzIGZyb20gdGhlIGJvcmRl ci1ib3ggKi8KKyAgICB3aWR0aDogMjBweDsKKyAgICBoZWlnaHQ6IDEwcHg7CisgICAgYm9yZGVy OiA1cHggc29saWQgdHJhbnNwYXJlbnQ7CisgICAgbWFyZ2luOiAzNXB4IDY1cHg7Cit9CisKKy5t YXJnaW4tYm94IHsKKyAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IG1hcmdpbi1ib3g7CisgICAg LXdlYmtpdC1zaGFwZS1tYXJnaW46IDVweDsgLyogaGFzIG5vIGVmZmVjdCwgc2hhcGUgaXMgY2xp cHBlZCB0byB0aGUgbWFyZ2luLWJveCAqLworICAgIGJhY2tncm91bmQtY2xpcDogY29udGVudC1i b3g7IAorICAgIHdpZHRoOiAyNXB4OworICAgIGhlaWdodDogMjBweDsKKyAgICBtYXJnaW46IDVw eDsKK30KKworLnNoYXBlIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBmbG9h dDogcmlnaHQ7CisgICAgcGFkZGluZy1yaWdodDogMHB4OworICAgIGJvcmRlci1yaWdodDogMHB4 OworICAgIG1hcmdpbi1yaWdodDogMHB4OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5Pgor ICAgIDxwPlZlcmlmeSB0aGF0IHNoYXBlLW1hcmdpbiBoYXMgdGhlIGV4cGVjdGVkIGVmZmVjdCBv biB0aGUgZm91ciBwb3NzaWJsZSBzaGFwZS1vdXRzaWRlIGJveCB2YWx1ZXMgZm9yIHJpZ2h0IGZs b2F0cy48L3A+CisKKyAgICA8cD5zaGFwZS1vdXRzaWRlOiBjb250ZW50LWJveDwvcD4KKyAgICA8 ZGl2IGNsYXNzPSdjb250YWluZXInPgorICAgICAgICA8ZGl2IGNsYXNzPSdzaGFwZSBjb250ZW50 LWJveCc+PC9kaXY+CisgICAgICAgIHh4eCB4eCB4eHgKKyAgICA8L2Rpdj4KKworICAgIDxwPnNo YXBlLW91dHNpZGU6IHBhZGRpbmctYm94PC9wPgorICAgIDxkaXYgY2xhc3M9J2NvbnRhaW5lcic+ CisgICAgICAgIDxkaXYgY2xhc3M9J3NoYXBlIHBhZGRpbmctYm94Jz48L2Rpdj4KKyAgICAgICAg eHh4IHh4IHh4eAorICAgIDwvZGl2PgorCisgICAgPHA+c2hhcGUtb3V0c2lkZTogYm9yZGVyLWJv eDwvcD4KKyAgICA8ZGl2IGNsYXNzPSdjb250YWluZXInIHN0eWxlPSJiYWNrZ3JvdW5kOiBibHVl Ij4KKyAgICAgICAgPGRpdiBjbGFzcz0nc2hhcGUgYm9yZGVyLWJveCc+PC9kaXY+CisgICAgICAg IHh4eCB4eCB4eHgKKyAgICA8L2Rpdj4KKworICAgIDxwPnNoYXBlLW91dHNpZGU6IG1hcmdpbi1i b3g8L3A+CisgICAgPGRpdiBjbGFzcz0nY29udGFpbmVyJyBzdHlsZT0iYmFja2dyb3VuZDogYmx1 ZSI+CisgICAgICAgIDxkaXYgY2xhc3M9J3NoYXBlIG1hcmdpbi1ib3gnPjwvZGl2PgorICAgICAg ICB4eCB4eHggeHh4CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Mzg2NmUxMS4uZTNiMzFiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTExLTI2 ICBIYW5zIE11bGxlciAgPGhtdWxsZXJAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgU2hhcGVz XSBTdXBwb3J0IGZvciBzaGFwZS1tYXJnaW4gaW4gQm94U2hhcGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDc4OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcnJlY3RlZCBCb3hTaGFwZSdzIGludGVy bmFsIHNoYXBlLW1hcmdpbi9wYWRkaW5nIGJvdW5kcyBGbG9hdFJvdW5kZWRSZWN0CisgICAgICAg IGluaXRpYWxpemF0aW9uLiBUZXN0cyBmb3IgdGhlIHBhZGRpbmcgYm91bmRzIHdpbGwgYmUgYWRk ZWQgd2hlbiB0aGUgcmVzdCBvZgorICAgICAgICBzaGFwZS1wYWRkaW5nIGZvciBib3ggc2hhcGVz IGltcGxlbWVudGF0aW9uIGlzIHJlYWR5LgorCisgICAgICAgIFRlc3RzOiBmYXN0L3NoYXBlcy9z aGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLW1hcmdpbi1ib3hlcy0wMDEuaHRtbAor ICAgICAgICAgICAgICAgZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0 c2lkZS1tYXJnaW4tYm94ZXMtMDAyLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9zaGFwZXMv Qm94U2hhcGUuY3BwOiBVc2UgY29uc3RydWN0b3Igc2hhcGUtbWFyZ2luLHNoYXBlLXBhZGRpbmcg cGFyYW1ldGVycy4KKyAgICAgICAgKFdlYkNvcmU6OkJveFNoYXBlOjpCb3hTaGFwZSk6CisgICAg ICAgICogcmVuZGVyaW5nL3NoYXBlcy9Cb3hTaGFwZS5oOgorICAgICAgICAqIHJlbmRlcmluZy9z aGFwZXMvU2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQm94U2hhcGUpOiBQYXNz IHRoZSBzaGFwZS1tYXJnaW4gYW5kIHNoYXBlLXBhZGRpbmcgdmFsdWVzIGFsb25nIHRvIHRoZSBC b3hTaGFwZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgKFdlYkNvcmU6OlNoYXBlOjpjcmVhdGVTaGFw ZSk6IERpdHRvLgorCiAyMDEzLTExLTI1ICBTaW1vbiBQZW5hICA8c2ltb24ucGVuYUBzYW1zdW5n LmNvbT4KIAogICAgICAgICBbRUZMXSBYMTFIZWxwZXI6OmNyZWF0ZVBpeG1hcCBkb2Vzbid0IGlu aXRpYWxpc2Ugb3V0IHZhbHVlIGhhbmRsZUlkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z aGFwZXMvQm94U2hhcGUuY3BwCmluZGV4IGJiZGQxYzYuLjAxMWNjYzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvQm94U2hhcGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvQm94U2hhcGUuY3BwCkBAIC0zNCwxOSArMzQsMTkgQEAK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1Cb3hTaGFwZTo6Qm94U2hhcGUoY29uc3QgRmxvYXRS b3VuZGVkUmVjdCYgYm91bmRzKQorQm94U2hhcGU6OkJveFNoYXBlKGNvbnN0IEZsb2F0Um91bmRl ZFJlY3QmIGJvdW5kcywgZmxvYXQgc2hhcGVNYXJnaW4sIGZsb2F0IHNoYXBlUGFkZGluZykKICAg ICA6IFNoYXBlKCkKICAgICAsIG1fYm91bmRzKGJvdW5kcykKICAgICAsIG1fbWFyZ2luQm91bmRz KGJvdW5kcykKICAgICAsIG1fcGFkZGluZ0JvdW5kcyhib3VuZHMpCiB7Ci0gICAgaWYgKHNoYXBl TWFyZ2luKCkgPiAwKSB7Ci0gICAgICAgIG1fbWFyZ2luQm91bmRzLmluZmxhdGUoc2hhcGVNYXJn aW4oKSk7Ci0gICAgICAgIG1fbWFyZ2luQm91bmRzLmV4cGFuZFJhZGlpKHNoYXBlTWFyZ2luKCkp OworICAgIGlmIChzaGFwZU1hcmdpbiA+IDApIHsKKyAgICAgICAgbV9tYXJnaW5Cb3VuZHMuaW5m bGF0ZShzaGFwZU1hcmdpbik7CisgICAgICAgIG1fbWFyZ2luQm91bmRzLmV4cGFuZFJhZGlpKHNo YXBlTWFyZ2luKTsKICAgICB9Ci0gICAgaWYgKHNoYXBlUGFkZGluZygpID4gMCkgewotICAgICAg ICBtX3BhZGRpbmdCb3VuZHMuaW5mbGF0ZSgtc2hhcGVQYWRkaW5nKCkpOwotICAgICAgICBtX3Bh ZGRpbmdCb3VuZHMuZXhwYW5kUmFkaWkoLXNoYXBlUGFkZGluZygpKTsKKyAgICBpZiAoc2hhcGVQ YWRkaW5nID4gMCkgeworICAgICAgICBtX3BhZGRpbmdCb3VuZHMuaW5mbGF0ZSgtc2hhcGVQYWRk aW5nKTsKKyAgICAgICAgbV9wYWRkaW5nQm91bmRzLmV4cGFuZFJhZGlpKC1zaGFwZVBhZGRpbmcp OwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBl cy9Cb3hTaGFwZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9Cb3hTaGFwZS5o CmluZGV4IDJkYWU4NmYuLjZhZDhjNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zaGFwZXMvQm94U2hhcGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hh cGVzL0JveFNoYXBlLmgKQEAgLTM3LDcgKzM3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBj bGFzcyBCb3hTaGFwZSA6IHB1YmxpYyBTaGFwZSB7CiBwdWJsaWM6Ci0gICAgQm94U2hhcGUoY29u c3QgRmxvYXRSb3VuZGVkUmVjdCYgYm91bmRzKTsKKyAgICBCb3hTaGFwZShjb25zdCBGbG9hdFJv dW5kZWRSZWN0JiBib3VuZHMsIGZsb2F0IHNoYXBlTWFyZ2luLCBmbG9hdCBzaGFwZVBhZGRpbmcp OwogCiAgICAgdmlydHVhbCBMYXlvdXRSZWN0IHNoYXBlTWFyZ2luTG9naWNhbEJvdW5kaW5nQm94 KCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gc3RhdGljX2Nhc3Q8TGF5b3V0UmVjdD4obV9tYXJn aW5Cb3VuZHMucmVjdCgpKTsgfQogICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBzaGFwZVBhZGRpbmdM b2dpY2FsQm91bmRpbmdCb3goKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBzdGF0aWNfY2FzdDxM YXlvdXRSZWN0PihtX3BhZGRpbmdCb3VuZHMucmVjdCgpKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1NoYXBlLmNwcAppbmRleCBjOGZiYjhmLi4zNDAwNTA0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcApAQCAtNDYsMTAgKzQ2LDEwIEBACiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIFBhc3NPd25QdHI8U2hhcGU+IGNyZWF0ZUJv eFNoYXBlKGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmIGJvdW5kcykKK3N0YXRpYyBQYXNzT3duUHRy PFNoYXBlPiBjcmVhdGVCb3hTaGFwZShjb25zdCBGbG9hdFJvdW5kZWRSZWN0JiBib3VuZHMsIGZs b2F0IHNoYXBlTWFyZ2luLCBmbG9hdCBzaGFwZVBhZGRpbmcpCiB7CiAgICAgQVNTRVJUKGJvdW5k cy5yZWN0KCkud2lkdGgoKSA+PSAwICYmIGJvdW5kcy5yZWN0KCkuaGVpZ2h0KCkgPj0gMCk7Ci0g ICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBCb3hTaGFwZShib3VuZHMpKTsKKyAgICByZXR1cm4gYWRv cHRQdHIobmV3IEJveFNoYXBlKGJvdW5kcywgc2hhcGVNYXJnaW4sIHNoYXBlUGFkZGluZykpOwog fQogCiBzdGF0aWMgUGFzc093blB0cjxTaGFwZT4gY3JlYXRlUmVjdGFuZ2xlU2hhcGUoY29uc3Qg RmxvYXRSZWN0JiBib3VuZHMsIGNvbnN0IEZsb2F0U2l6ZSYgcmFkaWkpCkBAIC0yNjMsMTEgKzI2 MywxMyBAQCBQYXNzT3duUHRyPFNoYXBlPiBTaGFwZTo6Y3JlYXRlU2hhcGUoY29uc3QgUm91bmRl ZFJlY3QmIHJvdW5kZWRSZWN0LCBXcml0aW5nTW9kZQogewogICAgIEZsb2F0UmVjdCByZWN0KDAs IDAsIHJvdW5kZWRSZWN0LnJlY3QoKS53aWR0aCgpLCByb3VuZGVkUmVjdC5yZWN0KCkuaGVpZ2h0 KCkpOwogICAgIEZsb2F0Um91bmRlZFJlY3QgYm91bmRzKHJlY3QsIHJvdW5kZWRSZWN0LnJhZGlp KCkudG9wTGVmdCgpLCByb3VuZGVkUmVjdC5yYWRpaSgpLnRvcFJpZ2h0KCksIHJvdW5kZWRSZWN0 LnJhZGlpKCkuYm90dG9tTGVmdCgpLCByb3VuZGVkUmVjdC5yYWRpaSgpLmJvdHRvbVJpZ2h0KCkp OworICAgIGZsb2F0IHNoYXBlTWFyZ2luID0gZmxvYXRWYWx1ZUZvckxlbmd0aChtYXJnaW4sIDAp OworICAgIGZsb2F0IHNoYXBlUGFkZGluZyA9IGZsb2F0VmFsdWVGb3JMZW5ndGgocGFkZGluZywg MCk7CiAKLSAgICBPd25QdHI8U2hhcGU+IHNoYXBlID0gY3JlYXRlQm94U2hhcGUoYm91bmRzKTsK KyAgICBPd25QdHI8U2hhcGU+IHNoYXBlID0gY3JlYXRlQm94U2hhcGUoYm91bmRzLCBzaGFwZU1h cmdpbiwgc2hhcGVQYWRkaW5nKTsKICAgICBzaGFwZS0+bV93cml0aW5nTW9kZSA9IHdyaXRpbmdN b2RlOwotICAgIHNoYXBlLT5tX21hcmdpbiA9IGZsb2F0VmFsdWVGb3JMZW5ndGgobWFyZ2luLCAw KTsKLSAgICBzaGFwZS0+bV9wYWRkaW5nID0gZmxvYXRWYWx1ZUZvckxlbmd0aChwYWRkaW5nLCAw KTsKKyAgICBzaGFwZS0+bV9tYXJnaW4gPSBzaGFwZU1hcmdpbjsKKyAgICBzaGFwZS0+bV9wYWRk aW5nID0gc2hhcGVQYWRkaW5nOwogCiAgICAgcmV0dXJuIHNoYXBlLnJlbGVhc2UoKTsKIH0K