115840 2013-05-08 18:19:22 -0700 REGRESSION (r145680): No box shadow rendered on element with positioned child that obscures it 2013-05-10 17:58:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn koivisto mitz simon.fraser webkit-bug-importer oldest_to_newest 886557 0 201125 simon.fraser 2013-05-08 18:19:22 -0700 Created attachment 201125 Testcase There should be a box shadow on the parent of the gray box in the testcase, but it's missing. 886558 1 webkit-bug-importer 2013-05-08 18:19:48 -0700 <rdar://problem/13845025> 886562 2 simon.fraser 2013-05-08 18:28:39 -0700 Regressed at http://trac.webkit.org/changeset/145680 886593 3 simon.fraser 2013-05-08 21:57:22 -0700 Ah, there's a code path where paintFillLayer() paints the box shadow. 886594 4 simon.fraser 2013-05-08 21:58:20 -0700 …which was done to fix bug 78728. 886595 5 201134 simon.fraser 2013-05-08 22:10:47 -0700 Created attachment 201134 Patch 886602 6 201136 koivisto 2013-05-08 22:27:33 -0700 Created attachment 201136 Alternative patch 886604 7 koivisto 2013-05-08 22:31:25 -0700 The simpler approach might be better. I'm not sure if it is semantically correct to consider box shadow in background extent. 886609 8 201136 simon.fraser 2013-05-08 22:53:20 -0700 Comment on attachment 201136 Alternative patch View in context: https://bugs.webkit.org/attachment.cgi?id=201136&action=review > Source/WebCore/rendering/RenderBox.cpp:1151 > + LayoutRect backgroundRect = pixelSnappedIntRect(style()->boxShadow() ? boxShadowExtent() : borderBoxRect()); I think it's confusing for a function called backgroundPaintedExtent() to return the box shadow extent, unless you rename it to boxDecorationExtent(). This patch also means that you'll always consult box shadows for obscuration, even when the background might be obscured and the shadow drawn separately. So I prefer my patch. 887710 9 simon.fraser 2013-05-10 17:58:55 -0700 https://trac.webkit.org/r149918 201125 2013-05-08 18:19:22 -0700 2013-05-08 18:19:22 -0700 Testcase overflow-hidden-child-layers.html text/html 684 simon.fraser PCFET0NUWVBFIGh0bWw+Cgo8aHRtbD4KPGhlYWQ+CiAgICA8c3R5bGU+CiAgICAgICAgLmJveCB7 CiAgICAgICAgICAgIGhlaWdodDogMTAwcHg7CiAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKICAg ICAgICAgICAgbWFyZ2luOiA1MHB4OwogICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVl OwogICAgICAgICAgICBib3gtc2hhZG93OiAwIDAgMjBweCBibGFjazsKLyogICAgICAgICAgICBv dmVyZmxvdzogaGlkZGVuOyovCiAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICAg ICAgICAgei1pbmRleDogMDsKLyogICAgICAgICAgICAtd2Via2l0LXRyYW5zZm9ybTogdHJhbnNs YXRlWigwKTsqLwogICAgICAgIH0KICAgICAgICAKICAgICAgICAuY2hpbGQgewogICAgICAgICAg ICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgICAgICAgIHRvcDogMDsKICAgICAgICAgICAgbGVm dDogMDsKICAgICAgICAgICAgd2lkdGg6IDIwMHB4OwogICAgICAgICAgICBoZWlnaHQ6IDIwMHB4 OwogICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBzaWx2ZXI7CiAgICAgICAgfQogICAgPC9z dHlsZT4KPC9oZWFkPgo8Ym9keT4KCiAgICA8ZGl2IGNsYXNzPSJib3giPgogICAgICAgIDxkaXYg Y2xhc3M9ImNoaWxkIj4KICAgICAgICA8L2Rpdj4KICAgIDwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4K 201134 2013-05-08 22:10:47 -0700 2013-05-08 22:29:40 -0700 Patch bug-115840-20130508220951.patch text/plain 4447 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2QyZTE3OGMzNDFhZmNl ZGE3NjFiMmQwMzZhYjRlMjg1NGI3NTQ0OS4uYjRhOTczMzJiZWIwN2YzZmJmNGFmN2QxODc0OTFk YzQyZDBlZjFhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA1LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04g KHIxNDU2ODApOiBObyBib3ggc2hhZG93IHJlbmRlcmVkIG9uIGVsZW1lbnQgd2l0aCBwb3NpdGlv bmVkIGNoaWxkIHRoYXQgb2JzY3VyZXMgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNTg0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorICAgICAgICAKKyAgICAgICAgSW4gcjEwNzgzNiwgd2UgbW92ZWQgc29tZSBib3gt c2hhZG93IHBhaW50aW5nIGludG8gdGhlIHBhaW50RmlsbExheWVyIGNvZGUgZm9yIHBlcmZvcm1h bmNlLgorICAgICAgICBIb3dldmVyLCBpbiByMTQ1NjgwIHdlIHN0YXJ0ZWQgdG8gc2tpcCBiYWNr Z3JvdW5kIHBhaW50aW5nIHdoZW4gd2Uga25vdyB0aGUgYmFja2dyb3VuZCBpcworICAgICAgICBv YnNjdXJlZC4gVGhpcyBicm9rZSBzaGFkb3cgcGFpbnRpbmcgaW4gc29tZSBjYXNlcy4KKyAgICAg ICAgCisgICAgICAgIEZpeCBieSBhbHdheXMgcGFpbnRpbmcgdGhlIGJhY2tncm91bmQgZmlsbCBs YXllcnMgaWYgd2Uga25vdyB0aGF0IHRoZXkgd2lsbCBhbHNvCisgICAgICAgIHBhaW50IHRoZSBz aGFkb3cuCisKKyAgICAgICAgVGVzdDogZmFzdC9ib3gtc2hhZG93L2JveC1zaGFkb3ctb2JzY3Vy ZWQtYmFja2dyb3VuZHMuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnBhaW50QmFja2dyb3VuZCk6CisKIDIwMTMt MDUtMDggIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAg W01hY10gSW5iYW5kIHRleHQgdHJhY2tzIGFyZSBub3QgaW4gdHJhY2sgbWVudSBvbiBMaW9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDEzNmMzNjU4ODZkODYwYWNi MWFmMTJmZGYwOTlkMWE4ZDRmYTA5NzAuLjk3YmVmZDUzNDhkNTk2ZWJkY2Y1NzVhNzA2ZmQyOWU5 MWZhYWQwMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0xMTQw LDcgKzExNDAsNyBAQCB2b2lkIFJlbmRlckJveDo6cGFpbnRCYWNrZ3JvdW5kKGNvbnN0IFBhaW50 SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRSZWN0JiBwYQogICAgIH0KICAgICBpZiAoaXNC b2R5KCkgJiYgc2tpcEJvZHlCYWNrZ3JvdW5kKHRoaXMpKQogICAgICAgICByZXR1cm47Ci0gICAg aWYgKGJhY2tncm91bmRJc0tub3duVG9CZU9ic2N1cmVkKCkpCisgICAgaWYgKGJhY2tncm91bmRJ c0tub3duVG9CZU9ic2N1cmVkKCkgJiYgIWJveFNoYWRvd1Nob3VsZEJlQXBwbGllZFRvQmFja2dy b3VuZChibGVlZEF2b2lkYW5jZSkpCiAgICAgICAgIHJldHVybjsKICAgICBwYWludEZpbGxMYXll cnMocGFpbnRJbmZvLCBzdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlC YWNrZ3JvdW5kQ29sb3IpLCBzdHlsZSgpLT5iYWNrZ3JvdW5kTGF5ZXJzKCksIHBhaW50UmVjdCwg YmxlZWRBdm9pZGFuY2UpOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGE0NmQ3NGRmMjg0MGQ3MmY1OTc2ZTAwNjI3ZWVl ZjRjZTliNTIwMjAuLmY2Yzk1YmUzYjkyM2ZhNWNlYjk2MzNkMzQxNDllY2FiZDYyOTQ5ODUgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wNS0wOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTQ1NjgwKTogTm8gYm94IHNo YWRvdyByZW5kZXJlZCBvbiBlbGVtZW50IHdpdGggcG9zaXRpb25lZCBjaGlsZCB0aGF0IG9ic2N1 cmVzIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTU4NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGZhc3QvYm94LXNoYWRvdy9ib3gtc2hhZG93LW9ic2N1cmVkLWJhY2tncm91bmRzLWV4cGVjdGVk Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvYm94LXNoYWRvdy9ib3gtc2hhZG93LW9ic2N1 cmVkLWJhY2tncm91bmRzLmh0bWw6IEFkZGVkLgorCiAyMDEzLTA1LTA4ICBFcmljIENhcmxzb24g IDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIEluYmFuZCB0ZXh0IHRy YWNrcyBhcmUgbm90IGluIHRyYWNrIG1lbnUgb24gTGlvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9ib3gtc2hhZG93L2JveC1zaGFkb3ctb2JzY3VyZWQtYmFja2dyb3VuZHMtZXhwZWN0 ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvYm94LXNoYWRvdy9ib3gtc2hhZG93LW9ic2N1cmVk LWJhY2tncm91bmRzLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzAyNGRjNGQzZjQwZDMyMWM4 YzlkOTRhYjkxM2NiY2E0YWRmZmRmZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvYm94LXNoYWRvdy9ib3gtc2hhZG93LW9ic2N1cmVkLWJhY2tncm91bmRzLWV4cGVjdGVkLmh0 bWwKQEAgLTAsMCArMSwyMCBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorPGhlYWQ+Cisg ICAgPHN0eWxlPgorICAgICAgICAuYm94IHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0 ZTsKKyAgICAgICAgICAgIHRvcDogNTBweDsKKyAgICAgICAgICAgIGxlZnQ6IDUwcHg7CisgICAg ICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAg ICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICAgICAgYm94LXNoYWRvdzog MCAwIDIwcHggYmxhY2s7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+ CisgICAgPGRpdiBjbGFzcz0iYm94Ij48L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvYm94LXNoYWRvdy9ib3gtc2hhZG93LW9ic2N1cmVkLWJhY2tn cm91bmRzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2JveC1zaGFkb3cvYm94LXNoYWRvdy1vYnNj dXJlZC1iYWNrZ3JvdW5kcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJlYzRjNjEwY2I3MzRjYTFiZTk0ZWY3 MWRhZDU2MTU5NTM0N2UzMzcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Jv eC1zaGFkb3cvYm94LXNoYWRvdy1vYnNjdXJlZC1iYWNrZ3JvdW5kcy5odG1sCkBAIC0wLDAgKzEs MzEgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAg ICAgICAgLmJveCB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAg ICB0b3A6IDUwcHg7CisgICAgICAgICAgICBsZWZ0OiA1MHB4OworICAgICAgICAgICAgaGVpZ2h0 OiAxMDBweDsKKyAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgICAgIGJhY2tncm91 bmQtY29sb3I6IGJsdWU7CisgICAgICAgICAgICBib3gtc2hhZG93OiAwIDAgMjBweCBibGFjazsK KyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmNoaWxkIHsKKyAgICAgICAgICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHRvcDogMHB4OworICAgICAgICAgICAgbGVmdDog MHB4OworICAgICAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAxMDBw eDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHNpbHZlcjsKKyAgICAgICAgfQorICAg IDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGNsYXNzPSJib3giPgorICAgICAg ICA8ZGl2IGNsYXNzPSJjaGlsZCI+PC9kaXY+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+ Cg== 201136 2013-05-08 22:27:33 -0700 2013-05-08 22:53:20 -0700 Alternative patch obscured-box-shadow.patch text/plain 7499 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTc5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA1LTA4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTQ1Njgw KTogTm8gYm94IHNoYWRvdyByZW5kZXJlZCBvbiBlbGVtZW50IHdpdGggcG9zaXRpb25lZCBjaGls ZCB0aGF0IG9ic2N1cmVzIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTU4NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KyAgICAgICAgCisgICAgICAgIFRha2UgYm94IHNoYWRvdyBvdmVyZmxvdyBpbnRvIGFjY291bnQg d2hlbiBjb21wdXRpbmcgdGhlIGJhY2tncm91bmQgYm94LgorCisgICAgICAgIFRlc3Q6IGZhc3Qv YmFja2dyb3VuZHMvb2JzY3VyZWQtYmFja2dyb3VuZC1ib3gtc2hhZG93Lmh0bWwKKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 OjpiYWNrZ3JvdW5kUGFpbnRlZEV4dGVudCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6Ym94U2hhZG93RXh0ZW50KToKKyAgICAgICAgCisgICAgICAg ICAgICBGYWN0b3IgdGhlIGJveCBzaGFkb3cgcmVjdCBjb21wdXRhdGlvbiBpbnRvIGEgZnVuY3Rp b24uCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YWRkVmlzdWFsRWZmZWN0T3ZlcmZs b3cpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFJlbmRlckJv eCk6CisKIDIwMTMtMDUtMDggIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBCVUlMRCBGSVg6IERvbid0IHVzZSBhZG9wdENGKCkgd2l0aCBOU0RpY3Rpb25hcnkg KiBvYmplY3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCShyZXZp c2lvbiAxNDk3ODkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTE0OCw3ICsxMTQ4LDcgQEAgdm9pZCBSZW5kZXJCb3g6OnBhaW50 QmFja2dyb3VuZChjb25zdCBQYQogTGF5b3V0UmVjdCBSZW5kZXJCb3g6OmJhY2tncm91bmRQYWlu dGVkRXh0ZW50KCkgY29uc3QKIHsKICAgICBBU1NFUlQoaGFzQmFja2dyb3VuZCgpKTsKLSAgICBM YXlvdXRSZWN0IGJhY2tncm91bmRSZWN0ID0gcGl4ZWxTbmFwcGVkSW50UmVjdChib3JkZXJCb3hS ZWN0KCkpOworICAgIExheW91dFJlY3QgYmFja2dyb3VuZFJlY3QgPSBwaXhlbFNuYXBwZWRJbnRS ZWN0KHN0eWxlKCktPmJveFNoYWRvdygpID8gYm94U2hhZG93RXh0ZW50KCkgOiBib3JkZXJCb3hS ZWN0KCkpOwogCiAgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yID0gc3R5bGUoKS0+dmlzaXRlZERl cGVuZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsKICAgICBpZiAoYmFja2dy b3VuZENvbG9yLmlzVmFsaWQoKSAmJiBiYWNrZ3JvdW5kQ29sb3IuYWxwaGEoKSkKQEAgLTQwODYs NiArNDA4NiwyNiBAQCBib29sIFJlbmRlckJveDo6YXZvaWRzRmxvYXRzKCkgY29uc3QKIHsKICAg ICByZXR1cm4gaXNSZXBsYWNlZCgpIHx8IGhhc092ZXJmbG93Q2xpcCgpIHx8IGlzSFIoKSB8fCBp c0xlZ2VuZCgpIHx8IGlzV3JpdGluZ01vZGVSb290KCkgfHwgaXNEZXByZWNhdGVkRmxleEl0ZW0o KTsKIH0KKyAgICAKK0xheW91dFJlY3QgUmVuZGVyQm94Ojpib3hTaGFkb3dFeHRlbnQoKSBjb25z dAoreworICAgIEFTU0VSVChzdHlsZSgpLT5ib3hTaGFkb3coKSk7CisgICAgTGF5b3V0VW5pdCBz aGFkb3dMZWZ0OworICAgIExheW91dFVuaXQgc2hhZG93UmlnaHQ7CisgICAgTGF5b3V0VW5pdCBz aGFkb3dUb3A7CisgICAgTGF5b3V0VW5pdCBzaGFkb3dCb3R0b207CisgICAgc3R5bGUoKS0+Z2V0 Qm94U2hhZG93RXh0ZW50KHNoYWRvd1RvcCwgc2hhZG93UmlnaHQsIHNoYWRvd0JvdHRvbSwgc2hh ZG93TGVmdCk7CisgICAgCisgICAgLy8gSW4gZmxpcHBlZCBibG9ja3Mgd3JpdGluZyBtb2RlcyBz dWNoIGFzIHZlcnRpY2FsLXJsLCB0aGUgcGh5c2ljYWwgcmlnaHQgc2hhZG93IHZhbHVlIGlzIGFj dHVhbGx5IGF0IHRoZSBsb3dlciB4LWNvb3JkaW5hdGUuCisgICAgTGF5b3V0UmVjdCBib3JkZXJC b3ggPSBib3JkZXJCb3hSZWN0KCk7CisgICAgYm9vbCBpc0ZsaXBwZWQgPSBzdHlsZSgpLT5pc0Zs aXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpOworICAgIGJvb2wgaXNIb3Jpem9udGFsID0gaXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKTsKKyAgICBMYXlvdXRVbml0IG92ZXJmbG93TWluWCA9IGJvcmRl ckJveC54KCkgKyAoKCFpc0ZsaXBwZWQgfHwgaXNIb3Jpem9udGFsKSA/IHNoYWRvd0xlZnQgOiAt c2hhZG93UmlnaHQpOworICAgIExheW91dFVuaXQgb3ZlcmZsb3dNYXhYID0gYm9yZGVyQm94Lm1h eFgoKSArICgoIWlzRmxpcHBlZCB8fCBpc0hvcml6b250YWwpID8gc2hhZG93UmlnaHQgOiAtc2hh ZG93TGVmdCk7CisgICAgTGF5b3V0VW5pdCBvdmVyZmxvd01pblkgPSBib3JkZXJCb3gueSgpICsg KCghaXNGbGlwcGVkIHx8ICFpc0hvcml6b250YWwpID8gc2hhZG93VG9wIDogLXNoYWRvd0JvdHRv bSk7CisgICAgTGF5b3V0VW5pdCBvdmVyZmxvd01heFkgPSBib3JkZXJCb3gubWF4WSgpICsgKCgh aXNGbGlwcGVkIHx8ICFpc0hvcml6b250YWwpID8gc2hhZG93Qm90dG9tIDogLXNoYWRvd1RvcCk7 CisgICAgcmV0dXJuIExheW91dFJlY3Qob3ZlcmZsb3dNaW5YLCBvdmVyZmxvd01pblksIG92ZXJm bG93TWF4WCAtIG92ZXJmbG93TWluWCwgb3ZlcmZsb3dNYXhZIC0gb3ZlcmZsb3dNaW5ZKTsKK30K IAogdm9pZCBSZW5kZXJCb3g6OmFkZFZpc3VhbEVmZmVjdE92ZXJmbG93KCkKIHsKQEAgLTQxMDMs MTcgKzQxMjMsMTEgQEAgdm9pZCBSZW5kZXJCb3g6OmFkZFZpc3VhbEVmZmVjdE92ZXJmbG93KAog ICAgIAogICAgIC8vIENvbXB1dGUgYm94LXNoYWRvdyBvdmVyZmxvdyBmaXJzdC4KICAgICBpZiAo c3R5bGUoKS0+Ym94U2hhZG93KCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCBzaGFkb3dMZWZ0Owot ICAgICAgICBMYXlvdXRVbml0IHNoYWRvd1JpZ2h0OwotICAgICAgICBMYXlvdXRVbml0IHNoYWRv d1RvcDsKLSAgICAgICAgTGF5b3V0VW5pdCBzaGFkb3dCb3R0b207Ci0gICAgICAgIHN0eWxlKCkt PmdldEJveFNoYWRvd0V4dGVudChzaGFkb3dUb3AsIHNoYWRvd1JpZ2h0LCBzaGFkb3dCb3R0b20s IHNoYWRvd0xlZnQpOwotCi0gICAgICAgIC8vIEluIGZsaXBwZWQgYmxvY2tzIHdyaXRpbmcgbW9k ZXMgc3VjaCBhcyB2ZXJ0aWNhbC1ybCwgdGhlIHBoeXNpY2FsIHJpZ2h0IHNoYWRvdyB2YWx1ZSBp cyBhY3R1YWxseSBhdCB0aGUgbG93ZXIgeC1jb29yZGluYXRlLgotICAgICAgICBvdmVyZmxvd01p blggPSBib3JkZXJCb3gueCgpICsgKCghaXNGbGlwcGVkIHx8IGlzSG9yaXpvbnRhbCkgPyBzaGFk b3dMZWZ0IDogLXNoYWRvd1JpZ2h0KTsKLSAgICAgICAgb3ZlcmZsb3dNYXhYID0gYm9yZGVyQm94 Lm1heFgoKSArICgoIWlzRmxpcHBlZCB8fCBpc0hvcml6b250YWwpID8gc2hhZG93UmlnaHQgOiAt c2hhZG93TGVmdCk7Ci0gICAgICAgIG92ZXJmbG93TWluWSA9IGJvcmRlckJveC55KCkgKyAoKCFp c0ZsaXBwZWQgfHwgIWlzSG9yaXpvbnRhbCkgPyBzaGFkb3dUb3AgOiAtc2hhZG93Qm90dG9tKTsK LSAgICAgICAgb3ZlcmZsb3dNYXhZID0gYm9yZGVyQm94Lm1heFkoKSArICgoIWlzRmxpcHBlZCB8 fCAhaXNIb3Jpem9udGFsKSA/IHNoYWRvd0JvdHRvbSA6IC1zaGFkb3dUb3ApOworICAgICAgICBM YXlvdXRSZWN0IGJveFNoYWRvdyA9IGJveFNoYWRvd0V4dGVudCgpOworICAgICAgICBvdmVyZmxv d01pblggPSBib3hTaGFkb3cueCgpOworICAgICAgICBvdmVyZmxvd01heFggPSBib3hTaGFkb3cu bWF4WCgpOworICAgICAgICBvdmVyZmxvd01pblkgPSBib3hTaGFkb3cueSgpOworICAgICAgICBv dmVyZmxvd01heFkgPSBib3hTaGFkb3cubWF4WSgpOwogICAgIH0KIAogICAgIC8vIE5vdyBjb21w dXRlIGJvcmRlci1pbWFnZS1vdXRzZXQgb3ZlcmZsb3cuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5oCShyZXZpc2lvbiAxNDk3ODkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTY1NCw2ICs2NTQsOCBAQCBwcml2 YXRlOgogICAgIHZvaWQgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0UmVwbGFjZWQoTG9n aWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJikgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRlUG9zaXRp b25lZExvZ2ljYWxXaWR0aFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYpIGNv bnN0OwogCisgICAgTGF5b3V0UmVjdCBib3hTaGFkb3dFeHRlbnQoKSBjb25zdDsKKwogICAgIExh eW91dFVuaXQgZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2Fs V2lkdGgpIGNvbnN0OwogICAgIExheW91dFVuaXQgZmlsbEF2YWlsYWJsZU1lYXN1cmUoTGF5b3V0 VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1hcmdpblN0YXJ0LCBMYXlv dXRVbml0JiBtYXJnaW5FbmQpIGNvbnN0OwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDk3OTApCisr KyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAor MjAxMy0wNS0wOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAg UkVHUkVTU0lPTiAocjE0NTY4MCk6IE5vIGJveCBzaGFkb3cgcmVuZGVyZWQgb24gZWxlbWVudCB3 aXRoIHBvc2l0aW9uZWQgY2hpbGQgdGhhdCBvYnNjdXJlcyBpdAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1ODQwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2JhY2tncm91bmRzL29ic2N1cmVk LWJhY2tncm91bmQtYm94LXNoYWRvdy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2JhY2tncm91bmRzL29ic2N1cmVkLWJhY2tncm91bmQtYm94LXNoYWRvdy5odG1sOiBBZGRl ZC4KKwogMjAxMy0wNS0wOCAgU2Vva2p1IEt3b24gIDxzZW9ranUua3dvbkBnbWFpbC5jb20+CiAK ICAgICAgICAgW0VGTF0gR2V0IHJpZCBvZiBkdXBsaWNhdGUgZW50cnkgbGluZSBpbiBUZXN0RXhw ZWN0YXRpb25zCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2JhY2tncm91bmRzL29ic2N1cmVkLWJh Y2tncm91bmQtYm94LXNoYWRvdy1leHBlY3RlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2Zhc3QvYmFja2dyb3VuZHMvb2JzY3VyZWQtYmFja2dyb3VuZC1ib3gtc2hhZG93LWV4cGVj dGVkLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2JhY2tncm91bmRzL29i c2N1cmVkLWJhY2tncm91bmQtYm94LXNoYWRvdy1leHBlY3RlZC5odG1sCSh3b3JraW5nIGNvcHkp CkBAIC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFkPgorICAg IDxzdHlsZT4KKyAgICAgICAgLmJveCB7CisgICAgICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAg ICAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICAgICAgbWFyZ2luOiA1MHB4OworICAgICAg ICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICAgICAgYm94LXNoYWRvdzog MCAwIDIwcHggYmxhY2s7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAg ICAgICB6LWluZGV4OiAwOworICAgICAgICB9CisgICAgPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5 PgorCisgICAgPGRpdiBjbGFzcz0iYm94Ij4KKyAgICAgICAgPGRpdiBjbGFzcz0iY2hpbGQiPgor ICAgICAgICA8L2Rpdj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91 dFRlc3RzL2Zhc3QvYmFja2dyb3VuZHMvb2JzY3VyZWQtYmFja2dyb3VuZC1ib3gtc2hhZG93Lmh0 bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9iYWNrZ3JvdW5kcy9vYnNjdXJlZC1i YWNrZ3JvdW5kLWJveC1zaGFkb3cuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zh c3QvYmFja2dyb3VuZHMvb2JzY3VyZWQtYmFja2dyb3VuZC1ib3gtc2hhZG93Lmh0bWwJKHdvcmtp bmcgY29weSkKQEAgLTAsMCArMSwzMyBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorPGhl YWQ+CisgICAgPHN0eWxlPgorICAgICAgICAuYm94IHsKKyAgICAgICAgICAgIGhlaWdodDogMTAw cHg7CisgICAgICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgICAgICBtYXJnaW46IDUwcHg7 CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOworICAgICAgICAgICAgYm94LXNo YWRvdzogMCAwIDIwcHggYmxhY2s7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Cisg ICAgICAgICAgICB6LWluZGV4OiAwOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuY2hp bGQgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAgdG9wOiAw OworICAgICAgICAgICAgbGVmdDogMDsKKyAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAg ICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBzaWx2 ZXI7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisKKyAgICA8ZGl2 IGNsYXNzPSJib3giPgorICAgICAgICA8ZGl2IGNsYXNzPSJjaGlsZCI+CisgICAgICAgIDwvZGl2 PgorICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=