129739 2014-03-05 07:30:30 -0800 [CSS Shapes] large corner radius combined with 0 radius does not wrap properly 2014-04-08 15:26:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 127982 129726 124173 1 bjonesbe giles_joplin commit-queue dino esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 987246 0 225881 bjonesbe 2014-03-05 07:30:30 -0800 Created attachment 225881 inset example If a corner radius larger than 50% of the length of the associated dimension (width or height) of the shape is combined with a corner radius that is 0, then wrapping doesn't happen properly to the resultant shape. This happens for both inset and box shapes. See the attached tests for examples. 987265 1 225887 bjonesbe 2014-03-05 08:23:42 -0800 Created attachment 225887 border-box example 998221 2 228753 giles_joplin 2014-04-07 13:12:26 -0700 Created attachment 228753 Patch Corrected special case handling for shape-outside border-box values with border-radius values that greater than or equal to the box's height. 998804 3 228753 bjonesbe 2014-04-08 14:57:05 -0700 Comment on attachment 228753 Patch r=me 998822 4 228753 commit-queue 2014-04-08 15:26:30 -0700 Comment on attachment 228753 Patch Clearing flags on attachment: 228753 Committed r166966: <http://trac.webkit.org/changeset/166966> 998823 5 commit-queue 2014-04-08 15:26:33 -0700 All reviewed patches have been landed. Closing bug. 225881 2014-03-05 07:30:30 -0800 2014-03-05 07:30:30 -0800 inset example shape-outside-floats-inset-rounded-large-radius-and-zero.html text/html 522 bjonesbe PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8c3R5bGU+Ci5jb250YWluZXIgewogICAgZm9udDogMjBw eC8xIEFoZW0sIHNhbnMtc2VyaWY7CiAgICB3aWR0aDogNTAwcHg7CiAgICBoZWlnaHQ6IDIwMHB4 OwogICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7Cn0KCi5yb3VuZGVkLXJlY3QgewogICAgd2lk dGg6IDMyMHB4OwogICAgaGVpZ2h0OiAxNjBweDsKICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7 CiAgICBib3JkZXItcmFkaXVzOiAyMDBweCAwcHg7CiAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6 IGluc2V0KDBweCByb3VuZCAyMDBweCAwcHgpOwp9Cjwvc3R5bGU+Cgo8Ym9keT4KPGRpdiBjbGFz cz0iY29udGFpbmVyIiBzdHlsZT0idGV4dC1hbGlnbjogcmlnaHQiPgpYPGJyLz4KICAgIDxkaXYg c3R5bGU9ImZsb2F0OiByaWdodCIgY2xhc3M9InJvdW5kZWQtcmVjdCI+PC9kaXY+Clg8YnIvPgpY PGJyLz4KWDxici8+Clg8YnIvPgpYPGJyLz4KWDxici8+Clg8YnIvPgpYPGJyLz4KWAo8L2Rpdj4K CjwvYm9keT4K 225887 2014-03-05 08:23:42 -0800 2014-03-05 08:23:42 -0800 border-box example shape-outside-floats-border-radius-border-box-001.html text/html 950 bjonesbe PCFET0NUWVBFIGh0bWw+CjxzdHlsZT4KICAgIC5jb250YWluZXIgewogICAgICAgIHdpZHRoOiAz MDBweDsKICAgICAgICBmb250OiAxMHB4LzEgQWhlbTsKICAgIH0KICAgIC5mbG9hdCB7CiAgICAg ICAgZmxvYXQ6IGxlZnQ7CiAgICAgICAgd2lkdGg6IDEwMHB4OwogICAgICAgIGhlaWdodDogMTAw cHg7CiAgICAgICAgcGFkZGluZzogMjBweDsKICAgICAgICBib3JkZXI6IDIwcHggc29saWQgYmx1 ZTsKICAgICAgICBib3JkZXItcmFkaXVzOiAyMDBweCAwcHg7CiAgICAgICAgbWFyZ2luOiAyMHB4 OwogICAgICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CiAgICAgICAgYmFja2dyb3VuZC1jbGlw OiBib3JkZXItYm94OwogICAgICAgIC13ZWJraXQtc2hhcGUtb3V0c2lkZTogYm9yZGVyLWJveDsK ICAgIH0KPC9zdHlsZT4KPGJvZHk+CiAgICA8cD5UaGUgYmxhY2sgc3F1YXJlcyBzaG91bGQgZm9s bG93IHRoZSByaWdodCBzaWRlIG9mIHRoZSBibHVlIHNoYXBlLiBUaGV5IHNob3VsZCBub3Qgb3Zl cmxhcCB0aGUgc2hhcGUuPC9wPgogICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KICAgICAgICA8 ZGl2IGNsYXNzPSJmbG9hdCI+PC9kaXY+CiAgICAgICAgWDxicj4KICAgICAgICBYPGJyPgogICAg ICAgIFg8YnI+CiAgICAgICAgWDxicj4KICAgICAgICBYPGJyPgogICAgICAgIFg8YnI+CiAgICAg ICAgWDxicj4KICAgICAgICBYPGJyPgogICAgICAgIFg8YnI+CiAgICAgICAgWDxicj4KICAgICAg ICBYPGJyPgogICAgICAgIFg8YnI+CiAgICAgICAgWDxicj4KICAgICAgICBYPGJyPgogICAgICAg IFg8YnI+CiAgICAgICAgWDxicj4KICAgICAgICBYPGJyPgogICAgICAgIFg8YnI+CiAgICAgICAg WDxicj4KICAgICAgICBYPGJyPgogICAgICAgIFg8YnI+CiAgICAgICAgWDxicj4KICAgICAgICBY PGJyPgogICAgICAgIFg8YnI+CiAgICA8L2Rpdj4KPC9ib2R5Pgo= 228753 2014-04-07 13:12:26 -0700 2014-04-08 15:26:29 -0700 Patch tmp.patch text/plain 8742 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0MjdjN2M1Li45NDUwNDkzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDQt MDcgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIGxhcmdlIGNvcm5lciByYWRpdXMgY29tYmluZWQgd2l0aCAwIHJhZGl1cyBkb2VzIG5vdCB3 cmFwIHByb3Blcmx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjk3MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtYmln LWJveC1ib3JkZXItcmFkaXVzLTAwMS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtYmlnLWJveC1ib3Jk ZXItcmFkaXVzLTAwMS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3NoYXBlcy9zaGFwZS1v dXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWJpZy1ib3gtYm9yZGVyLXJhZGl1cy0wMDItZXhw ZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1iaWctYm94LWJvcmRlci1yYWRpdXMtMDAyLmh0bWw6IEFkZGVk LgorCiAyMDE0LTAzLTMwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAg ICAgTW92ZSBzbG93IEpTUmVncmVzcyB0ZXN0cyBvdXQgb2YgdGhlIHdheSBzbyB0aGF0IHRoZXkg ZG9uJ3Qgc2hvdyB1cCBpbiBydW4tanNjLWJlbmNobWFya3MgcnVucyBhbmQgYWxzbyBza2lwIHRl c3RzIHRoYXQgYXJlIGV4dHJlbWVseSBsb25nLXJ1bm5pbmcKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtYmlnLWJv eC1ib3JkZXItcmFkaXVzLTAwMS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBl cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWJpZy1ib3gtYm9yZGVyLXJhZGl1 cy0wMDEtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmVk YTM1MGIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1v dXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWJpZy1ib3gtYm9yZGVyLXJhZGl1cy0wMDEtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTcgQEAKK1RoZSBncmVlbiBzcXVhcmVzIHNob3VsZCBmb2xs b3cgdGhlIHJpZ2h0IHNpZGUgb2YgdGhlIGJsdWUgc2hhcGUuIFRoZXkgc2hvdWxkIG5vdCBvdmVy bGFwIHRoZSBzaGFwZS4KKworWAorWAorWAorWAorWAorWAorUEFTUyBlbGVtZW50UmVjdCgnYScp LnRvcCBpcyAwCitQQVNTIGVsZW1lbnRSZWN0KCdhJykucmlnaHQgaXMgMTIwCitQQVNTIGVsZW1l bnRSZWN0KCdiJykudG9wIGlzIDIwCitQQVNTIGVsZW1lbnRSZWN0KCdjJykudG9wIGlzIDQwCitQ QVNTIGVsZW1lbnRSZWN0KCdkJykudG9wIGlzIDYwCitQQVNTIGVsZW1lbnRSZWN0KCdlJykudG9w IGlzIDgwCitQQVNTIGVsZW1lbnRSZWN0KCdmJykudG9wIGlzIDEwMAorUEFTUyBlbGVtZW50UmVj dCgnZicpLnJpZ2h0IGlzIDIwCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVz L3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtYmlnLWJveC1ib3JkZXItcmFkaXVz LTAwMS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1iaWctYm94LWJvcmRlci1yYWRpdXMtMDAxLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTIzMDhlZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtYmln LWJveC1ib3JkZXItcmFkaXVzLTAwMS5odG1sCkBAIC0wLDAgKzEsNjggQEAKKzwhRE9DVFlQRSBo dG1sPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9z Y3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3N1YnBpeGVsLXV0aWxzLmpzIj48L3Nj cmlwdD4KKzxzdHlsZT4KKyNjb250YWluZXIgeworICAgIHdpZHRoOiAzMDBweDsKKyAgICBmb250 OiAyMHB4LzEgQWhlbTsKKyAgICBjb2xvcjogZ3JlZW47Cit9CisKKyNmbG9hdCB7CisgICAgZmxv YXQ6IGxlZnQ7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAgYm9y ZGVyLXJhZGl1czogMTAwcHggMHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgICAg YmFja2dyb3VuZC1jbGlwOiBib3JkZXItYm94OworICAgIC13ZWJraXQtc2hhcGUtb3V0c2lkZTog Ym9yZGVyLWJveDsKK30KKzwvc3R5bGU+Cis8Ym9keT4KKyAgICA8cD5UaGUgZ3JlZW4gc3F1YXJl cyBzaG91bGQgZm9sbG93IHRoZSByaWdodCBzaWRlIG9mIHRoZSBibHVlIHNoYXBlLiBUaGV5IHNo b3VsZCBub3Qgb3ZlcmxhcCB0aGUgc2hhcGUuPC9wPgorICAgIDxkaXYgaWQ9ImNvbnRhaW5lciI+ CisgICAgICAgIDxkaXYgaWQ9ImZsb2F0Ij48L2Rpdj4KKyAgICAgICAgPHNwYW4gaWQ9ImEiPlg8 L3NwYW4+PGJyPgorICAgICAgICA8c3BhbiBpZD0iYiI+WDwvc3Bhbj48YnI+CisgICAgICAgIDxz cGFuIGlkPSJjIj5YPC9zcGFuPjxicj4KKyAgICAgICAgPHNwYW4gaWQ9ImQiPlg8L3NwYW4+PGJy PgorICAgICAgICA8c3BhbiBpZD0iZSI+WDwvc3Bhbj48YnI+CisgICAgICAgIDxzcGFuIGlkPSJm Ij5YPC9zcGFuPgorICAgIDwvZGl2PgorICAgIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPC9i b2R5PgorPHNjcmlwdD4KK2Z1bmN0aW9uIGVsZW1lbnRSZWN0KGVsZW1lbnRJZCkgCit7CisgICAg dmFyIHMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGFpbmVyIikuZ2V0Qm91bmRpbmdD bGllbnRSZWN0KCk7CisgICAgdmFyIHIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZChlbGVtZW50 SWQpLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgIHJldHVybiB7cmlnaHQ6IChyLmxlZnQg LSBzLmxlZnQpICsgci53aWR0aCwgdG9wOiByLnRvcCAtIHMudG9wLCB3aWR0aDogci53aWR0aCwg aGVpZ2h0OiByLmhlaWdodH07Cit9CisKK2Z1bmN0aW9uIGJvcmRlclhJbnRlcmNlcHQoeSkgCit7 CisgICAgdmFyIHJhZGl1c1NxdWFyZWQgPSAxMDAgKiAxMDA7CisgICAgdmFyIGYgPSBTdWJQaXhl bExheW91dC5zbmFwVG9MYXlvdXRVbml0KE1hdGguc3FydChyYWRpdXNTcXVhcmVkIC0geSAqIHkp KTsKKyAgICByZXR1cm4gZiArIDIwOyAgLy8gd2lsbCBiZSBjb21wYXJlZCB3aXRoIHRoZSByaWdo dCBlZGdlIG9mIGEgMjB4MjAgQWhlbSBjaGFyIGNlbGwKK30KKwordmFyIHF1aWV0ID0gdHJ1ZTsg Ly8gUEFTUyBvdXRwdXQgZGVwZW5kcyBvbiBTdWJQaXhlbExheW91dC5pc0VuYWJsZWQoKQorCitz aG91bGRCZSgiZWxlbWVudFJlY3QoJ2EnKS50b3AiLCAiMCIpOworc2hvdWxkQmUoImVsZW1lbnRS ZWN0KCdhJykucmlnaHQiLCAiMTIwIik7CisKK3Nob3VsZEJlKCJlbGVtZW50UmVjdCgnYicpLnRv cCIsICIyMCIpOworc2hvdWxkQmVDbG9zZVRvKCJlbGVtZW50UmVjdCgnYicpLnJpZ2h0IiwgYm9y ZGVyWEludGVyY2VwdCgyMCksIDEsIHF1aWV0KTsKKworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdj JykudG9wIiwgIjQwIik7CitzaG91bGRCZUNsb3NlVG8oImVsZW1lbnRSZWN0KCdjJykucmlnaHQi LCBib3JkZXJYSW50ZXJjZXB0KDQwKSwgMSwgcXVpZXQpOworCitzaG91bGRCZSgiZWxlbWVudFJl Y3QoJ2QnKS50b3AiLCAiNjAiKTsKK3Nob3VsZEJlQ2xvc2VUbygiZWxlbWVudFJlY3QoJ2QnKS5y aWdodCIsIGJvcmRlclhJbnRlcmNlcHQoNjApLCAxLCBxdWlldCk7CisKK3Nob3VsZEJlKCJlbGVt ZW50UmVjdCgnZScpLnRvcCIsICI4MCIpOworc2hvdWxkQmVDbG9zZVRvKCJlbGVtZW50UmVjdCgn ZScpLnJpZ2h0IiwgYm9yZGVyWEludGVyY2VwdCg4MCksIDEsIHF1aWV0KTsKKworc2hvdWxkQmUo ImVsZW1lbnRSZWN0KCdmJykudG9wIiwgIjEwMCIpOworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdm JykucmlnaHQiLCAiMjAiKTsKKzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1iaWctYm94LWJvcmRl ci1yYWRpdXMtMDAyLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFw ZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWJpZy1ib3gtYm9yZGVyLXJhZGl1cy0wMDIt ZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kMDkwNmYw Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lk ZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1iaWctYm94LWJvcmRlci1yYWRpdXMtMDAyLWV4cGVjdGVk Lmh0bWwKQEAgLTAsMCArMSwyOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8c3R5bGU+CisjY29udGFp bmVyIHsKKyAgICB3aWR0aDogMzAwcHg7CisgICAgZm9udDogNDBweC8xIEFoZW07CisgICAgY29s b3I6IGdyZWVuOworICAgIHRleHQtYWxpZ246IHJpZ2h0OworfQorCisjZmxvYXQgeworICAgIGZs b2F0OiByaWdodDsKKyAgICB3aWR0aDogMjQwcHg7CisgICAgaGVpZ2h0OiAxMjBweDsKKyAgICBi b3JkZXItdG9wLWxlZnQtcmFkaXVzOiA2MHB4OworICAgIGJvcmRlci1ib3R0b20tbGVmdC1yYWRp dXM6IDYwcHg7CisgICAgYm9yZGVyLXRvcC1yaWdodC1yYWRpdXM6IDBweDsKKyAgICBib3JkZXIt Ym90dG9tLXJpZ2h0LXJhZGl1czogMTIwcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsK KyAgICBiYWNrZ3JvdW5kLWNsaXA6IGJvcmRlci1ib3g7Cit9Cis8L3N0eWxlPgorPGJvZHk+Cisg ICAgPHA+VGhlIGdyZWVuIHNxdWFyZSBzaG91bGQgYXBlYXIgdG8gdGhlIGxlZnQgb2YgdGhlIGJs dWUgcm91bmRlZCBzaGFwZS4KKyAgICA8ZGl2IGlkPSJjb250YWluZXIiPgorICAgICAgICA8ZGl2 IGlkPSJmbG9hdCI+PC9kaXY+CisgICAgICAgIDxicj5YCisgICAgPC9kaXY+Cis8L2JvZHk+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9z aGFwZS1vdXRzaWRlLWJpZy1ib3gtYm9yZGVyLXJhZGl1cy0wMDIuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtYmlnLWJveC1i b3JkZXItcmFkaXVzLTAwMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmIwOTdiZTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFw ZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWJpZy1ib3gtYm9yZGVyLXJhZGl1cy0wMDIu aHRtbApAQCAtMCwwICsxLDMwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KKyNjb250YWlu ZXIgeworICAgIHdpZHRoOiAzMDBweDsKKyAgICBmb250OiA0MHB4LzEgQWhlbTsKKyAgICBjb2xv cjogZ3JlZW47CisgICAgdGV4dC1hbGlnbjogcmlnaHQ7Cit9CisKKyNmbG9hdCB7CisgICAgZmxv YXQ6IHJpZ2h0OworICAgIHdpZHRoOiAyNDBweDsKKyAgICBoZWlnaHQ6IDEyMHB4OworICAgIGJv cmRlci10b3AtbGVmdC1yYWRpdXM6IDYwcHg7CisgICAgYm9yZGVyLWJvdHRvbS1sZWZ0LXJhZGl1 czogNjBweDsKKyAgICBib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogMHB4OworICAgIGJvcmRlci1i b3R0b20tcmlnaHQtcmFkaXVzOiAxMjBweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOwor ICAgIGJhY2tncm91bmQtY2xpcDogYm9yZGVyLWJveDsKKyAgICAtd2Via2l0LXNoYXBlLW91dHNp ZGU6IGJvcmRlci1ib3g7CisgICAgbWFyZ2luLWxlZnQ6IDIwcHg7IC8qIGRlbW9uc3RyYXRlIHRo YXQgdGhlIHNoYXBlIGRlZmluZXMgdGhlIGNoYXIncyBwb3NpdGlvbiAqLworfQorPC9zdHlsZT4K Kzxib2R5PgorICAgIDxwPlRoZSBncmVlbiBzcXVhcmUgc2hvdWxkIGFwZWFyIHRvIHRoZSBsZWZ0 IG9mIHRoZSBibHVlIHJvdW5kZWQgc2hhcGUuCisgICAgPGRpdiBpZD0iY29udGFpbmVyIj4KKyAg ICAgICAgPGRpdiBpZD0iZmxvYXQiPjwvZGl2PgorICAgICAgICA8YnI+WAorICAgIDwvZGl2Pgor PC9ib2R5PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IGI0ZDlkNzYuLjg5MjdkYjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxNC0wNC0wNyAgSGFucyBNdWxsZXIgIDxobXVsbGVyQGFkb2JlLmNvbT4K KworICAgICAgICBbQ1NTIFNoYXBlc10gbGFyZ2UgY29ybmVyIHJhZGl1cyBjb21iaW5lZCB3aXRo IDAgcmFkaXVzIGRvZXMgbm90IHdyYXAgcHJvcGVybHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTczOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcnJlY3RlZCBzcGVjaWFsIGNhc2UgaGFuZGxpbmcg Zm9yIHNoYXBlLW91dHNpZGUgYm9yZGVyLWJveCB2YWx1ZXMgd2l0aCBib3JkZXItcmFkaXVzCisg ICAgICAgIHZhbHVlcyB0aGF0IGdyZWF0ZXIgdGhhbiBvciBlcXVhbCB0byB0aGUgYm94J3MgaGVp Z2h0LgorCisgICAgICAgIFRlc3RzOiBmYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9z aGFwZS1vdXRzaWRlLWJpZy1ib3gtYm9yZGVyLXJhZGl1cy0wMDEuaHRtbAorICAgICAgICAgICAg ICAgZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1iaWctYm94 LWJvcmRlci1yYWRpdXMtMDAyLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9zaGFwZXMvQm94 U2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Qm94U2hhcGU6OmdldEV4Y2x1ZGVkSW50ZXJ2 YWxzKToKKwogMjAxNC0wNC0wNyAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4K IAogICAgICAgICBbQ1NTIFNoYXBlc10gQ2xlYW4gdXAgaW52YWxpZCBGSVhNRQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9Cb3hTaGFwZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBlLmNwcAppbmRleCAwOGFiZTI1Li4xMWFh ZTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBlLmNwcApA QCAtMTMwLDcgKzEzMCw3IEBAIHZvaWQgQm94U2hhcGU6OmdldEV4Y2x1ZGVkSW50ZXJ2YWxzKExh eW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpCiAgICAgZmxvYXQgdG9w Q29ybmVyTWF4WSA9IHN0ZDo6bWF4PGZsb2F0PihtYXJnaW5Cb3VuZHMudG9wTGVmdENvcm5lcigp Lm1heFkoKSwgbWFyZ2luQm91bmRzLnRvcFJpZ2h0Q29ybmVyKCkubWF4WSgpKTsKICAgICBmbG9h dCBib3R0b21Db3JuZXJNaW5ZID0gc3RkOjptaW48ZmxvYXQ+KG1hcmdpbkJvdW5kcy5ib3R0b21M ZWZ0Q29ybmVyKCkueSgpLCBtYXJnaW5Cb3VuZHMuYm90dG9tUmlnaHRDb3JuZXIoKS55KCkpOwog Ci0gICAgaWYgKHkxIDw9IHRvcENvcm5lck1heFkgJiYgeTIgPj0gYm90dG9tQ29ybmVyTWluWSkg eworICAgIGlmICh0b3BDb3JuZXJNYXhZIDw9IGJvdHRvbUNvcm5lck1pblkgJiYgeTEgPD0gdG9w Q29ybmVyTWF4WSAmJiB5MiA+PSBib3R0b21Db3JuZXJNaW5ZKSB7CiAgICAgICAgIHJlc3VsdC5h cHBlbmQoTGluZVNlZ21lbnQocmVjdC54KCksIHJlY3QubWF4WCgpKSk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CkBAIC0xNDAsNiArMTQwLDEyIEBAIHZvaWQgQm94U2hhcGU6OmdldEV4Y2x1ZGVk SW50ZXJ2YWxzKExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpCiAg ICAgZmxvYXQgbWluWEludGVyY2VwdDsKICAgICBmbG9hdCBtYXhYSW50ZXJjZXB0OwogCisgICAg aWYgKHkxIDw9IG1hcmdpbkJvdW5kcy50b3BMZWZ0Q29ybmVyKCkubWF4WSgpICYmIHkyID49IG1h cmdpbkJvdW5kcy5ib3R0b21MZWZ0Q29ybmVyKCkueSgpKQorICAgICAgICB4MSA9IHJlY3QueCgp OworCisgICAgaWYgKHkxIDw9IG1hcmdpbkJvdW5kcy50b3BSaWdodENvcm5lcigpLm1heFkoKSAm JiB5MiA+PSBtYXJnaW5Cb3VuZHMuYm90dG9tUmlnaHRDb3JuZXIoKS55KCkpCisgICAgICAgIHgy ID0gcmVjdC5tYXhYKCk7CisKICAgICBpZiAobWFyZ2luQm91bmRzLnhJbnRlcmNlcHRzQXRZKHkx LCBtaW5YSW50ZXJjZXB0LCBtYXhYSW50ZXJjZXB0KSkgewogICAgICAgICB4MSA9IHN0ZDo6bWlu PGZsb2F0Pih4MSwgbWluWEludGVyY2VwdCk7CiAgICAgICAgIHgyID0gc3RkOjptYXg8ZmxvYXQ+ KHgyLCBtYXhYSW50ZXJjZXB0KTsK