205619 2019-12-28 14:20:23 -0800 [LFC][IFC] Keep track of last line wrap opportunity 2019-12-28 16:19:52 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1601703 0 zalan 2019-12-28 14:20:23 -0800 so that we can revert back to this position if needed. 1601704 1 webkit-bug-importer 2019-12-28 14:20:40 -0800 <rdar://problem/58227112> 1601705 2 386475 zalan 2019-12-28 14:28:33 -0800 Created attachment 386475 Patch 1601708 3 commit-queue 2019-12-28 15:34:49 -0800 The commit-queue encountered the following flaky tests while processing attachment 386475: storage/indexeddb/modern/idbobjectstore-count-1.html bug 205620 (author: beidson@apple.com) The commit-queue is continuing to process your patch. 1601711 4 commit-queue 2019-12-28 15:34:58 -0800 The commit-queue encountered the following flaky tests while processing attachment 386475: fetch/fetch-worker-crash.html bug 187257 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1601712 5 386475 commit-queue 2019-12-28 16:19:51 -0800 Comment on attachment 386475 Patch Clearing flags on attachment: 386475 Committed r253928: <https://trac.webkit.org/changeset/253928> 1601713 6 commit-queue 2019-12-28 16:19:52 -0800 All reviewed patches have been landed. Closing bug. 386475 2019-12-28 14:28:33 -0800 2019-12-28 16:19:51 -0800 Patch bug-205619-20191228142833.patch text/plain 11768 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVmNTk0NzUzYzM3NWUz NmM1OTQ3Yjg1OGRhZTQ5ZTUwNzYyZmE1NC4uMTdhNDMwOTUyOWUwNmE2OWMxZjM3ODU0ZGJmOTFj N2ZmZjJiN2NhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTEyLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBLZWVwIHRy YWNrIG9mIGxhc3QgbGluZSB3cmFwIG9wcG9ydHVuaXR5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU2MTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzU4MjI3MTEyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGJlaW5nIGFibGUgdG8gcmV2ZXJ0IGJhY2sg dG8gYW4gZWFybGllciBwb3NpdGlvbgorICAgICAgICBvZiB0aGUgY3VycmVudCBsaW5lIGFzIHRo ZSBsaW5lIHdyYXBwaW5nIG9wcG9ydHVuaXR5LgorICAgICAgICAoYWN0dWFsbHkgdGhlIG1fbGFz dFdyYXBPcHBvcnR1bml0eSBpcyBhbHJlYWR5IHRha2VuIGludG8gdXNlIGF0IExpbmVCcmVha2Vy Ojp3b3JkQnJlYWtCZWhhdmlvcikKKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6c2hvdWxk S2VlcEJlZ2lubmluZ09mTGluZVdoaXRlc3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpMaW5lQnJlYWtlcjo6c2hvdWxkV3JhcElubGluZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6c2hvdWxkV3JhcEZsb2F0Qm94KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6TGluZUJyZWFrZXI6OnRyeVdyYXBwaW5nSW5saW5lQ29udGVudCBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCcmVha2VyOjp3cmFwVGV4dENvbnRl bnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6d29yZEJy ZWFrQmVoYXZpb3IgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtl cjo6dHJ5QnJlYWtpbmdUZXh0UnVuIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJyZWFrZXI6OkNvbnRpbm91c0NvbnRlbnQ6Omxhc3RXcmFwT3Bwb3J0dW5pdHlJbmRleCBj b25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFr ZXIuaDoKKwogMjAxOS0xMi0yOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gS2VlcCB0aGUgTGluZUJyZWFrZXIgb2JqZWN0IGFyb3VuZCB1bnRp bCBhZnRlciB0aGUgbGluZSBpcyBjbG9zZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKaW5kZXgg YWU1MWUwNzJmNjEzNTZjMGJiNGY4NDUxZWVkNmExYWU0M2M4YTdjYS4uYmUzMDA1NmI4MzdkNWFl ODIwMDA4MzMzZGEyMGY4NWUxZjRkZjA3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcApAQCAt NDMsNiArNDMsMTIgQEAgc3RhdGljIGlubGluZSBib29sIGlzV3JhcHBpbmdBbGxvd2VkKGNvbnN0 IFJlbmRlclN0eWxlJiBzdHlsZSkKICAgICByZXR1cm4gc3R5bGUud2hpdGVTcGFjZSgpICE9IFdo aXRlU3BhY2U6OlByZSAmJiBzdHlsZS53aGl0ZVNwYWNlKCkgIT0gV2hpdGVTcGFjZTo6Tm9XcmFw OwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkS2VlcEJlZ2lubmluZ09mTGluZVdoaXRl c3BhY2UoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQoreworICAgIGF1dG8gd2hpdGVzcGFjZSA9 IHN0eWxlLndoaXRlU3BhY2UoKTsKKyAgICByZXR1cm4gd2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNl OjpQcmUgfHwgd2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwIHx8IHdoaXRlc3BhY2Ug PT0gV2hpdGVTcGFjZTo6QnJlYWtTcGFjZXM7Cit9CisKIGJvb2wgTGluZUJyZWFrZXI6OmlzQ29u dGVudFdyYXBwaW5nQWxsb3dlZChjb25zdCBDb250aW5vdXNDb250ZW50JiBjYW5kaWRhdGVSdW5z KSBjb25zdAogewogICAgIC8vIFVzZSB0aGUgbGFzdCBpbmxpbmUgaXRlbSB3aXRoIGNvbnRlbnQg KHdoZXJlIHdlIHdvdWxkIGJlIHdyYXBwaW5nKSB0byBkZWNpZGUgaWYgY29udGVudCB3cmFwcGlu ZyBpcyBhbGxvd2VkLgpAQCAtNjQsNiArNzAsMjcgQEAgTGluZUJyZWFrZXI6OlJlc3VsdCBMaW5l QnJlYWtlcjo6c2hvdWxkV3JhcElubGluZUNvbnRlbnQoY29uc3QgUnVuTGlzdCYgY2FuZGlkYXQK IHsKICAgICBhdXRvIGNhbmRpZGF0ZUNvbnRlbnQgPSBDb250aW5vdXNDb250ZW50IHsgY2FuZGlk YXRlUnVucyB9OwogICAgIEFTU0VSVCghY2FuZGlkYXRlQ29udGVudC5pc0VtcHR5KCkpOworICAg IGF1dG8gcmVzdWx0ID0gdHJ5V3JhcHBpbmdJbmxpbmVDb250ZW50KGNhbmRpZGF0ZUNvbnRlbnQs IGxpbmVTdGF0dXMpOworICAgIC8vIElmIHRoaXMgaXMgbm90IHRoZSBlbmQgb2YgdGhlIGxpbmUs IGhvbGQgb24gdG8gdGhlIGxhc3QgZWxpZ2libGUgbGluZSB3cmFwIG9wcG9ydHVuaXR5IHNvIHRo YXQgd2UgY291bGQgcmV2ZXJ0IGJhY2sKKyAgICAvLyB0byB0aGlzIHBvc2l0aW9uIGlmIG5vIG90 aGVyIGxpbmUgYnJlYWtpbmcgb3Bwb3J0dW5pdHkgZXhpc3RzIGluIHRoaXMgY29udGVudC4KKyAg ICBpZiAocmVzdWx0LmlzRW5kT2ZMaW5lID09IElzRW5kT2ZMaW5lOjpZZXMpCisgICAgICAgIHJl dHVybiByZXN1bHQ7CisgICAgaWYgKGF1dG8gbGFzdExpbmVXcmFwT3Bwb3J0dW5pdHlJbmRleCA9 IGNhbmRpZGF0ZUNvbnRlbnQubGFzdFdyYXBPcHBvcnR1bml0eUluZGV4KCkpIHsKKyAgICAgICAg YXV0byBpc0VsaWdpYmxlTGluZVdyYXBPcHBvcnR1bml0eSA9IFsmXSAoYXV0byYgY2FuZGlkYXRl SXRlbSkgeworICAgICAgICAgICAgLy8gSnVzdCBjaGVjayBmb3IgbGVhZGluZyBjb2xsYXBzaWJs ZSB3aGl0ZXNwYWNlIGZvciBub3cuCisgICAgICAgICAgICBpZiAoIWxpbmVTdGF0dXMubGluZUlz RW1wdHkgfHwgIWNhbmRpZGF0ZUl0ZW0uaXNUZXh0KCkgfHwgIWRvd25jYXN0PElubGluZVRleHRJ dGVtPihjYW5kaWRhdGVJdGVtKS5pc1doaXRlc3BhY2UoKSkKKyAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBzaG91bGRLZWVwQmVnaW5uaW5nT2ZMaW5lV2hp dGVzcGFjZShjYW5kaWRhdGVJdGVtLnN0eWxlKCkpOworICAgICAgICB9OworICAgICAgICBhdXRv JiBpbmxpbmVJdGVtID0gY2FuZGlkYXRlQ29udGVudC5ydW5zKClbKmxhc3RMaW5lV3JhcE9wcG9y dHVuaXR5SW5kZXhdLmlubGluZUl0ZW07CisgICAgICAgIGlmIChpc0VsaWdpYmxlTGluZVdyYXBP cHBvcnR1bml0eShpbmxpbmVJdGVtKSkKKyAgICAgICAgICAgIG1fbGFzdFdyYXBPcHBvcnR1bml0 eSA9ICZpbmxpbmVJdGVtOworICAgIH0KKyAgICByZXR1cm4gcmVzdWx0OworfQorCitMaW5lQnJl YWtlcjo6UmVzdWx0IExpbmVCcmVha2VyOjp0cnlXcmFwcGluZ0lubGluZUNvbnRlbnQoY29uc3Qg Q29udGlub3VzQ29udGVudCYgY2FuZGlkYXRlQ29udGVudCwgY29uc3QgTGluZVN0YXR1cyYgbGlu ZVN0YXR1cykgY29uc3QKK3sKICAgICBpZiAoY2FuZGlkYXRlQ29udGVudC53aWR0aCgpIDw9IGxp bmVTdGF0dXMuYXZhaWxhYmxlV2lkdGgpCiAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9u OjpLZWVwLCBJc0VuZE9mTGluZTo6Tm8sIHsgfSB9OwogICAgIGlmIChjYW5kaWRhdGVDb250ZW50 Lmhhc1RyYWlsaW5nQ29sbGFwc2libGVDb250ZW50KCkpIHsKQEAgLTExMyw4ICsxNDAsOCBAQCBM aW5lQnJlYWtlcjo6UmVzdWx0IExpbmVCcmVha2VyOjpzaG91bGRXcmFwSW5saW5lQ29udGVudChj b25zdCBSdW5MaXN0JiBjYW5kaWRhdAogICAgIH0KICAgICAvLyBJZiB3ZSBhcmUgbm90IGFsbG93 ZWQgdG8gYnJlYWsgdGhpcyBjb250ZW50LCB3ZSBzdGlsbCBuZWVkIHRvIGRlY2lkZSB3aGV0aGVy IGtlZXAgaXQgb3IgcHVzaCBpdCB0byB0aGUgbmV4dCBsaW5lLgogICAgIGF1dG8gaXNXcmFwcGlu Z0FsbG93ZWQgPSBpc0NvbnRlbnRXcmFwcGluZ0FsbG93ZWQoY2FuZGlkYXRlQ29udGVudCk7Ci0g ICAgYXV0byBjb250ZW50T3ZlcmZsb3dzID0gbGluZVN0YXR1cy5saW5lSXNFbXB0eSB8fCAhaXNX cmFwcGluZ0FsbG93ZWQ7Ci0gICAgaWYgKCFjb250ZW50T3ZlcmZsb3dzKQorICAgIGF1dG8gbGV0 Q29udGVudE92ZXJmbG93ID0gbGluZVN0YXR1cy5saW5lSXNFbXB0eSB8fCAhaXNXcmFwcGluZ0Fs bG93ZWQ7CisgICAgaWYgKCFsZXRDb250ZW50T3ZlcmZsb3cpCiAgICAgICAgIHJldHVybiB7IFJl c3VsdDo6QWN0aW9uOjpQdXNoLCBJc0VuZE9mTGluZTo6WWVzLCB7IH0gfTsKICAgICByZXR1cm4g eyBSZXN1bHQ6OkFjdGlvbjo6S2VlcCwgaXNXcmFwcGluZ0FsbG93ZWQgPyBJc0VuZE9mTGluZTo6 WWVzIDogSXNFbmRPZkxpbmU6Ok5vLCB7IH0gfTsKIH0KQEAgLTE0OCw3ICsxNzUsNyBAQCBPcHRp b25hbDxMaW5lQnJlYWtlcjo6V3JhcHBlZFRleHRDb250ZW50PiBMaW5lQnJlYWtlcjo6d3JhcFRl eHRDb250ZW50KGNvbnN0IFJ1bgogICAgICAgICAgICAgLy8gPHNwYW4gc3R5bGU9IndvcmQtYnJl YWs6IGtlZXAtYWxsIj50ZXh0Y29udGVudHdpdGhub2JyZWFrPC9zcGFuPjxzcGFuPnRleHRjb250 ZW50d2l0aHllc2JyZWFrPC9zcGFuPgogICAgICAgICAgICAgLy8gV2hlbiB0aGUgZmlyc3Qgc3Bh biBjb21wdXRlcyBsb25nZXIgdGhhbiB0aGUgYXZhaWxhYmxlIHNwYWNlLCBieSB0aGUgdGltZSB3 ZSBnZXQgdG8gdGhlIHNlY29uZCBzcGFuLCB0aGUgYWRqdXN0ZWQgYXZhaWxhYmxlIHNwYWNlIGJl Y29tZXMgbmVnYXRpdmUuCiAgICAgICAgICAgICBhdXRvIGFkanVzdGVkQXZhaWxhYmxlV2lkdGgg PSBzdGQ6Om1heDxJbmxpbmVMYXlvdXRVbml0PigwLCBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRo IC0gYWNjdW11bGF0ZWRSdW5XaWR0aCk7Ci0gICAgICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJ1 biA9IHRyeUJyZWFraW5nVGV4dFJ1bihydW4sIGFkanVzdGVkQXZhaWxhYmxlV2lkdGgsIGxpbmVT dGF0dXMubGluZUlzRW1wdHkpKSB7CisgICAgICAgICAgICBpZiAoYXV0byBwYXJ0aWFsUnVuID0g dHJ5QnJlYWtpbmdUZXh0UnVuKHJ1biwgYWRqdXN0ZWRBdmFpbGFibGVXaWR0aCkpIHsKICAgICAg ICAgICAgICAgICAgaWYgKHBhcnRpYWxSdW4tPmxlbmd0aCkKICAgICAgICAgICAgICAgICAgICAg IHJldHVybiBXcmFwcGVkVGV4dENvbnRlbnQgeyBpbmRleCwgZmFsc2UsIHBhcnRpYWxSdW4gfTsK ICAgICAgICAgICAgICAgICAgLy8gV2hlbiB0aGUgY29udGVudCBpcyB3cmFwcGVkIGF0IHRoZSBy dW4gYm91bmRhcnksIHRoZSB0cmFpbGluZyBydW4gaXMgdGhlIHByZXZpb3VzIHJ1bi4KQEAgLTE2 OSw3ICsxOTYsNyBAQCBPcHRpb25hbDxMaW5lQnJlYWtlcjo6V3JhcHBlZFRleHRDb250ZW50PiBM aW5lQnJlYWtlcjo6d3JhcFRleHRDb250ZW50KGNvbnN0IFJ1bgogICAgICAgICBhdXRvJiBydW4g PSBydW5zW2luZGV4XTsKICAgICAgICAgaWYgKGlzQ29udGVudFNwbGl0QWxsb3dlZChydW4pKSB7 CiAgICAgICAgICAgICBBU1NFUlQocnVuLmlubGluZUl0ZW0uaXNUZXh0KCkpOwotICAgICAgICAg ICAgaWYgKGF1dG8gcGFydGlhbFJ1biA9IHRyeUJyZWFraW5nVGV4dFJ1bihydW4sIG1heElubGlu ZUxheW91dFVuaXQoKSwgbGluZVN0YXR1cy5saW5lSXNFbXB0eSkpIHsKKyAgICAgICAgICAgIGlm IChhdXRvIHBhcnRpYWxSdW4gPSB0cnlCcmVha2luZ1RleHRSdW4ocnVuLCBtYXhJbmxpbmVMYXlv dXRVbml0KCkpKSB7CiAgICAgICAgICAgICAgICAgIC8vIFdlIGtub3cgdGhpcyBydW4gZml0cywg c28gaWYgd3JhcHBpbmcgaXMgYWxsb3dlZCBvbiB0aGUgcnVuLCBpdCBzaG91bGQgcmV0dXJuIGEg bm9uLWVtcHR5IGxlZnQtc2lkZS4KICAgICAgICAgICAgICAgICAgQVNTRVJUKHBhcnRpYWxSdW4t Pmxlbmd0aCk7CiAgICAgICAgICAgICAgICAgIHJldHVybiBXcmFwcGVkVGV4dENvbnRlbnQgeyBp bmRleCwgZmFsc2UsIHBhcnRpYWxSdW4gfTsKQEAgLTE4MCw3ICsyMDcsNyBAQCBPcHRpb25hbDxM aW5lQnJlYWtlcjo6V3JhcHBlZFRleHRDb250ZW50PiBMaW5lQnJlYWtlcjo6d3JhcFRleHRDb250 ZW50KGNvbnN0IFJ1bgogICAgIHJldHVybiB7IH07CiB9CiAKLUxpbmVCcmVha2VyOjpXb3JkQnJl YWtSdWxlIExpbmVCcmVha2VyOjp3b3JkQnJlYWtCZWhhdmlvcihjb25zdCBSZW5kZXJTdHlsZSYg c3R5bGUsIGJvb2wgbGluZUlzRW1wdHkpIGNvbnN0CitMaW5lQnJlYWtlcjo6V29yZEJyZWFrUnVs ZSBMaW5lQnJlYWtlcjo6d29yZEJyZWFrQmVoYXZpb3IoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxl KSBjb25zdAogewogICAgIC8vIERpc3JlZ2FyZCBhbnkgcHJvaGliaXRpb24gYWdhaW5zdCBsaW5l IGJyZWFrcyBtYW5kYXRlZCBieSB0aGUgd29yZC1icmVhayBwcm9wZXJ0eS4KICAgICAvLyBUaGUg ZGlmZmVyZW50IHdyYXBwaW5nIG9wcG9ydHVuaXRpZXMgbXVzdCBub3QgYmUgcHJpb3JpdGl6ZWQu IEh5cGhlbmF0aW9uIGlzIG5vdCBhcHBsaWVkLgpAQCAtMTk0LDEwICsyMjEsMTAgQEAgTGluZUJy ZWFrZXI6OldvcmRCcmVha1J1bGUgTGluZUJyZWFrZXI6OndvcmRCcmVha0JlaGF2aW9yKGNvbnN0 IFJlbmRlclN0eWxlJiBzdHkKICAgICAgICAgcmV0dXJuIFdvcmRCcmVha1J1bGU6Ok5vQnJlYWs7 CiAgICAgLy8gRm9yIGNvbXBhdGliaWxpdHkgd2l0aCBsZWdhY3kgY29udGVudCwgdGhlIHdvcmQt YnJlYWsgcHJvcGVydHkgYWxzbyBzdXBwb3J0cyBhIGRlcHJlY2F0ZWQgYnJlYWstd29yZCBrZXl3 b3JkLgogICAgIC8vIFdoZW4gc3BlY2lmaWVkLCB0aGlzIGhhcyB0aGUgc2FtZSBlZmZlY3QgYXMg d29yZC1icmVhazogbm9ybWFsIGFuZCBvdmVyZmxvdy13cmFwOiBhbnl3aGVyZSwgcmVnYXJkbGVz cyBvZiB0aGUgYWN0dWFsIHZhbHVlIG9mIHRoZSBvdmVyZmxvdy13cmFwIHByb3BlcnR5LgotICAg IGlmIChzdHlsZS53b3JkQnJlYWsoKSA9PSBXb3JkQnJlYWs6OkJyZWFrV29yZCAmJiBsaW5lSXNF bXB0eSkKKyAgICBpZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpCcmVha1dvcmQg JiYgIW1fbGFzdFdyYXBPcHBvcnR1bml0eSkKICAgICAgICAgcmV0dXJuIFdvcmRCcmVha1J1bGU6 OkF0QXJiaXRyYXJ5UG9zaXRpb247CiAgICAgLy8gT3ZlcmZsb3dXcmFwOjpCcmVhazogQW4gb3Ro ZXJ3aXNlIHVuYnJlYWthYmxlIHNlcXVlbmNlIG9mIGNoYXJhY3RlcnMgbWF5IGJlIGJyb2tlbiBh dCBhbiBhcmJpdHJhcnkgcG9pbnQgaWYgdGhlcmUgYXJlIG5vIG90aGVyd2lzZS1hY2NlcHRhYmxl IGJyZWFrIHBvaW50cyBpbiB0aGUgbGluZS4KLSAgICBpZiAoc3R5bGUub3ZlcmZsb3dXcmFwKCkg PT0gT3ZlcmZsb3dXcmFwOjpCcmVhayAmJiBsaW5lSXNFbXB0eSkKKyAgICBpZiAoc3R5bGUub3Zl cmZsb3dXcmFwKCkgPT0gT3ZlcmZsb3dXcmFwOjpCcmVhayAmJiAhbV9sYXN0V3JhcE9wcG9ydHVu aXR5KQogICAgICAgICByZXR1cm4gV29yZEJyZWFrUnVsZTo6QXRBcmJpdHJhcnlQb3NpdGlvbjsK IAogICAgIGlmICghbl9oeXBoZW5hdGlvbklzRGlzYWJsZWQgJiYgc3R5bGUuaHlwaGVucygpID09 IEh5cGhlbnM6OkF1dG8gJiYgY2FuSHlwaGVuYXRlKHN0eWxlLmxvY2FsZSgpKSkKQEAgLTIwNiwx NCArMjMzLDE0IEBAIExpbmVCcmVha2VyOjpXb3JkQnJlYWtSdWxlIExpbmVCcmVha2VyOjp3b3Jk QnJlYWtCZWhhdmlvcihjb25zdCBSZW5kZXJTdHlsZSYgc3R5CiAgICAgcmV0dXJuIFdvcmRCcmVh a1J1bGU6Ok5vQnJlYWs7CiB9CiAKLU9wdGlvbmFsPExpbmVCcmVha2VyOjpQYXJ0aWFsUnVuPiBM aW5lQnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0IFJ1biYgb3ZlcmZsb3dSdW4sIElu bGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIGJvb2wgbGluZUlzRW1wdHkpIGNvbnN0CitP cHRpb25hbDxMaW5lQnJlYWtlcjo6UGFydGlhbFJ1bj4gTGluZUJyZWFrZXI6OnRyeUJyZWFraW5n VGV4dFJ1bihjb25zdCBSdW4mIG92ZXJmbG93UnVuLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJs ZVdpZHRoKSBjb25zdAogewogICAgIEFTU0VSVChvdmVyZmxvd1J1bi5pbmxpbmVJdGVtLmlzVGV4 dCgpKTsKICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVt PihvdmVyZmxvd1J1bi5pbmxpbmVJdGVtKTsKICAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRleHRJ dGVtLnN0eWxlKCk7CiAgICAgYXV0byBmaW5kTGFzdEJyZWFrYWJsZVBvc2l0aW9uID0gYXZhaWxh YmxlV2lkdGggPT0gbWF4SW5saW5lTGF5b3V0VW5pdCgpOwogCi0gICAgYXV0byBicmVha1J1bGUg PSB3b3JkQnJlYWtCZWhhdmlvcihzdHlsZSwgbGluZUlzRW1wdHkpOworICAgIGF1dG8gYnJlYWtS dWxlID0gd29yZEJyZWFrQmVoYXZpb3Ioc3R5bGUpOwogICAgIGlmIChicmVha1J1bGUgPT0gV29y ZEJyZWFrUnVsZTo6QXRBcmJpdHJhcnlQb3NpdGlvbikgewogICAgICAgICBpZiAoZmluZExhc3RC cmVha2FibGVQb3NpdGlvbikgewogICAgICAgICAgICAgLy8gV2hlbiB0aGUgcnVuIGNhbiBiZSBz cGxpdCBhdCBhcmJpdHJhcnkgcG9zaXRpb24sCkBAIC00OTcsMTMgKzUyNCwyNCBAQCBib29sIExp bmVCcmVha2VyOjpDb250aW5vdXNDb250ZW50OjpoYXNOb25Db250ZW50UnVuc09ubHkoKSBjb25z dAogICAgIHJldHVybiB0cnVlOwogfQogCitPcHRpb25hbDxzaXplX3Q+IExpbmVCcmVha2VyOjpD b250aW5vdXNDb250ZW50OjpsYXN0V3JhcE9wcG9ydHVuaXR5SW5kZXgoKSBjb25zdAoreworICAg IC8vIDxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTogcHJlIj5ub193cmFwPC9zcGFuPjxzcGFuPnll c193cmFwPC9zcGFuPjxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTogcHJlIj5ub193cmFwPC9zcGFu Pi4KKyAgICAvLyBbY29udGFpbmVyIHN0YXJ0XVtub193cmFwXVtjb250YWluZXIgZW5kXVtjb250 YWluZXIgc3RhcnRdW3llc193cmFwXVtjb250YWluZXIgZW5kXVtjb250YWluZXIgc3RhcnRdW25v X3dyYXBdW2NvbnRhaW5lciBlbmRdCisgICAgLy8gUmV0dXJuICM1IGFzIHRoZSBpbmRleCB3aGVy ZSB0aGlzIGNvbnRlbnQgY2FuIHdyYXAgYXQgbGFzdC4KKyAgICBmb3IgKGF1dG8gaW5kZXggPSBt X3J1bnMuc2l6ZSgpOyBpbmRleC0tOykgeworICAgICAgICBpZiAoaXNXcmFwcGluZ0FsbG93ZWQo bV9ydW5zW2luZGV4XS5pbmxpbmVJdGVtLnN0eWxlKCkpKQorICAgICAgICAgICAgcmV0dXJuIGlu ZGV4OworICAgIH0KKyAgICByZXR1cm4geyB9OworfQorCiB2b2lkIExpbmVCcmVha2VyOjpDb250 aW5vdXNDb250ZW50OjpUcmFpbGluZ0NvbGxhcHNpYmxlQ29udGVudDo6cmVzZXQoKQogewogICAg IGlzRnVsbHlDb2xsYXBzaWJsZSA9IGZhbHNlOwogICAgIHdpZHRoID0gMF9sdTsKIH0KIAotCiB9 CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oCmluZGV4IDZiNTdmZDJmOTE3MGQ4ZDIyNzBi OTQwZDI3M2M0MWUxYzMyNmI4N2IuLjI2YWYzNjNhYWQ2ZjZiNTA4MDYyNzgxYjQwZDJlMjFiZDVi ODE1OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCcmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaApAQCAtMTA0LDYgKzEwNCw3IEBAIHByaXZhdGU6 CiAKICAgICAgICAgYm9vbCBoYXNUcmFpbGluZ0NvbGxhcHNpYmxlQ29udGVudCgpIGNvbnN0IHsg cmV0dXJuICEhbV90cmFpbGluZ0NvbGxhcHNpYmxlQ29udGVudC53aWR0aDsgfQogICAgICAgICBi b29sIGlzVHJhaWxpbmdDb250ZW50RnVsbHlDb2xsYXBzaWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1f dHJhaWxpbmdDb2xsYXBzaWJsZUNvbnRlbnQuaXNGdWxseUNvbGxhcHNpYmxlOyB9CisgICAgICAg IE9wdGlvbmFsPHNpemVfdD4gbGFzdFdyYXBPcHBvcnR1bml0eUluZGV4KCkgY29uc3Q7CiAKICAg ICAgICAgT3B0aW9uYWw8dW5zaWduZWQ+IGZpcnN0VGV4dFJ1bkluZGV4KCkgY29uc3Q7CiAgICAg ICAgIE9wdGlvbmFsPHVuc2lnbmVkPiBsYXN0Q29udGVudFJ1bkluZGV4KCkgY29uc3Q7CkBAIC0x MjYsMTggKzEyNywyMCBAQCBwcml2YXRlOgogICAgICAgICBPcHRpb25hbDxQYXJ0aWFsUnVuPiBw YXJ0aWFsVHJhaWxpbmdSdW47CiAgICAgfTsKICAgICBPcHRpb25hbDxXcmFwcGVkVGV4dENvbnRl bnQ+IHdyYXBUZXh0Q29udGVudChjb25zdCBSdW5MaXN0JiwgY29uc3QgTGluZVN0YXR1cyYpIGNv bnN0OwotICAgIE9wdGlvbmFsPFBhcnRpYWxSdW4+IHRyeUJyZWFraW5nVGV4dFJ1bihjb25zdCBS dW4mIG92ZXJmbG93UnVuLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBib29sIGxp bmVJc0VtcHR5KSBjb25zdDsKKyAgICBSZXN1bHQgdHJ5V3JhcHBpbmdJbmxpbmVDb250ZW50KGNv bnN0IENvbnRpbm91c0NvbnRlbnQmLCBjb25zdCBMaW5lU3RhdHVzJikgY29uc3Q7CisgICAgT3B0 aW9uYWw8UGFydGlhbFJ1bj4gdHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0IFJ1biYgb3ZlcmZsb3dS dW4sIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpIGNvbnN0OwogCiAgICAgZW51bSBj bGFzcyBXb3JkQnJlYWtSdWxlIHsKICAgICAgICAgTm9CcmVhaywKICAgICAgICAgQXRBcmJpdHJh cnlQb3NpdGlvbiwKICAgICAgICAgT25seUh5cGhlbmF0aW9uQWxsb3dlZAogICAgIH07Ci0gICAg V29yZEJyZWFrUnVsZSB3b3JkQnJlYWtCZWhhdmlvcihjb25zdCBSZW5kZXJTdHlsZSYsIGJvb2wg bGluZUlzRW1wdHkpIGNvbnN0OworICAgIFdvcmRCcmVha1J1bGUgd29yZEJyZWFrQmVoYXZpb3Io Y29uc3QgUmVuZGVyU3R5bGUmKSBjb25zdDsKICAgICBib29sIHNob3VsZEtlZXBFbmRPZkxpbmVX aGl0ZXNwYWNlKGNvbnN0IENvbnRpbm91c0NvbnRlbnQmKSBjb25zdDsKICAgICBib29sIGlzQ29u dGVudFdyYXBwaW5nQWxsb3dlZChjb25zdCBDb250aW5vdXNDb250ZW50JikgY29uc3Q7CiAKICAg ICBib29sIG5faHlwaGVuYXRpb25Jc0Rpc2FibGVkIHsgZmFsc2UgfTsKKyAgICBjb25zdCBJbmxp bmVJdGVtKiBtX2xhc3RXcmFwT3Bwb3J0dW5pdHkgeyBudWxscHRyIH07CiB9OwogCiBpbmxpbmUg TGluZUJyZWFrZXI6OlJ1bjo6UnVuKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGlu ZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQo=