130369 2014-03-17 16:48:51 -0700 [CSS Shapes] shape-margin in percentage units always computes to 0px 2014-04-04 10:14:57 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98664 1 rhauck bjonesbe bjonesbe commit-queue esprehn+autocc glenn gyuyoung.kim kondapallykalyan macpherson menard zoltan oldest_to_newest 991454 0 rhauck 2014-03-17 16:48:51 -0700 The following shape definition results in at shape-margin: 0px: -webkit-shape-margin: 10%; -webkit-shape-outside: inset(40px 100px 40px 0px); I've attached two ref files to go with the test file - one is with just a simple green square element, the other is with the same shape defined with the shape-margin: 20px, which should be the computed value of the 10% in the test file (containing block is 200px x 200px) 991456 1 226979 rhauck 2014-03-17 16:49:45 -0700 Created attachment 226979 Test case for bug 991457 2 226980 rhauck 2014-03-17 16:50:41 -0700 Created attachment 226980 ref file #1 for test - uses shape-margin in px units on the same exact shape 991458 3 226981 rhauck 2014-03-17 16:51:21 -0700 Created attachment 226981 ref file #2 for test - uses simple green square 997364 4 228556 bjonesbe 2014-04-03 16:27:22 -0700 Created attachment 228556 Patch 997369 5 228556 zoltan 2014-04-03 16:51:46 -0700 Comment on attachment 228556 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228556&action=review > Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp:163 > + float margin = floatValueForLength(m_renderer.style().shapeMargin(), m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : LayoutUnit()); I like this change! The floatValueForLength will present only here, not in every shape types. Also, Shape class stores a float, so we won't be passing Length all around! Looks good to me. 997596 6 228556 kling 2014-04-04 09:41:00 -0700 Comment on attachment 228556 Patch r=me 997609 7 228556 commit-queue 2014-04-04 10:14:53 -0700 Comment on attachment 228556 Patch Clearing flags on attachment: 228556 Committed r166787: <http://trac.webkit.org/changeset/166787> 997610 8 commit-queue 2014-04-04 10:14:57 -0700 All reviewed patches have been landed. Closing bug. 226979 2014-03-17 16:49:45 -0700 2014-03-17 16:49:45 -0700 Test case for bug shape-margin-percentage.html text/html 1156 rhauck PCFET0NUWVBFIGh0bWw+CjxodG1sPgogICAgPGhlYWQ+CiAgICAgICAgPHRpdGxlPkNTUyBUZXN0 OiBsZWZ0IGZsb2F0LCBpbnNldCArIHNoYXBlLW1hcmdpbiwgJSB1bml0czwvdGl0bGU+CiAgICA8 L2hlYWQ+CiAgICA8c3R5bGU+CiAgICAgICAgI2NvbnRhaW5lciB7CiAgICAgICAgICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKICAgICAgICAgICAgbGVmdDogMjVweDsKICAgICAgICAgICAgd2lkdGg6 IDIwMHB4OwogICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OwogICAgICAgICAgICBmb250LWZhbWls eTogQWhlbTsKICAgICAgICAgICAgZm9udC1zaXplOiAyMHB4OwogICAgICAgICAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZWQ7CiAgICAgICAgICAgIGNvbG9yOiBncmVlbjsKICAgICAgICB9CiAgICAg ICAgI3Rlc3Qtc2hhcGUgewogICAgICAgICAgICBmbG9hdDogbGVmdDsKICAgICAgICAgICAgd2lk dGg6IDIwMHB4OwogICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OwogICAgICAgICAgICAtd2Via2l0 LXNoYXBlLW1hcmdpbjogMTAlOwogICAgICAgICAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6IGlu c2V0KDQwcHggMTAwcHggNDBweCAwcHgpOwogICAgICAgIH0KICAgICAgICAjc3RhdGljLXNoYXBl IHsKICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgICAgICAgICBsZWZ0OiAyNXB4 OwogICAgICAgICAgICB3aWR0aDogMTAwcHg7CiAgICAgICAgICAgIGhlaWdodDogMTIwcHg7CiAg ICAgICAgICAgIHRvcDogNzBweDsKICAgICAgICAgICAgYm9yZGVyOiAyMHB4IHNvbGlkIGdyZWVu OwogICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKICAgICAgICB9CiAgICA8L3N0 eWxlPgogICAgPGJvZHk+CiAgICAgICAgPHA+VGhlIHRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEg Z3JlZW4gc3F1YXJlIGFuZCBubyByZWQuPC9wPgogICAgICAgIDxkaXYgaWQ9ImNvbnRhaW5lciI+ CiAgICAgICAgICAgIDxkaXYgaWQ9InRlc3Qtc2hhcGUiPjwvZGl2PgogICAgICAgICAgICBYWFhY WFhYWFhYIFhYWFggWFhYWCBYWFhYIFhYWFggWFhYWCBYWFhYIFhYWFggWFhYWCBYWFhYWFhYWFhY CiAgICAgICAgPC9kaXY+CiAgICAgICAgPGRpdiBpZD0ic3RhdGljLXNoYXBlIj48L2Rpdj4KICAg IDwvYm9keT4KPC9odG1sPg== 226980 2014-03-17 16:50:41 -0700 2014-03-17 16:50:41 -0700 ref file #1 for test - uses shape-margin in px units on the same exact shape shape-margin-px-ref.html text/html 1158 rhauck PCFET0NUWVBFIGh0bWw+CjxodG1sPgogICAgPGhlYWQ+CiAgICAgICAgPHRpdGxlPkNTUyBUZXN0 OiBsZWZ0IGZsb2F0LCBpbnNldCArIHNoYXBlLW1hcmdpbiwgcHggdW5pdHM8L3RpdGxlPgogICAg PC9oZWFkPgogICAgPHN0eWxlPgogICAgICAgICNjb250YWluZXIgewogICAgICAgICAgICBwb3Np dGlvbjogYWJzb2x1dGU7CiAgICAgICAgICAgIGxlZnQ6IDI1cHg7CiAgICAgICAgICAgIHdpZHRo OiAyMDBweDsKICAgICAgICAgICAgaGVpZ2h0OiAyMDBweDsKICAgICAgICAgICAgZm9udC1mYW1p bHk6IEFoZW07CiAgICAgICAgICAgIGZvbnQtc2l6ZTogMjBweDsKICAgICAgICAgICAgYmFja2dy b3VuZC1jb2xvcjogcmVkOwogICAgICAgICAgICBjb2xvcjogZ3JlZW47CiAgICAgICAgfQogICAg ICAgICN0ZXN0LXNoYXBlIHsKICAgICAgICAgICAgZmxvYXQ6IGxlZnQ7CiAgICAgICAgICAgIHdp ZHRoOiAyMDBweDsKICAgICAgICAgICAgaGVpZ2h0OiAyMDBweDsKICAgICAgICAgICAgLXdlYmtp dC1zaGFwZS1tYXJnaW46IDIwcHg7CiAgICAgICAgICAgIC13ZWJraXQtc2hhcGUtb3V0c2lkZTog aW5zZXQoNDBweCAxMDBweCA0MHB4IDBweCk7CiAgICAgICAgfQogICAgICAgICNzdGF0aWMtc2hh cGUgewogICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgICAgICAgIGxlZnQ6IDI1 cHg7CiAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKICAgICAgICAgICAgaGVpZ2h0OiAxMjBweDsK ICAgICAgICAgICAgdG9wOiA3MHB4OwogICAgICAgICAgICBib3JkZXI6IDIwcHggc29saWQgZ3Jl ZW47CiAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOwogICAgICAgIH0KICAgIDwv c3R5bGU+CiAgICA8Ym9keT4KICAgICAgICA8cD5UaGUgdGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMg YSBncmVlbiBzcXVhcmUgYW5kIG5vIHJlZC48L3A+CiAgICAgICAgPGRpdiBpZD0iY29udGFpbmVy Ij4KICAgICAgICAgICAgPGRpdiBpZD0idGVzdC1zaGFwZSI+PC9kaXY+CiAgICAgICAgICAgIFhY WFhYWFhYWFggWFhYWCBYWFhYIFhYWFggWFhYWCBYWFhYIFhYWFggWFhYWCBYWFhYIFhYWFhYWFhY WFgKICAgICAgICA8L2Rpdj4KICAgICAgICA8ZGl2IGlkPSJzdGF0aWMtc2hhcGUiPjwvZGl2Pgog ICAgPC9ib2R5Pgo8L2h0bWw+ 226981 2014-03-17 16:51:21 -0700 2014-03-17 16:51:21 -0700 ref file #2 for test - uses simple green square shape-margin-percentage-ref.html text/html 457 rhauck PCFET0NUWVBFIGh0bWw+CjxodG1sPgogICAgPGhlYWQ+CiAgICAgICAgPHRpdGxlPkNTUyBSZWZl cmVuY2UgRmlsZTwvdGl0bGU+CiAgICA8L2hlYWQ+CiAgICA8c3R5bGU+CiAgICAgICAgI2dyZWVu LXNxdWFyZSB7CiAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICAgICAgICAgbGVm dDogMjVweDsKICAgICAgICAgICAgd2lkdGg6IDIwMHB4OwogICAgICAgICAgICBoZWlnaHQ6IDIw MHB4OwogICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKICAgICAgICAgICAgY29s b3I6IGdyZWVuOwogICAgICAgIH0KICAgIDwvc3R5bGU+CiAgICA8Ym9keT4KICAgICAgICA8cD5U aGUgdGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBncmVlbiBzcXVhcmUgYW5kIG5vIHJlZC48L3A+ CiAgICAgICAgPGRpdiBpZD0iZ3JlZW4tc3F1YXJlIj48L2Rpdj4KICAgIDwvYm9keT4KPC9odG1s Pg== 228556 2014-04-03 16:27:22 -0700 2014-04-04 10:14:52 -0700 Patch bug-130369-20140403162938.patch text/plain 12273 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTllMWIxOGVlYjAwNzAx OGMxYjcyNDUzMGU0OTYzZDg3MmNhZWIxZC4uYzI1OTliMmFlZTUwNTNmM2FjYTYzMjA1YTY2YTU0 NjI5NGNhZDE4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTA0LTAzICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCisgICAgICAgIFtDU1MgU2hhcGVzXSBz aGFwZS1tYXJnaW4gaW4gcGVyY2VudGFnZSB1bml0cyBhbHdheXMgY29tcHV0ZXMgdG8gMHB4Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAzNjkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHNoYXBl LW1hcmdpbiBwYXJzaW5nIGFjY2VwdCBwZXJjZW50YWdlcyBhbmQgcHJvcGVybHkgY29tcHV0ZSB0 aGUKKyAgICAgICAgbGVuZ3RoIG9uY2UgdGhlIHBlcmNlbnRhZ2UgaXMgYWNjZXB0ZWQuCisKKyAg ICAgICAgVGVzdDogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lk ZS1mbG9hdHMtc2hhcGUtbWFyZ2luLXBlcmNlbnQuaHRtbAorCisgICAgICAgICogY3NzL0NTU1Bh cnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWUpOgorICAg ICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hh cGU6OmNyZWF0ZVNoYXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlNoYXBlOjpjcmVhdGVSYXN0ZXJT aGFwZSk6CisgICAgICAgIChXZWJDb3JlOjpTaGFwZTo6Y3JlYXRlQm94U2hhcGUpOgorICAgICAg ICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVz L1NoYXBlT3V0c2lkZUluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hhcGVPdXRzaWRlSW5m bzo6Y29tcHV0ZWRTaGFwZSk6CisKKzIwMTQtMDQtMDMgIEJlbSBKb25lcy1CZXkgIDxiam9uZXNi ZUBhZG9iZS5jb20+CisKICAgICAgICAgTWVyZ2UgU2hhcGVJbmZvICYgU2hhcGVPdXRzaWRlSW5m byBub3cgdGhhdCBTaGFwZUluc2lkZUluZm8gaXMgbm8gbW9yZQogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMTgwCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNl ci5jcHAKaW5kZXggNDViNGMwYjgxN2Q3OTIyYzkzODkzOTExYzk4N2Y4ZTdjZDE2MTVmOC4uMjEz NDE1OGQ1MTY2ZTNkMGIzOWUyZWRjYmVlYjY5MDhlNTNmNTgxNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Bh cnNlci5jcHAKQEAgLTI4OTgsNyArMjg5OCw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVl KENTU1Byb3BlcnR5SUQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAgICAgcGFyc2VkVmFs dWUgPSBwYXJzZVNoYXBlUHJvcGVydHkocHJvcElkKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdFNoYXBlTWFyZ2luOgotICAgICAgICB2YWxpZFByaW1pdGl2ZSA9 IChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmNzc1NoYXBlc0VuYWJs ZWQoKSAmJiAhaWQgJiYgdmFsaWRVbml0KHZhbHVlLCBGTGVuZ3RoIHwgRk5vbk5lZykpOworICAg ICAgICB2YWxpZFByaW1pdGl2ZSA9IChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0 dXJlcygpLmNzc1NoYXBlc0VuYWJsZWQoKSAmJiAhaWQgJiYgdmFsaWRVbml0KHZhbHVlLCBGTGVu Z3RoIHwgRlBlcmNlbnQgfCBGTm9uTmVnKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRTaGFwZUltYWdlVGhyZXNob2xkOgogICAgICAgICB2YWxpZFByaW1pdGl2 ZSA9IChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmNzc1NoYXBlc0Vu YWJsZWQoKSAmJiAhaWQgJiYgdmFsaWRVbml0KHZhbHVlLCBGTnVtYmVyKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwCmluZGV4IDUxY2IzNjNjMDQ1OGE1MjcxMzMw NjVhZWQ5NGYyZDc0NzNmNzZlZjEuLjU2MzgzNDY2ZWQ1ODZlYzM5NTBjZjBjYThlNmEzNDA1YjEx N2IyZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwCkBAIC05 Miw3ICs5Miw3IEBAIHN0YXRpYyBpbmxpbmUgRmxvYXRTaXplIHBoeXNpY2FsU2l6ZVRvTG9naWNh bChjb25zdCBGbG9hdFNpemUmIHNpemUsIFdyaXRpbmdNb2RlCiAgICAgcmV0dXJuIHNpemUudHJh bnNwb3NlZFNpemUoKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPFNoYXBlPiBTaGFwZTo6Y3JlYXRl U2hhcGUoY29uc3QgQmFzaWNTaGFwZSogYmFzaWNTaGFwZSwgY29uc3QgTGF5b3V0U2l6ZSYgbG9n aWNhbEJveFNpemUsIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlLCBMZW5ndGggbWFyZ2luKQorc3Rk Ojp1bmlxdWVfcHRyPFNoYXBlPiBTaGFwZTo6Y3JlYXRlU2hhcGUoY29uc3QgQmFzaWNTaGFwZSog YmFzaWNTaGFwZSwgY29uc3QgTGF5b3V0U2l6ZSYgbG9naWNhbEJveFNpemUsIFdyaXRpbmdNb2Rl IHdyaXRpbmdNb2RlLCBmbG9hdCBtYXJnaW4pCiB7CiAgICAgQVNTRVJUKGJhc2ljU2hhcGUpOwog CkBAIC0xNzEsMTIgKzE3MSwxMiBAQCBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IFNoYXBlOjpjcmVh dGVTaGFwZShjb25zdCBCYXNpY1NoYXBlKiBiYXNpY1NoYXBlLCBjb25zdCBMYQogICAgIH0KIAog ICAgIHNoYXBlLT5tX3dyaXRpbmdNb2RlID0gd3JpdGluZ01vZGU7Ci0gICAgc2hhcGUtPm1fbWFy Z2luID0gZmxvYXRWYWx1ZUZvckxlbmd0aChtYXJnaW4sIDApOworICAgIHNoYXBlLT5tX21hcmdp biA9IG1hcmdpbjsKIAogICAgIHJldHVybiBzaGFwZTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPFNo YXBlPiBTaGFwZTo6Y3JlYXRlUmFzdGVyU2hhcGUoSW1hZ2UqIGltYWdlLCBmbG9hdCB0aHJlc2hv bGQsIGNvbnN0IExheW91dFJlY3QmIGltYWdlUiwgY29uc3QgTGF5b3V0UmVjdCYgbWFyZ2luUiwg V3JpdGluZ01vZGUgd3JpdGluZ01vZGUsIExlbmd0aCBtYXJnaW4pCitzdGQ6OnVuaXF1ZV9wdHI8 U2hhcGU+IFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZShJbWFnZSogaW1hZ2UsIGZsb2F0IHRocmVz aG9sZCwgY29uc3QgTGF5b3V0UmVjdCYgaW1hZ2VSLCBjb25zdCBMYXlvdXRSZWN0JiBtYXJnaW5S LCBXcml0aW5nTW9kZSB3cml0aW5nTW9kZSwgZmxvYXQgbWFyZ2luKQogewogICAgIEludFJlY3Qg aW1hZ2VSZWN0ID0gcGl4ZWxTbmFwcGVkSW50UmVjdChpbWFnZVIpOwogICAgIEludFJlY3QgbWFy Z2luUmVjdCA9IHBpeGVsU25hcHBlZEludFJlY3QobWFyZ2luUik7CkBAIC0yMTQsMTEgKzIxNCwx MSBAQCBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZShJbWFn ZSogaW1hZ2UsIGZsb2F0IHRocmVzaG9sZCwgYwogCiAgICAgYXV0byByYXN0ZXJTaGFwZSA9IHN0 ZDo6bWFrZV91bmlxdWU8UmFzdGVyU2hhcGU+KHN0ZDo6bW92ZShpbnRlcnZhbHMpLCBtYXJnaW5S ZWN0LnNpemUoKSk7CiAgICAgcmFzdGVyU2hhcGUtPm1fd3JpdGluZ01vZGUgPSB3cml0aW5nTW9k ZTsKLSAgICByYXN0ZXJTaGFwZS0+bV9tYXJnaW4gPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKG1hcmdp biwgMCk7CisgICAgcmFzdGVyU2hhcGUtPm1fbWFyZ2luID0gbWFyZ2luOwogICAgIHJldHVybiBz dGQ6Om1vdmUocmFzdGVyU2hhcGUpOwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IFNoYXBl OjpjcmVhdGVCb3hTaGFwZShjb25zdCBSb3VuZGVkUmVjdCYgcm91bmRlZFJlY3QsIFdyaXRpbmdN b2RlIHdyaXRpbmdNb2RlLCBMZW5ndGggbWFyZ2luKQorc3RkOjp1bmlxdWVfcHRyPFNoYXBlPiBT aGFwZTo6Y3JlYXRlQm94U2hhcGUoY29uc3QgUm91bmRlZFJlY3QmIHJvdW5kZWRSZWN0LCBXcml0 aW5nTW9kZSB3cml0aW5nTW9kZSwgZmxvYXQgbWFyZ2luKQogewogICAgIEFTU0VSVChyb3VuZGVk UmVjdC5yZWN0KCkud2lkdGgoKSA+PSAwICYmIHJvdW5kZWRSZWN0LnJlY3QoKS5oZWlnaHQoKSA+ PSAwKTsKIApAQCAtMjI2LDcgKzIyNiw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxTaGFwZT4gU2hhcGU6 OmNyZWF0ZUJveFNoYXBlKGNvbnN0IFJvdW5kZWRSZWN0JiByb3VuZGVkUmVjdCwgV3JpCiAgICAg RmxvYXRSb3VuZGVkUmVjdCBib3VuZHMocmVjdCwgcm91bmRlZFJlY3QucmFkaWkoKSk7CiAgICAg YXV0byBzaGFwZSA9IHN0ZDo6bWFrZV91bmlxdWU8Qm94U2hhcGU+KGJvdW5kcyk7CiAgICAgc2hh cGUtPm1fd3JpdGluZ01vZGUgPSB3cml0aW5nTW9kZTsKLSAgICBzaGFwZS0+bV9tYXJnaW4gPSBm bG9hdFZhbHVlRm9yTGVuZ3RoKG1hcmdpbiwgMCk7CisgICAgc2hhcGUtPm1fbWFyZ2luID0gbWFy Z2luOwogCiAgICAgcmV0dXJuIHN0ZDo6bW92ZShzaGFwZSk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1NoYXBlLmgKaW5kZXggNGRiMTJkZTFkNTE1YTQ1MGUwZWY2MjE5YmE4NTJl YTZmNzE2ODM4NC4uY2Q0ZWMxNmQ0OGJlNjQ2MjY0MzdkNDE1OTJlMzk4OWE1ZDQ5NzBhZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuaApAQCAtNjcsOSArNjcsOSBAQCBw dWJsaWM6CiAgICAgICAgIFBhdGggbWFyZ2luU2hhcGU7CiAgICAgfTsKIAotICAgIHN0YXRpYyBz dGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IGNyZWF0ZVNoYXBlKGNvbnN0IEJhc2ljU2hhcGUqLCBjb25z dCBMYXlvdXRTaXplJiBsb2dpY2FsQm94U2l6ZSwgV3JpdGluZ01vZGUsIExlbmd0aCBtYXJnaW4p OwotICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IGNyZWF0ZVJhc3RlclNoYXBlKElt YWdlKiwgZmxvYXQgdGhyZXNob2xkLCBjb25zdCBMYXlvdXRSZWN0JiBpbWFnZVJlY3QsIGNvbnN0 IExheW91dFJlY3QmIG1hcmdpblJlY3QsIFdyaXRpbmdNb2RlLCBMZW5ndGggbWFyZ2luKTsKLSAg ICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFNoYXBlPiBjcmVhdGVCb3hTaGFwZShjb25zdCBSb3Vu ZGVkUmVjdCYsIFdyaXRpbmdNb2RlLCBMZW5ndGggbWFyZ2luKTsKKyAgICBzdGF0aWMgc3RkOjp1 bmlxdWVfcHRyPFNoYXBlPiBjcmVhdGVTaGFwZShjb25zdCBCYXNpY1NoYXBlKiwgY29uc3QgTGF5 b3V0U2l6ZSYgbG9naWNhbEJveFNpemUsIFdyaXRpbmdNb2RlLCBmbG9hdCBtYXJnaW4pOworICAg IHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IGNyZWF0ZVJhc3RlclNoYXBlKEltYWdlKiwg ZmxvYXQgdGhyZXNob2xkLCBjb25zdCBMYXlvdXRSZWN0JiBpbWFnZVJlY3QsIGNvbnN0IExheW91 dFJlY3QmIG1hcmdpblJlY3QsIFdyaXRpbmdNb2RlLCBmbG9hdCBtYXJnaW4pOworICAgIHN0YXRp YyBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IGNyZWF0ZUJveFNoYXBlKGNvbnN0IFJvdW5kZWRSZWN0 JiwgV3JpdGluZ01vZGUsIGZsb2F0IG1hcmdpbik7CiAKICAgICB2aXJ0dWFsIH5TaGFwZSgpIHsg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0 c2lkZUluZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNp ZGVJbmZvLmNwcAppbmRleCAwNGU2NDY2YjE0YjQwMjk2MjkxY2Q4MjIwZThmNTE0ZGUxM2VjMmEz Li45ZTAxNjQ5OWExZWIxNjQzNzU3NTNmZjdhMjU0ZGRhM2UwN2ZkODQ1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5jcHAKQEAg LTE2MCw3ICsxNjAsNyBAQCBjb25zdCBTaGFwZSYgU2hhcGVPdXRzaWRlSW5mbzo6Y29tcHV0ZWRT aGFwZSgpIGNvbnN0CiAgICAgICAgIHJldHVybiAqc2hhcGU7CiAKICAgICBXcml0aW5nTW9kZSB3 cml0aW5nTW9kZSA9IG1fcmVuZGVyZXIuY29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkud3JpdGlu Z01vZGUoKTsKLSAgICBMZW5ndGggbWFyZ2luID0gbV9yZW5kZXJlci5zdHlsZSgpLnNoYXBlTWFy Z2luKCk7CisgICAgZmxvYXQgbWFyZ2luID0gZmxvYXRWYWx1ZUZvckxlbmd0aChtX3JlbmRlcmVy LnN0eWxlKCkuc2hhcGVNYXJnaW4oKSwgbV9yZW5kZXJlci5jb250YWluaW5nQmxvY2soKSA/IG1f cmVuZGVyZXIuY29udGFpbmluZ0Jsb2NrKCktPmNvbnRlbnRXaWR0aCgpIDogTGF5b3V0VW5pdCgp KTsKICAgICBmbG9hdCBzaGFwZUltYWdlVGhyZXNob2xkID0gbV9yZW5kZXJlci5zdHlsZSgpLnNo YXBlSW1hZ2VUaHJlc2hvbGQoKTsKICAgICBjb25zdCBTaGFwZVZhbHVlKiBzaGFwZVZhbHVlID0g dGhpcy0+bV9yZW5kZXJlci5zdHlsZSgpLnNoYXBlT3V0c2lkZSgpOwogICAgIEFTU0VSVChzaGFw ZVZhbHVlKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCAwNWZjYzViMDMxNDQ2YWUyMWE4ZTI1OWU4NDg4ZDNmZWZlNjRkYmUy Li5kYmVkN2NhNGUzNmM0NTg5MTZiY2NkNWNmNDc3NDcwMzk2MmQ2ZjI4IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTggQEAKKzIwMTQtMDQtMDMgIEJlbSBKb25lcy1CZXkgIDxiam9uZXNiZUBhZG9iZS5jb20+ CisKKyAgICAgICAgW0NTUyBTaGFwZXNdIHNoYXBlLW1hcmdpbiBpbiBwZXJjZW50YWdlIHVuaXRz IGFsd2F5cyBjb21wdXRlcyB0byAwcHgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzMDM2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZpeCBwYXJzaW5nIHRlc3QgdG8gdW5kZXJzdGFuZCB0aGF0IHBlcmNl bnRhZ2VzIGFyZSBhbGxvd2VkIGZvcgorICAgICAgICBzaGFwZS1tYXJnaW4uIEFsc28gYWRkIHRo ZSBsYXlvdXQgdGVzdCBmcm9tIFJlYmVjY2EgSGF1Y2suCisKKyAgICAgICAgKiBmYXN0L3NoYXBl cy9wYXJzaW5nL3BhcnNpbmctc2hhcGUtbWFyZ2luLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBm YXN0L3NoYXBlcy9wYXJzaW5nL3BhcnNpbmctdGVzdC11dGlscy5qczoKKyAgICAgICAgKiBmYXN0 L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zaGFwZS1t YXJnaW4tcGVyY2VudC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3NoYXBl cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zaGFwZS1tYXJnaW4t cGVyY2VudC5odG1sOiBBZGRlZC4KKwogMjAxNC0wNC0wMyAgRGlyayBTY2h1bHplICA8a3JpdEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtDR10gQ2FudmFzIGxpbmVEYXNoT2Zmc2V0IGRvZXMgbm90 IGhhbmRsZSBuZWdhdGl2ZSBudW1iZXJzIGNvcnJlY3RseQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9zaGFwZXMvcGFyc2luZy9wYXJzaW5nLXNoYXBlLW1hcmdpbi1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9wYXJzaW5nL3BhcnNpbmctc2hhcGUtbWFyZ2luLWV4 cGVjdGVkLnR4dAppbmRleCA2YjMxMGQ2Zjg5ODZlMDYwNWE3YjJmYjkzN2FhYmMyMzY5YjI1MzYz Li4yNmU4NzI4YTY3MDY1ZGJhYjI3NzAyOTBjMTQxZDMzYTNkYmY0ZWJlIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9wYXJzaW5nL3BhcnNpbmctc2hhcGUtbWFyZ2luLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9wYXJzaW5nL3BhcnNpbmctc2hh cGUtbWFyZ2luLWV4cGVjdGVkLnR4dApAQCAtMTEsMTAgKzExLDEwIEBAIFBBU1MgZ2V0Q1NTVGV4 dCgiLXdlYmtpdC1zaGFwZS1tYXJnaW4iLCAiMy41bW0iKSBpcyAiMy41bW0iCiBQQVNTIGdldENT U1RleHQoIi13ZWJraXQtc2hhcGUtbWFyZ2luIiwgIjRwdCIpIGlzICI0cHQiCiBQQVNTIGdldENT U1RleHQoIi13ZWJraXQtc2hhcGUtbWFyZ2luIiwgIjQuNXBjIikgaXMgIjQuNXBjIgogUEFTUyBn ZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLW1hcmdpbiIsICI1cHgiKSBpcyAiNXB4IgorUEFTUyBn ZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLW1hcmdpbiIsICIxMjAlIikgaXMgIjEyMCUiCiBQQVNT IGdldENTU1RleHQoIi13ZWJraXQtc2hhcGUtbWFyZ2luIiwgIjAiKSBpcyAiMHB4IgogUEFTUyBn ZXRDU1NUZXh0KCItd2Via2l0LXNoYXBlLW1hcmdpbiIsICItNXB4IikgaXMgIiIKIFBBU1MgZ2V0 Q1NTVGV4dCgiLXdlYmtpdC1zaGFwZS1tYXJnaW4iLCAibm9uZSIpIGlzICIiCi1QQVNTIGdldENT U1RleHQoIi13ZWJraXQtc2hhcGUtbWFyZ2luIiwgIjEyMCUiKSBpcyAiIgogUEFTUyBnZXRDU1NU ZXh0KCItd2Via2l0LXNoYXBlLW1hcmdpbiIsICInc3RyaW5nJyIpIGlzICIiCiBQQVNTIGdldENv bXB1dGVkU3R5bGVWYWx1ZSgiLXdlYmtpdC1zaGFwZS1tYXJnaW4iLCAiMCIpIGlzICIwcHgiCiBQ QVNTIGdldENvbXB1dGVkU3R5bGVWYWx1ZSgiLXdlYmtpdC1zaGFwZS1tYXJnaW4iLCAiMXB4Iikg aXMgIjFweCIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3BhcnNpbmcvcGFy c2luZy10ZXN0LXV0aWxzLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvcGFyc2luZy9wYXJz aW5nLXRlc3QtdXRpbHMuanMKaW5kZXggNzRiMTMyNWMyZmIxMzI4YTc0N2E3YmEyZjRjMmMyNWY5 YTI1YTc5NC4uMmRmOGZlNjcyNjg3Y2Q5YzYwZjg5OWNkMWYwZDEyMDYwZmQwMjY1MSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvcGFyc2luZy9wYXJzaW5nLXRlc3QtdXRpbHMu anMKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvcGFyc2luZy9wYXJzaW5nLXRlc3QtdXRp bHMuanMKQEAgLTE2MSwxNCArMTYxLDE0IEBAIHZhciB2YWxpZFNoYXBlTGVuZ3RocyA9IFsKICAg ICAiMy41bW0iLAogICAgICI0cHQiLAogICAgICI0LjVwYyIsCi0gICAgIjVweCIKKyAgICAiNXB4 IiwKKyAgICAiMTIwJSIKIF07CiAKIC8vIEludmFsaWQgbGVuZ3RoIHZhbHVlcyBmb3Igc2hhcGUt bWFyZ2luIGFuZCBzaGFwZS1wYWRkaW5nLgogdmFyIGludmFsaWRTaGFwZUxlbmd0aHMgPSBbCiAg ICAgIi01cHgiLAogICAgICJub25lIiwKLSAgICAiMTIwJSIsCiAgICAgIlwnc3RyaW5nXCciCiBd OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZs b2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0cy1zaGFwZS1tYXJnaW4tcGVyY2VudC1leHBlY3RlZC5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUt b3V0c2lkZS1mbG9hdHMtc2hhcGUtbWFyZ2luLXBlcmNlbnQtZXhwZWN0ZWQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5iOTZmMmMwMTUyNWVlMGIwMzI3NjczYTMxYmNiN2ZlOWMyOTQ4OTM4Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hh cGUtb3V0c2lkZS1mbG9hdHMtc2hhcGUtbWFyZ2luLXBlcmNlbnQtZXhwZWN0ZWQuaHRtbApAQCAt MCwwICsxLDIwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAg ICA8dGl0bGU+Q1NTIFJlZmVyZW5jZSBGaWxlPC90aXRsZT4KKyAgICA8L2hlYWQ+CisgICAgPHN0 eWxlPgorICAgICAgICAjZ3JlZW4tc3F1YXJlIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKKyAgICAgICAgICAgIGxlZnQ6IDI1cHg7CisgICAgICAgICAgICB3aWR0aDogMjAwcHg7 CisgICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xv cjogZ3JlZW47CisgICAgICAgICAgICBjb2xvcjogZ3JlZW47CisgICAgICAgIH0KKyAgICA8L3N0 eWxlPgorICAgIDxib2R5PgorICAgICAgICA8cD5UaGUgdGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMg YSBncmVlbiBzcXVhcmUgYW5kIG5vIHJlZC48L3A+CisgICAgICAgIDxkaXYgaWQ9ImdyZWVuLXNx dWFyZSI+PC9kaXY+CisgICAgPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUt ZmxvYXRzL3NoYXBlLW91dHNpZGUtZmxvYXRzLXNoYXBlLW1hcmdpbi1wZXJjZW50Lmh0bWwgYi9M YXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRl LWZsb2F0cy1zaGFwZS1tYXJnaW4tcGVyY2VudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjg3N2E1N2Q4YTNi ODY4NmIyMDBjZGY0ZGRkMWQxMjFkNmU1NWQ5OGIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWZsb2F0 cy1zaGFwZS1tYXJnaW4tcGVyY2VudC5odG1sCkBAIC0wLDAgKzEsNDIgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDx0aXRsZT5DU1MgVGVzdDogbGVmdCBm bG9hdCwgaW5zZXQgKyBzaGFwZS1tYXJnaW4sICUgdW5pdHM8L3RpdGxlPgorICAgIDwvaGVhZD4K KyAgICA8c3R5bGU+CisgICAgICAgICNjb250YWluZXIgeworICAgICAgICAgICAgcG9zaXRpb246 IGFic29sdXRlOworICAgICAgICAgICAgbGVmdDogMjVweDsKKyAgICAgICAgICAgIHdpZHRoOiAy MDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICBmb250LWZhbWls eTogQWhlbTsKKyAgICAgICAgICAgIGZvbnQtc2l6ZTogMjBweDsKKyAgICAgICAgICAgIGJhY2tn cm91bmQtY29sb3I6IHJlZDsKKyAgICAgICAgICAgIGNvbG9yOiBncmVlbjsKKyAgICAgICAgfQor ICAgICAgICAjdGVzdC1zaGFwZSB7CisgICAgICAgICAgICBmbG9hdDogbGVmdDsKKyAgICAgICAg ICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAg ICAtd2Via2l0LXNoYXBlLW1hcmdpbjogMTAlOworICAgICAgICAgICAgLXdlYmtpdC1zaGFwZS1v dXRzaWRlOiBpbnNldCg0MHB4IDEwMHB4IDQwcHggMHB4KTsKKyAgICAgICAgfQorICAgICAgICAj c3RhdGljLXNoYXBlIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAg ICAgIGxlZnQ6IDI1cHg7CisgICAgICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgICAgICBo ZWlnaHQ6IDEyMHB4OworICAgICAgICAgICAgdG9wOiA3MHB4OworICAgICAgICAgICAgYm9yZGVy OiAyMHB4IHNvbGlkIGdyZWVuOworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47 CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorICAgIDxib2R5PgorICAgICAgICA8cD5UaGUgdGVz dCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBncmVlbiBzcXVhcmUgYW5kIG5vIHJlZC48L3A+CisgICAg ICAgIDxkaXYgaWQ9ImNvbnRhaW5lciI+CisgICAgICAgICAgICA8ZGl2IGlkPSJ0ZXN0LXNoYXBl Ij48L2Rpdj4KKyAgICAgICAgICAgIFhYWFhYWFhYWFggWFhYWCBYWFhYIFhYWFggWFhYWCBYWFhY IFhYWFggWFhYWCBYWFhYIFhYWFhYWFhYWFgKKyAgICAgICAgPC9kaXY+CisgICAgICAgIDxkaXYg aWQ9InN0YXRpYy1zaGFwZSI+PC9kaXY+CisgICAgPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xp bmUgYXQgZW5kIG9mIGZpbGUK