186255 2018-06-03 20:55:02 -0700 Remove unnecessary MotionMark controllers 2018-06-04 09:18:27 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 186256 1 jonlee jonlee cdumez commit-queue ews-watchlist rniwa sabouhallawa simon.fraser webkit-bug-importer oldest_to_newest 1429752 0 jonlee 2018-06-03 20:55:02 -0700 pulling an Alan: ssia 1429758 1 341886 jonlee 2018-06-03 21:09:48 -0700 Created attachment 341886 Patch 1429836 2 341886 commit-queue 2018-06-04 09:17:48 -0700 Comment on attachment 341886 Patch Clearing flags on attachment: 341886 Committed r232467: <https://trac.webkit.org/changeset/232467> 1429837 3 commit-queue 2018-06-04 09:17:50 -0700 All reviewed patches have been landed. Closing bug. 1429838 4 webkit-bug-importer 2018-06-04 09:18:27 -0700 <rdar://problem/40773105> 341886 2018-06-03 21:09:48 -0700 2018-06-04 09:17:48 -0700 Patch bug-186255-20180603210947.patch text/plain 9775 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNDU2CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDA4MjcyOTA5ZGZm NTc3YWYxMGI5YmRjNmRlNDdiNTI5NGFhZmEwYWIuLmJhZmE1MGYxN2VkZDgxNDBkMTZlNGU0MDc2 MzNmYzY2YzllMDk2MmIgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDYt MDMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB1bm5lY2Vz c2FyeSBNb3Rpb25NYXJrIGNvbnRyb2xsZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODYyNTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBHZXQgcmlkIG9mIHRoZSByYW1wMzAgYW5kIHRoZSBmaXhlZC13 aXRoLWEtc3RlcCBjb250cm9sbGVycywgd2hpY2ggYXJlbid0IHVzZWQgZm9yIHRlc3RpbmcKKyAg ICAgICAgb3IgZGVidWdnaW5nLgorCisgICAgICAgICogTW90aW9uTWFyay9kZXZlbG9wZXIuaHRt bDogTW92ZSB0aGUgInJhbXAiIG9wdGlvbiBhcyBmaXJzdCwgc2luY2UgdGhhdCBpcyB0aGUgZGVm YXVsdAorICAgICAgICBjb250cm9sbGVyIGZvciB0aGUgYmVuY2htYXJrLgorICAgICAgICAqIE1v dGlvbk1hcmsvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci9tb3Rpb25tYXJrLmpzOgorICAgICAgICAq IE1vdGlvbk1hcmsvcmVzb3VyY2VzL3J1bm5lci9tb3Rpb25tYXJrLmpzOiBBZGRlZCBtaXNzaW5n IGNvcHlyaWdodCBub3RpY2UuCisgICAgICAgICogTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMv bWFpbi5qczoKKwogMjAxOC0wNS0yNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBw bGUuY29tPgogCiAgICAgICAgIEltcHJvdmUgdGhlIHBlcmZvcm1hbmNlIG9mIEZvbnQ6OmNhblJl bmRlckNvbWJpbmluZ0NoYXJhY3RlclNlcXVlbmNlKCkKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNl VGVzdHMvTW90aW9uTWFyay9kZXZlbG9wZXIuaHRtbCBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9u TWFyay9kZXZlbG9wZXIuaHRtbAppbmRleCAxMjQ5MzQ3ODEyZWFlNTllYzFlMWMxZjdlNTg1YTI4 MDk2MTVhMTY1Li5lYjM5NTFkNDAxNzU0Yzg3Y2IyY2I5MGJlN2NjY2RiM2NkMWUyYzVjIDEwMDY0 NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvZGV2ZWxvcGVyLmh0bWwKKysrIGIv UGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL2RldmVsb3Blci5odG1sCkBAIC0xLDUgKzEsNSBA QAogPCEtLQotICBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgIENvcHlyaWdodCAoQykgMjAxNS0yMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KIAogICBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC04MSwxMSArODEsOSBA QAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bGk+CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA8aDM+QWRqdXN0aW5nIHRoZSB0ZXN0IGNvbXBsZXhpdHk6PC9o Mz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx1bD4KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bGk+PGxhYmVsPjxpbnB1dCBuYW1lPSJjb250 cm9sbGVyIiB0eXBlPSJyYWRpbyIgdmFsdWU9InJhbXAiIGNoZWNrZWQ+IFJhbXA8L2xhYmVsPjwv bGk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGxpPjxsYWJlbD48 aW5wdXQgbmFtZT0iY29udHJvbGxlciIgdHlwZT0icmFkaW8iIHZhbHVlPSJmaXhlZCI+IEtlZXAg YXQgYSBmaXhlZCBjb21wbGV4aXR5PC9sYWJlbD48L2xpPgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxsaT48bGFiZWw+PGlucHV0IG5hbWU9ImNvbnRyb2xsZXIiIHR5 cGU9InJhZGlvIiB2YWx1ZT0ic3RlcCI+IEtlZXAgYXQgYSBmaXhlZCBjb21wbGV4aXR5LCB0aGVu IG1ha2UgYSBiaWcgc3RlcDwvbGFiZWw+PC9saT4KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8bGk+PGxhYmVsPjxpbnB1dCBuYW1lPSJjb250cm9sbGVyIiB0eXBlPSJy YWRpbyIgdmFsdWU9ImFkYXB0aXZlIj4gTWFpbnRhaW4gdGFyZ2V0IEZQUzwvbGFiZWw+PC9saT4K LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bGk+PGxhYmVsPjxpbnB1 dCBuYW1lPSJjb250cm9sbGVyIiB0eXBlPSJyYWRpbyIgdmFsdWU9InJhbXAiIGNoZWNrZWQ+IFJh bXA8L2xhYmVsPjwvbGk+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PGxpPjxsYWJlbD48aW5wdXQgbmFtZT0iY29udHJvbGxlciIgdHlwZT0icmFkaW8iIHZhbHVlPSJy YW1wMzAiPiBSYW1wIEAgMzBmcHM8L2xhYmVsPjwvbGk+CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8L3VsPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2xp PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bGk+CmRpZmYgLS1naXQgYS9QZXJm b3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci9tb3Rpb25tYXJr LmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIv bW90aW9ubWFyay5qcwppbmRleCAwMmQzZTQxM2VmZWUxYzFjNmY1NDg4MjkxZTVmYTBiMTI1YzFl NDZmLi44OGIxYzNkZTcyYTE3NWI3MTY2YjljZTg5OWU3OTU4MjgzOGVmZmM3IDEwMDY0NAotLS0g YS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci9tb3Rp b25tYXJrLmpzCisrKyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay9yZXNvdXJjZXMvZGVi dWctcnVubmVyL21vdGlvbm1hcmsuanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0 IChDKSAyMDE1LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJp Z2h0IChDKSAyMDE1LTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00MDUsNyArNDA1LDcgQEAgd2luZG93LnN1aXRl c01hbmFnZXIgPQogICAgIHVwZGF0ZUVkaXRzRWxlbWVudHNTdGF0ZTogZnVuY3Rpb24oKQogICAg IHsKICAgICAgICAgdmFyIGVkaXRzRWxlbWVudHMgPSB0aGlzLl9lZGl0c0VsZW1lbnRzKCk7Ci0g ICAgICAgIHZhciBzaG93Q29tcGxleGl0eUlucHV0cyA9IFsiZml4ZWQiLCAic3RlcCJdLmluZGV4 T2Yob3B0aW9uc01hbmFnZXIudmFsdWVGb3JPcHRpb24oImNvbnRyb2xsZXIiKSkgIT0gLTE7Cisg ICAgICAgIHZhciBzaG93Q29tcGxleGl0eUlucHV0cyA9IG9wdGlvbnNNYW5hZ2VyLnZhbHVlRm9y T3B0aW9uKCJjb250cm9sbGVyIikgPT0gImZpeGVkIjsKIAogICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGVkaXRzRWxlbWVudHMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBlZGl0 RWxlbWVudCA9IGVkaXRzRWxlbWVudHNbaV07CkBAIC02MzksNyArNjM5LDcgQEAgVXRpbGl0aWVz LmV4dGVuZE9iamVjdCh3aW5kb3cuYmVuY2htYXJrQ29udHJvbGxlciwgewogICAgICAgICB9CiAK ICAgICAgICAgdmFyIGRhc2hib2FyZCA9IGJlbmNobWFya1J1bm5lckNsaWVudC5yZXN1bHRzOwot ICAgICAgICBpZiAoWyJyYW1wIiwgInJhbXAzMCJdLmluZGV4T2YoZGFzaGJvYXJkLm9wdGlvbnNb ImNvbnRyb2xsZXIiXSkgIT0gLTEpCisgICAgICAgIGlmIChkYXNoYm9hcmQub3B0aW9uc1siY29u dHJvbGxlciJdID09ICJyYW1wIikKICAgICAgICAgICAgIEhlYWRlcnMuZGV0YWlsc1szXS5kaXNh YmxlZCA9IHRydWU7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgSGVhZGVycy5kZXRhaWxz WzFdLmRpc2FibGVkID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9u TWFyay9yZXNvdXJjZXMvcnVubmVyL21vdGlvbm1hcmsuanMgYi9QZXJmb3JtYW5jZVRlc3RzL01v dGlvbk1hcmsvcmVzb3VyY2VzL3J1bm5lci9tb3Rpb25tYXJrLmpzCmluZGV4IDY1ZThjNTQ1MGQ3 ZGQ0MTM4YzgyYjYyZGM3NDNjYWI4ZTNhZmM0MWUuLjQwZTZhMjE0ZDcwYWEwOWZhNDgyNjllMTcx ZDlhMmQ5Y2JmY2E2YWYgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay9y ZXNvdXJjZXMvcnVubmVyL21vdGlvbm1hcmsuanMKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rp b25NYXJrL3Jlc291cmNlcy9ydW5uZXIvbW90aW9ubWFyay5qcwpAQCAtMSw0ICsxLDI4IEBACi1S ZXN1bHRzRGFzaGJvYXJkID0gVXRpbGl0aWVzLmNyZWF0ZUNsYXNzKAorLyoKKyAqIENvcHlyaWdo dCAoQykgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor ICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJ QlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQ VVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElU UyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsg T1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBU SEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJ U0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisgUmVz dWx0c0Rhc2hib2FyZCA9IFV0aWxpdGllcy5jcmVhdGVDbGFzcygKICAgICBmdW5jdGlvbihvcHRp b25zLCB0ZXN0RGF0YSkKICAgICB7CiAgICAgICAgIHRoaXMuX2l0ZXJhdGlvbnNTYW1wbGVycyA9 IFtdOwpAQCAtNjksOCArOTMsNiBAQCBSZXN1bHRzRGFzaGJvYXJkID0gVXRpbGl0aWVzLmNyZWF0 ZUNsYXNzKAogICAgICAgICB2YXIgc2FtcGxlcyA9IGRhdGFbU3RyaW5ncy5qc29uLnNhbXBsZXNd OwogCiAgICAgICAgIHZhciBkZXNpcmVkRnJhbWVMZW5ndGggPSAxMDAwLzYwOwotICAgICAgICBp ZiAodGhpcy5fb3B0aW9uc1siY29udHJvbGxlciJdID09ICJyYW1wMzAiKQotICAgICAgICAgICAg ZGVzaXJlZEZyYW1lTGVuZ3RoID0gMTAwMC8zMDsKIAogICAgICAgICBmdW5jdGlvbiBmaW5kUmVn cmVzc2lvbihzZXJpZXMsIHByb2ZpbGUpIHsKICAgICAgICAgICAgIHZhciBtaW5JbmRleCA9IE1h dGgucm91bmQoLjAyNSAqIHNlcmllcy5sZW5ndGgpOwpAQCAtMTEwLDcgKzEzMiw3IEBAIFJlc3Vs dHNEYXNoYm9hcmQgPSBVdGlsaXRpZXMuY3JlYXRlQ2xhc3MoCiAgICAgICAgICAgICAgICAgc2Ft cGxlc1tzZXJpZXNOYW1lXSA9IG5ldyBTYW1wbGVEYXRhKHNlcmllcy5maWVsZE1hcCwgc2VyaWVz LmRhdGEpOwogICAgICAgICB9KTsKIAotICAgICAgICB2YXIgaXNSYW1wQ29udHJvbGxlciA9IFsi cmFtcCIsICJyYW1wMzAiXS5pbmRleE9mKHRoaXMuX29wdGlvbnNbImNvbnRyb2xsZXIiXSkgIT0g LTE7CisgICAgICAgIHZhciBpc1JhbXBDb250cm9sbGVyID0gdGhpcy5fb3B0aW9uc1siY29udHJv bGxlciJdID09ICJyYW1wIjsKICAgICAgICAgdmFyIHByZWRvbWluYW50UHJvZmlsZSA9ICIiOwog ICAgICAgICBpZiAoaXNSYW1wQ29udHJvbGxlcikgewogICAgICAgICAgICAgdmFyIHByb2ZpbGVz ID0ge307CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvcmVz b3VyY2VzL21haW4uanMgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvcmVzb3Vy Y2VzL21haW4uanMKaW5kZXggMjNjODY0MTAyYzY4N2ZjNDE2ZGI1NzI0ZDQxMjJiOGE4MTY1NDYz Ny4uMDkzZWI1ODBlOTZlY2MyN2UzZmRlYWFkMGVkZmMxMmM5YWIxN2QyZCAxMDA2NDQKLS0tIGEv UGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL3Jlc291cmNlcy9tYWluLmpzCisrKyBi L1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcwpAQCAt MSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxNyBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxOCBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAg LTI2NiwzMyArMjY2LDYgQEAgRml4ZWRDb250cm9sbGVyID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNs YXNzKENvbnRyb2xsZXIsCiAgICAgfQogKTsKIAotU3RlcENvbnRyb2xsZXIgPSBVdGlsaXRpZXMu Y3JlYXRlU3ViY2xhc3MoQ29udHJvbGxlciwKLSAgICBmdW5jdGlvbihiZW5jaG1hcmssIG9wdGlv bnMpCi0gICAgewotICAgICAgICBDb250cm9sbGVyLmNhbGwodGhpcywgYmVuY2htYXJrLCBvcHRp b25zKTsKLSAgICAgICAgdGhpcy5pbml0aWFsQ29tcGxleGl0eSA9IG9wdGlvbnNbImNvbXBsZXhp dHkiXTsKLSAgICAgICAgdGhpcy5pbnRlcnZhbFNhbXBsaW5nTGVuZ3RoID0gMDsKLSAgICAgICAg dGhpcy5fc3RlcHBlZCA9IGZhbHNlOwotICAgICAgICB0aGlzLl9zdGVwVGltZSA9IG9wdGlvbnNb InRlc3QtaW50ZXJ2YWwiXSAvIDI7Ci0gICAgfSwgewotCi0gICAgc3RhcnQ6IGZ1bmN0aW9uKHN0 YXJ0VGltZXN0YW1wLCBzdGFnZSkKLSAgICB7Ci0gICAgICAgIENvbnRyb2xsZXIucHJvdG90eXBl LnN0YXJ0LmNhbGwodGhpcywgc3RhcnRUaW1lc3RhbXAsIHN0YWdlKTsKLSAgICAgICAgdGhpcy5f c3RlcFRpbWUgKz0gc3RhcnRUaW1lc3RhbXA7Ci0gICAgfSwKLQotICAgIHR1bmU6IGZ1bmN0aW9u KHRpbWVzdGFtcCwgc3RhZ2UpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fc3RlcHBlZCB8fCB0 aW1lc3RhbXAgPCB0aGlzLl9zdGVwVGltZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAg ICB0aGlzLm1hcmsoU3RyaW5ncy5qc29uLnNhbXBsaW5nRW5kVGltZU9mZnNldCwgdGltZXN0YW1w KTsKLSAgICAgICAgdGhpcy5fc3RlcHBlZCA9IHRydWU7Ci0gICAgICAgIHN0YWdlLnR1bmUoc3Rh Z2UuY29tcGxleGl0eSgpICogMyk7Ci0gICAgfQotfSk7Ci0KIEFkYXB0aXZlQ29udHJvbGxlciA9 IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9sbGVyLAogICAgIGZ1bmN0aW9uKGJlbmNo bWFyaywgb3B0aW9ucykKICAgICB7CkBAIC02MjgsMTkgKzYwMSw2IEBAIFJhbXBDb250cm9sbGVy ID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKENvbnRyb2xsZXIsCiAgICAgfQogfSk7CiAKLVJh bXAzMENvbnRyb2xsZXIgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoUmFtcENvbnRyb2xsZXIs Ci0gICAgZnVuY3Rpb24oYmVuY2htYXJrLCBvcHRpb25zKQotICAgIHsKLSAgICAgICAgUmFtcENv bnRyb2xsZXIuY2FsbCh0aGlzLCBiZW5jaG1hcmssIG9wdGlvbnMpOwotICAgIH0sIHsKLQotICAg IGZyYW1lTGVuZ3RoRGVzaXJlZDogMTAwMC8zMCwKLSAgICBmcmFtZUxlbmd0aERlc2lyZWRUaHJl c2hvbGQ6IDEwMDAvMjksCi0gICAgZnJhbWVMZW5ndGhUaWVyVGhyZXNob2xkOiAxMDAwLzIwLAot ICAgIGZyYW1lTGVuZ3RoUmFtcExvd2VyVGhyZXNob2xkOiAxMDAwLzIwLAotICAgIGZyYW1lTGVu Z3RoUmFtcFVwcGVyVGhyZXNob2xkOiAxMDAwLzEyCi19KTsKLQogU3RhZ2UgPSBVdGlsaXRpZXMu Y3JlYXRlQ2xhc3MoCiAgICAgZnVuY3Rpb24oKQogICAgIHsKQEAgLTg3NSwxNyArODM1LDEyIEBA IEJlbmNobWFyayA9IFV0aWxpdGllcy5jcmVhdGVDbGFzcygKICAgICAgICAgY2FzZSAiZml4ZWQi OgogICAgICAgICAgICAgdGhpcy5fY29udHJvbGxlciA9IG5ldyBGaXhlZENvbnRyb2xsZXIodGhp cywgb3B0aW9ucyk7CiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSAic3RlcCI6Ci0g ICAgICAgICAgICB0aGlzLl9jb250cm9sbGVyID0gbmV3IFN0ZXBDb250cm9sbGVyKHRoaXMsIG9w dGlvbnMpOwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgImFkYXB0aXZlIjoKICAg ICAgICAgICAgIHRoaXMuX2NvbnRyb2xsZXIgPSBuZXcgQWRhcHRpdmVDb250cm9sbGVyKHRoaXMs IG9wdGlvbnMpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgInJhbXAiOgogICAg ICAgICAgICAgdGhpcy5fY29udHJvbGxlciA9IG5ldyBSYW1wQ29udHJvbGxlcih0aGlzLCBvcHRp b25zKTsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlICJyYW1wMzAiOgotICAgICAg ICAgICAgdGhpcy5fY29udHJvbGxlciA9IG5ldyBSYW1wMzBDb250cm9sbGVyKHRoaXMsIG9wdGlv bnMpOwogICAgICAgICB9CiAgICAgfSwgewogCg==