191813 2018-11-17 14:13:57 -0800 Avoid triggering compositing updates when only the root layer is composited 2018-11-27 15:46:52 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser tsavell webkit-bug-importer zalan oldest_to_newest 1479969 0 simon.fraser 2018-11-17 14:13:57 -0800 Avoid triggering compositing updates when only the root layer is composited 1479972 1 355206 simon.fraser 2018-11-17 14:17:13 -0800 Created attachment 355206 Patch 1479987 2 355211 simon.fraser 2018-11-17 15:59:24 -0800 Created attachment 355211 Patch 1479992 3 355211 zalan 2018-11-17 16:07:36 -0800 Comment on attachment 355211 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355211&action=review > Source/WebCore/rendering/RenderLayerCompositor.cpp:1181 > + auto appendForegroundLayerIfNecessary = [&] () { () can be dropped here 1480000 4 simon.fraser 2018-11-17 16:52:44 -0800 https://trac.webkit.org/changeset/238357/webkit 1480001 5 webkit-bug-importer 2018-11-17 16:53:24 -0800 <rdar://problem/46152493> 1481553 6 tsavell 2018-11-26 09:54:08 -0800 Looks like https://trac.webkit.org/changeset/238357/webkit Has caused three tests to fail constantly: css3/filters/blur-filter-page-scroll-parents.html css3/filters/blur-filter-page-scroll-self.html css3/filters/blur-filter-page-scroll.html History: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=css3%2Ffilters%2Fblur-filter-page-scroll-parents.html%20css3%2Ffilters%2Fblur-filter-page-scroll-self.html%20css3%2Ffilters%2Fblur-filter-page-scroll.html Diff of css3/filters/blur-filter-page-scroll-parents.html: --- /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test-results/css3/filters/blur-filter-page-scroll-parents-expected.txt +++ /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test-results/css3/filters/blur-filter-page-scroll-parents-actual.txt @@ -9,5 +9,6 @@ RenderBlock {DIV} at (0,0) size 800x1200 RenderBlock {DIV} at (0,0) size 800x200 [bgcolor=#FF0000] RenderBlock {DIV} at (0,200) size 800x1000 [bgcolor=#008000] -layer at (0,0) size 800x100 +layer at (0,100) size 800x100 RenderBlock (positioned) {DIV} at (0,0) size 800x100 [bgcolor=#000000] +scrolled to 0,100 1481555 7 tsavell 2018-11-26 09:56:38 -0800 Failures are on iOS Release WK2. Debug WK2 is crashing and may be unrelated. 1481569 8 simon.fraser 2018-11-26 10:20:34 -0800 (In reply to Truitt Savell from comment #6) > Looks like https://trac.webkit.org/changeset/238357/webkit > > Has caused three tests to fail constantly: > > css3/filters/blur-filter-page-scroll-parents.html > css3/filters/blur-filter-page-scroll-self.html > css3/filters/blur-filter-page-scroll.html > > History: > https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard. > html#showAllRuns=true&tests=css3%2Ffilters%2Fblur-filter-page-scroll-parents. > html%20css3%2Ffilters%2Fblur-filter-page-scroll-self. > html%20css3%2Ffilters%2Fblur-filter-page-scroll.html > > Diff of css3/filters/blur-filter-page-scroll-parents.html: > --- > /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test- > results/css3/filters/blur-filter-page-scroll-parents-expected.txt > +++ > /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test- > results/css3/filters/blur-filter-page-scroll-parents-actual.txt > @@ -9,5 +9,6 @@ > RenderBlock {DIV} at (0,0) size 800x1200 > RenderBlock {DIV} at (0,0) size 800x200 [bgcolor=#FF0000] > RenderBlock {DIV} at (0,200) size 800x1000 [bgcolor=#008000] > -layer at (0,0) size 800x100 > +layer at (0,100) size 800x100 > RenderBlock (positioned) {DIV} at (0,0) size 800x100 [bgcolor=#000000] > +scrolled to 0,100 These tests are trying to disable accelerated compositing, which doesn't work so well in WK2. 1481681 9 tsavell 2018-11-26 14:11:29 -0800 it does appear this change has caused the crashing of these three tests as well. This is effecting ews so I am going to roll it out until a fix is found. 1481687 10 tsavell 2018-11-26 14:22:12 -0800 Reverted r238357 for reason: Casued three css tests to fail and crash on ios sim Committed r238523: <https://trac.webkit.org/changeset/238523> 1482179 11 simon.fraser 2018-11-27 15:35:12 -0800 I'm going to disable those tests for iOS WK2: bug 192045 1482185 12 simon.fraser 2018-11-27 15:46:52 -0800 https://trac.webkit.org/r238583 355206 2018-11-17 14:17:13 -0800 2018-11-17 15:59:22 -0800 Patch bug-191813-20181117141713.patch text/plain 8645 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZiNDg2ZDRmYzcxZTU3 N2E4ODBmNzM0OWM5YWZiZTk5NzYxY2E4Zi4uNzNkODNhMWViODA1ZTlhYWI5NGE5M2IwZGYyOTli Y2E2NzI3ZmVkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTExLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEF2b2lkIHRyaWdn ZXJpbmcgY29tcG9zaXRpbmcgdXBkYXRlcyB3aGVuIG9ubHkgdGhlIHJvb3QgbGF5ZXIgaXMgY29t cG9zaXRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTkxODEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SWYgd2Uga25vdyB0aGF0IHRoZSBvbmx5IGNvbXBvc2l0ZWQgbGF5ZXIgaXMgdGhlIHJvb3QsIHdl IGNhbiBhdm9pZCB0cmlnZ2VyaW5nIGRlZXAKKyAgICAgICAgY29tcG9zaXRpbmcgdXBkYXRlcyBz b21ldGltZXMsIGZvciBleGFtcGxlIHdoZW4gbGF5b3V0IGNoYW5nZXMgc2l6ZSBvciBwb3NpdGlv biwKKyAgICAgICAgb3Igd2hlbiB6LW9yZGVyIGxpc3RzIGNoYW5nZS4KKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 YWRkQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnJlbW92ZUNoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3JvbGxUbyk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbCk6CisgICAg ICAgIChXZWJDb3JlOjpvdXRwdXRQYWludE9yZGVyVHJlZVJlY3Vyc2l2ZSk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUJhY2tpbmdBbmRIaWVyYXJjaHkpOiBDb25zdWx0 IHRoZSBsYXllci5oYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoKQorICAgICAgICBmbGFnIHRvIGN1 dCBvZmYgZGVzY2VuZGFudHMgdHJhdmVyc2FsIHdoZW4gcG9zc2libGUuCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmxheWVyU3R5bGVDaGFuZ2VkKToKKwogMjAxOC0x MS0xNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBD bGFyaWZ5IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6aGFzQW55QWRkaXRpb25hbENvbXBvc2l0ZWRM YXllcnMoKSBhbmQgcmVsYXRlZCBjb2RlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKaW5kZXggNzkzN2Q0MTdhZTIxN2Y2ZGFjZGQ1MmVlOGY3MTU0Y2U2OTcyOWM0Yi4u YmEyNDE2OTk4NWQwYjA5OTlhZjgwNGNhZWIwZjNiZjI2Yzk2MzQ5NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC00MDUsNyArNDA1LDcgQEAgdm9pZCBSZW5k ZXJMYXllcjo6YWRkQ2hpbGQoUmVuZGVyTGF5ZXImIGNoaWxkLCBSZW5kZXJMYXllciogYmVmb3Jl Q2hpbGQpCiAgICAgaWYgKGNoaWxkLmlzU2VsZlBhaW50aW5nTGF5ZXIoKSB8fCBjaGlsZC5oYXNT ZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnQoKSkKICAgICAgICAgc2V0QW5jZXN0b3JDaGFpbkhh c1NlbGZQYWludGluZ0xheWVyRGVzY2VuZGFudCgpOwogCi0gICAgaWYgKGNvbXBvc2l0b3IoKS51 c2VzQ29tcG9zaXRpbmcoKSkKKyAgICBpZiAoY29tcG9zaXRvcigpLmhhc0NvbnRlbnRDb21wb3Np dGluZ0xheWVycygpKQogICAgICAgICBzZXREZXNjZW5kYW50c05lZWRDb21wb3NpdGluZ1JlcXVp cmVtZW50c1RyYXZlcnNhbCgpOwogCiAgICAgaWYgKGNoaWxkLmhhc0Rlc2NlbmRhbnROZWVkaW5n Q29tcG9zaXRpbmdSZXF1aXJlbWVudHNUcmF2ZXJzYWwoKSB8fCBjaGlsZC5uZWVkc0NvbXBvc2l0 aW5nUmVxdWlyZW1lbnRzVHJhdmVyc2FsKCkpCkBAIC00NTEsNyArNDUxLDcgQEAgdm9pZCBSZW5k ZXJMYXllcjo6cmVtb3ZlQ2hpbGQoUmVuZGVyTGF5ZXImIG9sZENoaWxkKQogICAgIGlmIChvbGRD aGlsZC5pc1NlbGZQYWludGluZ0xheWVyKCkgfHwgb2xkQ2hpbGQuaGFzU2VsZlBhaW50aW5nTGF5 ZXJEZXNjZW5kYW50KCkpCiAgICAgICAgIGRpcnR5QW5jZXN0b3JDaGFpbkhhc1NlbGZQYWludGlu Z0xheWVyRGVzY2VuZGFudFN0YXR1cygpOwogCi0gICAgaWYgKGNvbXBvc2l0b3IoKS51c2VzQ29t cG9zaXRpbmcoKSkKKyAgICBpZiAoY29tcG9zaXRvcigpLmhhc0NvbnRlbnRDb21wb3NpdGluZ0xh eWVycygpKQogICAgICAgICBzZXREZXNjZW5kYW50c05lZWRDb21wb3NpdGluZ1JlcXVpcmVtZW50 c1RyYXZlcnNhbCgpOwogCiAjaWYgRU5BQkxFKENTU19DT01QT1NJVElORykKQEAgLTE1NzcsNyAr MTU3Nyw3IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb24oKQogICAgIHBv c2l0aW9uT3JPZmZzZXRDaGFuZ2VkIHw9IGxvY2F0aW9uKCkgIT0gbG9jYWxQb2ludDsKICAgICBz ZXRMb2NhdGlvbihsb2NhbFBvaW50KTsKICAgICAKLSAgICBpZiAocG9zaXRpb25Pck9mZnNldENo YW5nZWQgJiYgY29tcG9zaXRvcigpLnVzZXNDb21wb3NpdGluZygpKSB7CisgICAgaWYgKHBvc2l0 aW9uT3JPZmZzZXRDaGFuZ2VkICYmIGNvbXBvc2l0b3IoKS5oYXNDb250ZW50Q29tcG9zaXRpbmdM YXllcnMoKSkgewogICAgICAgICBpZiAoaXNDb21wb3NpdGVkKCkpCiAgICAgICAgICAgICBzZXRO ZWVkc0NvbXBvc2l0aW5nR2VvbWV0cnlVcGRhdGUoKTsKICAgICAgICAgLy8gVGhpcyBsYXllcidz IHBvc2l0aW9uIGNhbiBhZmZlY3QgdGhlIGxvY2F0aW9uIG9mIGEgY29tcG9zaXRlZCBkZXNjZW5k YW50ICh3aGljaCBtYXkgYmUgYSBzaWJsaW5nIGluIHotb3JkZXIpLApAQCAtMjQzMCw3ICsyNDMw LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsVG8oY29uc3QgU2Nyb2xsUG9zaXRpb24mIHBv c2l0aW9uKQogICAgIGZyYW1lLmV2ZW50SGFuZGxlcigpLmRpc3BhdGNoRmFrZU1vdXNlTW92ZUV2 ZW50U29vbkluUXVhZChxdWFkRm9yRmFrZU1vdXNlTW92ZUV2ZW50KTsKIAogICAgIGJvb2wgcmVx dWlyZXNSZXBhaW50ID0gdHJ1ZTsKLSAgICBpZiAoY29tcG9zaXRvcigpLnVzZXNDb21wb3NpdGlu ZygpICYmIHVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkpIHsKKyAgICBpZiAodXNlc0NvbXBvc2l0 ZWRTY3JvbGxpbmcoKSkgewogICAgICAgICBzZXROZWVkc0NvbXBvc2l0aW5nR2VvbWV0cnlVcGRh dGUoKTsKICAgICAgICAgc2V0RGVzY2VuZGFudHNOZWVkVXBkYXRlQmFja2luZ0FuZEhpZXJhcmNo eVRyYXZlcnNhbCgpOwogICAgICAgICByZXF1aXJlc1JlcGFpbnQgPSBmYWxzZTsKQEAgLTI1ODAs NyArMjU4MCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFJlY3RUb1Zpc2libGUoY29uc3Qg TGF5b3V0UmVjdCYgYWJzb2x1dGVSZWN0LCBib29sIGluc2lkCiAKIHZvaWQgUmVuZGVyTGF5ZXI6 OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJTY3JvbGwoKQogewotICAgIGlmIChjb21wb3Np dG9yKCkudXNlc0NvbXBvc2l0aW5nKCkpIHsKKyAgICBpZiAoY29tcG9zaXRvcigpLmhhc0NvbnRl bnRDb21wb3NpdGluZ0xheWVycygpKSB7CiAgICAgICAgIC8vIE91ciBzdGFja2luZyBjb250YWlu ZXIgaXMgZ3VhcmFudGVlZCB0byBjb250YWluIGFsbCBvZiBvdXIgZGVzY2VuZGFudHMgdGhhdCBt YXkgbmVlZAogICAgICAgICAvLyByZXBvc2l0aW9uaW5nLCBzbyB1cGRhdGUgY29tcG9zaXRpbmcg bGF5ZXJzIGZyb20gdGhlcmUuCiAgICAgICAgIGlmIChSZW5kZXJMYXllciogY29tcG9zaXRpbmdB bmNlc3RvciA9IHN0YWNraW5nQ29udGV4dCgpLT5lbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyKCkp IHsKQEAgLTY2NDMsNyArNjY0Myw3IEBAIHZvaWQgc2hvd0xheWVyVHJlZShjb25zdCBXZWJDb3Jl OjpSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogc3RhdGljIHZvaWQgb3V0cHV0UGFpbnRPcmRlclRy ZWVMZWdlbmQoVGV4dFN0cmVhbSYgc3RyZWFtKQogewogICAgIHN0cmVhbS5uZXh0TGluZSgpOwot ICAgIHN0cmVhbSA8PCAiKFMpdGFja2luZyBDb250ZXh0LCAoTilvcm1hbCBmbG93IG9ubHksIChP KXZlcmZsb3cgY2xpcCwgKEEpbHBoYSAob3BhY2l0eSBvciBtYXNrKSwgaGFzIChCKWxlbmQgbW9k ZSwgKEkpc29sYXRlcyBibGVuZGluZywgKFQpcmFuc2Zvcm0taXNoLCAoRilpbHRlciwgRmkoWCll ZCBwb3NpdGlvbiwgKEMpb21wb3NpdGVkXG4iCisgICAgc3RyZWFtIDw8ICIoUyl0YWNraW5nIENv bnRleHQsIChOKW9ybWFsIGZsb3cgb25seSwgKE8pdmVyZmxvdyBjbGlwLCAoQSlscGhhIChvcGFj aXR5IG9yIG1hc2spLCBoYXMgKEIpbGVuZCBtb2RlLCAoSSlzb2xhdGVzIGJsZW5kaW5nLCAoVCly YW5zZm9ybS1pc2gsIChGKWlsdGVyLCBGaShYKWVkIHBvc2l0aW9uLCAoQylvbXBvc2l0ZWQsIChj KW9tcG9zaXRlZCBkZXNjZW5kYW50XG4iCiAgICAgICAgICJEaXJ0eSAoeiktbGlzdHMsIERpcnR5 IChuKW9ybWFsIGZsb3cgbGlzdHNcbiIKICAgICAgICAgIkRlc2NlbmRhbnQgbmVlZHMgb3Zlcmxh cCAodClyYXZlcnNhbCwgRGVzY2VuZGFudCBuZWVkcyAoYilhY2tpbmcgb3IgaGllcmFyY2h5IHVw ZGF0ZSwgQWxsIGRlc2NlbmRhbnRzIG5lZWQgKHIpZXF1aXJlbWVudHMgdHJhdmVyc2FsLCBBbGwg KHMpdWJzZXF1ZW50IGxheWVycyBuZWVkIHJlcXVpcmVtZW50cyB0cmF2ZXJzYWwsIEFsbCBkZXNj ZW5kYW50cyBuZWVkIChoKWllcmFyY2h5IHRyYXZlcnNhbFxuIgogICAgICAgICAiTmVlZHMgY29t cG9zaXRpbmcgcGFpbnQgb3JkZXIgdXBkYXRlIG9uIChzKXVic2VxdWVudCBsYXllcnMsIE5lZWRz IGNvbXBvc2l0aW5nIHBhaW50IChvKXJkZXIgY2hpbGRyZW4gdXBkYXRlLCAiCkBAIC02NjcwLDYg KzY2NzAsNyBAQCBzdGF0aWMgdm9pZCBvdXRwdXRQYWludE9yZGVyVHJlZVJlY3Vyc2l2ZShUZXh0 U3RyZWFtJiBzdHJlYW0sIGNvbnN0IFdlYkNvcmU6OlJlbgogICAgIHN0cmVhbSA8PCAobGF5ZXIu aGFzRmlsdGVyKCkgPyAiRiIgOiAiLSIpOwogICAgIHN0cmVhbSA8PCAobGF5ZXIucmVuZGVyZXIo KS5pc0ZpeGVkUG9zaXRpb25lZCgpID8gIlgiIDogIi0iKTsKICAgICBzdHJlYW0gPDwgKGxheWVy LmlzQ29tcG9zaXRlZCgpID8gIkMiIDogIi0iKTsKKyAgICBzdHJlYW0gPDwgKGxheWVyLmhhc0Nv bXBvc2l0aW5nRGVzY2VuZGFudCgpID8gImMiIDogIi0iKTsKIAogICAgIHN0cmVhbSA8PCAiICI7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRv ci5jcHAKaW5kZXggZTA1NThkNzVjOTAwMTZmYTM2YWFiMzFmNzZmOWYxNDAyZjZmODNiNS4uMGFi MjM0ODZlMmM3ZjkxNGRkNWJjZWMzMjRjNDViNWQ3N2Q3ZGY5ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTExNzAsMjkg KzExNzAsMzUgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUJhY2tpbmdBbmRI aWVyYXJjaHkoUmVuZGVyTGF5ZXImIGxheWVyLCBWZWN0b3IKICAgICAvLyB0byB0aGUgY29tcG9z aXRpbmcgY2hpbGQgbGlzdCBvZiBhbiBlbmNsb3NpbmcgbGF5ZXIuCiAgICAgVmVjdG9yPFJlZjxH cmFwaGljc0xheWVyPj4gbGF5ZXJDaGlsZHJlbjsKICAgICBhdXRvJiBjaGlsZExpc3QgPSBsYXll ckJhY2tpbmcgPyBsYXllckNoaWxkcmVuIDogY2hpbGRMYXllcnNPZkVuY2xvc2luZ0xheWVyOwot ICAgIC8vIEZJWE1FOiB3aHkgdGhlICFsYXllckJhY2tpbmcgY2hlY2s/Ci0gICAgYm9vbCByZXF1 aXJlRGVzY2VuZGFudFRyYXZlcnNhbCA9ICFsYXllckJhY2tpbmcgfHwgbGF5ZXIubmVlZHNDb21w b3NpdGluZ0xheWVyQ29ubmVjdGlvbigpIHx8IGxheWVyLmhhc0Rlc2NlbmRhbnROZWVkaW5nVXBk YXRlQmFja2luZ09ySGllcmFyY2h5VHJhdmVyc2FsKCkgfHwgIXVwZGF0ZUxldmVsLmlzRW1wdHko KTsKKworICAgIGJvb2wgcmVxdWlyZURlc2NlbmRhbnRUcmF2ZXJzYWwgPSBsYXllci5oYXNEZXNj ZW5kYW50TmVlZGluZ1VwZGF0ZUJhY2tpbmdPckhpZXJhcmNoeVRyYXZlcnNhbCgpCisgICAgICAg IHx8IChsYXllci5oYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoKSAmJiAoIWxheWVyQmFja2luZyB8 fCBsYXllci5uZWVkc0NvbXBvc2l0aW5nTGF5ZXJDb25uZWN0aW9uKCkgfHwgIXVwZGF0ZUxldmVs LmlzRW1wdHkoKSkpOwogCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIExheWVyTGlzdE11dGF0 aW9uRGV0ZWN0b3IgbXV0YXRpb25DaGVja2VyKGxheWVyKTsKICNlbmRpZgogICAgIAotICAgIGlm IChyZXF1aXJlRGVzY2VuZGFudFRyYXZlcnNhbCkgewotICAgICAgICBmb3IgKGF1dG8qIHJlbmRl ckxheWVyIDogbGF5ZXIubmVnYXRpdmVaT3JkZXJMYXllcnMoKSkKLSAgICAgICAgICAgIHVwZGF0 ZUJhY2tpbmdBbmRIaWVyYXJjaHkoKnJlbmRlckxheWVyLCBjaGlsZExpc3QsIHVwZGF0ZUxldmVs LCBkZXB0aCArIDEpOwotCi0gICAgICAgICAgICAvLyBJZiBhIG5lZ2F0aXZlIHotb3JkZXIgY2hp bGQgaXMgY29tcG9zaXRpbmcsIHdlIGdldCBhIGZvcmVncm91bmQgbGF5ZXIgd2hpY2ggbmVlZHMg dG8gZ2V0IHBhcmVudGVkLgorICAgIGF1dG8gYXBwZW5kRm9yZWdyb3VuZExheWVySWZOZWNlc3Nh cnkgPSBbJl0gKCkgeworICAgICAgICAvLyBJZiBhIG5lZ2F0aXZlIHotb3JkZXIgY2hpbGQgaXMg Y29tcG9zaXRpbmcsIHdlIGdldCBhIGZvcmVncm91bmQgbGF5ZXIgd2hpY2ggbmVlZHMgdG8gZ2V0 IHBhcmVudGVkLgogICAgICAgICBpZiAobGF5ZXIubmVnYXRpdmVaT3JkZXJMYXllcnMoKS5zaXpl KCkpIHsKICAgICAgICAgICAgIGlmIChsYXllckJhY2tpbmcgJiYgbGF5ZXJCYWNraW5nLT5mb3Jl Z3JvdW5kTGF5ZXIoKSkKICAgICAgICAgICAgICAgICBjaGlsZExpc3QuYXBwZW5kKCpsYXllckJh Y2tpbmctPmZvcmVncm91bmRMYXllcigpKTsKICAgICAgICAgfQorICAgIH07CisKKyAgICBpZiAo cmVxdWlyZURlc2NlbmRhbnRUcmF2ZXJzYWwpIHsKKyAgICAgICAgZm9yIChhdXRvKiByZW5kZXJM YXllciA6IGxheWVyLm5lZ2F0aXZlWk9yZGVyTGF5ZXJzKCkpCisgICAgICAgICAgICB1cGRhdGVC YWNraW5nQW5kSGllcmFyY2h5KCpyZW5kZXJMYXllciwgY2hpbGRMaXN0LCB1cGRhdGVMZXZlbCwg ZGVwdGggKyAxKTsKKworICAgICAgICBhcHBlbmRGb3JlZ3JvdW5kTGF5ZXJJZk5lY2Vzc2FyeSgp OwogCiAgICAgICAgIGZvciAoYXV0byogcmVuZGVyTGF5ZXIgOiBsYXllci5ub3JtYWxGbG93TGF5 ZXJzKCkpCiAgICAgICAgICAgICB1cGRhdGVCYWNraW5nQW5kSGllcmFyY2h5KCpyZW5kZXJMYXll ciwgY2hpbGRMaXN0LCB1cGRhdGVMZXZlbCwgZGVwdGggKyAxKTsKICAgICAgICAgCiAgICAgICAg IGZvciAoYXV0byogcmVuZGVyTGF5ZXIgOiBsYXllci5wb3NpdGl2ZVpPcmRlckxheWVycygpKQog ICAgICAgICAgICAgdXBkYXRlQmFja2luZ0FuZEhpZXJhcmNoeSgqcmVuZGVyTGF5ZXIsIGNoaWxk TGlzdCwgdXBkYXRlTGV2ZWwsIGRlcHRoICsgMSk7Ci0gICAgfQorICAgIH0gZWxzZQorICAgICAg ICBhcHBlbmRGb3JlZ3JvdW5kTGF5ZXJJZk5lY2Vzc2FyeSgpOwogCiAgICAgaWYgKGxheWVyQmFj a2luZykgewogICAgICAgICBpZiAocmVxdWlyZURlc2NlbmRhbnRUcmF2ZXJzYWwpIHsKQEAgLTEz NzAsNyArMTM3Niw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpsYXllclN0eWxlQ2hh bmdlZChTdHlsZURpZmZlcmVuY2UgZGlmZiwgUmVuZGVyTGF5ZXImCiAgICAgaWYgKHF1ZXJ5RGF0 YS5yZWV2YWx1YXRlQWZ0ZXJMYXlvdXQpCiAgICAgICAgIGxheWVyLnNldE5lZWRzUG9zdExheW91 dENvbXBvc2l0aW5nVXBkYXRlKCk7CiAKLSAgICBpZiAoZGlmZiA+PSBTdHlsZURpZmZlcmVuY2U6 OkxheW91dFBvc2l0aW9uZWRNb3ZlbWVudE9ubHkgJiYgdXNlc0NvbXBvc2l0aW5nKCkpIHsKKyAg ICBpZiAoZGlmZiA+PSBTdHlsZURpZmZlcmVuY2U6OkxheW91dFBvc2l0aW9uZWRNb3ZlbWVudE9u bHkgJiYgaGFzQ29udGVudENvbXBvc2l0aW5nTGF5ZXJzKCkpIHsKICAgICAgICAgbGF5ZXIuc2V0 TmVlZHNQb3N0TGF5b3V0Q29tcG9zaXRpbmdVcGRhdGUoKTsKICAgICAgICAgbGF5ZXIuc2V0TmVl ZHNDb21wb3NpdGluZ0dlb21ldHJ5VXBkYXRlKCk7CiAgICAgfQo= 355211 2018-11-17 15:59:24 -0800 2018-11-17 16:07:36 -0800 Patch bug-191813-20181117155923.patch text/plain 8598 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjU3NGI4MjFjZjkwNzZm YzQ2OTJiNGIzZTNjNDM5NGQ2YjIzMjQ4ZC4uMzA2M2MzYmRhOTE5Zjc5MGUzZjE2ODlmOTRiYmVj NjJjYTk5MTFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTExLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEF2b2lkIHRyaWdn ZXJpbmcgY29tcG9zaXRpbmcgdXBkYXRlcyB3aGVuIG9ubHkgdGhlIHJvb3QgbGF5ZXIgaXMgY29t cG9zaXRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTkxODEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SWYgd2Uga25vdyB0aGF0IHRoZSBvbmx5IGNvbXBvc2l0ZWQgbGF5ZXIgaXMgdGhlIHJvb3QsIHdl IGNhbiBhdm9pZCB0cmlnZ2VyaW5nIGRlZXAKKyAgICAgICAgY29tcG9zaXRpbmcgdXBkYXRlcyBz b21ldGltZXMsIGZvciBleGFtcGxlIHdoZW4gbGF5b3V0IGNoYW5nZXMgc2l6ZSBvciBwb3NpdGlv biwKKyAgICAgICAgb3Igd2hlbiB6LW9yZGVyIGxpc3RzIGNoYW5nZS4KKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 YWRkQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnJlbW92ZUNoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3JvbGxUbyk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbCk6CisgICAg ICAgIChXZWJDb3JlOjpvdXRwdXRQYWludE9yZGVyVHJlZVJlY3Vyc2l2ZSk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUJhY2tpbmdBbmRIaWVyYXJjaHkpOiBDb25zdWx0 IHRoZSBsYXllci5oYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoKQorICAgICAgICBmbGFnIHRvIGN1 dCBvZmYgZGVzY2VuZGFudHMgdHJhdmVyc2FsIHdoZW4gcG9zc2libGUuCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmxheWVyU3R5bGVDaGFuZ2VkKToKKwogMjAxOC0x MS0xNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBG aXggYW4gZXJyb3IgaW4gMjM4MzU0IC0gIT0sIG5vdCA9PS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDc5MzdkNDE3YWUyMTdmNmRhY2RkNTJlZThmNzE1NGNl Njk3MjljNGIuLmJhMjQxNjk5ODVkMGIwOTk5YWY4MDRjYWViMGYzYmYyNmM5NjM0OTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNDA1LDcgKzQwNSw3IEBA IHZvaWQgUmVuZGVyTGF5ZXI6OmFkZENoaWxkKFJlbmRlckxheWVyJiBjaGlsZCwgUmVuZGVyTGF5 ZXIqIGJlZm9yZUNoaWxkKQogICAgIGlmIChjaGlsZC5pc1NlbGZQYWludGluZ0xheWVyKCkgfHwg Y2hpbGQuaGFzU2VsZlBhaW50aW5nTGF5ZXJEZXNjZW5kYW50KCkpCiAgICAgICAgIHNldEFuY2Vz dG9yQ2hhaW5IYXNTZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnQoKTsKIAotICAgIGlmIChjb21w b3NpdG9yKCkudXNlc0NvbXBvc2l0aW5nKCkpCisgICAgaWYgKGNvbXBvc2l0b3IoKS5oYXNDb250 ZW50Q29tcG9zaXRpbmdMYXllcnMoKSkKICAgICAgICAgc2V0RGVzY2VuZGFudHNOZWVkQ29tcG9z aXRpbmdSZXF1aXJlbWVudHNUcmF2ZXJzYWwoKTsKIAogICAgIGlmIChjaGlsZC5oYXNEZXNjZW5k YW50TmVlZGluZ0NvbXBvc2l0aW5nUmVxdWlyZW1lbnRzVHJhdmVyc2FsKCkgfHwgY2hpbGQubmVl ZHNDb21wb3NpdGluZ1JlcXVpcmVtZW50c1RyYXZlcnNhbCgpKQpAQCAtNDUxLDcgKzQ1MSw3IEBA IHZvaWQgUmVuZGVyTGF5ZXI6OnJlbW92ZUNoaWxkKFJlbmRlckxheWVyJiBvbGRDaGlsZCkKICAg ICBpZiAob2xkQ2hpbGQuaXNTZWxmUGFpbnRpbmdMYXllcigpIHx8IG9sZENoaWxkLmhhc1NlbGZQ YWludGluZ0xheWVyRGVzY2VuZGFudCgpKQogICAgICAgICBkaXJ0eUFuY2VzdG9yQ2hhaW5IYXNT ZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnRTdGF0dXMoKTsKIAotICAgIGlmIChjb21wb3NpdG9y KCkudXNlc0NvbXBvc2l0aW5nKCkpCisgICAgaWYgKGNvbXBvc2l0b3IoKS5oYXNDb250ZW50Q29t cG9zaXRpbmdMYXllcnMoKSkKICAgICAgICAgc2V0RGVzY2VuZGFudHNOZWVkQ29tcG9zaXRpbmdS ZXF1aXJlbWVudHNUcmF2ZXJzYWwoKTsKIAogI2lmIEVOQUJMRShDU1NfQ09NUE9TSVRJTkcpCkBA IC0xNTc3LDcgKzE1NzcsNyBAQCBib29sIFJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9u KCkKICAgICBwb3NpdGlvbk9yT2Zmc2V0Q2hhbmdlZCB8PSBsb2NhdGlvbigpICE9IGxvY2FsUG9p bnQ7CiAgICAgc2V0TG9jYXRpb24obG9jYWxQb2ludCk7CiAgICAgCi0gICAgaWYgKHBvc2l0aW9u T3JPZmZzZXRDaGFuZ2VkICYmIGNvbXBvc2l0b3IoKS51c2VzQ29tcG9zaXRpbmcoKSkgeworICAg IGlmIChwb3NpdGlvbk9yT2Zmc2V0Q2hhbmdlZCAmJiBjb21wb3NpdG9yKCkuaGFzQ29udGVudENv bXBvc2l0aW5nTGF5ZXJzKCkpIHsKICAgICAgICAgaWYgKGlzQ29tcG9zaXRlZCgpKQogICAgICAg ICAgICAgc2V0TmVlZHNDb21wb3NpdGluZ0dlb21ldHJ5VXBkYXRlKCk7CiAgICAgICAgIC8vIFRo aXMgbGF5ZXIncyBwb3NpdGlvbiBjYW4gYWZmZWN0IHRoZSBsb2NhdGlvbiBvZiBhIGNvbXBvc2l0 ZWQgZGVzY2VuZGFudCAod2hpY2ggbWF5IGJlIGEgc2libGluZyBpbiB6LW9yZGVyKSwKQEAgLTI0 MzAsNyArMjQzMCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFRvKGNvbnN0IFNjcm9sbFBv c2l0aW9uJiBwb3NpdGlvbikKICAgICBmcmFtZS5ldmVudEhhbmRsZXIoKS5kaXNwYXRjaEZha2VN b3VzZU1vdmVFdmVudFNvb25JblF1YWQocXVhZEZvckZha2VNb3VzZU1vdmVFdmVudCk7CiAKICAg ICBib29sIHJlcXVpcmVzUmVwYWludCA9IHRydWU7Ci0gICAgaWYgKGNvbXBvc2l0b3IoKS51c2Vz Q29tcG9zaXRpbmcoKSAmJiB1c2VzQ29tcG9zaXRlZFNjcm9sbGluZygpKSB7CisgICAgaWYgKHVz ZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkpIHsKICAgICAgICAgc2V0TmVlZHNDb21wb3NpdGluZ0dl b21ldHJ5VXBkYXRlKCk7CiAgICAgICAgIHNldERlc2NlbmRhbnRzTmVlZFVwZGF0ZUJhY2tpbmdB bmRIaWVyYXJjaHlUcmF2ZXJzYWwoKTsKICAgICAgICAgcmVxdWlyZXNSZXBhaW50ID0gZmFsc2U7 CkBAIC0yNTgwLDcgKzI1ODAsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxSZWN0VG9WaXNp YmxlKGNvbnN0IExheW91dFJlY3QmIGFic29sdXRlUmVjdCwgYm9vbCBpbnNpZAogCiB2b2lkIFJl bmRlckxheWVyOjp1cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVyU2Nyb2xsKCkKIHsKLSAgICBp ZiAoY29tcG9zaXRvcigpLnVzZXNDb21wb3NpdGluZygpKSB7CisgICAgaWYgKGNvbXBvc2l0b3Io KS5oYXNDb250ZW50Q29tcG9zaXRpbmdMYXllcnMoKSkgewogICAgICAgICAvLyBPdXIgc3RhY2tp bmcgY29udGFpbmVyIGlzIGd1YXJhbnRlZWQgdG8gY29udGFpbiBhbGwgb2Ygb3VyIGRlc2NlbmRh bnRzIHRoYXQgbWF5IG5lZWQKICAgICAgICAgLy8gcmVwb3NpdGlvbmluZywgc28gdXBkYXRlIGNv bXBvc2l0aW5nIGxheWVycyBmcm9tIHRoZXJlLgogICAgICAgICBpZiAoUmVuZGVyTGF5ZXIqIGNv bXBvc2l0aW5nQW5jZXN0b3IgPSBzdGFja2luZ0NvbnRleHQoKS0+ZW5jbG9zaW5nQ29tcG9zaXRp bmdMYXllcigpKSB7CkBAIC02NjQzLDcgKzY2NDMsNyBAQCB2b2lkIHNob3dMYXllclRyZWUoY29u c3QgV2ViQ29yZTo6UmVuZGVyT2JqZWN0KiByZW5kZXJlcikKIHN0YXRpYyB2b2lkIG91dHB1dFBh aW50T3JkZXJUcmVlTGVnZW5kKFRleHRTdHJlYW0mIHN0cmVhbSkKIHsKICAgICBzdHJlYW0ubmV4 dExpbmUoKTsKLSAgICBzdHJlYW0gPDwgIihTKXRhY2tpbmcgQ29udGV4dCwgKE4pb3JtYWwgZmxv dyBvbmx5LCAoTyl2ZXJmbG93IGNsaXAsIChBKWxwaGEgKG9wYWNpdHkgb3IgbWFzayksIGhhcyAo QilsZW5kIG1vZGUsIChJKXNvbGF0ZXMgYmxlbmRpbmcsIChUKXJhbnNmb3JtLWlzaCwgKEYpaWx0 ZXIsIEZpKFgpZWQgcG9zaXRpb24sIChDKW9tcG9zaXRlZFxuIgorICAgIHN0cmVhbSA8PCAiKFMp dGFja2luZyBDb250ZXh0LCAoTilvcm1hbCBmbG93IG9ubHksIChPKXZlcmZsb3cgY2xpcCwgKEEp bHBoYSAob3BhY2l0eSBvciBtYXNrKSwgaGFzIChCKWxlbmQgbW9kZSwgKEkpc29sYXRlcyBibGVu ZGluZywgKFQpcmFuc2Zvcm0taXNoLCAoRilpbHRlciwgRmkoWCllZCBwb3NpdGlvbiwgKEMpb21w b3NpdGVkLCAoYylvbXBvc2l0ZWQgZGVzY2VuZGFudFxuIgogICAgICAgICAiRGlydHkgKHopLWxp c3RzLCBEaXJ0eSAobilvcm1hbCBmbG93IGxpc3RzXG4iCiAgICAgICAgICJEZXNjZW5kYW50IG5l ZWRzIG92ZXJsYXAgKHQpcmF2ZXJzYWwsIERlc2NlbmRhbnQgbmVlZHMgKGIpYWNraW5nIG9yIGhp ZXJhcmNoeSB1cGRhdGUsIEFsbCBkZXNjZW5kYW50cyBuZWVkIChyKWVxdWlyZW1lbnRzIHRyYXZl cnNhbCwgQWxsIChzKXVic2VxdWVudCBsYXllcnMgbmVlZCByZXF1aXJlbWVudHMgdHJhdmVyc2Fs LCBBbGwgZGVzY2VuZGFudHMgbmVlZCAoaClpZXJhcmNoeSB0cmF2ZXJzYWxcbiIKICAgICAgICAg Ik5lZWRzIGNvbXBvc2l0aW5nIHBhaW50IG9yZGVyIHVwZGF0ZSBvbiAocyl1YnNlcXVlbnQgbGF5 ZXJzLCBOZWVkcyBjb21wb3NpdGluZyBwYWludCAobylyZGVyIGNoaWxkcmVuIHVwZGF0ZSwgIgpA QCAtNjY3MCw2ICs2NjcwLDcgQEAgc3RhdGljIHZvaWQgb3V0cHV0UGFpbnRPcmRlclRyZWVSZWN1 cnNpdmUoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBXZWJDb3JlOjpSZW4KICAgICBzdHJlYW0g PDwgKGxheWVyLmhhc0ZpbHRlcigpID8gIkYiIDogIi0iKTsKICAgICBzdHJlYW0gPDwgKGxheWVy LnJlbmRlcmVyKCkuaXNGaXhlZFBvc2l0aW9uZWQoKSA/ICJYIiA6ICItIik7CiAgICAgc3RyZWFt IDw8IChsYXllci5pc0NvbXBvc2l0ZWQoKSA/ICJDIiA6ICItIik7CisgICAgc3RyZWFtIDw8IChs YXllci5oYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoKSA/ICJjIiA6ICItIik7CiAKICAgICBzdHJl YW0gPDwgIiAiOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCmluZGV4IDkzZDRmMDM5YjZkNDFjNGVjMTJmZDgxMDYzNjUyNGNjY2Ix ZGNiYTQuLmQ2OWI3Y2YxMjdiZTliZDA2Mzc2NTg4ODQwZTRlNDliYzA0YmY2ZjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBA IC0xMTcwLDI5ICsxMTcwLDM1IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVC YWNraW5nQW5kSGllcmFyY2h5KFJlbmRlckxheWVyJiBsYXllciwgVmVjdG9yCiAgICAgLy8gdG8g dGhlIGNvbXBvc2l0aW5nIGNoaWxkIGxpc3Qgb2YgYW4gZW5jbG9zaW5nIGxheWVyLgogICAgIFZl Y3RvcjxSZWY8R3JhcGhpY3NMYXllcj4+IGxheWVyQ2hpbGRyZW47CiAgICAgYXV0byYgY2hpbGRM aXN0ID0gbGF5ZXJCYWNraW5nID8gbGF5ZXJDaGlsZHJlbiA6IGNoaWxkTGF5ZXJzT2ZFbmNsb3Np bmdMYXllcjsKLSAgICAvLyBGSVhNRTogd2h5IHRoZSAhbGF5ZXJCYWNraW5nIGNoZWNrPwotICAg IGJvb2wgcmVxdWlyZURlc2NlbmRhbnRUcmF2ZXJzYWwgPSAhbGF5ZXJCYWNraW5nIHx8IGxheWVy Lm5lZWRzQ29tcG9zaXRpbmdMYXllckNvbm5lY3Rpb24oKSB8fCBsYXllci5oYXNEZXNjZW5kYW50 TmVlZGluZ1VwZGF0ZUJhY2tpbmdPckhpZXJhcmNoeVRyYXZlcnNhbCgpIHx8ICF1cGRhdGVMZXZl bC5pc0VtcHR5KCk7CisKKyAgICBib29sIHJlcXVpcmVEZXNjZW5kYW50VHJhdmVyc2FsID0gbGF5 ZXIuaGFzRGVzY2VuZGFudE5lZWRpbmdVcGRhdGVCYWNraW5nT3JIaWVyYXJjaHlUcmF2ZXJzYWwo KQorICAgICAgICB8fCAobGF5ZXIuaGFzQ29tcG9zaXRpbmdEZXNjZW5kYW50KCkgJiYgKCFsYXll ckJhY2tpbmcgfHwgbGF5ZXIubmVlZHNDb21wb3NpdGluZ0xheWVyQ29ubmVjdGlvbigpIHx8ICF1 cGRhdGVMZXZlbC5pc0VtcHR5KCkpKTsKIAogI2lmICFBU1NFUlRfRElTQUJMRUQKICAgICBMYXll ckxpc3RNdXRhdGlvbkRldGVjdG9yIG11dGF0aW9uQ2hlY2tlcihsYXllcik7CiAjZW5kaWYKICAg ICAKLSAgICBpZiAocmVxdWlyZURlc2NlbmRhbnRUcmF2ZXJzYWwpIHsKLSAgICAgICAgZm9yIChh dXRvKiByZW5kZXJMYXllciA6IGxheWVyLm5lZ2F0aXZlWk9yZGVyTGF5ZXJzKCkpCi0gICAgICAg ICAgICB1cGRhdGVCYWNraW5nQW5kSGllcmFyY2h5KCpyZW5kZXJMYXllciwgY2hpbGRMaXN0LCB1 cGRhdGVMZXZlbCwgZGVwdGggKyAxKTsKLQotICAgICAgICAgICAgLy8gSWYgYSBuZWdhdGl2ZSB6 LW9yZGVyIGNoaWxkIGlzIGNvbXBvc2l0aW5nLCB3ZSBnZXQgYSBmb3JlZ3JvdW5kIGxheWVyIHdo aWNoIG5lZWRzIHRvIGdldCBwYXJlbnRlZC4KKyAgICBhdXRvIGFwcGVuZEZvcmVncm91bmRMYXll cklmTmVjZXNzYXJ5ID0gWyZdICgpIHsKKyAgICAgICAgLy8gSWYgYSBuZWdhdGl2ZSB6LW9yZGVy IGNoaWxkIGlzIGNvbXBvc2l0aW5nLCB3ZSBnZXQgYSBmb3JlZ3JvdW5kIGxheWVyIHdoaWNoIG5l ZWRzIHRvIGdldCBwYXJlbnRlZC4KICAgICAgICAgaWYgKGxheWVyLm5lZ2F0aXZlWk9yZGVyTGF5 ZXJzKCkuc2l6ZSgpKSB7CiAgICAgICAgICAgICBpZiAobGF5ZXJCYWNraW5nICYmIGxheWVyQmFj a2luZy0+Zm9yZWdyb3VuZExheWVyKCkpCiAgICAgICAgICAgICAgICAgY2hpbGRMaXN0LmFwcGVu ZCgqbGF5ZXJCYWNraW5nLT5mb3JlZ3JvdW5kTGF5ZXIoKSk7CiAgICAgICAgIH0KKyAgICB9Owor CisgICAgaWYgKHJlcXVpcmVEZXNjZW5kYW50VHJhdmVyc2FsKSB7CisgICAgICAgIGZvciAoYXV0 byogcmVuZGVyTGF5ZXIgOiBsYXllci5uZWdhdGl2ZVpPcmRlckxheWVycygpKQorICAgICAgICAg ICAgdXBkYXRlQmFja2luZ0FuZEhpZXJhcmNoeSgqcmVuZGVyTGF5ZXIsIGNoaWxkTGlzdCwgdXBk YXRlTGV2ZWwsIGRlcHRoICsgMSk7CisKKyAgICAgICAgYXBwZW5kRm9yZWdyb3VuZExheWVySWZO ZWNlc3NhcnkoKTsKIAogICAgICAgICBmb3IgKGF1dG8qIHJlbmRlckxheWVyIDogbGF5ZXIubm9y bWFsRmxvd0xheWVycygpKQogICAgICAgICAgICAgdXBkYXRlQmFja2luZ0FuZEhpZXJhcmNoeSgq cmVuZGVyTGF5ZXIsIGNoaWxkTGlzdCwgdXBkYXRlTGV2ZWwsIGRlcHRoICsgMSk7CiAgICAgICAg IAogICAgICAgICBmb3IgKGF1dG8qIHJlbmRlckxheWVyIDogbGF5ZXIucG9zaXRpdmVaT3JkZXJM YXllcnMoKSkKICAgICAgICAgICAgIHVwZGF0ZUJhY2tpbmdBbmRIaWVyYXJjaHkoKnJlbmRlckxh eWVyLCBjaGlsZExpc3QsIHVwZGF0ZUxldmVsLCBkZXB0aCArIDEpOwotICAgIH0KKyAgICB9IGVs c2UKKyAgICAgICAgYXBwZW5kRm9yZWdyb3VuZExheWVySWZOZWNlc3NhcnkoKTsKIAogICAgIGlm IChsYXllckJhY2tpbmcpIHsKICAgICAgICAgaWYgKHJlcXVpcmVEZXNjZW5kYW50VHJhdmVyc2Fs KSB7CkBAIC0xMzcwLDcgKzEzNzYsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6bGF5 ZXJTdHlsZUNoYW5nZWQoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIFJlbmRlckxheWVyJgogICAgIGlm IChxdWVyeURhdGEucmVldmFsdWF0ZUFmdGVyTGF5b3V0KQogICAgICAgICBsYXllci5zZXROZWVk c1Bvc3RMYXlvdXRDb21wb3NpdGluZ1VwZGF0ZSgpOwogCi0gICAgaWYgKGRpZmYgPj0gU3R5bGVE aWZmZXJlbmNlOjpMYXlvdXRQb3NpdGlvbmVkTW92ZW1lbnRPbmx5ICYmIHVzZXNDb21wb3NpdGlu ZygpKSB7CisgICAgaWYgKGRpZmYgPj0gU3R5bGVEaWZmZXJlbmNlOjpMYXlvdXRQb3NpdGlvbmVk TW92ZW1lbnRPbmx5ICYmIGhhc0NvbnRlbnRDb21wb3NpdGluZ0xheWVycygpKSB7CiAgICAgICAg IGxheWVyLnNldE5lZWRzUG9zdExheW91dENvbXBvc2l0aW5nVXBkYXRlKCk7CiAgICAgICAgIGxh eWVyLnNldE5lZWRzQ29tcG9zaXRpbmdHZW9tZXRyeVVwZGF0ZSgpOwogICAgIH0K