230482 2021-09-20 07:54:34 -0700 Refactor some code that controls Live Text selection behavior 2021-09-20 12:32:44 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin cdumez changseok esprehn+autocc ews-watchlist gyuyoung.kim hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1795083 0 wenson_hsieh 2021-09-20 07:54:34 -0700 rdar://83173597 1795092 1 438682 wenson_hsieh 2021-09-20 08:39:52 -0700 Created attachment 438682 WIP 1795114 2 438687 wenson_hsieh 2021-09-20 09:37:38 -0700 Created attachment 438687 Patch 1795132 3 438687 megan_gardner 2021-09-20 10:09:56 -0700 Comment on attachment 438687 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438687&action=review > Source/WebCore/page/EventHandler.cpp:2529 > + if (!candidateElement) Why did you expand this? 1795170 4 438687 wenson_hsieh 2021-09-20 11:08:57 -0700 Comment on attachment 438687 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438687&action=review Thanks for the review! >> Source/WebCore/page/EventHandler.cpp:2529 >> + if (!candidateElement) > > Why did you expand this? Ah, good question. So I had actually inadvertently shrank this in https://trac.webkit.org/r282740, due to a mistake when breaking out my changes into these smaller patches :P (It was originally intended to be just one larger refactoring, but I split it into smaller pieces to make it easier to review). 1795214 5 ews-feeder 2021-09-20 12:32:41 -0700 Committed r282769 (241904@main): <https://commits.webkit.org/241904@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438687. 438682 2021-09-20 08:39:52 -0700 2021-09-20 09:37:37 -0700 WIP bug-230482-20210920083952.patch text/plain 6981 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGJlNWE3ZGFiOWVmYjM1ZTQxM2YzZDg4 YmVmMDczZTNmNjhjMDA2MTYuLjhiMmQ2MWVkNjhlOTg5NmEzYTExNTVhYTExY2M2MmMzODljZTk3 YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDktMjAgIFdlbnNvbiBIc2llaCAgPHdlbnNv bl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3Igc29tZSBjb2RlIHRoYXQgY29u dHJvbHMgTGl2ZSBUZXh0IHNlbGVjdGlvbiBiZWhhdmlvcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNDgyCisgICAgICAgIHJkYXI6Ly84MzE3MzU5 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh biAob2ZmLWJ5LWRlZmF1bHQpIGludGVybmFsIGZlYXR1cmUgdG8gZW5hYmxlIGNlcnRhaW4gZW5o YW5jZW1lbnRzIHRvIExpdmUgVGV4dC4KKworICAgICAgICAqIFNjcmlwdHMvUHJlZmVyZW5jZXMv V2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTA5LTE4ICBNeWxlcyBDLiBNYXhm aWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBGYW1pbHldIERlbGV0 ZSBsZXR0ZXJwcmVzcyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRlMWYyNTQ3YWFmNTE3ZGE1N2E1 ZDhiYTBlNzM1NmE4YjFjN2QxNy4uYjQ5YmEyM2I0NzI2YjY2ZTU4NDE5NjVjMmZkNzkzNDU0MDZl MTAxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIxLTA5LTIwICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9yIHNvbWUgY29k ZSB0aGF0IGNvbnRyb2xzIExpdmUgVGV4dCBzZWxlY3Rpb24gYmVoYXZpb3IKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDQ4MgorICAgICAgICByZGFy Oi8vODMxNzM1OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIGEgZmV3IGFkanVzdG1lbnRzIHRvIExpdmUgVGV4dCBjb2RlLiBTZWUgYmVsb3cg Zm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICAqIGh0bWwvSFRNTEVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTEVsZW1lbnQ6OnNob3VsZEV4dGVuZFNlbGVjdGlvblRvVGFyZ2V0 Tm9kZSk6CisKKyAgICAgICAgQWRqdXN0IHRoaXMgcnVsZSBzbyB0aGF0IGluc3RlYWQgb2YgY2hl Y2tpbmcgd2hldGhlciB3ZSdyZSBoaXQtdGVzdGluZyB0byB0aGUgaW1hZ2Ugb3ZlcmxheSBjb250 YWluZXIgYGRpdmAsIHdlCisgICAgICAgIG9ubHkgYWxsb3cgdGhlIGV4aXN0aW5nIHNlbGVjdGlv biBpbiBhbiBpbWFnZSBvdmVybGF5IHRvIGV4dGVuZCB3aGVuIHBlcmZvcm1pbmcgYSBtb3VzZSBk cmFnIGlmIHRoZSB0YXJnZXQgbm9kZQorICAgICAgICAodG8gd2hpY2ggd2UncmUgZXh0ZW5kaW5n IHRoZSBzZWxlY3Rpb24pIGlzIGEgdGV4dCBub2RlIGluc2lkZSB0aGUgaW1hZ2Ugb3ZlcmxheS4K KworICAgICAgICBUaGlzIHR3ZWFrIGlzIG5lZWRlZCB0byBkZWFsIHdpdGggdGhlIHN0eWxlc2hl ZXQgYWRqdXN0bWVudCBiZWxvdywgd2hlcmUgdGhlIHJvb3QgYCNpbWFnZS1vdmVybGF5YCBjb250 YWluZXIgbm93CisgICAgICAgIGhhcyBgcG9pbnRlci1ldmVudHM6IG5vbmU7YC4KKworICAgICAg ICAqIGh0bWwvc2hhZG93L2ltYWdlT3ZlcmxheS5jc3M6CisgICAgICAgIChkaXYjaW1hZ2Utb3Zl cmxheSk6CisgICAgICAgIChkaXYuaW1hZ2Utb3ZlcmxheS1saW5lKToKKyAgICAgICAgKGRpdi5p bWFnZS1vdmVybGF5LWRhdGEtZGV0ZWN0b3ItcmVzdWx0KToKKworICAgICAgICBNYXJrIHRoZSBy b290IGAjaW1hZ2Utb3ZlcmxheWAgY29udGFpbmVyIGFzIGBwb2ludGVyLWV2ZW50czogbm9uZTtg LCBidXQgbWFyayB0aGUgaW5kaXZpZHVhbCB0ZXh0IGNvbnRhaW5lcnMgaW4KKyAgICAgICAgdGhl IGltYWdlIG92ZXJsYXkgYXMgYHBvaW50ZXItZXZlbnRzOiBhdXRvO2AgdG8gZW5zdXJlIHRoYXQg dGhleSBjYW4gc3RpbGwgYmUgc2VsZWN0ZWQgdmlhIG1vdXNlIGV2ZW50cy4gVGhpcworICAgICAg ICBjaGFuZ2UgZW5zdXJlcyB0aGF0IGltYWdlIG92ZXJsYXlzIGNhbiBiZSBzYWZlbHkgb3Zlcmxh aWQgb24gdG9wIG9mIG90aGVyIHVzZXIgYWdlbnQgc2hhZG93IHJvb3QgY29udGVudCB3aXRob3V0 CisgICAgICAgIGJyZWFraW5nIHBvaW50ZXItYmFzZWQgaW50ZXJhY3Rpb25zIG9uIHRoZSBzaGFk b3cgcm9vdCBjb250ZW50IGJlbmVhdGggaXQuCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnRleHRSZWNvZ25pdGlvbkNh bmRpZGF0ZUVsZW1lbnQgY29uc3QpOgorCisgICAgICAgIEFkZCBhIFdlYktpdEFkZGl0aW9ucyBl eHRlbnNpb24gcG9pbnQgZm9yIGRldGVybWluaW5nIHdoZXRoZXIgb3Igbm90IGFuIGVsZW1lbnQg aXMgYSBjYW5kaWRhdGUgZm9yIHRleHQKKyAgICAgICAgcmVjb2duaXRpb24uCisKIDIwMjEtMDkt MTkgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0xp dmUgVGV4dF0gQWRvcHQgV2Vha0hhc2hNYXAgZm9yIGNhY2hpbmcgcGVyLWVsZW1lbnQgdGV4dCBy ZWNvZ25pdGlvbiByZXN1bHRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVy ZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291cmNlL1dURi9TY3JpcHRzL1By ZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAppbmRleCA3NjRjNWE3Mjk1NTg5 YWFmZDZjNjE1NmY5ZjIyMzQxMjllMzg4MTU1Li4xZTJmZDIyNWY2NDMwNDY4ODc3OTI1MDBkNTU0 OGRhZjIzNjMxMjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMv V2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCisrKyBiL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVm ZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0ludGVybmFsLnlhbWwKQEAgLTc0MCw2ICs3NDAsMjAgQEAg VGV4dEF1dG9zaXppbmdVc2VzSWRlbXBvdGVudE1vZGU6CiAgICAgV2ViQ29yZToKICAgICAgIGRl ZmF1bHQ6IGZhbHNlCiAKK1RleHRSZWNvZ25pdGlvbkVuaGFuY2VtZW50c0VuYWJsZWQ6CisgIHR5 cGU6IGJvb2wKKyAgaHVtYW5SZWFkYWJsZU5hbWU6ICJUZXh0IFJlY29nbml0aW9uIEVuaGFuY2Vt ZW50cyIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiRW5hYmxlIFRleHQgUmVjb2duaXRp b24gRW5oYW5jZW1lbnRzIgorICBjb25kaXRpb246IEVOQUJMRShJTUFHRV9BTkFMWVNJUykKKyAg ZXhwb3NlZDogWyBXZWJLaXQgXQorICBkZWZhdWx0VmFsdWU6CisgICAgV2ViQ29yZToKKyAgICAg IGRlZmF1bHQ6IGZhbHNlCisgICAgV2ViS2l0TGVnYWN5OgorICAgICAgZGVmYXVsdDogZmFsc2UK KyAgICBXZWJLaXQ6CisgICAgICBkZWZhdWx0OiBmYWxzZQorCiAjIEZJWE1FOiBJcyB0aGlzIGlt cGxlbWVudGVkIGZvciBXZWJLaXRMZWdhY3k/IElmIG5vdCwgdGhpcyBzaG91bGQgYmUgZXhjbHVk ZWQgZnJvbSBXZWJLaXRMZWdhY3kgZW50aXJlbHkuCiBVbmRvTWFuYWdlckFQSUVuYWJsZWQ6CiAg IHR5cGU6IGJvb2wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKaW5kZXggODAxMTMwYTc3 ZDc3MGMyMmYxNGQ1NTM4MmZmY2JhNmZlZWQ1ODI0MC4uNzg2ODg1YWMxNTRlMGVhMzUwMjllZDg3 ODc4OTQ5OTNlMzNhYTRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKQEAgLTEy NTQsOSArMTI1NCw2IEBAIHN0YXRpYyBjb25zdCBBdG9tU3RyaW5nJiBpbWFnZU92ZXJsYXlEYXRh RGV0ZWN0b3JDbGFzc05hbWUoKQogCiBib29sIEhUTUxFbGVtZW50OjpzaG91bGRFeHRlbmRTZWxl Y3Rpb25Ub1RhcmdldE5vZGUoY29uc3QgTm9kZSYgdGFyZ2V0Tm9kZSwgY29uc3QgVmlzaWJsZVNl bGVjdGlvbiYgc2VsZWN0aW9uQmVmb3JlVXBkYXRlKQogewotICAgIGlmICghaXM8SFRNTERpdkVs ZW1lbnQ+KHRhcmdldE5vZGUpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQogICAgIGF1dG8gc2hh ZG93SG9zdCA9IG1ha2VSZWZQdHIodGFyZ2V0Tm9kZS5zaGFkb3dIb3N0KCkpOwogICAgIGlmICgh aXM8SFRNTEVsZW1lbnQ+KHNoYWRvd0hvc3QpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTEy NjUsMTMgKzEyNjIsOSBAQCBib29sIEhUTUxFbGVtZW50OjpzaG91bGRFeHRlbmRTZWxlY3Rpb25U b1RhcmdldE5vZGUoY29uc3QgTm9kZSYgdGFyZ2V0Tm9kZSwgY29ucwogICAgIGlmICghaG9zdC5o YXNJbWFnZU92ZXJsYXkoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAoIXRhcmdl dE5vZGUuY29udGFpbnMoc2VsZWN0aW9uQmVmb3JlVXBkYXRlLnN0YXJ0KCkuY29udGFpbmVyTm9k ZSgpKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBmb3IgKGF1dG8mIGNoaWxkIDogY2hp bGRyZW5PZlR5cGU8SFRNTERpdkVsZW1lbnQ+KCpob3N0LnVzZXJBZ2VudFNoYWRvd1Jvb3QoKSkp IHsKLSAgICAgICAgaWYgKGNoaWxkLmdldElkQXR0cmlidXRlKCkgPT0gaW1hZ2VPdmVybGF5RWxl bWVudElkZW50aWZpZXIoKSkKLSAgICAgICAgICAgIHJldHVybiAmdGFyZ2V0Tm9kZSAhPSAmY2hp bGQ7Ci0gICAgfQorICAgIGF1dG8gcmFuZ2VCZWZvcmVVcGRhdGUgPSBzZWxlY3Rpb25CZWZvcmVV cGRhdGUucmFuZ2UoKTsKKyAgICBpZiAocmFuZ2VCZWZvcmVVcGRhdGUgJiYgaXNJbnNpZGVJbWFn ZU92ZXJsYXkoKnJhbmdlQmVmb3JlVXBkYXRlKSkKKyAgICAgICAgcmV0dXJuICFpc0ltYWdlT3Zl cmxheVRleHQodGFyZ2V0Tm9kZSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L2ltYWdlT3ZlcmxheS5jc3MgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9pbWFnZU92ZXJsYXkuY3NzCmluZGV4IGYzMjRiMDY4ODNlY2RlNGQw NDgyMGQ3MjhmNGRjMGU4OWY5ODhmMGQuLjYwNDk1MjIwYTE1YmQyNTNjYmEyMzZlY2E2MDdhMDJh Yzk3MjQwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L2ltYWdlT3Zl cmxheS5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvaW1hZ2VPdmVybGF5LmNz cwpAQCAtMjQsNiArMjQsNyBAQAogCiBkaXYjaW1hZ2Utb3ZlcmxheSB7CiAgICAgZGlzcGxheTog aW5saW5lLWJsb2NrOworICAgIHBvaW50ZXItZXZlbnRzOiBub25lOwogICAgIHBvc2l0aW9uOiBy ZWxhdGl2ZTsKICAgICBvdmVyZmxvdzogaGlkZGVuOwogICAgIGNvbG9yOiB0cmFuc3BhcmVudDsK QEAgLTQwLDYgKzQxLDEwIEBAIGRpdi5pbWFnZS1vdmVybGF5LWxpbmUsIC5pbWFnZS1vdmVybGF5 LXRleHQgewogICAgIG92ZXJmbG93OiBoaWRkZW47CiB9CiAKK2Rpdi5pbWFnZS1vdmVybGF5LWxp bmUgeworICAgIHBvaW50ZXItZXZlbnRzOiBhdXRvOworfQorCiAuaW1hZ2Utb3ZlcmxheS10ZXh0 OjpzZWxlY3Rpb24gewogICAgIGNvbG9yOiB0cmFuc3BhcmVudDsKICAgICBiYWNrZ3JvdW5kLWNv bG9yOiBoaWdobGlnaHQ7CkBAIC00OCw1ICs1Myw0IEBAIGRpdi5pbWFnZS1vdmVybGF5LWxpbmUs IC5pbWFnZS1vdmVybGF5LXRleHQgewogZGl2LmltYWdlLW92ZXJsYXktZGF0YS1kZXRlY3Rvci1y ZXN1bHQgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICAtd2Via2l0LXVzZXItc2VsZWN0 OiBub25lOwotICAgIHBvaW50ZXItZXZlbnRzOiBub25lOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVu dEhhbmRsZXIuY3BwCmluZGV4IDBmNDUwMzAwMjkwNTg0NjBjZmI3ODQxY2Q4Yzg1ZjliMGQwYWMw NGMuLmNjMGIwNzNhYjQxNzhjNmZiMjcwYTlmOTA1Y2Y4OTY2ZmE5Y2VlNDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTE0Myw2ICsxNDMsMTAgQEAKICNpbmNsdWRlICJQ b2ludGVyTG9ja0NvbnRyb2xsZXIuaCIKICNlbmRpZgogCisjaWYgVVNFKEFQUExFX0lOVEVSTkFM X1NESykKKyNpbmNsdWRlIDxXZWJLaXRBZGRpdGlvbnMvRXZlbnRIYW5kbGVyQWRkaXRpb25zLmNw cD4KKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1M TmFtZXM7CkBAIC0yNTI0LDYgKzI1MjgsMTEgQEAgUmVmUHRyPEVsZW1lbnQ+IEV2ZW50SGFuZGxl cjo6dGV4dFJlY29nbml0aW9uQ2FuZGlkYXRlRWxlbWVudCgpIGNvbnN0CiAgICAgaWYgKCFpczxS ZW5kZXJJbWFnZT4ocmVuZGVyZXIpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAorI2lmIFVT RShBUFBMRV9JTlRFUk5BTF9TREspCisgICAgaWYgKGlzQWRkaXRpb25hbFRleHRSZWNvZ25pdGlv bkNhbmRpZGF0ZUVsZW1lbnQoKnNoYWRvd0hvc3QpKQorICAgICAgICByZXR1cm4gc2hhZG93SG9z dDsKKyNlbmRpZgorCiAgICAgaWYgKGlzPEhUTUxWaWRlb0VsZW1lbnQ+KCpzaGFkb3dIb3N0KSkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAK 438687 2021-09-20 09:37:38 -0700 2021-09-20 12:32:42 -0700 Patch bug-230482-20210920093737.patch text/plain 7738 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGJlNWE3ZGFiOWVmYjM1ZTQxM2YzZDg4 YmVmMDczZTNmNjhjMDA2MTYuLjhiMmQ2MWVkNjhlOTg5NmEzYTExNTVhYTExY2M2MmMzODljZTk3 YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDktMjAgIFdlbnNvbiBIc2llaCAgPHdlbnNv bl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3Igc29tZSBjb2RlIHRoYXQgY29u dHJvbHMgTGl2ZSBUZXh0IHNlbGVjdGlvbiBiZWhhdmlvcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNDgyCisgICAgICAgIHJkYXI6Ly84MzE3MzU5 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh biAob2ZmLWJ5LWRlZmF1bHQpIGludGVybmFsIGZlYXR1cmUgdG8gZW5hYmxlIGNlcnRhaW4gZW5o YW5jZW1lbnRzIHRvIExpdmUgVGV4dC4KKworICAgICAgICAqIFNjcmlwdHMvUHJlZmVyZW5jZXMv V2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sOgorCiAyMDIxLTA5LTE4ICBNeWxlcyBDLiBNYXhm aWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBGYW1pbHldIERlbGV0 ZSBsZXR0ZXJwcmVzcyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRlMWYyNTQ3YWFmNTE3ZGE1N2E1 ZDhiYTBlNzM1NmE4YjFjN2QxNy4uYjQ5YmEyM2I0NzI2YjY2ZTU4NDE5NjVjMmZkNzkzNDU0MDZl MTAxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIxLTA5LTIwICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9yIHNvbWUgY29k ZSB0aGF0IGNvbnRyb2xzIExpdmUgVGV4dCBzZWxlY3Rpb24gYmVoYXZpb3IKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDQ4MgorICAgICAgICByZGFy Oi8vODMxNzM1OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIGEgZmV3IGFkanVzdG1lbnRzIHRvIExpdmUgVGV4dCBjb2RlLiBTZWUgYmVsb3cg Zm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICAqIGh0bWwvSFRNTEVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTEVsZW1lbnQ6OnNob3VsZEV4dGVuZFNlbGVjdGlvblRvVGFyZ2V0 Tm9kZSk6CisKKyAgICAgICAgQWRqdXN0IHRoaXMgcnVsZSBzbyB0aGF0IGluc3RlYWQgb2YgY2hl Y2tpbmcgd2hldGhlciB3ZSdyZSBoaXQtdGVzdGluZyB0byB0aGUgaW1hZ2Ugb3ZlcmxheSBjb250 YWluZXIgYGRpdmAsIHdlCisgICAgICAgIG9ubHkgYWxsb3cgdGhlIGV4aXN0aW5nIHNlbGVjdGlv biBpbiBhbiBpbWFnZSBvdmVybGF5IHRvIGV4dGVuZCB3aGVuIHBlcmZvcm1pbmcgYSBtb3VzZSBk cmFnIGlmIHRoZSB0YXJnZXQgbm9kZQorICAgICAgICAodG8gd2hpY2ggd2UncmUgZXh0ZW5kaW5n IHRoZSBzZWxlY3Rpb24pIGlzIGEgdGV4dCBub2RlIGluc2lkZSB0aGUgaW1hZ2Ugb3ZlcmxheS4K KworICAgICAgICBUaGlzIHR3ZWFrIGlzIG5lZWRlZCB0byBkZWFsIHdpdGggdGhlIHN0eWxlc2hl ZXQgYWRqdXN0bWVudCBiZWxvdywgd2hlcmUgdGhlIHJvb3QgYCNpbWFnZS1vdmVybGF5YCBjb250 YWluZXIgbm93CisgICAgICAgIGhhcyBgcG9pbnRlci1ldmVudHM6IG5vbmU7YC4KKworICAgICAg ICAqIGh0bWwvc2hhZG93L2ltYWdlT3ZlcmxheS5jc3M6CisgICAgICAgIChkaXYjaW1hZ2Utb3Zl cmxheSk6CisgICAgICAgIChkaXYuaW1hZ2Utb3ZlcmxheS1saW5lKToKKyAgICAgICAgKGRpdi5p bWFnZS1vdmVybGF5LWRhdGEtZGV0ZWN0b3ItcmVzdWx0KToKKworICAgICAgICBNYXJrIHRoZSBy b290IGAjaW1hZ2Utb3ZlcmxheWAgY29udGFpbmVyIGFzIGBwb2ludGVyLWV2ZW50czogbm9uZTtg LCBidXQgbWFyayB0aGUgaW5kaXZpZHVhbCB0ZXh0IGNvbnRhaW5lcnMgaW4KKyAgICAgICAgdGhl IGltYWdlIG92ZXJsYXkgYXMgYHBvaW50ZXItZXZlbnRzOiBhdXRvO2AgdG8gZW5zdXJlIHRoYXQg dGhleSBjYW4gc3RpbGwgYmUgc2VsZWN0ZWQgdmlhIG1vdXNlIGV2ZW50cy4gVGhpcworICAgICAg ICBjaGFuZ2UgZW5zdXJlcyB0aGF0IGltYWdlIG92ZXJsYXlzIGNhbiBiZSBzYWZlbHkgb3Zlcmxh aWQgb24gdG9wIG9mIG90aGVyIHVzZXIgYWdlbnQgc2hhZG93IHJvb3QgY29udGVudCB3aXRob3V0 CisgICAgICAgIGJyZWFraW5nIHBvaW50ZXItYmFzZWQgaW50ZXJhY3Rpb25zIG9uIHRoZSBzaGFk b3cgcm9vdCBjb250ZW50IGJlbmVhdGggaXQuCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnRleHRSZWNvZ25pdGlvbkNh bmRpZGF0ZUVsZW1lbnQgY29uc3QpOgorCisgICAgICAgIEFkZCBhIFdlYktpdEFkZGl0aW9ucyBl eHRlbnNpb24gcG9pbnQgZm9yIGRldGVybWluaW5nIHdoZXRoZXIgb3Igbm90IGFuIGVsZW1lbnQg aXMgYSBjYW5kaWRhdGUgZm9yIHRleHQKKyAgICAgICAgcmVjb2duaXRpb24uCisKIDIwMjEtMDkt MTkgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0xp dmUgVGV4dF0gQWRvcHQgV2Vha0hhc2hNYXAgZm9yIGNhY2hpbmcgcGVyLWVsZW1lbnQgdGV4dCBy ZWNvZ25pdGlvbiByZXN1bHRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVy ZW5jZXMvV2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sIGIvU291cmNlL1dURi9TY3JpcHRzL1By ZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzSW50ZXJuYWwueWFtbAppbmRleCA3NjRjNWE3Mjk1NTg5 YWFmZDZjNjE1NmY5ZjIyMzQxMjllMzg4MTU1Li4xZTJmZDIyNWY2NDMwNDY4ODc3OTI1MDBkNTU0 OGRhZjIzNjMxMjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMv V2ViUHJlZmVyZW5jZXNJbnRlcm5hbC55YW1sCisrKyBiL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVm ZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0ludGVybmFsLnlhbWwKQEAgLTc0MCw2ICs3NDAsMjAgQEAg VGV4dEF1dG9zaXppbmdVc2VzSWRlbXBvdGVudE1vZGU6CiAgICAgV2ViQ29yZToKICAgICAgIGRl ZmF1bHQ6IGZhbHNlCiAKK1RleHRSZWNvZ25pdGlvbkVuaGFuY2VtZW50c0VuYWJsZWQ6CisgIHR5 cGU6IGJvb2wKKyAgaHVtYW5SZWFkYWJsZU5hbWU6ICJUZXh0IFJlY29nbml0aW9uIEVuaGFuY2Vt ZW50cyIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiRW5hYmxlIFRleHQgUmVjb2duaXRp b24gRW5oYW5jZW1lbnRzIgorICBjb25kaXRpb246IEVOQUJMRShJTUFHRV9BTkFMWVNJUykKKyAg ZXhwb3NlZDogWyBXZWJLaXQgXQorICBkZWZhdWx0VmFsdWU6CisgICAgV2ViQ29yZToKKyAgICAg IGRlZmF1bHQ6IGZhbHNlCisgICAgV2ViS2l0TGVnYWN5OgorICAgICAgZGVmYXVsdDogZmFsc2UK KyAgICBXZWJLaXQ6CisgICAgICBkZWZhdWx0OiBmYWxzZQorCiAjIEZJWE1FOiBJcyB0aGlzIGlt cGxlbWVudGVkIGZvciBXZWJLaXRMZWdhY3k/IElmIG5vdCwgdGhpcyBzaG91bGQgYmUgZXhjbHVk ZWQgZnJvbSBXZWJLaXRMZWdhY3kgZW50aXJlbHkuCiBVbmRvTWFuYWdlckFQSUVuYWJsZWQ6CiAg IHR5cGU6IGJvb2wKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKaW5kZXggODAxMTMwYTc3 ZDc3MGMyMmYxNGQ1NTM4MmZmY2JhNmZlZWQ1ODI0MC4uODliOTllNGU2M2Q3MmY4YTc5ZGRiMWFl MzliYTljYjFhZTA1MTM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKQEAgLTEy NTQsMjQgKzEyNTQsOCBAQCBzdGF0aWMgY29uc3QgQXRvbVN0cmluZyYgaW1hZ2VPdmVybGF5RGF0 YURldGVjdG9yQ2xhc3NOYW1lKCkKIAogYm9vbCBIVE1MRWxlbWVudDo6c2hvdWxkRXh0ZW5kU2Vs ZWN0aW9uVG9UYXJnZXROb2RlKGNvbnN0IE5vZGUmIHRhcmdldE5vZGUsIGNvbnN0IFZpc2libGVT ZWxlY3Rpb24mIHNlbGVjdGlvbkJlZm9yZVVwZGF0ZSkKIHsKLSAgICBpZiAoIWlzPEhUTUxEaXZF bGVtZW50Pih0YXJnZXROb2RlKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBhdXRvIHNo YWRvd0hvc3QgPSBtYWtlUmVmUHRyKHRhcmdldE5vZGUuc2hhZG93SG9zdCgpKTsKLSAgICBpZiAo IWlzPEhUTUxFbGVtZW50PihzaGFkb3dIb3N0KSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAg ICBhdXRvJiBob3N0ID0gZG93bmNhc3Q8SFRNTEVsZW1lbnQ+KCpzaGFkb3dIb3N0KTsKLSAgICBp ZiAoIWhvc3QuaGFzSW1hZ2VPdmVybGF5KCkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAg aWYgKCF0YXJnZXROb2RlLmNvbnRhaW5zKHNlbGVjdGlvbkJlZm9yZVVwZGF0ZS5zdGFydCgpLmNv bnRhaW5lck5vZGUoKSkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgZm9yIChhdXRvJiBj aGlsZCA6IGNoaWxkcmVuT2ZUeXBlPEhUTUxEaXZFbGVtZW50PigqaG9zdC51c2VyQWdlbnRTaGFk b3dSb290KCkpKSB7Ci0gICAgICAgIGlmIChjaGlsZC5nZXRJZEF0dHJpYnV0ZSgpID09IGltYWdl T3ZlcmxheUVsZW1lbnRJZGVudGlmaWVyKCkpCi0gICAgICAgICAgICByZXR1cm4gJnRhcmdldE5v ZGUgIT0gJmNoaWxkOwotICAgIH0KKyAgICBpZiAoYXV0byByYW5nZSA9IHNlbGVjdGlvbkJlZm9y ZVVwZGF0ZS5yYW5nZSgpOyByYW5nZSAmJiBpc0luc2lkZUltYWdlT3ZlcmxheSgqcmFuZ2UpKQor ICAgICAgICByZXR1cm4gaXNJbWFnZU92ZXJsYXlUZXh0KHRhcmdldE5vZGUpOwogCiAgICAgcmV0 dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9pbWFn ZU92ZXJsYXkuY3NzIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvaW1hZ2VPdmVybGF5LmNz cwppbmRleCBmMzI0YjA2ODgzZWNkZTRkMDQ4MjBkNzI4ZjRkYzBlODlmOTg4ZjBkLi42MDQ5NTIy MGExNWJkMjUzY2JhMjM2ZWNhNjA3YTAyYWM5NzI0MDg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9pbWFnZU92ZXJsYXkuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L2ltYWdlT3ZlcmxheS5jc3MKQEAgLTI0LDYgKzI0LDcgQEAKIAogZGl2I2ltYWdl LW92ZXJsYXkgewogICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBwb2ludGVyLWV2ZW50 czogbm9uZTsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsK ICAgICBjb2xvcjogdHJhbnNwYXJlbnQ7CkBAIC00MCw2ICs0MSwxMCBAQCBkaXYuaW1hZ2Utb3Zl cmxheS1saW5lLCAuaW1hZ2Utb3ZlcmxheS10ZXh0IHsKICAgICBvdmVyZmxvdzogaGlkZGVuOwog fQogCitkaXYuaW1hZ2Utb3ZlcmxheS1saW5lIHsKKyAgICBwb2ludGVyLWV2ZW50czogYXV0bzsK K30KKwogLmltYWdlLW92ZXJsYXktdGV4dDo6c2VsZWN0aW9uIHsKICAgICBjb2xvcjogdHJhbnNw YXJlbnQ7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaGlnaGxpZ2h0OwpAQCAtNDgsNSArNTMsNCBA QCBkaXYuaW1hZ2Utb3ZlcmxheS1saW5lLCAuaW1hZ2Utb3ZlcmxheS10ZXh0IHsKIGRpdi5pbWFn ZS1vdmVybGF5LWRhdGEtZGV0ZWN0b3ItcmVzdWx0IHsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7 CiAgICAgLXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZTsKLSAgICBwb2ludGVyLWV2ZW50czogbm9u ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCAwZjQ1MDMwMDI5MDU4 NDYwY2ZiNzg0MWNkOGM4NWY5YjBkMGFjMDRjLi45NWJhZWJhNDE3MjE5ZWJlMzAzMzdjM2Y2ZWZl ODI3MjU1ZWQ5NDZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0xNDMs NiArMTQzLDEwIEBACiAjaW5jbHVkZSAiUG9pbnRlckxvY2tDb250cm9sbGVyLmgiCiAjZW5kaWYK IAorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25z L0V2ZW50SGFuZGxlckFkZGl0aW9ucy5jcHA+CisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUg ewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwpAQCAtMjUxNiwxOCArMjUyMCwyOCBAQCBz dGF0aWMgYm9vbCBoaWVyYXJjaHlIYXNDYXB0dXJpbmdFdmVudExpc3RlbmVycyhFbGVtZW50KiBl bGVtZW50LCBjb25zdCBBdG9tU3RyaQogCiBSZWZQdHI8RWxlbWVudD4gRXZlbnRIYW5kbGVyOjp0 ZXh0UmVjb2duaXRpb25DYW5kaWRhdGVFbGVtZW50KCkgY29uc3QKIHsKLSAgICBSZWZQdHIgc2hh ZG93SG9zdCA9IG1fZWxlbWVudFVuZGVyTW91c2UgPyBtX2VsZW1lbnRVbmRlck1vdXNlLT5zaGFk b3dIb3N0KCkgOiBudWxscHRyOwotICAgIGlmICghc2hhZG93SG9zdCkKKyAgICBSZWZQdHIgY2Fu ZGlkYXRlRWxlbWVudCA9IG1fZWxlbWVudFVuZGVyTW91c2U7CisgICAgaWYgKGNhbmRpZGF0ZUVs ZW1lbnQpIHsKKyAgICAgICAgaWYgKGF1dG8gc2hhZG93SG9zdCA9IGNhbmRpZGF0ZUVsZW1lbnQt PnNoYWRvd0hvc3QoKSkKKyAgICAgICAgICAgIGNhbmRpZGF0ZUVsZW1lbnQgPSBzaGFkb3dIb3N0 OworICAgIH0KKworICAgIGlmICghY2FuZGlkYXRlRWxlbWVudCkKICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAKLSAgICBhdXRvIHJlbmRlcmVyID0gc2hhZG93SG9zdC0+cmVuZGVyZXIoKTsKKyAg ICBhdXRvIHJlbmRlcmVyID0gY2FuZGlkYXRlRWxlbWVudC0+cmVuZGVyZXIoKTsKICAgICBpZiAo IWlzPFJlbmRlckltYWdlPihyZW5kZXJlcikpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0g ICAgaWYgKGlzPEhUTUxWaWRlb0VsZW1lbnQ+KCpzaGFkb3dIb3N0KSkKKyNpZiBVU0UoQVBQTEVf SU5URVJOQUxfU0RLKQorICAgIGlmIChpc0FkZGl0aW9uYWxUZXh0UmVjb2duaXRpb25DYW5kaWRh dGVFbGVtZW50KCpjYW5kaWRhdGVFbGVtZW50KSkKKyAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZUVs ZW1lbnQ7CisjZW5kaWYKKworICAgIGlmIChpczxIVE1MVmlkZW9FbGVtZW50PigqY2FuZGlkYXRl RWxlbWVudCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgcmV0dXJuIHNoYWRvd0hv c3Q7CisgICAgcmV0dXJuIGNhbmRpZGF0ZUVsZW1lbnQ7CiB9CiAKIHZvaWQgRXZlbnRIYW5kbGVy Ojp1cGRhdGVNb3VzZUV2ZW50VGFyZ2V0Tm9kZShjb25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUs IE5vZGUqIHRhcmdldE5vZGUsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgcGxhdGZvcm1Nb3Vz ZUV2ZW50LCBGaXJlTW91c2VPdmVyT3V0IGZpcmVNb3VzZU92ZXJPdXQpCg==