202049 2019-09-20 11:27:09 -0700 Setting border-radius on <video> element clips top and left sections of video 2019-10-24 14:22:31 -0700 1 1 1 Unclassified WebKit Compositing Safari Technology Preview Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=199135 InRadar P2 Normal --- 1 jonathan simon.fraser bfulgham commit-queue dino eric.carlson esprehn+autocc ews-watchlist fred.wang glenn jer.noble jonathan kondapallykalyan pdr philipj sabouhallawa sergio simon.fraser thorton tsavell webkit-bug-importer zalan oldest_to_newest 1572785 0 jonathan 2019-09-20 11:27:09 -0700 Setting border-radius on a <video> element to a value greater than zero causes large chunks of the video to be clipped incorrectly. Please see https://directmailmac.com/safari-13-bug.php for an example. On that page, the <video> element has a border-radius of 5px, but approx. 40px of the left and 30px of the top of the video are clipped off. The workaround (which can be seen at https://directmailmac.com) is to set the border-radius to zero. 1572849 1 webkit-bug-importer 2019-09-20 13:25:16 -0700 <rdar://problem/55570024> 1577394 2 simon.fraser 2019-10-07 10:56:20 -0700 I can reproduce. 1581733 3 simon.fraser 2019-10-19 14:11:11 -0700 Probably regressed in r246845. 1581762 4 381389 simon.fraser 2019-10-19 21:54:07 -0700 Created attachment 381389 Patch 1581853 5 381389 zalan 2019-10-21 08:40:30 -0700 Comment on attachment 381389 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381389&action=review > Source/WebCore/rendering/RenderLayerBacking.cpp:1934 > + contentsClippingRect.move(LayoutSize(-clipLayer->offsetFromRenderer())); moveBy()? or LayoutSize { } 1581871 6 381389 sabouhallawa 2019-10-21 10:19:45 -0700 Comment on attachment 381389 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381389&action=review > Source/WebCore/platform/graphics/FloatRoundedRect.h:106 > + void setLocation(FloatPoint location) { m_rect.setLocation(location); } Can't we use setRect() or move() to change the location? Or can't we make rect() non-const and use rect().setLocation()? Maybe a better solution is to make FloatRoundedRect inherits FloatRect. > Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:2648 > + clippingRectRelativeToClippingLayer.setLocation({ }); Shouldn't clippingRectRelativeToClippingLayer be translated to the coordinates of m_contentsClippingLayer instead of just making its location at { 0, 0 }? > LayoutTests/compositing/video/video-border-radius-clipping-expected.html:27 > + var totalCount = document.getElementsByTagName('video').length; > + var count = totalCount; There is only one <video> element in the <body> element. Why do we have to get the count and check if (!--count...) in the script below? > LayoutTests/compositing/video/video-border-radius-clipping.html:28 > + var totalCount = document.getElementsByTagName('video').length; > + var count = totalCount; Ditto. 1581882 7 381389 commit-queue 2019-10-21 10:37:58 -0700 Comment on attachment 381389 Patch Rejecting attachment 381389 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 381389, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=381389&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=202049&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 381389 from bug 202049. Fetching: https://bugs.webkit.org/attachment.cgi?id=381389 /Volumes/Data/EWS/WebKit/LayoutTests/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Updating OpenSource Current branch master is up to date. Full output: https://webkit-queues.webkit.org/results/13159497 1581883 8 sabouhallawa 2019-10-21 10:41:00 -0700 I am sorry I did not mean to set r? There was a review conflict and I chose to submit it anyway. It seems this replaced the r+ with the r?. 1581966 9 simon.fraser 2019-10-21 13:08:40 -0700 (In reply to Said Abou-Hallawa from comment #6) > Comment on attachment 381389 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=381389&action=review > > > Source/WebCore/platform/graphics/FloatRoundedRect.h:106 > > + void setLocation(FloatPoint location) { m_rect.setLocation(location); } > > Can't we use setRect() or move() to change the location? > > Or can't we make rect() non-const and use rect().setLocation()? Maybe a > better solution is to make FloatRoundedRect inherits FloatRect. I considered these. setLocation() seemed simplest. > > Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:2648 > > + clippingRectRelativeToClippingLayer.setLocation({ }); > > Shouldn't clippingRectRelativeToClippingLayer be translated to the > coordinates of m_contentsClippingLayer instead of just making its location > at { 0, 0 }? clippingRectRelativeToClippingLayer was sized and positioned based on the rounded rect. > > LayoutTests/compositing/video/video-border-radius-clipping-expected.html:27 > > + var totalCount = document.getElementsByTagName('video').length; > > + var count = totalCount; > > There is only one <video> element in the <body> element. Why do we have to > get the count and check if (!--count...) in the script below? > > > LayoutTests/compositing/video/video-border-radius-clipping.html:28 > > + var totalCount = document.getElementsByTagName('video').length; > > + var count = totalCount; > > Ditto. Copy-pasted from another test. 1582053 10 simon.fraser 2019-10-21 14:36:31 -0700 https://trac.webkit.org/changeset/251385/webkit 1582801 11 tsavell 2019-10-23 07:37:22 -0700 The new test compositing/video/video-border-radius-clipping.html added in https://trac.webkit.org/changeset/251385/webkit is failing on Mojave wk1 History: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=compositing%2Fvideo%2Fvideo-border-radius-clipping.html Diff: https://build.webkit.org/results/Apple%20Mojave%20Release%20WK1%20(Tests)/r251477%20(8605)/compositing/video/video-border-radius-clipping-diffs.html It is unfortunately only missing by one pixel 1583527 12 simon.fraser 2019-10-24 14:22:31 -0700 Fixed the test in https://trac.webkit.org/r251561. 381389 2019-10-19 21:54:07 -0700 2019-10-21 13:09:02 -0700 Patch bug-202049-20191019215406.patch text/plain 12585 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGEwNmU3Y2NlZTM4ZGJl MjhiM2EyZjBlNjc5MjBiMmJiNDliNDgwMS4uZDVmNmQ5M2U1OWU0ZTA1Mzk2Y2U4NTE0NjFhMTc1 MjZhNzdlMzM3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTEwLTE5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNldHRpbmcgYm9y ZGVyLXJhZGl1cyBvbiA8dmlkZW8+IGVsZW1lbnQgY2xpcHMgdG9wIGFuZCBsZWZ0IHNlY3Rpb25z IG9mIHZpZGVvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDIwNDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU1NTcwMDI0PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHVwZGF0ZUNsaXBwaW5nU3RyYXRl Z3koKSBpcyBjYWxsZWQgYm90aCB3aGVuIHdlJ3JlIHNldHRpbmcgYSBtYXNrIGxheWVyIG9uIG1f bGF5ZXIsCisgICAgICAgIGFuZCBvbiBtX2NvbnRlbnRzQ2xpcHBpbmdMYXllciwgYW5kIHRoZXkg ZGlzYWdyZWVkIG9uIHRoZSBjb29yZGluYXRlIHNwYWNlIHRoYXQKKyAgICAgICAgdGhlIHJvdW5k ZWQgcmVjdCB3YXMgaW4uIHIyNDY4NDUgZml4ZWQgcm91bmRlZC1yZWN0IHNjcm9sbGVycywgYnV0 IGJyb2tlIHZpZGVvLgorCisgICAgICAgIEZpeCBieSBkZWNsYXJpbmcgdGhhdCB0aGUgcm91bmRl ZCByZWN0IGlzIHJlbGF0aXZlIHRvIHRoZSBib3VuZHMgb2YgdGhlIGxheWVyCisgICAgICAgIGFy Z3VtZW50LiBXZSBkb24ndCB0cnkgdG8gc2l6ZSB0aGUgc2hhcGUgbGF5ZXIgdG8gdGhlIHJvdW5k ZWQgcmVjdCwgYmVjYXVzZSBpbiBzb21lCisgICAgICAgIGNvbmZpZ3VyYXRpb25zIChlLmcuIHNj cm9sbGVyIHdpdGggbGVmdCBzY3JvbGxiYXIpIHRoZSByb3VuZGVkIHJlY3QgaGFuZ3Mgb3V0c2lk ZQorICAgICAgICB0aGUgY2xpcHBpbmcgbGF5ZXIuCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRp bmcvdmlkZW8vdmlkZW8tYm9yZGVyLXJhZGl1cy1jbGlwcGluZy5odG1sCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJvdW5kZWRSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpG bG9hdFJvdW5kZWRSZWN0OjpzZXRMb2NhdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXJDQTo6dXBkYXRlQ2xpcHBpbmdTdHJhdGVneSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0xheWVyQ0E6OnVwZGF0ZUNvbnRlbnRzUmVjdHMpOiBUaGUgcm91bmRlZCByZWN0IGlzIHJlbGF0 aXZlIHRvIHRoZSBjb250ZW50c0NsaXBwaW5nTGF5ZXIsCisgICAgICAgIHNvIHNldCBpdHMgbG9j YXRpb24gdG8gemVyby4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ2hpbGRDbGlw cGluZ1N0cmF0ZWd5KTogbmVnYXRlIHRoZSBvZmZzZXQsIGFzIHdlIGRvIGluIHVwZGF0ZUdlb21l dHJ5IHdoaWNoCisgICAgICAgIGhhcyBzaW1pbGFyIGNvZGUuCisKIDIwMTktMTAtMTkgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSW50ZWdyYXRlIG1lZGlhIHF1 ZXJ5IGV2YWx1YXRpb24gaW50byBIVE1MNSBldmVudCBsb29wCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJvdW5kZWRSZWN0LmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJvdW5kZWRSZWN0LmgKaW5kZXggYTM1YjM5M2Uy ZWYzNTA2ZWNkYzNhZGU0ZjRhMmMxMTdjNThlNWRkZi4uOGVmZWU1N2E5ZTQ3Y2M5MDc2YThhNWU3 N2JlZjIyMjE0MGViOGRiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRmxvYXRSb3VuZGVkUmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0Zsb2F0Um91bmRlZFJlY3QuaApAQCAtMTAzLDYgKzEwMyw3IEBAIHB1YmxpYzoKICAg ICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX3JlY3QuaXNFbXB0eSgpOyB9CiAKICAg ICB2b2lkIHNldFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KSB7IG1fcmVjdCA9IHJlY3Q7IH0K KyAgICB2b2lkIHNldExvY2F0aW9uKEZsb2F0UG9pbnQgbG9jYXRpb24pIHsgbV9yZWN0LnNldExv Y2F0aW9uKGxvY2F0aW9uKTsgfQogICAgIHZvaWQgc2V0UmFkaWkoY29uc3QgUmFkaWkmIHJhZGlp KSB7IG1fcmFkaWkgPSByYWRpaTsgfQogCiAgICAgdm9pZCBtb3ZlKGNvbnN0IEZsb2F0U2l6ZSYg c2l6ZSkgeyBtX3JlY3QubW92ZShzaXplKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKaW5kZXggOWE0OTE4Yzdk ZGM2MTAwYWQzYjY0MWU1NWZkNmRiNGIzNzMxMDk3Yy4uOGQ4YzIwMzQxMjlhMTBlYzNhZGE3MDBj NGE5YjJiMDg4NWUwNjI5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCkBAIC0yNTg5LDkgKzI1ODksMTAgQEAg dm9pZCBHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUNvbnRlbnRzQ29sb3JMYXllcigpCiB9CiAKIC8v IFRoZSBjbGlwcGluZyBzdHJhdGVneSBkZXBlbmRzIG9uIHdoZXRoZXIgdGhlIHJvdW5kZWQgcmVj dCBoYXMgZXF1YWwgY29ybmVyIHJhZGlpLgorLy8gcm91bmRlZFJlY3QgaXMgaW4gdGhlIGNvb3Jk aW5hdGUgc3BhY2Ugb2YgY2xpcHBpbmdMYXllci4KIHZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRh dGVDbGlwcGluZ1N0cmF0ZWd5KFBsYXRmb3JtQ0FMYXllciYgY2xpcHBpbmdMYXllciwgUmVmUHRy PFBsYXRmb3JtQ0FMYXllcj4mIHNoYXBlTWFza0xheWVyLCBjb25zdCBGbG9hdFJvdW5kZWRSZWN0 JiByb3VuZGVkUmVjdCkKIHsKLSAgICBpZiAocm91bmRlZFJlY3QucmFkaWkoKS5pc1VuaWZvcm1D b3JuZXJSYWRpdXMoKSkgeworICAgIGlmIChyb3VuZGVkUmVjdC5yYWRpaSgpLmlzVW5pZm9ybUNv cm5lclJhZGl1cygpICYmIGNsaXBwaW5nTGF5ZXIuYm91bmRzKCkgPT0gcm91bmRlZFJlY3QucmVj dCgpKSB7CiAgICAgICAgIGNsaXBwaW5nTGF5ZXIuc2V0TWFzayhudWxscHRyKTsKICAgICAgICAg aWYgKHNoYXBlTWFza0xheWVyKSB7CiAgICAgICAgICAgICBzaGFwZU1hc2tMYXllci0+c2V0T3du ZXIobnVsbHB0cik7CkBAIC0yNjA5LDExICsyNjEwLDggQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6 OnVwZGF0ZUNsaXBwaW5nU3RyYXRlZ3koUGxhdGZvcm1DQUxheWVyJiBjbGlwcGluZ0xheWVyLCBS ZWYKICAgICAgICAgc2hhcGVNYXNrTGF5ZXItPnNldE5hbWUoInNoYXBlIG1hc2siKTsKICAgICB9 CiAgICAgCi0gICAgc2hhcGVNYXNrTGF5ZXItPnNldFBvc2l0aW9uKHJvdW5kZWRSZWN0LnJlY3Qo KS5sb2NhdGlvbigpKTsKLSAgICBGbG9hdFJlY3Qgc2hhcGVCb3VuZHMoeyB9LCByb3VuZGVkUmVj dC5yZWN0KCkuc2l6ZSgpKTsKLSAgICBzaGFwZU1hc2tMYXllci0+c2V0Qm91bmRzKHNoYXBlQm91 bmRzKTsKLSAgICBGbG9hdFJvdW5kZWRSZWN0IG9mZnNldFJvdW5kZWRSZWN0KHNoYXBlQm91bmRz LCByb3VuZGVkUmVjdC5yYWRpaSgpKTsKLSAgICBzaGFwZU1hc2tMYXllci0+c2V0U2hhcGVSb3Vu ZGVkUmVjdChvZmZzZXRSb3VuZGVkUmVjdCk7CisgICAgc2hhcGVNYXNrTGF5ZXItPnNldEJvdW5k cyhjbGlwcGluZ0xheWVyLmJvdW5kcygpKTsKKyAgICBzaGFwZU1hc2tMYXllci0+c2V0U2hhcGVS b3VuZGVkUmVjdChyb3VuZGVkUmVjdCk7CiAKICAgICBjbGlwcGluZ0xheWVyLnNldENvcm5lclJh ZGl1cygwKTsKICAgICBjbGlwcGluZ0xheWVyLnNldE1hc2soc2hhcGVNYXNrTGF5ZXIuZ2V0KCkp OwpAQCAtMjYyOCwxMyArMjYyNiwxMyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29u dGVudHNSZWN0cygpCiAgICAgY29uc3QgRmxvYXRSZWN0IGNvbnRlbnRCb3VuZHMoMCwgMCwgbV9j b250ZW50c1JlY3Qud2lkdGgoKSwgbV9jb250ZW50c1JlY3QuaGVpZ2h0KCkpOwogCiAgICAgRmxv YXRQb2ludCBjbGlwcGluZ09yaWdpbihtX2NvbnRlbnRzQ2xpcHBpbmdSZWN0LnJlY3QoKS5sb2Nh dGlvbigpKTsKLSAgICBGbG9hdFJlY3QgY2xpcHBpbmdCb3VuZHMoRmxvYXRQb2ludCgpLCBtX2Nv bnRlbnRzQ2xpcHBpbmdSZWN0LnJlY3QoKS5zaXplKCkpOworICAgIEZsb2F0UmVjdCBjbGlwcGlu Z0JvdW5kcyh7IH0sIG1fY29udGVudHNDbGlwcGluZ1JlY3QucmVjdCgpLnNpemUoKSk7CiAgICAg CiAgICAgYm9vbCBnYWluZWRPckxvc3RDbGlwcGluZ0xheWVyID0gZmFsc2U7CiAgICAgaWYgKG1f Y29udGVudHNDbGlwcGluZ1JlY3QuaXNSb3VuZGVkKCkgfHwgIW1fY29udGVudHNDbGlwcGluZ1Jl Y3QucmVjdCgpLmNvbnRhaW5zKG1fY29udGVudHNSZWN0KSkgewogICAgICAgICBpZiAoIW1fY29u dGVudHNDbGlwcGluZ0xheWVyKSB7CiAgICAgICAgICAgICBtX2NvbnRlbnRzQ2xpcHBpbmdMYXll ciA9IGNyZWF0ZVBsYXRmb3JtQ0FMYXllcihQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZUxheWVy LCB0aGlzKTsKLSAgICAgICAgICAgIG1fY29udGVudHNDbGlwcGluZ0xheWVyLT5zZXRBbmNob3JQ b2ludChGbG9hdFBvaW50KCkpOworICAgICAgICAgICAgbV9jb250ZW50c0NsaXBwaW5nTGF5ZXIt PnNldEFuY2hvclBvaW50KHsgfSk7CiAjaWYgRU5BQkxFKFRSRUVfREVCVUdHSU5HKQogICAgICAg ICAgICAgbV9jb250ZW50c0NsaXBwaW5nTGF5ZXItPnNldE5hbWUobWFrZVN0cmluZygiY29udGVu dHMgY2xpcHBpbmcgIiwgbV9jb250ZW50c0NsaXBwaW5nTGF5ZXItPmxheWVySUQoKSkpOwogI2Vs c2UKQEAgLTI2NDUsOCArMjY0MywxMSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29u dGVudHNSZWN0cygpCiAKICAgICAgICAgbV9jb250ZW50c0NsaXBwaW5nTGF5ZXItPnNldFBvc2l0 aW9uKGNsaXBwaW5nT3JpZ2luKTsKICAgICAgICAgbV9jb250ZW50c0NsaXBwaW5nTGF5ZXItPnNl dEJvdW5kcyhjbGlwcGluZ0JvdW5kcyk7CisgICAgICAgIAorICAgICAgICBhdXRvIGNsaXBwaW5n UmVjdFJlbGF0aXZlVG9DbGlwcGluZ0xheWVyID0gbV9jb250ZW50c0NsaXBwaW5nUmVjdDsKKyAg ICAgICAgY2xpcHBpbmdSZWN0UmVsYXRpdmVUb0NsaXBwaW5nTGF5ZXIuc2V0TG9jYXRpb24oeyB9 KTsKIAotICAgICAgICB1cGRhdGVDbGlwcGluZ1N0cmF0ZWd5KCptX2NvbnRlbnRzQ2xpcHBpbmdM YXllciwgbV9jb250ZW50c1NoYXBlTWFza0xheWVyLCBtX2NvbnRlbnRzQ2xpcHBpbmdSZWN0KTsK KyAgICAgICAgdXBkYXRlQ2xpcHBpbmdTdHJhdGVneSgqbV9jb250ZW50c0NsaXBwaW5nTGF5ZXIs IG1fY29udGVudHNTaGFwZU1hc2tMYXllciwgY2xpcHBpbmdSZWN0UmVsYXRpdmVUb0NsaXBwaW5n TGF5ZXIpOwogCiAgICAgICAgIGlmIChnYWluZWRPckxvc3RDbGlwcGluZ0xheWVyKSB7CiAgICAg ICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnJlbW92ZUZyb21TdXBlcmxheWVyKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDIxNGY2 MDk1NzdmOGE4ZjBiNTc1ZmQ1MWFhNTRhMzYzNjQ5ZTMxYzYuLjdkOTk3OGYzMjgwM2VhOWZmY2Fi NmQyYzIwNjRmYWRjMGZmYWU0YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0xOTMxLDcgKzE5MzEsNyBAQCB2b2lkIFJlbmRlckxh eWVyQmFja2luZzo6dXBkYXRlQ2hpbGRDbGlwcGluZ1N0cmF0ZWd5KGJvb2wgbmVlZHNEZXNjZW5k YW50c0NsaXBwaQogICAgICAgICAgICAgYXV0byogY2xpcExheWVyID0gY2xpcHBpbmdMYXllcigp OwogICAgICAgICAgICAgTGF5b3V0UmVjdCBib3hSZWN0KExheW91dFBvaW50KCksIGRvd25jYXN0 PFJlbmRlckJveD4ocmVuZGVyZXIoKSkuc2l6ZSgpKTsKICAgICAgICAgICAgIEZsb2F0Um91bmRl ZFJlY3QgY29udGVudHNDbGlwcGluZ1JlY3QgPSByZW5kZXJlcigpLnN0eWxlKCkuZ2V0Um91bmRl ZElubmVyQm9yZGVyRm9yKGJveFJlY3QpLnBpeGVsU25hcHBlZFJvdW5kZWRSZWN0Rm9yUGFpbnRp bmcoZGV2aWNlU2NhbGVGYWN0b3IoKSk7Ci0gICAgICAgICAgICBjb250ZW50c0NsaXBwaW5nUmVj dC5tb3ZlKExheW91dFNpemUoY2xpcExheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKSkpOworICAg ICAgICAgICAgY29udGVudHNDbGlwcGluZ1JlY3QubW92ZShMYXlvdXRTaXplKC1jbGlwTGF5ZXIt Pm9mZnNldEZyb21SZW5kZXJlcigpKSk7CiAgICAgICAgICAgICAvLyBOb3RlIHRoYXQgd2UgaGF2 ZSB0byBzZXQgdGhpcyByb3VuZGVkIHJlY3QgYWdhaW4gZHVyaW5nIHRoZSBnZW9tZXRyeSB1cGRh dGUgKGNsaXBMYXllci0+b2Zmc2V0RnJvbVJlbmRlcmVyKCkgbWF5IGJlIHN0YWxlIGhlcmUpLgog ICAgICAgICAgICAgaWYgKGNsaXBMYXllci0+c2V0TWFza3NUb0JvdW5kc1JlY3QoY29udGVudHND bGlwcGluZ1JlY3QpKSB7CiAgICAgICAgICAgICAgICAgY2xpcExheWVyLT5zZXRNYXNrTGF5ZXIo bnVsbHB0cik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggOWYzMzY1YmFjMjI4NjRhODNiYWQ5MTAxMDQwN2VlZmE4NmRmYzgw Ni4uMmJkZDMwZjk0NGVlMzYxMDdkZjk4OTA2NTRmY2ZmODQ4NGY4ODFlYSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDE5LTEwLTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgorCisgICAgICAgIFNldHRpbmcgYm9yZGVyLXJhZGl1cyBvbiA8dmlkZW8+IGVsZW1lbnQg Y2xpcHMgdG9wIGFuZCBsZWZ0IHNlY3Rpb25zIG9mIHZpZGVvCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIwNDkKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzU1NTcwMDI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogY29tcG9zaXRpbmcvdmlkZW8vdmlkZW8tYm9yZGVyLXJhZGl1cy1jbGlwcGluZy1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBjb21wb3NpdGluZy92aWRlby92aWRlby1i b3JkZXItcmFkaXVzLWNsaXBwaW5nLmh0bWw6IEFkZGVkLgorCiAyMDE5LTEwLTE5ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEludGVncmF0ZSBtZWRpYSBxdWVy eSBldmFsdWF0aW9uIGludG8gSFRNTDUgZXZlbnQgbG9vcApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvdmlkZW8vdmlkZW8tYm9yZGVyLXJhZGl1cy1jbGlwcGluZy1leHBlY3Rl ZC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdmlkZW8vdmlkZW8tYm9yZGVyLXJhZGl1 cy1jbGlwcGluZy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI1MjI4MDY5MTQzOTQzMzE1YmI0 NmE5ZmM5YWZhYTgyN2JiM2Y0MzQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21w b3NpdGluZy92aWRlby92aWRlby1ib3JkZXItcmFkaXVzLWNsaXBwaW5nLWV4cGVjdGVkLmh0bWwK QEAgLTAsMCArMSw2MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxz dHlsZT4KKyAgICAgICAgdmlkZW8geworICAgICAgICAgICAgYm94LXNoYWRvdzogLTUwcHggLTUw cHggMHB4IGJsYWNrOworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOyAgIAorICAg ICAgICAgICAgbWFyZ2luOiA1MHB4OworICAgICAgICAgICAgd2lkdGg6IDUwMC4yNXB4OworICAg ICAgICB9CisKKyAgICAgICAgLm9ic2N1cmVyIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKKyAgICAgICAgICAgIHdpZHRoOiAxMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAxMHB4 OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JheTsKKyAgICAgICAgfQorICAgIDwv c3R5bGU+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL21lZGlhL21lZGlhLWZpbGUuanMiPjwvc2Ny aXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAg ICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworCisgICAgICAgIGZ1bmN0aW9uIHNl dHVwVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciB0b3RhbENvdW50ID0gZG9jdW1l bnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3ZpZGVvJykubGVuZ3RoOworICAgICAgICAgICAgdmFy IGNvdW50ID0gdG90YWxDb3VudDsKKyAgICAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVu ZXIoImNhbnBsYXl0aHJvdWdoIiwgZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgICAgIGlmICgh LS1jb3VudCAmJiB3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAgICAgICAgICAgICAgICBzZXRU aW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5u b3RpZnlEb25lKCk7CisgICAgICAgICAgICAgICAgICAgIH0sIHRvdGFsQ291bnQgKiAxNTApOwor ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0sIHRydWUpOworCisgICAgICAgICAgICBk b2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJlcnJvciIsIGZ1bmN0aW9uIChldmVudCkgeworICAg ICAgICAgICAgICAgIGNvbnNvbGUubG9nKCJWaWRlbyAiICsgZXZlbnQudGFyZ2V0LmdldEF0dHJp YnV0ZSgibmFtZSIpICsgIiBmYWlsZWQgdG8gbG9hZCwgZXJyb3IgIiArIGV2ZW50LnRhcmdldC5l cnJvci5jb2RlKTsKKyAgICAgICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAg ICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgfSwg dHJ1ZSk7CisKKyAgICAgICAgICAgIHNldFNyY0J5VGFnTmFtZSgidmlkZW8iLCBmaW5kTWVkaWFG aWxlKCJ2aWRlbyIsICIuLi8uLi9tZWRpYS9jb250ZW50L2NvdW50aW5nIikpOworICAgICAgICB9 CisgICAgICAgIAorICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIHNldHVw VGVzdCwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPHZpZGVv PjwvdmlkZW8+CisKKyAgICA8ZGl2IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6IDVweDsg dG9wOiA1cHg7Ij48L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6 IDVweDsgdG9wOiA0MTBweDsiPjwvZGl2PgorICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHls ZT0ibGVmdDogNTAwcHg7IHRvcDogNXB4OyI+PC9kaXY+CisKKyAgICA8ZGl2IGNsYXNzPSJvYnNj dXJlciIgc3R5bGU9ImxlZnQ6IDU1cHg7IHRvcDogNTVweDsiPjwvZGl2PgorICAgIDxkaXYgY2xh c3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogNTVweDsgdG9wOiA0NjBweDsiPjwvZGl2PgorICAg IDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogNTUwcHg7IHRvcDogNTVweDsiPjwv ZGl2PgorICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogNTUwcHg7IHRvcDog NDYwcHg7Ij48L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2NvbXBvc2l0aW5nL3ZpZGVvL3ZpZGVvLWJvcmRlci1yYWRpdXMtY2xpcHBpbmcuaHRtbCBiL0xh eW91dFRlc3RzL2NvbXBvc2l0aW5nL3ZpZGVvL3ZpZGVvLWJvcmRlci1yYWRpdXMtY2xpcHBpbmcu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5lNjkxZDU3NWE1ZTQ1Njg0ZGMwYWY1OWI3M2U4YWI5MDZmYjRjMTZl Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvdmlkZW8vdmlkZW8t Ym9yZGVyLXJhZGl1cy1jbGlwcGluZy5odG1sCkBAIC0wLDAgKzEsNjEgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgIHZpZGVvIHsKKyAgICAg ICAgICAgIGJvcmRlci1yYWRpdXM6IDVweDsKKyAgICAgICAgICAgIGJveC1zaGFkb3c6IC01MHB4 IC01MHB4IDBweCBibGFjazsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsgICAK KyAgICAgICAgICAgIG1hcmdpbjogNTBweDsKKyAgICAgICAgICAgIHdpZHRoOiA1MDAuMjVweDsK KyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLm9ic2N1cmVyIHsKKyAgICAgICAgICAgIHBv c2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHdpZHRoOiAxMHB4OworICAgICAgICAgICAg aGVpZ2h0OiAxMHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JheTsKKyAgICAg ICAgfQorICAgIDwvc3R5bGU+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL21lZGlhL21lZGlhLWZp bGUuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1 bm5lcikKKyAgICAgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworCisgICAgICAg IGZ1bmN0aW9uIHNldHVwVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZhciB0b3RhbENv dW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3ZpZGVvJykubGVuZ3RoOworICAg ICAgICAgICAgdmFyIGNvdW50ID0gdG90YWxDb3VudDsKKyAgICAgICAgICAgIGRvY3VtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImNhbnBsYXl0aHJvdWdoIiwgZnVuY3Rpb24gKCkgeworICAgICAgICAg ICAgICAgIGlmICghLS1jb3VudCAmJiB3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAgICAgICAg ICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICAgICAg dGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgICAgICAgICAgIH0sIHRvdGFsQ291 bnQgKiAxNTApOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0sIHRydWUpOworCisg ICAgICAgICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJlcnJvciIsIGZ1bmN0aW9uIChl dmVudCkgeworICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKCJWaWRlbyAiICsgZXZlbnQudGFy Z2V0LmdldEF0dHJpYnV0ZSgibmFtZSIpICsgIiBmYWlsZWQgdG8gbG9hZCwgZXJyb3IgIiArIGV2 ZW50LnRhcmdldC5lcnJvci5jb2RlKTsKKyAgICAgICAgICAgICAgICBpZiAod2luZG93LnRlc3RS dW5uZXIpCisgICAgICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAg ICAgICAgICAgfSwgdHJ1ZSk7CisKKyAgICAgICAgICAgIHNldFNyY0J5VGFnTmFtZSgidmlkZW8i LCBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICIuLi8uLi9tZWRpYS9jb250ZW50L2NvdW50aW5nIikp OworICAgICAgICB9CisgICAgICAgIAorICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcign bG9hZCcsIHNldHVwVGVzdCwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+ CisgICAgPHZpZGVvPjwvdmlkZW8+CisKKyAgICA8ZGl2IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9 ImxlZnQ6IDVweDsgdG9wOiA1cHg7Ij48L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJvYnNjdXJlciIg c3R5bGU9ImxlZnQ6IDVweDsgdG9wOiA0MTBweDsiPjwvZGl2PgorICAgIDxkaXYgY2xhc3M9Im9i c2N1cmVyIiBzdHlsZT0ibGVmdDogNTAwcHg7IHRvcDogNXB4OyI+PC9kaXY+CisKKyAgICA8ZGl2 IGNsYXNzPSJvYnNjdXJlciIgc3R5bGU9ImxlZnQ6IDU1cHg7IHRvcDogNTVweDsiPjwvZGl2Pgor ICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogNTVweDsgdG9wOiA0NjBweDsi PjwvZGl2PgorICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDogNTUwcHg7IHRv cDogNTVweDsiPjwvZGl2PgorICAgIDxkaXYgY2xhc3M9Im9ic2N1cmVyIiBzdHlsZT0ibGVmdDog NTUwcHg7IHRvcDogNDYwcHg7Ij48L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K