210007 2020-04-04 10:28:28 -0700 Remove LockHistory parameter from loadWithNavigationAction 2020-04-04 22:10:15 -0700 1 1 1 Unclassified WebKit New Bugs Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez darin ews-watchlist japhet webkit-bug-importer oldest_to_newest 1637705 0 rbuis 2020-04-04 10:28:28 -0700 Remove LockHistory parameter from loadWithNavigationAction since NavigationAction has a member for this. Where needed explicitly set the LockHistory on the actions. 1637706 1 395456 rbuis 2020-04-04 10:30:18 -0700 Created attachment 395456 Patch 1637773 2 395456 darin 2020-04-04 16:27:14 -0700 Comment on attachment 395456 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395456&action=review > Source/WebCore/loader/FrameLoader.cpp:1424 > - loadWithNavigationAction(request, WTFMove(action), lockHistory, newLoadType, WTFMove(formState), allowNavigationToInvalidURL, frameLoadRequest.downloadAttribute(), [this, isRedirect, sameURL, newLoadType, protectedFrame = makeRef(m_frame), completionHandler = completionHandlerCaller.release()] () mutable { > + loadWithNavigationAction(request, WTFMove(action), newLoadType, WTFMove(formState), allowNavigationToInvalidURL, frameLoadRequest.downloadAttribute(), [this, isRedirect, sameURL, newLoadType, protectedFrame = makeRef(m_frame), completionHandler = completionHandlerCaller.release()] () mutable { How did you determine that it’s not necessary to call setLockHistory on the action here, the way you did in FrameLoader::loadWithNavigationAction? 1637774 3 395456 darin 2020-04-04 16:27:44 -0700 Comment on attachment 395456 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395456&action=review >> Source/WebCore/loader/FrameLoader.cpp:1424 >> + loadWithNavigationAction(request, WTFMove(action), newLoadType, WTFMove(formState), allowNavigationToInvalidURL, frameLoadRequest.downloadAttribute(), [this, isRedirect, sameURL, newLoadType, protectedFrame = makeRef(m_frame), completionHandler = completionHandlerCaller.release()] () mutable { > > How did you determine that it’s not necessary to call setLockHistory on the action here, the way you did in FrameLoader::loadWithNavigationAction? Oh, I see now. It’s already done above. 1637812 4 ews-feeder 2020-04-04 22:09:48 -0700 Committed r259544: <https://trac.webkit.org/changeset/259544> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395456. 1637813 5 webkit-bug-importer 2020-04-04 22:10:15 -0700 <rdar://problem/61308935> 395456 2020-04-04 10:30:18 -0700 2020-04-04 22:09:48 -0700 Patch bug-210007-20200404193017.patch text/plain 8510 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTIzZDdlMTcwNmNmMWY5 ZmYxMDZkMmEyOTRhZjQ3MTE5Yjk5ZjUzOS4uZTNhYTBkYTljNDM1YzdhMTdkYjk4ODUzMGYxODJk NTNkMGEzNmQwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA0LTA0ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIExvY2tIaXN0b3J5IHBh cmFtZXRlciBmcm9tIGxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMDA3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIExvY2tIaXN0b3J5IHBhcmFtZXRl ciBmcm9tIGxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbiBzaW5jZSBOYXZpZ2F0aW9uQWN0aW9uCisg ICAgICAgIGhhcyBhIG1lbWJlciBmb3IgdGhpcy4gV2hlcmUgbmVlZGVkIGV4cGxpY2l0bHkgc2V0 IHRoZSBMb2NrSGlzdG9yeSBvbiB0aGUgYWN0aW9ucy4KKworICAgICAgICAqIGxvYWRlci9GcmFt ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFVSTCk6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFdpdGhOYXZpZ2F0aW9uQWN0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkUG9zdFJlcXVlc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbnRpbnVlTG9hZEFmdGVyTmV3V2luZG93UG9saWN5 KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkRGlmZmVyZW50RG9jdW1lbnRJ dGVtKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKwogMjAyMC0wNC0wMyAgeW91 ZW5uIGZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGluaXRpYWwgc3Vw cG9ydCBmb3IgV2ViUlRDIEhFVkMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmlu ZGV4IGM5NGM5MTQzMmQ2N2NlMjYzMDRhYTc0OGNhODcxMjhlOGZjNDViYmYuLmUyODk2MmY2ZmZh ZTYyZmFmZTliMGI2Njc0OGNiY2RiYjcyOGM1MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcApAQCAtMTQyMSw3ICsxNDIxLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVS TChGcmFtZUxvYWRSZXF1ZXN0JiYgZnJhbWVMb2FkUmVxdWVzdCwgY29uc3QgU3RyaW5nJiByZWYK ICAgICBpZiAoaXNTeXN0ZW1QcmV2aWV3KQogICAgICAgICByZXF1ZXN0LnNldFN5c3RlbVByZXZp ZXdJbmZvKGZyYW1lTG9hZFJlcXVlc3Quc3lzdGVtUHJldmlld0luZm8oKSk7CiAjZW5kaWYKLSAg ICBsb2FkV2l0aE5hdmlnYXRpb25BY3Rpb24ocmVxdWVzdCwgV1RGTW92ZShhY3Rpb24pLCBsb2Nr SGlzdG9yeSwgbmV3TG9hZFR5cGUsIFdURk1vdmUoZm9ybVN0YXRlKSwgYWxsb3dOYXZpZ2F0aW9u VG9JbnZhbGlkVVJMLCBmcmFtZUxvYWRSZXF1ZXN0LmRvd25sb2FkQXR0cmlidXRlKCksIFt0aGlz LCBpc1JlZGlyZWN0LCBzYW1lVVJMLCBuZXdMb2FkVHlwZSwgcHJvdGVjdGVkRnJhbWUgPSBtYWtl UmVmKG1fZnJhbWUpLCBjb21wbGV0aW9uSGFuZGxlciA9IGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVy LnJlbGVhc2UoKV0gKCkgbXV0YWJsZSB7CisgICAgbG9hZFdpdGhOYXZpZ2F0aW9uQWN0aW9uKHJl cXVlc3QsIFdURk1vdmUoYWN0aW9uKSwgbmV3TG9hZFR5cGUsIFdURk1vdmUoZm9ybVN0YXRlKSwg YWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBmcmFtZUxvYWRSZXF1ZXN0LmRvd25sb2FkQXR0 cmlidXRlKCksIFt0aGlzLCBpc1JlZGlyZWN0LCBzYW1lVVJMLCBuZXdMb2FkVHlwZSwgcHJvdGVj dGVkRnJhbWUgPSBtYWtlUmVmKG1fZnJhbWUpLCBjb21wbGV0aW9uSGFuZGxlciA9IGNvbXBsZXRp b25IYW5kbGVyQ2FsbGVyLnJlbGVhc2UoKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgIGlmIChpc1Jl ZGlyZWN0KSB7CiAgICAgICAgICAgICBtX3F1aWNrUmVkaXJlY3RDb21pbmcgPSBmYWxzZTsKICAg ICAgICAgICAgIGlmIChtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIpCkBAIC0xNDk4LDcgKzE0 OTgsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkKEZyYW1lTG9hZFJlcXVlc3QmJiByZXF1ZXN0 KQogICAgIGxvYWQobG9hZGVyLmdldCgpKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFdp dGhOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgTmF2aWdh dGlvbkFjdGlvbiYmIGFjdGlvbiwgTG9ja0hpc3RvcnkgbG9ja0hpc3RvcnksIEZyYW1lTG9hZFR5 cGUgdHlwZSwgUmVmUHRyPEZvcm1TdGF0ZT4mJiBmb3JtU3RhdGUsIEFsbG93TmF2aWdhdGlvblRv SW52YWxpZFVSTCBhbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIGNvbnN0IFN0cmluZyYgZG93 bmxvYWRBdHRyaWJ1dGUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKK3ZvaWQgRnJhbWVMb2FkZXI6OmxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbihjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIE5hdmlnYXRpb25BY3Rpb24mJiBhY3Rpb24sIEZyYW1l TG9hZFR5cGUgdHlwZSwgUmVmUHRyPEZvcm1TdGF0ZT4mJiBmb3JtU3RhdGUsIEFsbG93TmF2aWdh dGlvblRvSW52YWxpZFVSTCBhbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIGNvbnN0IFN0cmlu ZyYgZG93bmxvYWRBdHRyaWJ1dGUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0 aW9uSGFuZGxlcikKIHsKICAgICBGUkFNRUxPQURFUl9SRUxFQVNFX0xPR19JRl9BTExPV0VEKFJl c291cmNlTG9hZGluZywgImxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbjogZnJhbWUgbG9hZCBzdGFy dGVkIik7CiAKQEAgLTE1MDYsNyArMTUwNiw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRXaXRo TmF2aWdhdGlvbkFjdGlvbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIE5hdmlnCiAg ICAgbG9hZGVyLT5zZXREb3dubG9hZEF0dHJpYnV0ZShkb3dubG9hZEF0dHJpYnV0ZSk7CiAgICAg YXBwbHlTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9OZXdEb2N1bWVudExvYWRlcihtX2Zy YW1lLCBsb2FkZXIsIGFjdGlvbi5pbml0aWF0ZWRCeU1haW5GcmFtZSgpLCBhY3Rpb24uc2hvdWxk T3BlbkV4dGVybmFsVVJMc1BvbGljeSgpKTsKIAotICAgIGlmIChsb2NrSGlzdG9yeSA9PSBMb2Nr SGlzdG9yeTo6WWVzICYmIG1fZG9jdW1lbnRMb2FkZXIpCisgICAgaWYgKGFjdGlvbi5sb2NrSGlz dG9yeSgpID09IExvY2tIaXN0b3J5OjpZZXMgJiYgbV9kb2N1bWVudExvYWRlcikKICAgICAgICAg bG9hZGVyLT5zZXRDbGllbnRSZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkobV9kb2N1bWVudExvYWRl ci0+ZGlkQ3JlYXRlR2xvYmFsSGlzdG9yeUVudHJ5KCkgPyBtX2RvY3VtZW50TG9hZGVyLT51cmxG b3JIaXN0b3J5KCkuc3RyaW5nKCkgOiBtX2RvY3VtZW50TG9hZGVyLT5jbGllbnRSZWRpcmVjdFNv dXJjZUZvckhpc3RvcnkoKSk7CiAKICAgICBsb2FkZXItPnNldFRyaWdnZXJpbmdBY3Rpb24oV1RG TW92ZShhY3Rpb24pKTsKQEAgLTMwMjIsMTEgKzMwMjIsMTIgQEAgdm9pZCBGcmFtZUxvYWRlcjo6 bG9hZFBvc3RSZXF1ZXN0KEZyYW1lTG9hZFJlcXVlc3QmJiByZXF1ZXN0LCBjb25zdCBTdHJpbmcm IHJlZmUKICAgICAgICAgZG9jdW1lbnQtPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT51cGdyYWRl SW5zZWN1cmVSZXF1ZXN0SWZOZWVkZWQod29ya2luZ1Jlc291cmNlUmVxdWVzdCwgQ29udGVudFNl Y3VyaXR5UG9saWN5OjpJbnNlY3VyZVJlcXVlc3RUeXBlOjpMb2FkKTsKIAogICAgIE5hdmlnYXRp b25BY3Rpb24gYWN0aW9uIHsgcmVxdWVzdC5yZXF1ZXN0ZXIoKSwgd29ya2luZ1Jlc291cmNlUmVx dWVzdCwgcmVxdWVzdC5pbml0aWF0ZWRCeU1haW5GcmFtZSgpLCBsb2FkVHlwZSwgdHJ1ZSwgZXZl bnQsIHJlcXVlc3Quc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSgpLCByZXF1ZXN0LmRvd25s b2FkQXR0cmlidXRlKCkgfTsKKyAgICBhY3Rpb24uc2V0TG9ja0hpc3RvcnkobG9ja0hpc3Rvcnkp OwogCiAgICAgaWYgKCFmcmFtZU5hbWUuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIFRoZSBzZWFy Y2ggZm9yIGEgdGFyZ2V0IGZyYW1lIGlzIGRvbmUgZWFybGllciBpbiB0aGUgY2FzZSBvZiBmb3Jt IHN1Ym1pc3Npb24uCiAgICAgICAgIGlmIChhdXRvKiB0YXJnZXRGcmFtZSA9IGZvcm1TdGF0ZSA/ IG51bGxwdHIgOiBmaW5kRnJhbWVGb3JOYXZpZ2F0aW9uKGZyYW1lTmFtZSkpIHsKLSAgICAgICAg ICAgIHRhcmdldEZyYW1lLT5sb2FkZXIoKS5sb2FkV2l0aE5hdmlnYXRpb25BY3Rpb24od29ya2lu Z1Jlc291cmNlUmVxdWVzdCwgV1RGTW92ZShhY3Rpb24pLCBsb2NrSGlzdG9yeSwgbG9hZFR5cGUs IFdURk1vdmUoZm9ybVN0YXRlKSwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCB7IH0sIFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICAgICAgICAgIHRhcmdldEZyYW1lLT5sb2Fk ZXIoKS5sb2FkV2l0aE5hdmlnYXRpb25BY3Rpb24od29ya2luZ1Jlc291cmNlUmVxdWVzdCwgV1RG TW92ZShhY3Rpb24pLCBsb2FkVHlwZSwgV1RGTW92ZShmb3JtU3RhdGUpLCBhbGxvd05hdmlnYXRp b25Ub0ludmFsaWRVUkwsIHsgfSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTMwMzksNyArMzA0MCw3IEBAIHZvaWQgRnJh bWVMb2FkZXI6OmxvYWRQb3N0UmVxdWVzdChGcmFtZUxvYWRSZXF1ZXN0JiYgcmVxdWVzdCwgY29u c3QgU3RyaW5nJiByZWZlCiAKICAgICAvLyBtdXN0IGdyYWIgdGhpcyBub3csIHNpbmNlIHRoaXMg bG9hZCBtYXkgc3RvcCB0aGUgcHJldmlvdXMgbG9hZCBhbmQgY2xlYXIgdGhpcyBmbGFnCiAgICAg Ym9vbCBpc1JlZGlyZWN0ID0gbV9xdWlja1JlZGlyZWN0Q29taW5nOwotICAgIGxvYWRXaXRoTmF2 aWdhdGlvbkFjdGlvbih3b3JraW5nUmVzb3VyY2VSZXF1ZXN0LCBXVEZNb3ZlKGFjdGlvbiksIGxv Y2tIaXN0b3J5LCBsb2FkVHlwZSwgV1RGTW92ZShmb3JtU3RhdGUpLCBhbGxvd05hdmlnYXRpb25U b0ludmFsaWRVUkwsIHsgfSwgW3RoaXMsIGlzUmVkaXJlY3QsIHByb3RlY3RlZEZyYW1lID0gbWFr ZVJlZihtX2ZyYW1lKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0gKCkgbXV0YWJsZSB7CisgICAgbG9hZFdpdGhOYXZpZ2F0aW9uQWN0aW9uKHdvcmtpbmdS ZXNvdXJjZVJlcXVlc3QsIFdURk1vdmUoYWN0aW9uKSwgbG9hZFR5cGUsIFdURk1vdmUoZm9ybVN0 YXRlKSwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCB7IH0sIFt0aGlzLCBpc1JlZGlyZWN0 LCBwcm90ZWN0ZWRGcmFtZSA9IG1ha2VSZWYobV9mcmFtZSksIGNvbXBsZXRpb25IYW5kbGVyID0g V1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFibGUgewogICAgICAgICBpZiAoaXNS ZWRpcmVjdCkgewogICAgICAgICAgICAgbV9xdWlja1JlZGlyZWN0Q29taW5nID0gZmFsc2U7CiAg ICAgICAgICAgICBpZiAobV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKQpAQCAtMzUzMiw3ICsz NTMzLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29udGludWVMb2FkQWZ0ZXJOZXdXaW5kb3dQb2xp Y3koY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXMKICAgICB9CiAKICAgICBOYXZpZ2F0aW9u QWN0aW9uIG5ld0FjdGlvbiB7ICpmcmFtZS0+ZG9jdW1lbnQoKSwgcmVxdWVzdCwgSW5pdGlhdGVk QnlNYWluRnJhbWU6OlVua25vd24sIE5hdmlnYXRpb25UeXBlOjpPdGhlciwgYWN0aW9uLnNob3Vs ZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3koKSwgbnVsbHB0ciwgYWN0aW9uLmRvd25sb2FkQXR0cmli dXRlKCkgfTsKLSAgICBtYWluRnJhbWUtPmxvYWRlcigpLmxvYWRXaXRoTmF2aWdhdGlvbkFjdGlv bihyZXF1ZXN0LCBXVEZNb3ZlKG5ld0FjdGlvbiksIExvY2tIaXN0b3J5OjpObywgRnJhbWVMb2Fk VHlwZTo6U3RhbmRhcmQsIGZvcm1TdGF0ZSwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMKTsK KyAgICBtYWluRnJhbWUtPmxvYWRlcigpLmxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbihyZXF1ZXN0 LCBXVEZNb3ZlKG5ld0FjdGlvbiksIEZyYW1lTG9hZFR5cGU6OlN0YW5kYXJkLCBmb3JtU3RhdGUs IGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OnJl cXVlc3RGcm9tRGVsZWdhdGUoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCB1bnNpZ25lZCBsb25n JiBpZGVudGlmaWVyLCBSZXNvdXJjZUVycm9yJiBlcnJvcikKQEAgLTM4MjUsNyArMzgyNiw3IEBA IHZvaWQgRnJhbWVMb2FkZXI6OmxvYWREaWZmZXJlbnREb2N1bWVudEl0ZW0oSGlzdG9yeUl0ZW0m IGl0ZW0sIEhpc3RvcnlJdGVtKiBmcm9tCiAgICAgYWN0aW9uLnNldFRhcmdldEJhY2tGb3J3YXJk SXRlbShpdGVtKTsKICAgICBhY3Rpb24uc2V0U291cmNlQmFja0ZvcndhcmRJdGVtKGZyb21JdGVt KTsKIAotICAgIGxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbihyZXF1ZXN0LCBXVEZNb3ZlKGFjdGlv biksIExvY2tIaXN0b3J5OjpObywgbG9hZFR5cGUsIHsgfSwgQWxsb3dOYXZpZ2F0aW9uVG9JbnZh bGlkVVJMOjpZZXMpOworICAgIGxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbihyZXF1ZXN0LCBXVEZN b3ZlKGFjdGlvbiksIGxvYWRUeXBlLCB7IH0sIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6 WWVzKTsKIH0KIAogLy8gTG9hZHMgY29udGVudCBpbnRvIHRoaXMgZnJhbWUsIGFzIHNwZWNpZmll ZCBieSBoaXN0b3J5IGl0ZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggMGU2 NDhjYzZlYTcwMGU4NzhhMTRjOWJjMzdhNWYyMTc1MTcxZTM3OS4uMzc3ZGNhZmQyNjNiNGEyMjhh YjJiNDVlM2FlMjMzNGJkY2FiMDU4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgK QEAgLTM4OCw3ICszODgsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgbG9hZFdpdGhEb2N1bWVudExv YWRlcihEb2N1bWVudExvYWRlciosIEZyYW1lTG9hZFR5cGUsIFJlZlB0cjxGb3JtU3RhdGU+JiYs IEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2Fk LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgPSBbXSB7IH0pOyAvLyBDYWxscyBjb250aW51 ZUxvYWRBZnRlck5hdmlnYXRpb25Qb2xpY3kKICAgICB2b2lkIGxvYWQoRG9jdW1lbnRMb2FkZXIm KTsgLy8gQ2FsbHMgbG9hZFdpdGhEb2N1bWVudExvYWRlcgogCi0gICAgdm9pZCBsb2FkV2l0aE5h dmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgTmF2aWdhdGlvbkFjdGlvbiYm LCBMb2NrSGlzdG9yeSwgRnJhbWVMb2FkVHlwZSwgUmVmUHRyPEZvcm1TdGF0ZT4mJiwgQWxsb3dO YXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBjb25zdCBTdHJpbmcmIGRvd25sb2FkQXR0cmlidXRlID0g eyB9LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgPSBbXSB7IH0pOyAvLyBDYWxscyBsb2Fk V2l0aERvY3VtZW50TG9hZGVyCisgICAgdm9pZCBsb2FkV2l0aE5hdmlnYXRpb25BY3Rpb24oY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiwgTmF2aWdhdGlvbkFjdGlvbiYmLCBGcmFtZUxvYWRUeXBlLCBS ZWZQdHI8Rm9ybVN0YXRlPiYmLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIGNvbnN0IFN0 cmluZyYgZG93bmxvYWRBdHRyaWJ1dGUgPSB7IH0sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4m JiA9IFtdIHsgfSk7IC8vIENhbGxzIGxvYWRXaXRoRG9jdW1lbnRMb2FkZXIKIAogICAgIHZvaWQg bG9hZFBvc3RSZXF1ZXN0KEZyYW1lTG9hZFJlcXVlc3QmJiwgY29uc3QgU3RyaW5nJiByZWZlcnJl ciwgRnJhbWVMb2FkVHlwZSwgRXZlbnQqLCBSZWZQdHI8Rm9ybVN0YXRlPiYmLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgbG9hZFVSTChGcmFtZUxvYWRSZXF1ZXN0JiYs IGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIEZyYW1lTG9hZFR5cGUsIEV2ZW50KiwgUmVmUHRyPEZv cm1TdGF0ZT4mJiwgT3B0aW9uYWw8QWRDbGlja0F0dHJpYnV0aW9uPiYmLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKCk+JiYpOwo=