213701 2020-06-28 11:46:38 -0700 [iOS] Clean up visible position comparisons in WebPage::requestDocumentEditingContext() 2020-06-28 12:17:11 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates ggaren webkit-bug-importer oldest_to_newest 1666885 0 dbates 2020-06-28 11:46:38 -0700 Use std::min<VisiblePosition> and std::max<VisiblePosition> when the result needs to be copied instead of doing the comparison by hand to make the code a tiny bit more clear. Also, don't copy a VisiblePosition when doing the min/max in-place. 1666886 1 403003 dbates 2020-06-28 11:49:03 -0700 Created attachment 403003 Patch 1666887 2 403003 dbates 2020-06-28 11:51:08 -0700 Comment on attachment 403003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403003&action=review > Source/WebKit/ChangeLog:12 > + are unlikely to effect code generation. If they do, they make things a tiny bit more > + efficient. To be precise, only the latter makes things a tiny bit more efficient. 1666888 3 403003 ggaren 2020-06-28 12:07:24 -0700 Comment on attachment 403003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403003&action=review r=me > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:4183 > + startOfRangeOfInterestInSelection = std::max<VisiblePosition>(rangeOfInterestStart, selectionStart); > + endOfRangeOfInterestInSelection = std::min<VisiblePosition>(rangeOfInterestEnd, selectionEnd); No need to specify <VisiblePosition> when both arguments are <VisiblePosition>. 1666889 4 403003 dbates 2020-06-28 12:13:21 -0700 Comment on attachment 403003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403003&action=review Thanks for the review, Geoff! >> Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:4183 >> + endOfRangeOfInterestInSelection = std::min<VisiblePosition>(rangeOfInterestEnd, selectionEnd); > > No need to specify <VisiblePosition> when both arguments are <VisiblePosition>. OK. 1666890 5 403004 dbates 2020-06-28 12:15:06 -0700 Created attachment 403004 To Land 1666893 6 403004 dbates 2020-06-28 12:16:09 -0700 Comment on attachment 403004 To Land Clearing flags on attachment: 403004 Committed r263634: <https://trac.webkit.org/changeset/263634> 1666894 7 dbates 2020-06-28 12:16:11 -0700 All reviewed patches have been landed. Closing bug. 1666895 8 webkit-bug-importer 2020-06-28 12:17:11 -0700 <rdar://problem/64865522> 403003 2020-06-28 11:49:03 -0700 2020-06-28 12:15:05 -0700 Patch bug-213701-20200628114903.patch text/plain 3662 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMxNThhZDRkMGRjMmI0ZWVk ZTI2NWE5ZmE1OWFmZmI1NzM2YzZjZWYuLjcxNjc5ZTYzMDUzNzIyMDc3OWY1ZjljNDRjM2JiYmY3 ZWU2ZGRmOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDYtMjggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIENsZWFuIHVwIHZpc2li bGUgcG9zaXRpb24gY29tcGFyaXNvbnMgaW4gV2ViUGFnZTo6cmVxdWVzdERvY3VtZW50RWRpdGlu Z0NvbnRleHQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjEzNzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXNlIHN0ZDo6bWluPFZpc2libGVQb3NpdGlvbj4gYW5kIHN0ZDo6bWF4PFZpc2libGVQb3Np dGlvbj4gd2hlbiB0aGUgcmVzdWx0IG5lZWRzIHRvIGJlCisgICAgICAgIGNvcGllZCBpbnN0ZWFk IG9mIGRvaW5nIHRoZSBjb21wYXJpc29uIGJ5IGhhbmQgdG8gbWFrZSB0aGUgY29kZSBhIHRpbnkg Yml0IG1vcmUgY2xlYXIuCisgICAgICAgIEFsc28sIGRvbid0IGNvcHkgYSBWaXNpYmxlUG9zaXRp b24gd2hlbiBkb2luZyB0aGUgbWluL21heCBpbi1wbGFjZS4gQm90aCBvZiB0aGVzZSB0aGluZ3MK KyAgICAgICAgYXJlIHVubGlrZWx5IHRvIGVmZmVjdCBjb2RlIGdlbmVyYXRpb24uIElmIHRoZXkg ZG8sIHRoZXkgbWFrZSB0aGluZ3MgYSB0aW55IGJpdCBtb3JlCisgICAgICAgIGVmZmljaWVudC4K KworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6cmVxdWVzdERvY3VtZW50RWRpdGluZ0NvbnRleHQpOgorCiAy MDIwLTAzLTI0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBy ZXF1ZXN0RG9jdW1lbnRFZGl0aW5nQ29udGV4dCgpIHNob3VsZCBiYWlsIG91dCBpZiB0aGUgZm9j dXNlZCBmcmFtZSBkb2VzIG5vdCBoYXZlIGEgdmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCAzNTI1MTdkZTM4YTEzMzNl OWVkMjdkZjBmZTcxYzI2NTAyOWYyODYwLi4zMWJmMzIwZmUxYTI5ZDVkZGQ5MWFkZGFlMDgxMTI1 ODk5MGQ2NGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9p b3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9p b3MvV2ViUGFnZUlPUy5tbQpAQCAtNDE3OSw4ICs0MTc5LDggQEAgdm9pZCBXZWJQYWdlOjpyZXF1 ZXN0RG9jdW1lbnRFZGl0aW5nQ29udGV4dChEb2N1bWVudEVkaXRpbmdDb250ZXh0UmVxdWVzdCBy ZXF1ZXMKICAgICBhdXRvIHNlbGVjdGlvblJhbmdlID0gc2VsZWN0aW9uLnRvTm9ybWFsaXplZFJh bmdlKCk7CiAgICAgYXV0byByYW5nZU9mSW50ZXJlc3QgPSBtYWtlUmFuZ2UocmFuZ2VPZkludGVy ZXN0U3RhcnQsIHJhbmdlT2ZJbnRlcmVzdEVuZCk7CiAgICAgaWYgKHNlbGVjdGlvblJhbmdlICYm IHJhbmdlc092ZXJsYXAocmFuZ2VPZkludGVyZXN0LmdldCgpLCBjcmVhdGVMaXZlUmFuZ2UoKnNl bGVjdGlvblJhbmdlKS5wdHIoKSkpIHsKLSAgICAgICAgc3RhcnRPZlJhbmdlT2ZJbnRlcmVzdElu U2VsZWN0aW9uID0gcmFuZ2VPZkludGVyZXN0U3RhcnQgPiBzZWxlY3Rpb25TdGFydCA/IHJhbmdl T2ZJbnRlcmVzdFN0YXJ0IDogc2VsZWN0aW9uU3RhcnQ7Ci0gICAgICAgIGVuZE9mUmFuZ2VPZklu dGVyZXN0SW5TZWxlY3Rpb24gPSByYW5nZU9mSW50ZXJlc3RFbmQgPCBzZWxlY3Rpb25FbmQgPyBy YW5nZU9mSW50ZXJlc3RFbmQgOiBzZWxlY3Rpb25FbmQ7CisgICAgICAgIHN0YXJ0T2ZSYW5nZU9m SW50ZXJlc3RJblNlbGVjdGlvbiA9IHN0ZDo6bWF4PFZpc2libGVQb3NpdGlvbj4ocmFuZ2VPZklu dGVyZXN0U3RhcnQsIHNlbGVjdGlvblN0YXJ0KTsKKyAgICAgICAgZW5kT2ZSYW5nZU9mSW50ZXJl c3RJblNlbGVjdGlvbiA9IHN0ZDo6bWluPFZpc2libGVQb3NpdGlvbj4ocmFuZ2VPZkludGVyZXN0 RW5kLCBzZWxlY3Rpb25FbmQpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGF1dG8gcm9vdE5vZGUg PSBtYWtlUmVmUHRyKHJhbmdlT2ZJbnRlcmVzdC0+Y29tbW9uQW5jZXN0b3JDb250YWluZXIoKSk7 CiAgICAgICAgIGlmICghcm9vdE5vZGUpIHsKQEAgLTQyMjEsMTIgKzQyMjEsMTQgQEAgdm9pZCBX ZWJQYWdlOjpyZXF1ZXN0RG9jdW1lbnRFZGl0aW5nQ29udGV4dChEb2N1bWVudEVkaXRpbmdDb250 ZXh0UmVxdWVzdCByZXF1ZXMKICAgICAgICAgY29udGV4dEJlZm9yZVN0YXJ0ID0gcmFuZ2VPZklu dGVyZXN0U3RhcnQ7CiAgICAgICAgIGNvbnRleHRBZnRlckVuZCA9IHJhbmdlT2ZJbnRlcmVzdEVu ZDsKICAgICAgICAgaWYgKHdhbnRzTWFya2VkVGV4dFJlY3RzICYmIGNvbXBvc2l0aW9uUmFuZ2Up IHsKLSAgICAgICAgICAgIC8vIEluIHRoZSBjYXNlIHdoZXJlIHRoZSBjbGllbnQgaGFzIHJlcXVl c3RlZCBtYXJrZWQgdGV4dCByZWN0cywgYWRkaXRpb25hbGx5IG1ha2Ugc3VyZSB0aGF0IHRoZQot ICAgICAgICAgICAgLy8gY29udGV4dCByYW5nZSBlbmNvbXBhc3NlcyB0aGUgZW50aXJlIG1hcmtl ZCB0ZXh0IHJhbmdlLgorICAgICAgICAgICAgLy8gSW4gdGhlIGNhc2Ugd2hlcmUgdGhlIGNsaWVu dCBoYXMgcmVxdWVzdGVkIG1hcmtlZCB0ZXh0IHJlY3RzIG1ha2Ugc3VyZSB0aGF0IHRoZSBjb250 ZXh0CisgICAgICAgICAgICAvLyByYW5nZSBlbmNvbXBhc3NlcyB0aGUgZW50aXJlIG1hcmtlZCB0 ZXh0IHJhbmdlIHNvIHRoYXQgd2UgZG9uJ3QgcmV0dXJuIGEgdHJ1bmNhdGVkIHJlc3VsdC4KICAg ICAgICAgICAgIGF1dG8gY29tcG9zaXRpb25TdGFydCA9IGNvbXBvc2l0aW9uUmFuZ2UtPnN0YXJ0 UG9zaXRpb24oKTsKICAgICAgICAgICAgIGF1dG8gY29tcG9zaXRpb25FbmQgPSBjb21wb3NpdGlv blJhbmdlLT5lbmRQb3NpdGlvbigpOwotICAgICAgICAgICAgY29udGV4dEJlZm9yZVN0YXJ0ID0g Y29udGV4dEJlZm9yZVN0YXJ0ID4gY29tcG9zaXRpb25TdGFydCA/IGNvbXBvc2l0aW9uU3RhcnQg OiBjb250ZXh0QmVmb3JlU3RhcnQ7Ci0gICAgICAgICAgICBjb250ZXh0QWZ0ZXJFbmQgPSBjb250 ZXh0QWZ0ZXJFbmQgPCBjb21wb3NpdGlvbkVuZCA/IGNvbXBvc2l0aW9uRW5kIDogY29udGV4dEFm dGVyRW5kOworICAgICAgICAgICAgaWYgKGNvbnRleHRCZWZvcmVTdGFydCA+IGNvbXBvc2l0aW9u U3RhcnQpCisgICAgICAgICAgICAgICAgY29udGV4dEJlZm9yZVN0YXJ0ID0gY29tcG9zaXRpb25T dGFydDsKKyAgICAgICAgICAgIGlmIChjb250ZXh0QWZ0ZXJFbmQgPCBjb21wb3NpdGlvbkVuZCkK KyAgICAgICAgICAgICAgICBjb250ZXh0QWZ0ZXJFbmQgPSBjb21wb3NpdGlvbkVuZDsKICAgICAg ICAgfQogICAgIH0KIAo= 403004 2020-06-28 12:15:06 -0700 2020-06-28 12:15:06 -0700 To Land bug-213701-20200628121505.patch text/plain 3592 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMxNThhZDRkMGRjMmI0ZWVk ZTI2NWE5ZmE1OWFmZmI1NzM2YzZjZWYuLjU1NTYxNDE4OTk4ODg2NzNhZTUyNzcyMWU1YzE1MTcx MTNmMWI5MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDYtMjggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIENsZWFuIHVwIHZpc2li bGUgcG9zaXRpb24gY29tcGFyaXNvbnMgaW4gV2ViUGFnZTo6cmVxdWVzdERvY3VtZW50RWRpdGlu Z0NvbnRleHQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjEzNzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAg ICAgVXNlIHN0ZDo6bWluIGFuZCBzdGQ6Om1heCB3aGVuIHRoZSByZXN1bHQgbmVlZHMgdG8gYmUg Y29waWVkIGluc3RlYWQgb2YgZG9pbmcgdGhlIGNvbXBhcmlzb24KKyAgICAgICAgYnkgaGFuZCB0 byBtYWtlIHRoZSBjb2RlIGEgdGlueSBiaXQgbW9yZSBjbGVhci4gQWxzbywgZG9uJ3QgY29weSBh IFZpc2libGVQb3NpdGlvbiB3aGVuIGRvaW5nCisgICAgICAgIHRoZSBtaW4vbWF4IGluLXBsYWNl LiBCb3RoIG9mIHRoZXNlIHRoaW5ncyBhcmUgdW5saWtlbHkgdG8gZWZmZWN0IGNvZGUgZ2VuZXJh dGlvbi4gSWYgdGhleSBkbywKKyAgICAgICAgdGhlIGxhdHRlciBtYWtlcyB0aGluZ3MgYSB0aW55 IGJpdCBtb3JlIGVmZmljaWVudC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVxdWVzdERvY3VtZW50 RWRpdGluZ0NvbnRleHQpOgorCiAyMDIwLTAzLTI0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFw cGxlLmNvbT4KIAogICAgICAgICByZXF1ZXN0RG9jdW1lbnRFZGl0aW5nQ29udGV4dCgpIHNob3Vs ZCBiYWlsIG91dCBpZiB0aGUgZm9jdXNlZCBmcmFtZSBkb2VzIG5vdCBoYXZlIGEgdmlldwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpp bmRleCAzNTI1MTdkZTM4YTEzMzNlOWVkMjdkZjBmZTcxYzI2NTAyOWYyODYwLi5hM2Q1NTcxNWVm ZTQ5ODVjYTJkNDE0M2FjZWY0ODljOWQzNTFhMzQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtNDE3OSw4ICs0MTc5LDgg QEAgdm9pZCBXZWJQYWdlOjpyZXF1ZXN0RG9jdW1lbnRFZGl0aW5nQ29udGV4dChEb2N1bWVudEVk aXRpbmdDb250ZXh0UmVxdWVzdCByZXF1ZXMKICAgICBhdXRvIHNlbGVjdGlvblJhbmdlID0gc2Vs ZWN0aW9uLnRvTm9ybWFsaXplZFJhbmdlKCk7CiAgICAgYXV0byByYW5nZU9mSW50ZXJlc3QgPSBt YWtlUmFuZ2UocmFuZ2VPZkludGVyZXN0U3RhcnQsIHJhbmdlT2ZJbnRlcmVzdEVuZCk7CiAgICAg aWYgKHNlbGVjdGlvblJhbmdlICYmIHJhbmdlc092ZXJsYXAocmFuZ2VPZkludGVyZXN0LmdldCgp LCBjcmVhdGVMaXZlUmFuZ2UoKnNlbGVjdGlvblJhbmdlKS5wdHIoKSkpIHsKLSAgICAgICAgc3Rh cnRPZlJhbmdlT2ZJbnRlcmVzdEluU2VsZWN0aW9uID0gcmFuZ2VPZkludGVyZXN0U3RhcnQgPiBz ZWxlY3Rpb25TdGFydCA/IHJhbmdlT2ZJbnRlcmVzdFN0YXJ0IDogc2VsZWN0aW9uU3RhcnQ7Ci0g ICAgICAgIGVuZE9mUmFuZ2VPZkludGVyZXN0SW5TZWxlY3Rpb24gPSByYW5nZU9mSW50ZXJlc3RF bmQgPCBzZWxlY3Rpb25FbmQgPyByYW5nZU9mSW50ZXJlc3RFbmQgOiBzZWxlY3Rpb25FbmQ7Cisg ICAgICAgIHN0YXJ0T2ZSYW5nZU9mSW50ZXJlc3RJblNlbGVjdGlvbiA9IHN0ZDo6bWF4KHJhbmdl T2ZJbnRlcmVzdFN0YXJ0LCBzZWxlY3Rpb25TdGFydCk7CisgICAgICAgIGVuZE9mUmFuZ2VPZklu dGVyZXN0SW5TZWxlY3Rpb24gPSBzdGQ6Om1pbihyYW5nZU9mSW50ZXJlc3RFbmQsIHNlbGVjdGlv bkVuZCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgYXV0byByb290Tm9kZSA9IG1ha2VSZWZQdHIo cmFuZ2VPZkludGVyZXN0LT5jb21tb25BbmNlc3RvckNvbnRhaW5lcigpKTsKICAgICAgICAgaWYg KCFyb290Tm9kZSkgewpAQCAtNDIyMSwxMiArNDIyMSwxNCBAQCB2b2lkIFdlYlBhZ2U6OnJlcXVl c3REb2N1bWVudEVkaXRpbmdDb250ZXh0KERvY3VtZW50RWRpdGluZ0NvbnRleHRSZXF1ZXN0IHJl cXVlcwogICAgICAgICBjb250ZXh0QmVmb3JlU3RhcnQgPSByYW5nZU9mSW50ZXJlc3RTdGFydDsK ICAgICAgICAgY29udGV4dEFmdGVyRW5kID0gcmFuZ2VPZkludGVyZXN0RW5kOwogICAgICAgICBp ZiAod2FudHNNYXJrZWRUZXh0UmVjdHMgJiYgY29tcG9zaXRpb25SYW5nZSkgewotICAgICAgICAg ICAgLy8gSW4gdGhlIGNhc2Ugd2hlcmUgdGhlIGNsaWVudCBoYXMgcmVxdWVzdGVkIG1hcmtlZCB0 ZXh0IHJlY3RzLCBhZGRpdGlvbmFsbHkgbWFrZSBzdXJlIHRoYXQgdGhlCi0gICAgICAgICAgICAv LyBjb250ZXh0IHJhbmdlIGVuY29tcGFzc2VzIHRoZSBlbnRpcmUgbWFya2VkIHRleHQgcmFuZ2Uu CisgICAgICAgICAgICAvLyBJbiB0aGUgY2FzZSB3aGVyZSB0aGUgY2xpZW50IGhhcyByZXF1ZXN0 ZWQgbWFya2VkIHRleHQgcmVjdHMgbWFrZSBzdXJlIHRoYXQgdGhlIGNvbnRleHQKKyAgICAgICAg ICAgIC8vIHJhbmdlIGVuY29tcGFzc2VzIHRoZSBlbnRpcmUgbWFya2VkIHRleHQgcmFuZ2Ugc28g dGhhdCB3ZSBkb24ndCByZXR1cm4gYSB0cnVuY2F0ZWQgcmVzdWx0LgogICAgICAgICAgICAgYXV0 byBjb21wb3NpdGlvblN0YXJ0ID0gY29tcG9zaXRpb25SYW5nZS0+c3RhcnRQb3NpdGlvbigpOwog ICAgICAgICAgICAgYXV0byBjb21wb3NpdGlvbkVuZCA9IGNvbXBvc2l0aW9uUmFuZ2UtPmVuZFBv c2l0aW9uKCk7Ci0gICAgICAgICAgICBjb250ZXh0QmVmb3JlU3RhcnQgPSBjb250ZXh0QmVmb3Jl U3RhcnQgPiBjb21wb3NpdGlvblN0YXJ0ID8gY29tcG9zaXRpb25TdGFydCA6IGNvbnRleHRCZWZv cmVTdGFydDsKLSAgICAgICAgICAgIGNvbnRleHRBZnRlckVuZCA9IGNvbnRleHRBZnRlckVuZCA8 IGNvbXBvc2l0aW9uRW5kID8gY29tcG9zaXRpb25FbmQgOiBjb250ZXh0QWZ0ZXJFbmQ7CisgICAg ICAgICAgICBpZiAoY29udGV4dEJlZm9yZVN0YXJ0ID4gY29tcG9zaXRpb25TdGFydCkKKyAgICAg ICAgICAgICAgICBjb250ZXh0QmVmb3JlU3RhcnQgPSBjb21wb3NpdGlvblN0YXJ0OworICAgICAg ICAgICAgaWYgKGNvbnRleHRBZnRlckVuZCA8IGNvbXBvc2l0aW9uRW5kKQorICAgICAgICAgICAg ICAgIGNvbnRleHRBZnRlckVuZCA9IGNvbXBvc2l0aW9uRW5kOwogICAgICAgICB9CiAgICAgfQog Cg==