135318 2014-07-25 23:00:04 -0700 REGRESSION (r163382): Overflow hidden for inner elements breaks blurring 2014-08-06 08:06:31 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.9 RESOLVED FIXED http://codepen.io/JAStanton/pen/zyDov AdobeTracked, Regression P2 Normal --- 1 jonathan.a.stanton stavila ap benjamin commit-queue esprehn+autocc glenn kling koivisto kondapallykalyan krit mihnea pdr simon.fraser stavila thorton zalan oldest_to_newest 1024998 0 jonathan.a.stanton 2014-07-25 23:00:04 -0700 If I have a outer element that has a border radius and overflow hidden, and an inner element that is blurred: Expected Behavior: My inner element should be blurred and clipped. Actual Behavior: My inner element is clipped but no longer blurred. Example: http://codepen.io/JAStanton/pen/zyDov Example HTML: <div class="circle"> <div class="inner"></div> </div> Example CSS: .circle { width: 300px; height: 300px; background-color: #f5ad61; /* TOGGLE THESE PROPERTY: */ /* overflow: hidden; border-radius: 50% 50%; */ } .inner { -webkit-filter: blur(21px); background: rgba(0,0,0,0.4); height: 63px; width: 216px; } 1025392 1 ap 2014-07-28 23:40:34 -0700 This is a regression from Safari 7.0.5. 1025521 2 simon.fraser 2014-07-29 11:11:12 -0700 Regressed in r163382. 1025532 3 krit 2014-07-29 11:42:19 -0700 I can reproduce this bug in Blink as well. 1025675 4 mihnea 2014-07-29 23:46:35 -0700 Looking 1026227 5 235886 stavila 2014-08-01 04:49:08 -0700 Created attachment 235886 Patch 1026251 6 235886 zalan 2014-08-01 09:49:29 -0700 Comment on attachment 235886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235886&action=review > Source/WebCore/rendering/RenderLayer.cpp:3597 > if (clipRect.rect() != paintingInfo.paintDirtyRect || clipRect.hasRadius()) { > context->save(); > - LayoutRect adjustedClipRect = clipRect.rect(); > - adjustedClipRect.move(paintingInfo.subpixelAccumulation); > - context->clip(pixelSnappedForPainting(adjustedClipRect, deviceScaleFactor)); > + > + // Clipping for border radius will be applied later in this method. > + if (!clipRect.hasRadius()) { > + LayoutRect adjustedClipRect = clipRect.rect(); > + adjustedClipRect.move(paintingInfo.subpixelAccumulation); > + context->clip(pixelSnappedForPainting(adjustedClipRect, deviceScaleFactor)); > + } Now the if() gets highly confusing and almost no-op in case of cliprect has radius. I think it's time to branch out the radius and non-radius case properly. Simply when the clip rect has radius, you want the the rounded cliprect applied, while in case of no radius, the normal clip should be set. I never liked the if (!clipRect.hasRadius()) return; further down in the function anyway. 1027135 7 236093 stavila 2014-08-06 05:31:36 -0700 Created attachment 236093 Patch integrating reviewer feedback 1027164 8 236093 commit-queue 2014-08-06 08:06:25 -0700 Comment on attachment 236093 Patch integrating reviewer feedback Clearing flags on attachment: 236093 Committed r172146: <http://trac.webkit.org/changeset/172146> 1027165 9 commit-queue 2014-08-06 08:06:31 -0700 All reviewed patches have been landed. Closing bug. 235886 2014-08-01 04:49:08 -0700 2014-08-06 05:31:36 -0700 Patch 135318.patch text/plain 5763 stavila ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0NjRmOWQxLi5mNTc4NDVlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDgt MDEgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIxNjMzODIpOiBPdmVyZmxvdyBoaWRkZW4gZm9yIGlubmVyIGVsZW1lbnRzIGJyZWFrcyBi bHVycmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM1MzE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkZWQgdGVzdCBmb3IgZmlsdGVyIGFwcGxpZWQgb24gYW4gZWxlbWVudCBvdmVyZmxvd2luZyBp dHMgcGFyZW50LCB3aGljaCBoYXMgb3ZlcmZsb3c6aGlkZGVuLgorCisgICAgICAgICogZmFzdC9m aWx0ZXItaW1hZ2UvY2xpcHBlZC1maWx0ZXItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAg ICogZmFzdC9maWx0ZXItaW1hZ2UvY2xpcHBlZC1maWx0ZXIuaHRtbDogQWRkZWQuCisKIDIwMTQt MDgtMDEgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkIEVGTCBnYXJkZW5pbmcKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvZmlsdGVyLWltYWdlL2NsaXBwZWQtZmlsdGVyLWV4cGVjdGVkLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2ZpbHRlci1pbWFnZS9jbGlwcGVkLWZpbHRlci1leHBlY3RlZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA2OWFiNGYKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbHRlci1pbWFnZS9jbGlwcGVkLWZpbHRlci1leHBlY3Rl ZC5odG1sCkBAIC0wLDAgKzEsNTEgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFk PgorICAgIDxzdHlsZT4KKyAgICAgICAgLmNpcmNsZSB7CisgICAgICAgICAgICB3aWR0aDogMzAw cHg7CisgICAgICAgICAgICBoZWlnaHQ6IDMwMHB4OworICAgICAgICAgICAgbWFyZ2luLWxlZnQ6 IDEwMHB4OworICAgICAgICAgICAgbWFyZ2luLXRvcDogNjBweDsKKyAgICAgICAgICAgIGJhY2tn cm91bmQtY29sb3I6ICNmNWFkNjE7CisgICAgICAgICAgICBib3JkZXItcmFkaXVzOiA1MCUgNTAl OworICAgICAgICB9CisgICAgICAgIC5pbm5lciB7CisgICAgICAgICAgICAtd2Via2l0LWZpbHRl cjogZHJvcC1zaGFkb3coMTZweCAxNnB4IDBweCBibGFjayk7CisgICAgICAgICAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZWQ7CisgICAgICAgICAgICBoZWlnaHQ6IDYwcHg7CisgICAgICAgICAgICB3 aWR0aDogMjAwcHg7CisgICAgICAgIH0KKworICAgICAgICAjY2xpcCB7CisgICAgICAgICAgICBw b3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAgICB0b3A6IDBweDsKKyAgICAgICAgICAgIGxl ZnQ6IDBweDsKKyAgICAgICAgICAgIHdpZHRoOiA1MDBweDsKKyAgICAgICAgICAgIGhlaWdodDog NTAwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAgICAgICAgICAg IC13ZWJraXQtY2xpcC1wYXRoOiB1cmwoI2NsaXBQYXRoKTsKKyAgICAgICAgfQorICAgIDwvc3R5 bGU+Cis8L2hlYWQ+CisKKzxib2R5PgorICAgIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUzMTgiPkJ1ZyAxMzUzMTggLSBUaGlzIHRlc3QgcGFzc2Vz IGlmIHRoZSByZWQgZWxlbWVudCBoYXMgYSBibGFjayBzaGFkb3cgYW5kIGlzIGNsaXBwZWQgYnkg dGhlIG9yYW5nZSBjaXJjbGU8L2E+CisKKyAgICA8ZGl2IGNsYXNzPSJjaXJjbGUiPgorICAgICAg ICA8ZGl2IGNsYXNzPSJpbm5lciI+PC9kaXY+CisgICAgPC9kaXY+CisKKyAgICA8ZGl2IGlkPSJj bGlwIj48L2Rpdj4KKzwvYm9keT4KKworPHN2Zz4KKyAgICA8ZGVmcz4KKyAgICAgICAgPGNsaXBQ YXRoIGlkPSJjbGlwUGF0aCI+CisgICAgICAgICAgICA8cGF0aCBkPSJNMTgsMzggdjIwMCBoOTAg YTE1MCwxNTAgMCAwLDEgMzAwLDAgaDUwIHYtMjAwIHoiCisgICAgICAgIDwvY2xpcFBhdGg+Cisg ICAgPC9kZWZzPgorPC9zdmc+CisKKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbHRlci1pbWFnZS9jbGlwcGVkLWZpbHRl ci5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9maWx0ZXItaW1hZ2UvY2xpcHBlZC1maWx0ZXIuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hNDU1NmZmCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9maWx0ZXItaW1hZ2UvY2xpcHBlZC1maWx0ZXIuaHRt bApAQCAtMCwwICsxLDUzIEBACis8IURPQ1RZUEUgaHRtbD4KKworPGh0bWw+Cis8aGVhZD4KKyAg ICA8c3R5bGU+CisgICAgICAgIC5jaXJjbGUgeworICAgICAgICAgICAgd2lkdGg6IDMwMHB4Owor ICAgICAgICAgICAgaGVpZ2h0OiAzMDBweDsKKyAgICAgICAgICAgIG1hcmdpbi1sZWZ0OiAxMDBw eDsKKyAgICAgICAgICAgIG1hcmdpbi10b3A6IDYwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5k LWNvbG9yOiAjZjVhZDYxOworICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICAgICAg ICAgIGJvcmRlci1yYWRpdXM6IDUwJSA1MCU7CisgICAgICAgIH0KKworICAgICAgICAuaW5uZXIg eworICAgICAgICAgICAgLXdlYmtpdC1maWx0ZXI6IGRyb3Atc2hhZG93KDE2cHggMTZweCAwcHgg YmxhY2spOworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgICAgICAgICAg aGVpZ2h0OiA2MHB4OworICAgICAgICAgICAgd2lkdGg6IDIwMHB4OworICAgICAgICB9CisKKyAg ICAgICAgI2NsaXAgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAg ICAgdG9wOiAwcHg7CisgICAgICAgICAgICBsZWZ0OiAwcHg7CisgICAgICAgICAgICB3aWR0aDog NTAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDUwMHB4OworICAgICAgICAgICAgYmFja2dyb3Vu ZC1jb2xvcjogd2hpdGU7CisgICAgICAgICAgICAtd2Via2l0LWNsaXAtcGF0aDogdXJsKCNjbGlw UGF0aCk7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorCis8Ym9keT4KKyAgICA8 YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1MzE4Ij5C dWcgMTM1MzE4IC0gVGhpcyB0ZXN0IHBhc3NlcyBpZiB0aGUgcmVkIGVsZW1lbnQgaGFzIGEgYmxh Y2sgc2hhZG93IGFuZCBpcyBjbGlwcGVkIGJ5IHRoZSBvcmFuZ2UgY2lyY2xlPC9hPgorCisgICAg PGRpdiBjbGFzcz0iY2lyY2xlIj4KKyAgICAgICAgPGRpdiBjbGFzcz0iaW5uZXIiPjwvZGl2Pgor ICAgIDwvZGl2PgorCisgICAgPGRpdiBpZD0iY2xpcCI+PC9kaXY+Cis8L2JvZHk+CisKKzxzdmc+ CisgICAgPGRlZnM+CisgICAgICAgIDxjbGlwUGF0aCBpZD0iY2xpcFBhdGgiPgorICAgICAgICAg ICAgPHBhdGggZD0iTTE4LDM4IHYyMDAgaDkwIGExNTAsMTUwIDAgMCwxIDMwMCwwIGg1MCB2LTIw MCB6IgorICAgICAgICA8L2NsaXBQYXRoPgorICAgIDwvZGVmcz4KKzwvc3ZnPgorCis8L2h0bWw+ ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMwODk2ZmIuLjgyOGYy Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxNC0wOC0wMSAgUmFkdSBTdGF2aWxh ICA8c3RhdmlsYUBhZG9iZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjE2MzM4Mik6IE92 ZXJmbG93IGhpZGRlbiBmb3IgaW5uZXIgZWxlbWVudHMgYnJlYWtzIGJsdXJyaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUzMTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgZWxlbWVudHMgd2l0 aCBib3JkZXIgcmFkaXVzLCBjbGlwcGluZyBtdXN0IGJlIGFwcGxpZWQgdXNpbmcgY2xpcFJvdW5k ZWRSZWN0LgorICAgICAgICBUaGlzIHJlZ3Jlc3NlZCBpbiByMTYzMzgyLCB3aGVuIG5vcm1hbCBj bGlwcGluZyBzdGFydGVkIGJlaW5nIGFwcGxpZWQgYWxzbworICAgICAgICBmb3IgZWxlbWVudHMg aGF2aW5nIGJvcmRlciByYWRpdXMuCisKKyAgICAgICAgVGVzdDogZmFzdC9maWx0ZXItaW1hZ2Uv Y2xpcHBlZC1maWx0ZXIuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjbGlwVG9SZWN0KToKKwogMjAxNC0w OC0wMSAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFJlcGxhY2UgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMIHdpdGggTmV2ZXJEZXN0cm95 ZWQ8VD4gaW4gTmF2aWdhdG9yQ29udGVudFV0aWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcAppbmRleCBmYzNlMTFhLi42ZjkzMTRkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTM1ODgsOSArMzU4OCwxMyBAQCB2b2lkIFJlbmRl ckxheWVyOjpjbGlwVG9SZWN0KGNvbnN0IExheWVyUGFpbnRpbmdJbmZvJiBwYWludGluZ0luZm8s IEdyYXBoaWNzQ29udAogICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0gcmVuZGVyZXIoKS5k b2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCk7CiAgICAgaWYgKGNsaXBSZWN0LnJlY3QoKSAh PSBwYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QgfHwgY2xpcFJlY3QuaGFzUmFkaXVzKCkpIHsK ICAgICAgICAgY29udGV4dC0+c2F2ZSgpOwotICAgICAgICBMYXlvdXRSZWN0IGFkanVzdGVkQ2xp cFJlY3QgPSBjbGlwUmVjdC5yZWN0KCk7Ci0gICAgICAgIGFkanVzdGVkQ2xpcFJlY3QubW92ZShw YWludGluZ0luZm8uc3VicGl4ZWxBY2N1bXVsYXRpb24pOwotICAgICAgICBjb250ZXh0LT5jbGlw KHBpeGVsU25hcHBlZEZvclBhaW50aW5nKGFkanVzdGVkQ2xpcFJlY3QsIGRldmljZVNjYWxlRmFj dG9yKSk7CisgICAgICAgIAorICAgICAgICAvLyBDbGlwcGluZyBmb3IgYm9yZGVyIHJhZGl1cyB3 aWxsIGJlIGFwcGxpZWQgbGF0ZXIgaW4gdGhpcyBtZXRob2QuCisgICAgICAgIGlmICghY2xpcFJl Y3QuaGFzUmFkaXVzKCkpIHsKKyAgICAgICAgICAgIExheW91dFJlY3QgYWRqdXN0ZWRDbGlwUmVj dCA9IGNsaXBSZWN0LnJlY3QoKTsKKyAgICAgICAgICAgIGFkanVzdGVkQ2xpcFJlY3QubW92ZShw YWludGluZ0luZm8uc3VicGl4ZWxBY2N1bXVsYXRpb24pOworICAgICAgICAgICAgY29udGV4dC0+ Y2xpcChwaXhlbFNuYXBwZWRGb3JQYWludGluZyhhZGp1c3RlZENsaXBSZWN0LCBkZXZpY2VTY2Fs ZUZhY3RvcikpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKCFjbGlwUmVjdC5oYXNSYWRp dXMoKSkK 236093 2014-08-06 05:31:36 -0700 2014-08-06 08:06:25 -0700 Patch integrating reviewer feedback 135318.patch text/plain 8285 stavila ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhMzNjMTY3Li5jYWUzN2Q2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDgt MDEgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04gKHIxNjMzODIpOiBPdmVyZmxvdyBoaWRkZW4gZm9yIGlubmVyIGVsZW1lbnRzIGJyZWFrcyBi bHVycmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM1MzE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkZWQgdGVzdCBmb3IgZmlsdGVyIGFwcGxpZWQgb24gYW4gZWxlbWVudCBvdmVyZmxvd2luZyBp dHMgcGFyZW50LCB3aGljaCBoYXMgb3ZlcmZsb3c6aGlkZGVuLgorCisgICAgICAgICogZmFzdC9m aWx0ZXItaW1hZ2UvY2xpcHBlZC1maWx0ZXItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAg ICogZmFzdC9maWx0ZXItaW1hZ2UvY2xpcHBlZC1maWx0ZXIuaHRtbDogQWRkZWQuCisKIDIwMTQt MDgtMDYgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CiAKICAgICAgICAgW0NT U1JlZ2lvbnNdIE1vdmUgYXV0by1oZWlnaHQgdGVzdHMgaW50byBmYXN0L3JlZ2lvbnMvYXV0by1z aXplCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZpbHRlci1pbWFnZS9jbGlwcGVkLWZp bHRlci1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9maWx0ZXItaW1hZ2UvY2xpcHBl ZC1maWx0ZXItZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li4wNjlhYjRmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9maWx0ZXItaW1h Z2UvY2xpcHBlZC1maWx0ZXItZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDUxIEBACis8IURPQ1RZ UEUgaHRtbD4KKworPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgIC5jaXJjbGUg eworICAgICAgICAgICAgd2lkdGg6IDMwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAzMDBweDsK KyAgICAgICAgICAgIG1hcmdpbi1sZWZ0OiAxMDBweDsKKyAgICAgICAgICAgIG1hcmdpbi10b3A6 IDYwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjZjVhZDYxOworICAgICAgICAg ICAgYm9yZGVyLXJhZGl1czogNTAlIDUwJTsKKyAgICAgICAgfQorICAgICAgICAuaW5uZXIgewor ICAgICAgICAgICAgLXdlYmtpdC1maWx0ZXI6IGRyb3Atc2hhZG93KDE2cHggMTZweCAwcHggYmxh Y2spOworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOworICAgICAgICAgICAgaGVp Z2h0OiA2MHB4OworICAgICAgICAgICAgd2lkdGg6IDIwMHB4OworICAgICAgICB9CisKKyAgICAg ICAgI2NsaXAgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAg dG9wOiAwcHg7CisgICAgICAgICAgICBsZWZ0OiAwcHg7CisgICAgICAgICAgICB3aWR0aDogNTAw cHg7CisgICAgICAgICAgICBoZWlnaHQ6IDUwMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1j b2xvcjogd2hpdGU7CisgICAgICAgICAgICAtd2Via2l0LWNsaXAtcGF0aDogdXJsKCNjbGlwUGF0 aCk7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorCis8Ym9keT4KKyAgICA8YSBo cmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1MzE4Ij5CdWcg MTM1MzE4IC0gVGhpcyB0ZXN0IHBhc3NlcyBpZiB0aGUgcmVkIGVsZW1lbnQgaGFzIGEgYmxhY2sg c2hhZG93IGFuZCBpcyBjbGlwcGVkIGJ5IHRoZSBvcmFuZ2UgY2lyY2xlPC9hPgorCisgICAgPGRp diBjbGFzcz0iY2lyY2xlIj4KKyAgICAgICAgPGRpdiBjbGFzcz0iaW5uZXIiPjwvZGl2PgorICAg IDwvZGl2PgorCisgICAgPGRpdiBpZD0iY2xpcCI+PC9kaXY+Cis8L2JvZHk+CisKKzxzdmc+Cisg ICAgPGRlZnM+CisgICAgICAgIDxjbGlwUGF0aCBpZD0iY2xpcFBhdGgiPgorICAgICAgICAgICAg PHBhdGggZD0iTTE4LDM4IHYyMDAgaDkwIGExNTAsMTUwIDAgMCwxIDMwMCwwIGg1MCB2LTIwMCB6 IgorICAgICAgICA8L2NsaXBQYXRoPgorICAgIDwvZGVmcz4KKzwvc3ZnPgorCis8L2h0bWw+Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9m aWx0ZXItaW1hZ2UvY2xpcHBlZC1maWx0ZXIuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZmlsdGVy LWltYWdlL2NsaXBwZWQtZmlsdGVyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uYTQ1NTZmZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmlsdGVy LWltYWdlL2NsaXBwZWQtZmlsdGVyLmh0bWwKQEAgLTAsMCArMSw1MyBAQAorPCFET0NUWVBFIGh0 bWw+CisKKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAgICAuY2lyY2xlIHsKKyAg ICAgICAgICAgIHdpZHRoOiAzMDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMzAwcHg7CisgICAg ICAgICAgICBtYXJnaW4tbGVmdDogMTAwcHg7CisgICAgICAgICAgICBtYXJnaW4tdG9wOiA2MHB4 OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2Y1YWQ2MTsKKyAgICAgICAgICAgIG92 ZXJmbG93OiBoaWRkZW47CisgICAgICAgICAgICBib3JkZXItcmFkaXVzOiA1MCUgNTAlOworICAg ICAgICB9CisKKyAgICAgICAgLmlubmVyIHsKKyAgICAgICAgICAgIC13ZWJraXQtZmlsdGVyOiBk cm9wLXNoYWRvdygxNnB4IDE2cHggMHB4IGJsYWNrKTsKKyAgICAgICAgICAgIGJhY2tncm91bmQt Y29sb3I6IHJlZDsKKyAgICAgICAgICAgIGhlaWdodDogNjBweDsKKyAgICAgICAgICAgIHdpZHRo OiAyMDBweDsKKyAgICAgICAgfQorCisgICAgICAgICNjbGlwIHsKKyAgICAgICAgICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHRvcDogMHB4OworICAgICAgICAgICAgbGVmdDog MHB4OworICAgICAgICAgICAgd2lkdGg6IDUwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiA1MDBw eDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOworICAgICAgICAgICAgLXdl YmtpdC1jbGlwLXBhdGg6IHVybCgjY2xpcFBhdGgpOworICAgICAgICB9CisgICAgPC9zdHlsZT4K KzwvaGVhZD4KKworPGJvZHk+CisgICAgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNTMxOCI+QnVnIDEzNTMxOCAtIFRoaXMgdGVzdCBwYXNzZXMgaWYg dGhlIHJlZCBlbGVtZW50IGhhcyBhIGJsYWNrIHNoYWRvdyBhbmQgaXMgY2xpcHBlZCBieSB0aGUg b3JhbmdlIGNpcmNsZTwvYT4KKworICAgIDxkaXYgY2xhc3M9ImNpcmNsZSI+CisgICAgICAgIDxk aXYgY2xhc3M9ImlubmVyIj48L2Rpdj4KKyAgICA8L2Rpdj4KKworICAgIDxkaXYgaWQ9ImNsaXAi PjwvZGl2PgorPC9ib2R5PgorCis8c3ZnPgorICAgIDxkZWZzPgorICAgICAgICA8Y2xpcFBhdGgg aWQ9ImNsaXBQYXRoIj4KKyAgICAgICAgICAgIDxwYXRoIGQ9Ik0xOCwzOCB2MjAwIGg5MCBhMTUw LDE1MCAwIDAsMSAzMDAsMCBoNTAgdi0yMDAgeiIKKyAgICAgICAgPC9jbGlwUGF0aD4KKyAgICA8 L2RlZnM+Cis8L3N2Zz4KKworPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCA5NjI5MTMxLi4yOTJkZTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTQtMDgtMDEgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAgICAg IFJFR1JFU1NJT04gKHIxNjMzODIpOiBPdmVyZmxvdyBoaWRkZW4gZm9yIGlubmVyIGVsZW1lbnRz IGJyZWFrcyBibHVycmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM1MzE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRm9yIGVsZW1lbnRzIHdpdGggYm9yZGVyIHJhZGl1cywgY2xpcHBpbmcgbXVzdCBi ZSBhcHBsaWVkIHVzaW5nIGNsaXBSb3VuZGVkUmVjdC4KKyAgICAgICAgVGhpcyByZWdyZXNzZWQg aW4gcjE2MzM4Miwgd2hlbiBub3JtYWwgY2xpcHBpbmcgc3RhcnRlZCBiZWluZyBhcHBsaWVkIGFs c28KKyAgICAgICAgZm9yIGVsZW1lbnRzIGhhdmluZyBib3JkZXIgcmFkaXVzLgorCisgICAgICAg IFRlc3Q6IGZhc3QvZmlsdGVyLWltYWdlL2NsaXBwZWQtZmlsdGVyLmh0bWwKKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6Y2xpcFRvUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cmVzdG9yZUNs aXApOgorCiAyMDE0LTA4LTA2ICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkIHR5cG8gY29ycmVjdGlvbi4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGUzZWE1NDUuLjQ5ZjJhYmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMzU4NiwzNiArMzU4NiwzNCBAQCBz dGF0aWMgYm9vbCBpbkNvbnRhaW5pbmdCbG9ja0NoYWluKFJlbmRlckxheWVyKiBzdGFydExheWVy LCBSZW5kZXJMYXllciogZW5kTGF5ZQogdm9pZCBSZW5kZXJMYXllcjo6Y2xpcFRvUmVjdChjb25z dCBMYXllclBhaW50aW5nSW5mbyYgcGFpbnRpbmdJbmZvLCBHcmFwaGljc0NvbnRleHQqIGNvbnRl eHQsIGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCwgQm9yZGVyUmFkaXVzQ2xpcHBpbmdSdWxlIHJ1 bGUpCiB7CiAgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSByZW5kZXJlcigpLmRvY3VtZW50 KCkuZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICBpZiAoY2xpcFJlY3QucmVjdCgpICE9IHBhaW50 aW5nSW5mby5wYWludERpcnR5UmVjdCB8fCBjbGlwUmVjdC5oYXNSYWRpdXMoKSkgeworICAgIGlm IChjbGlwUmVjdC5oYXNSYWRpdXMoKSkgeworICAgICAgICBjb250ZXh0LT5zYXZlKCk7CisgICAg ICAgIAorICAgICAgICAvLyBJZiB0aGUgY2xpcCByZWN0IGhhcyBiZWVuIHRhaW50ZWQgYnkgYSBi b3JkZXIgcmFkaXVzLCB0aGVuIHdlIGhhdmUgdG8gd2FsayB1cCBvdXIgbGF5ZXIgY2hhaW4gYXBw bHlpbmcgdGhlIGNsaXBzIGZyb20KKyAgICAgICAgLy8gYW55IGxheWVycyB3aXRoIG92ZXJmbG93 LiBUaGUgY29uZGl0aW9uIGZvciBiZWluZyBhYmxlIHRvIGFwcGx5IHRoZXNlIGNsaXBzIGlzIHRo YXQgdGhlIG92ZXJmbG93IG9iamVjdCBiZSBpbiBvdXIKKyAgICAgICAgLy8gY29udGFpbmluZyBi bG9jayBjaGFpbiBzbyB3ZSBjaGVjayB0aGF0IGFsc28uCisgICAgICAgIGZvciAoUmVuZGVyTGF5 ZXIqIGxheWVyID0gcnVsZSA9PSBJbmNsdWRlU2VsZkZvckJvcmRlclJhZGl1cyA/IHRoaXMgOiBw YXJlbnQoKTsgbGF5ZXI7IGxheWVyID0gbGF5ZXItPnBhcmVudCgpKSB7CisgICAgICAgICAgICBp ZiAobGF5ZXItPnJlbmRlcmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkgJiYgbGF5ZXItPnJlbmRlcmVy KCkuc3R5bGUoKS5oYXNCb3JkZXJSYWRpdXMoKSAmJiBpbkNvbnRhaW5pbmdCbG9ja0NoYWluKHRo aXMsIGxheWVyKSkgeworICAgICAgICAgICAgICAgIExheW91dFJlY3QgYWRqdXN0ZWRDbGlwUmVj dCA9IExheW91dFJlY3QodG9MYXlvdXRQb2ludChsYXllci0+b2Zmc2V0RnJvbUFuY2VzdG9yKHBh aW50aW5nSW5mby5yb290TGF5ZXIpKSwgbGF5ZXItPnNpemUoKSk7CisgICAgICAgICAgICAgICAg YWRqdXN0ZWRDbGlwUmVjdC5tb3ZlKHBhaW50aW5nSW5mby5zdWJwaXhlbEFjY3VtdWxhdGlvbik7 CisgICAgICAgICAgICAgICAgY29udGV4dC0+Y2xpcFJvdW5kZWRSZWN0KGxheWVyLT5yZW5kZXJl cigpLnN0eWxlKCkuZ2V0Um91bmRlZElubmVyQm9yZGVyRm9yKGFkanVzdGVkQ2xpcFJlY3QpLnBp eGVsU25hcHBlZFJvdW5kZWRSZWN0Rm9yUGFpbnRpbmcoZGV2aWNlU2NhbGVGYWN0b3IpKTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKGxheWVyID09IHBhaW50 aW5nSW5mby5yb290TGF5ZXIpCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAg ICB9IGVsc2UgaWYgKGNsaXBSZWN0LnJlY3QoKSAhPSBwYWludGluZ0luZm8ucGFpbnREaXJ0eVJl Y3QpIHsKICAgICAgICAgY29udGV4dC0+c2F2ZSgpOwogICAgICAgICBMYXlvdXRSZWN0IGFkanVz dGVkQ2xpcFJlY3QgPSBjbGlwUmVjdC5yZWN0KCk7CiAgICAgICAgIGFkanVzdGVkQ2xpcFJlY3Qu bW92ZShwYWludGluZ0luZm8uc3VicGl4ZWxBY2N1bXVsYXRpb24pOwogICAgICAgICBjb250ZXh0 LT5jbGlwKHBpeGVsU25hcHBlZEZvclBhaW50aW5nKGFkanVzdGVkQ2xpcFJlY3QsIGRldmljZVNj YWxlRmFjdG9yKSk7CiAgICAgfQotCi0gICAgaWYgKCFjbGlwUmVjdC5oYXNSYWRpdXMoKSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgLy8gSWYgdGhlIGNsaXAgcmVjdCBoYXMgYmVlbiB0YWludGVk IGJ5IGEgYm9yZGVyIHJhZGl1cywgdGhlbiB3ZSBoYXZlIHRvIHdhbGsgdXAgb3VyIGxheWVyIGNo YWluIGFwcGx5aW5nIHRoZSBjbGlwcyBmcm9tCi0gICAgLy8gYW55IGxheWVycyB3aXRoIG92ZXJm bG93LiBUaGUgY29uZGl0aW9uIGZvciBiZWluZyBhYmxlIHRvIGFwcGx5IHRoZXNlIGNsaXBzIGlz IHRoYXQgdGhlIG92ZXJmbG93IG9iamVjdCBiZSBpbiBvdXIKLSAgICAvLyBjb250YWluaW5nIGJs b2NrIGNoYWluIHNvIHdlIGNoZWNrIHRoYXQgYWxzby4KLSAgICBmb3IgKFJlbmRlckxheWVyKiBs YXllciA9IHJ1bGUgPT0gSW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMgPyB0aGlzIDogcGFyZW50 KCk7IGxheWVyOyBsYXllciA9IGxheWVyLT5wYXJlbnQoKSkgewotICAgICAgICBpZiAobGF5ZXIt PnJlbmRlcmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkgJiYgbGF5ZXItPnJlbmRlcmVyKCkuc3R5bGUo KS5oYXNCb3JkZXJSYWRpdXMoKSAmJiBpbkNvbnRhaW5pbmdCbG9ja0NoYWluKHRoaXMsIGxheWVy KSkgewotICAgICAgICAgICAgTGF5b3V0UmVjdCBhZGp1c3RlZENsaXBSZWN0ID0gTGF5b3V0UmVj dCh0b0xheW91dFBvaW50KGxheWVyLT5vZmZzZXRGcm9tQW5jZXN0b3IocGFpbnRpbmdJbmZvLnJv b3RMYXllcikpLCBsYXllci0+c2l6ZSgpKTsKLSAgICAgICAgICAgIGFkanVzdGVkQ2xpcFJlY3Qu bW92ZShwYWludGluZ0luZm8uc3VicGl4ZWxBY2N1bXVsYXRpb24pOwotICAgICAgICAgICAgY29u dGV4dC0+Y2xpcFJvdW5kZWRSZWN0KGxheWVyLT5yZW5kZXJlcigpLnN0eWxlKCkuZ2V0Um91bmRl ZElubmVyQm9yZGVyRm9yKGFkanVzdGVkQ2xpcFJlY3QpLnBpeGVsU25hcHBlZFJvdW5kZWRSZWN0 Rm9yUGFpbnRpbmcoZGV2aWNlU2NhbGVGYWN0b3IpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGlm IChsYXllciA9PSBwYWludGluZ0luZm8ucm9vdExheWVyKQotICAgICAgICAgICAgYnJlYWs7Ci0g ICAgfQogfQogCiB2b2lkIFJlbmRlckxheWVyOjpyZXN0b3JlQ2xpcChHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IExheW91dFJlY3QmIHBhaW50RGlydHlSZWN0LCBjb25zdCBDbGlwUmVj dCYgY2xpcFJlY3QpCiB7Ci0gICAgaWYgKGNsaXBSZWN0LnJlY3QoKSA9PSBwYWludERpcnR5UmVj dCAmJiAhY2xpcFJlY3QuaGFzUmFkaXVzKCkpCi0gICAgICAgIHJldHVybjsKLSAgICBjb250ZXh0 LT5yZXN0b3JlKCk7CisgICAgaWYgKGNsaXBSZWN0LnJlY3QoKSAhPSBwYWludERpcnR5UmVjdCB8 fCBjbGlwUmVjdC5oYXNSYWRpdXMoKSkKKyAgICAgICAgY29udGV4dC0+cmVzdG9yZSgpOwogfQog CiBzdGF0aWMgdm9pZCBwZXJmb3JtT3ZlcmxhcFRlc3RzKE92ZXJsYXBUZXN0UmVxdWVzdE1hcCYg b3ZlcmxhcFRlc3RSZXF1ZXN0cywgY29uc3QgUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgY29uc3Qg UmVuZGVyTGF5ZXIqIGxheWVyKQo=