210544 2020-04-15 05:47:29 -0700 TextureMapper renders video element with "object-fit: cover" incorrectly 2020-04-21 02:33:17 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=52103 https://bugs.webkit.org/show_bug.cgi?id=177536 https://bugs.webkit.org/show_bug.cgi?id=163528 https://bugs.webkit.org/show_bug.cgi?id=210787 P2 Normal --- 1 tomoki.imai webkit-unassigned aboya bugs-noreply cmarcelo don.olmstead ews-watchlist gyuyoung.kim kondapallykalyan luiz mcatanzaro noam ryuan.choi sergio zan zeno oldest_to_newest 1641750 0 tomoki.imai 2020-04-15 05:47:29 -0700 WebKitGTK with AC mode renders compositing/video/video-object-fit.html incorrectly. The video layer spill outside of the box when "object-fit:cover" is specified. We need to propagate GraphicsLayer::contentsClippingRect (see bug 52103) to TextureMapper. 1641751 1 396522 tomoki.imai 2020-04-15 05:50:28 -0700 Created attachment 396522 patch 1641753 2 tomoki.imai 2020-04-15 05:55:45 -0700 Unfortunately compositing/video/video-object-fit.html is disabled due to bug 177536 and bug 163528. It might be better to re-enabled it again if possible. 1642161 3 tomoki.imai 2020-04-15 23:55:19 -0700 I tried to enable compositing/video/video-object-fit.html test in GTK, it doesn't crash for several run-webkit-tests. But instead of crash, I see some text diff failure. Where does "(anchor 0.00 0.00)" come from? --- /app/webkit/WebKitBuild/Release/layout-test-results/compositing/video/video-object-fit-expected.txt +++ /app/webkit/WebKitBuild/Release/layout-test-results/compositing/video/video-object-fit-actual.txt @@ -1,5 +1,6 @@ - + (GraphicsLayer + (anchor 0.00 0.00) (bounds 785.00 775.00) (children 1 (GraphicsLayer 1642164 4 zan 2020-04-16 00:00:56 -0700 (In reply to Tomoki Imai from comment #3) > I tried to enable compositing/video/video-object-fit.html test in GTK, it > doesn't crash for several run-webkit-tests. > But instead of crash, I see some text diff failure. > Where does "(anchor 0.00 0.00)" come from? > > --- > /app/webkit/WebKitBuild/Release/layout-test-results/compositing/video/video- > object-fit-expected.txt > +++ > /app/webkit/WebKitBuild/Release/layout-test-results/compositing/video/video- > object-fit-actual.txt > @@ -1,5 +1,6 @@ > - > + > (GraphicsLayer > + (anchor 0.00 0.00) > (bounds 785.00 775.00) > (children 1 > (GraphicsLayer It's just an extra parameter that's reported for the GraphicsLayer state, compared to the current -expected.txt baseline. It's not incorrect, but the -expected.txt file will require rebaselining. 1642165 5 396522 zan 2020-04-16 00:01:40 -0700 Comment on attachment 396522 patch Please do the rebaselining of the relevant test in a follow-up patch. 1642167 6 ews-feeder 2020-04-16 00:11:46 -0700 Committed r260174: <https://trac.webkit.org/changeset/260174> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396522. 1642168 7 tomoki.imai 2020-04-16 00:24:44 -0700 Thanks for your review! I will try to re-enable compositing/video/video-object-fit.html and re-baselining in bug 177536 or bug 163528 396522 2020-04-15 05:50:28 -0700 2020-04-16 00:11:46 -0700 patch fix-texturemapper-1.patch text/plain 9429 tomoki.imai ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxM2ZlZWM3NTg3ZWQuLmNmZmY2MmFlMGIxZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI3IEBACisyMDIwLTA0LTE1ICBUb21va2kgSW1haSAgPFRvbW9raS5JbWFpQHNvbnku Y29tPgorCisgICAgICAgIFRleHR1cmVNYXBwZXIgcmVuZGVycyB2aWRlbyBlbGVtZW50IHdpdGgg Im9iamVjdC1maXQ6IGNvdmVyIiBpbmNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwNTQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvcGFnYXRlIEdyYXBoaWNzTGF5ZXI6OmNvbnRlbnRz Q2xpcHBpbmdSZWN0IGluZm9ybWF0aW9uIHRvIFRleHR1cmVNYXBwZXJMYXllcgorICAgICAgICB0 byBwcm9wZXJseSBjbGlwIHRoZSBvdXRzaWRlIG9mIERPTSBlbGVtZW50IHdoZW4gdGhlIGVsZW1l bnQgaGFzICJvYmplY3QtZml0OiBjb3ZlciIuCisKKyAgICAgICAgVW5mb3J0dW5hdGVseSwgdGhl IHRlc3QgaXMgZGlzYWJsZWQgb24gV2ViS2l0R1RLIGR1ZSB0byBidWcgMTc3NTM2LCBidWcgMTYz NTI4LgorICAgICAgICBUZXN0OiBjb21wb3NpdGluZy92aWRlby92aWRlby1vYmplY3QtZml0Lmh0 bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvTmljb3NpYVBsYXRmb3Jt TGF5ZXIuaDoKKyAgICAgICAgKE5pY29zaWE6OkNvbXBvc2l0aW9uTGF5ZXI6OmZsdXNoU3RhdGUp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpwYWludFNlbGYpOiBD bGlwIHVzaW5nIHByb3BhZ2F0ZWQgY29udGVudHNDbGlwcGluZ1JlY3Qgd2hlbiByZW5kZXJpbmcg bV9jb250ZW50c0xheWVyLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpz ZXRDb250ZW50c0NsaXBwaW5nUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJMYXllci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpzZXRDb250ZW50c0NsaXBwaW5nUmVj dCk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29t cG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuaDoKKwogMjAy MC0wNC0xMyAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU10gUmVtb3ZlIHVudXNlZCBVVFR5cGUgc3dpenpsZXIgY29kZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS9OaWNvc2lhUGxhdGZvcm1MYXll ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS9OaWNvc2lhUGxh dGZvcm1MYXllci5oCmluZGV4IDBlYzExNjBlMGMzNC4uNTVkZDc0MGFiYWVjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL05pY29zaWFQbGF0Zm9y bUxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS9O aWNvc2lhUGxhdGZvcm1MYXllci5oCkBAIC0xMTcsNiArMTE3LDcgQEAgcHVibGljOgogICAgICAg ICAgICAgICAgICAgICBib29sIGNoaWxkcmVuVHJhbnNmb3JtQ2hhbmdlZCA6IDE7CiAgICAgICAg ICAgICAgICAgICAgIGJvb2wgY29udGVudHNSZWN0Q2hhbmdlZCA6IDE7CiAgICAgICAgICAgICAg ICAgICAgIGJvb2wgY29udGVudHNUaWxpbmdDaGFuZ2VkIDogMTsKKyAgICAgICAgICAgICAgICAg ICAgYm9vbCBjb250ZW50c0NsaXBwaW5nUmVjdENoYW5nZWQgOiAxOwogICAgICAgICAgICAgICAg ICAgICBib29sIG9wYWNpdHlDaGFuZ2VkIDogMTsKICAgICAgICAgICAgICAgICAgICAgYm9vbCBz b2xpZENvbG9yQ2hhbmdlZCA6IDE7CiAgICAgICAgICAgICAgICAgICAgIGJvb2wgZmlsdGVyc0No YW5nZWQgOiAxOwpAQCAtMTY2LDYgKzE2Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgV2ViQ29yZTo6 RmxvYXRSZWN0IGNvbnRlbnRzUmVjdDsKICAgICAgICAgV2ViQ29yZTo6RmxvYXRTaXplIGNvbnRl bnRzVGlsZVBoYXNlOwogICAgICAgICBXZWJDb3JlOjpGbG9hdFNpemUgY29udGVudHNUaWxlU2l6 ZTsKKyAgICAgICAgV2ViQ29yZTo6RmxvYXRSb3VuZGVkUmVjdCBjb250ZW50c0NsaXBwaW5nUmVj dDsKIAogICAgICAgICBmbG9hdCBvcGFjaXR5IHsgMCB9OwogICAgICAgICBXZWJDb3JlOjpDb2xv ciBzb2xpZENvbG9yOwpAQCAtMjMxLDYgKzIzMyw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHN0 YWdpbmcuY29udGVudHNUaWxlUGhhc2UgPSBwZW5kaW5nLmNvbnRlbnRzVGlsZVBoYXNlOwogICAg ICAgICAgICAgc3RhZ2luZy5jb250ZW50c1RpbGVTaXplID0gcGVuZGluZy5jb250ZW50c1RpbGVT aXplOwogICAgICAgICB9CisgICAgICAgIGlmIChwZW5kaW5nLmRlbHRhLmNvbnRlbnRzQ2xpcHBp bmdSZWN0Q2hhbmdlZCkKKyAgICAgICAgICAgIHN0YWdpbmcuY29udGVudHNDbGlwcGluZ1JlY3Qg PSBwZW5kaW5nLmNvbnRlbnRzQ2xpcHBpbmdSZWN0OwogCiAgICAgICAgIGlmIChwZW5kaW5nLmRl bHRhLm9wYWNpdHlDaGFuZ2VkKQogICAgICAgICAgICAgc3RhZ2luZy5vcGFjaXR5ID0gcGVuZGlu Zy5vcGFjaXR5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcAppbmRleCA5OTkzNGI4MDU1NzMu LjcxOWM2NzkyMzFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKQEAgLTE4OSw3ICsx ODksMTIgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50U2VsZihjb25zdCBUZXh0dXJl TWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQogICAgIH0KIAogICAgIEFTU0VSVCghbGF5ZXJS ZWN0KCkuaXNFbXB0eSgpKTsKKworICAgIC8vIEZJWE1FOiBUZXh0dXJlTWFwcGVyOjpiZWdpbkNs aXAgZG9lc24ndCBzdXBwb3J0IEZsb2F0Um91bmRlZFJlY3QsIHNvIHdlIG5lZWQgdG8gY29udmVy dCBtX3N0YXRlLmNvbnRlbnRzQ2xpcHBpbmdSZWN0IHRvIEZsb2F0UmVjdC4KKyAgICBvcHRpb25z LnRleHR1cmVNYXBwZXIuYmVnaW5DbGlwKHRyYW5zZm9ybSwgbV9zdGF0ZS5jb250ZW50c0NsaXBw aW5nUmVjdC5yZWN0KCkpOwogICAgIG1fY29udGVudHNMYXllci0+cGFpbnRUb1RleHR1cmVNYXBw ZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCBtX3N0YXRlLmNvbnRlbnRzUmVjdCwgdHJhbnNmb3Jt LCBvcHRpb25zLm9wYWNpdHkpOworICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci5lbmRDbGlwKCk7 CisKICAgICBpZiAobV9zdGF0ZS5zaG93RGVidWdCb3JkZXJzKQogICAgICAgICBtX2NvbnRlbnRz TGF5ZXItPmRyYXdCb3JkZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCBtX3N0YXRlLmRlYnVnQm9y ZGVyQ29sb3IsIG1fc3RhdGUuZGVidWdCb3JkZXJXaWR0aCwgbV9zdGF0ZS5jb250ZW50c1JlY3Qs IHRyYW5zZm9ybSk7CiB9CkBAIC01ODcsNiArNTkyLDExIEBAIHZvaWQgVGV4dHVyZU1hcHBlckxh eWVyOjpzZXRDb250ZW50c1RpbGVQaGFzZShjb25zdCBGbG9hdFNpemUmIHBoYXNlKQogICAgIG1f c3RhdGUuY29udGVudHNUaWxlUGhhc2UgPSBwaGFzZTsKIH0KIAordm9pZCBUZXh0dXJlTWFwcGVy TGF5ZXI6OnNldENvbnRlbnRzQ2xpcHBpbmdSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmIGNv bnRlbnRzQ2xpcHBpbmdSZWN0KQoreworICAgIG1fc3RhdGUuY29udGVudHNDbGlwcGluZ1JlY3Qg PSBjb250ZW50c0NsaXBwaW5nUmVjdDsKK30KKwogdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnNl dE1hc2tzVG9Cb3VuZHMoYm9vbCBtYXNrc1RvQm91bmRzKQogewogICAgIG1fc3RhdGUubWFza3NU b0JvdW5kcyA9IG1hc2tzVG9Cb3VuZHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKaW5kZXggYmUw ZWQxOWQ1NDE4Li41NTQxOGMwZDIwMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKQEAgLTgx LDYgKzgxLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0U29saWRDb2xvcihjb25zdCBDb2xvciYp OwogICAgIHZvaWQgc2V0Q29udGVudHNUaWxlU2l6ZShjb25zdCBGbG9hdFNpemUmKTsKICAgICB2 b2lkIHNldENvbnRlbnRzVGlsZVBoYXNlKGNvbnN0IEZsb2F0U2l6ZSYpOworICAgIHZvaWQgc2V0 Q29udGVudHNDbGlwcGluZ1JlY3QoY29uc3QgRmxvYXRSb3VuZGVkUmVjdCYpOwogICAgIHZvaWQg c2V0RmlsdGVycyhjb25zdCBGaWx0ZXJPcGVyYXRpb25zJik7CiAKICAgICBib29sIGhhc0ZpbHRl cnMoKSBjb25zdApAQCAtMTY2LDYgKzE2Nyw3IEBAIHByaXZhdGU6CiAgICAgICAgIEZsb2F0UmVj dCBjb250ZW50c1JlY3Q7CiAgICAgICAgIEZsb2F0U2l6ZSBjb250ZW50c1RpbGVTaXplOwogICAg ICAgICBGbG9hdFNpemUgY29udGVudHNUaWxlUGhhc2U7CisgICAgICAgIEZsb2F0Um91bmRlZFJl Y3QgY29udGVudHNDbGlwcGluZ1JlY3Q7CiAgICAgICAgIFdlYWtQdHI8VGV4dHVyZU1hcHBlckxh eWVyPiBtYXNrTGF5ZXI7CiAgICAgICAgIFdlYWtQdHI8VGV4dHVyZU1hcHBlckxheWVyPiByZXBs aWNhTGF5ZXI7CiAgICAgICAgIENvbG9yIHNvbGlkQ29sb3I7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRH cmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IDNkYzNjMGQ3 Yjk2Ny4uOWMxNTgyMWU1ZGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQv Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcApAQCAtNDI4LDYgKzQyOCwxNiBAQCB2b2lkIENv b3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNUaWxlUGhhc2UoY29uc3QgRmxvYXRT aXplJiBwKQogICAgIG5vdGlmeUZsdXNoUmVxdWlyZWQoKTsKIH0KIAordm9pZCBDb29yZGluYXRl ZEdyYXBoaWNzTGF5ZXI6OnNldENvbnRlbnRzQ2xpcHBpbmdSZWN0KGNvbnN0IEZsb2F0Um91bmRl ZFJlY3QmIHJvdW5kZWRSZWN0KQoreworICAgIGlmIChjb250ZW50c0NsaXBwaW5nUmVjdCgpID09 IHJvdW5kZWRSZWN0KQorICAgICAgICByZXR1cm47CisKKyAgICBHcmFwaGljc0xheWVyOjpzZXRD b250ZW50c0NsaXBwaW5nUmVjdChyb3VuZGVkUmVjdCk7CisgICAgbV9uaWNvc2lhLmRlbHRhLmNv bnRlbnRzQ2xpcHBpbmdSZWN0Q2hhbmdlZCA9IHRydWU7CisgICAgbm90aWZ5Rmx1c2hSZXF1aXJl ZCgpOworfQorCiBib29sIEdyYXBoaWNzTGF5ZXI6OnN1cHBvcnRzQ29udGVudHNUaWxpbmcoKQog ewogICAgIHJldHVybiB0cnVlOwpAQCAtODYzLDYgKzg3Myw4IEBAIHZvaWQgQ29vcmRpbmF0ZWRH cmFwaGljc0xheWVyOjpmbHVzaENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCkKICAg ICAgICAgICAgICAgICAgICAgc3RhdGUuY29udGVudHNUaWxlUGhhc2UgPSBjb250ZW50c1RpbGVQ aGFzZSgpOwogICAgICAgICAgICAgICAgICAgICBzdGF0ZS5jb250ZW50c1RpbGVTaXplID0gY29u dGVudHNUaWxlU2l6ZSgpOwogICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAo bG9jYWxEZWx0YS5jb250ZW50c0NsaXBwaW5nUmVjdENoYW5nZWQpCisgICAgICAgICAgICAgICAg ICAgIHN0YXRlLmNvbnRlbnRzQ2xpcHBpbmdSZWN0ID0gY29udGVudHNDbGlwcGluZ1JlY3QoKTsK IAogICAgICAgICAgICAgICAgIGlmIChsb2NhbERlbHRhLm9wYWNpdHlDaGFuZ2VkKQogICAgICAg ICAgICAgICAgICAgICBzdGF0ZS5vcGFjaXR5ID0gb3BhY2l0eSgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5h dGVkR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oCmluZGV4IDQ5MzZkNGRh M2Y2NC4uMWQzNGEwNDdmODExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nv b3JkaW5hdGVkR3JhcGhpY3NMYXllci5oCkBAIC05MCw2ICs5MCw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIHNldENvbnRlbnRzUmVjdChjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlkZTsKICAgICB2b2lk IHNldENvbnRlbnRzVGlsZVBoYXNlKGNvbnN0IEZsb2F0U2l6ZSYpIG92ZXJyaWRlOwogICAgIHZv aWQgc2V0Q29udGVudHNUaWxlU2l6ZShjb25zdCBGbG9hdFNpemUmKSBvdmVycmlkZTsKKyAgICB2 b2lkIHNldENvbnRlbnRzQ2xpcHBpbmdSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmKSBvdmVy cmlkZTsKICAgICB2b2lkIHNldENvbnRlbnRzVG9JbWFnZShJbWFnZSopIG92ZXJyaWRlOwogICAg IHZvaWQgc2V0Q29udGVudHNUb1NvbGlkQ29sb3IoY29uc3QgQ29sb3ImKSBvdmVycmlkZTsKICAg ICB2b2lkIHNldFNob3dEZWJ1Z0JvcmRlcihib29sKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNWRl MDg1ZjU5YmQ0Li4xOTVmYzA5YmVhZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAt MDQtMTUgIFRvbW9raSBJbWFpICA8VG9tb2tpLkltYWlAc29ueS5jb20+CisKKyAgICAgICAgVGV4 dHVyZU1hcHBlciByZW5kZXJzIHZpZGVvIGVsZW1lbnQgd2l0aCAib2JqZWN0LWZpdDogY292ZXIi IGluY29ycmVjdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTA1NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBQcm9wYWdhdGUgR3JhcGhpY3NMYXllcjo6Y29udGVudHNDbGlwcGluZ1JlY3QgaW5mb3Jt YXRpb24gdG8gVGV4dHVyZU1hcHBlckxheWVyCisgICAgICAgIHRvIHByb3Blcmx5IGNsaXAgdGhl IG91dHNpZGUgb2YgRE9NIGVsZW1lbnQgd2hlbiB0aGUgZWxlbWVudCBoYXMgIm9iamVjdC1maXQ6 IGNvdmVyIi4KKworICAgICAgICBVbmZvcnR1bmF0ZWx5LCB0aGUgdGVzdCBpcyBkaXNhYmxlZCBv biBXZWJLaXRHVEsgZHVlIHRvIGJ1ZyAxNzc1MzYsIGJ1ZyAxNjM1MjguCisgICAgICAgIFRlc3Q6 IGNvbXBvc2l0aW5nL3ZpZGVvL3ZpZGVvLW9iamVjdC1maXQuaHRtbAorCisgICAgICAgICogU2hh cmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjp1cGRhdGVTY2VuZVN0YXRl KToKKwogMjAyMC0wNC0xMyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgdGhlICJJZ25vcmVWaWV3cG9ydFNjYWxpbmdDb25zdHJhaW50cyIg ZGVidWcgV2ViS2l0IGZlYXR1cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nv b3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcCBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5l LmNwcAppbmRleCBhNzNkZDQzMzUzZmYuLjg0ODcyZWQyYjdjNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2Nl bmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29v cmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcApAQCAtMjk0LDYgKzI5NCw4IEBAIHZvaWQgQ29vcmRp bmF0ZWRHcmFwaGljc1NjZW5lOjp1cGRhdGVTY2VuZVN0YXRlKCkKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBsYXllci5zZXRDb250ZW50c1RpbGVQaGFzZShsYXllclN0YXRlLmNvbnRlbnRz VGlsZVBoYXNlKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXllci5zZXRDb250ZW50 c1RpbGVTaXplKGxheWVyU3RhdGUuY29udGVudHNUaWxlU2l6ZSk7CiAgICAgICAgICAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAobGF5ZXJTdGF0ZS5kZWx0YS5j b250ZW50c0NsaXBwaW5nUmVjdENoYW5nZWQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg bGF5ZXIuc2V0Q29udGVudHNDbGlwcGluZ1JlY3QobGF5ZXJTdGF0ZS5jb250ZW50c0NsaXBwaW5n UmVjdCk7CiAKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChsYXllclN0YXRlLmRlbHRhLm9w YWNpdHlDaGFuZ2VkKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxheWVyLnNldE9wYWNp dHkobGF5ZXJTdGF0ZS5vcGFjaXR5KTsK