237794 2022-03-11 13:25:23 -0800 Refactor the filter block in DocumentMarkerController::filterMarkers() to return an enum type 2022-03-11 16:58:16 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi cdumez esprehn+autocc ews-watchlist hi kangil.han katherine_cheney megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1850599 0 wenson_hsieh 2022-03-11 13:25:23 -0800 . 1850602 1 454508 wenson_hsieh 2022-03-11 13:37:04 -0800 Created attachment 454508 Patch 1850641 2 454508 wenson_hsieh 2022-03-11 16:10:29 -0800 Comment on attachment 454508 Patch Thanks for the review! 1850655 3 ews-feeder 2022-03-11 16:57:25 -0800 Committed r291201 (248356@main): <https://commits.webkit.org/248356@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454508. 1850656 4 webkit-bug-importer 2022-03-11 16:58:16 -0800 <rdar://problem/90188078> 454508 2022-03-11 13:37:04 -0800 2022-03-11 16:57:27 -0800 Patch bug-237794-20220311133703.patch text/plain 9068 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ3M2YzMzhkOTQ1ZDBk MGQyYTI5ZTBjNWExNTcxNWMwMzMwMmFiNy4uZDA2YTEyMTUyMDc3NWNjYzcyZGMxMzY0OWQ5ZGEx NGU0MDE2NjdhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAzLTExICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9yIHRo ZSBmaWx0ZXIgYmxvY2sgaW4gRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpmaWx0ZXJNYXJrZXJz KCkgdG8gcmV0dXJuIGFuIGVudW0gdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM3Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ2hhbmdlIHRoZSByZXR1cm4gdmFsdWUgb2YgdGhlIGBmaWx0ZXJg IGZ1bmN0aW9uIGFyZ3VtZW50IGluIGBmaWx0ZXJNYXJrZXJzKClgIGZyb20gYSBgYm9vbGAgdG8g YSBuYW1lZCBlbnVtCisgICAgICAgIHR5cGUgd2l0aCAyIHZhbHVlczogYEtlZXBgIG9yIGBSZW1v dmVgOyB0aGlzIG1ha2VzIGl0IG1vcmUgb2J2aW91cyB0byBjYWxsIHNpdGVzIHdoZXRoZXIgdGhl IHJldHVybiB2YWx1ZSB3aWxsCisgICAgICAgIGNhdXNlIGRvY3VtZW50IG1hcmtlcnMgdG8gcmVt YWluIG9yIGJlIHJlbW92ZWQgZnJvbSB0aGUgZG9jdW1lbnQuCisKKyAgICAgICAgKiBkb20vRG9j dW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFy a2VyQ29udHJvbGxlcjo6ZmlsdGVyTWFya2Vycyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dE1hcmtlckNvbnRyb2xsZXI6OnJlbW92ZU1hcmtlcnMpOgorICAgICAgICAqIGRvbS9Eb2N1bWVu dE1hcmtlckNvbnRyb2xsZXIuaDogUmVtb3ZlIGEgRklYTUUgYW5kIGNvbW1lbnQgdGhhdCdzIG5v IGxvbmdlciBuZWVkZWQuCisKIDIwMjItMDMtMTAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQWRkIHN1cHBvcnQgZm9yIC1bVUlUZXh0SW5w dXQgcmVtb3ZlRW1vamlBbHRlcm5hdGl2ZXNdIG9uIFdLQ29udGVudFZpZXcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg MjZjMjlmYmU2MjgwZTdmYjgyNWViNGZhNmRmZmE2YTg3NTdjMTE0Ny4uMDI1MzA3OTAxZTE2NTM5 ZDAxMDljYjM0MjY5OGIwZDVmN2QzMzQ1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAy Mi0wMy0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAg ICBSZWZhY3RvciB0aGUgZmlsdGVyIGJsb2NrIGluIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6 ZmlsdGVyTWFya2VycygpIHRvIHJldHVybiBhbiBlbnVtIHR5cGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzc5NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERyaXZlLWJ5IGZpeDogb25seSByZW1vdmUg dGhlIHNwZWxsY2hlY2tpbmcgZG9jdW1lbnQgbWFya2VyIGluIGByZW1vdmVBbm5vdGF0aW9uUmVs YXRpdmVUb1NlbGVjdGlvbmAgaWYgdGhlCisgICAgICAgIGFubm90YXRpb24gc3RyaW5nIG9mIHRo ZSBtYXJrZXIgbWF0Y2hlcyB0aGUgZ2l2ZW4gYW5ub3RhdGlvbiBzdHJpbmcgdG8gdGhlIG1ldGhv ZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9UZXh0Q2hlY2tpbmdDb250 cm9sbGVyUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OlRleHRDaGVja2luZ0NvbnRyb2xsZXJQ cm94eTo6cmVtb3ZlQW5ub3RhdGlvblJlbGF0aXZlVG9TZWxlY3Rpb24pOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OmNsZWFyRGljdGF0aW9uQWx0ZXJuYXRpdmVzKToKKwogMjAyMi0wMy0xMCAgV2Vu c29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBBZGQg c3VwcG9ydCBmb3IgLVtVSVRleHRJbnB1dCByZW1vdmVFbW9qaUFsdGVybmF0aXZlc10gb24gV0tD b250ZW50VmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2Vy Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9s bGVyLmNwcAppbmRleCBiM2RlZWMyMmYzZjIyOTFlZmI1N2IxZWIyZjlhYTlmZjkxODJhYzc4Li45 OTE1NWM1ZjUxMjhkYjRhM2U1ZTYyYjExNzc0ODBkYmU4ZGJlMWMxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcApAQCAtOTIsNyArOTIsNyBA QCB2b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6cmVtb3ZlTWFya2Vycyhjb25zdCBTaW1w bGVSYW5nZSYgcmFuZ2UsIE9wdGlvblNldAogICAgIGZpbHRlck1hcmtlcnMocmFuZ2UsIG51bGxw dHIsIHR5cGVzLCBvdmVybGFwUnVsZSk7CiB9CiAKLXZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9s bGVyOjpmaWx0ZXJNYXJrZXJzKGNvbnN0IFNpbXBsZVJhbmdlJiByYW5nZSwgY29uc3QgRnVuY3Rp b248Ym9vbChjb25zdCBEb2N1bWVudE1hcmtlciYpPiYgZmlsdGVyLCBPcHRpb25TZXQ8RG9jdW1l bnRNYXJrZXI6Ok1hcmtlclR5cGU+IHR5cGVzLCBSZW1vdmVQYXJ0aWFsbHlPdmVybGFwcGluZ01h cmtlciBvdmVybGFwUnVsZSkKK3ZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpmaWx0ZXJN YXJrZXJzKGNvbnN0IFNpbXBsZVJhbmdlJiByYW5nZSwgY29uc3QgRnVuY3Rpb248RmlsdGVyTWFy a2VyUmVzdWx0KGNvbnN0IERvY3VtZW50TWFya2VyJik+JiBmaWx0ZXIsIE9wdGlvblNldDxEb2N1 bWVudE1hcmtlcjo6TWFya2VyVHlwZT4gdHlwZXMsIFJlbW92ZVBhcnRpYWxseU92ZXJsYXBwaW5n TWFya2VyIG92ZXJsYXBSdWxlKQogewogICAgIGZvciAoYXV0byYgdGV4dFBpZWNlIDogY29sbGVj dFRleHRSYW5nZXMocmFuZ2UpKSB7CiAgICAgICAgIGlmICghcG9zc2libHlIYXNNYXJrZXJzKHR5 cGVzKSkKQEAgLTM1Nyw3ICszNTcsNyBAQCB2b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6 Y29weU1hcmtlcnMoTm9kZSYgc291cmNlLCBPZmZzZXRSYW5nZSByYW5nZSwgTm9kZQogICAgIH0K IH0KIAotdm9pZCBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnJlbW92ZU1hcmtlcnMoTm9kZSYg bm9kZSwgT2Zmc2V0UmFuZ2UgcmFuZ2UsIE9wdGlvblNldDxEb2N1bWVudE1hcmtlcjo6TWFya2Vy VHlwZT4gdHlwZXMsIGNvbnN0IEZ1bmN0aW9uPGJvb2woY29uc3QgRG9jdW1lbnRNYXJrZXImKT4m IGZpbHRlciwgUmVtb3ZlUGFydGlhbGx5T3ZlcmxhcHBpbmdNYXJrZXIgb3ZlcmxhcFJ1bGUpCit2 b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6cmVtb3ZlTWFya2VycyhOb2RlJiBub2RlLCBP ZmZzZXRSYW5nZSByYW5nZSwgT3B0aW9uU2V0PERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBlPiB0 eXBlcywgY29uc3QgRnVuY3Rpb248RmlsdGVyTWFya2VyUmVzdWx0KGNvbnN0IERvY3VtZW50TWFy a2VyJik+JiBmaWx0ZXIsIFJlbW92ZVBhcnRpYWxseU92ZXJsYXBwaW5nTWFya2VyIG92ZXJsYXBS dWxlKQogewogICAgIGlmIChyYW5nZS5zdGFydCA+PSByYW5nZS5lbmQpCiAgICAgICAgIHJldHVy bjsKQEAgLTM4NCw3ICszODQsNyBAQCB2b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6cmVt b3ZlTWFya2VycyhOb2RlJiBub2RlLCBPZmZzZXRSYW5nZSByYW5nZSwgT3B0aQogICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoZmlsdGVyICYmICFmaWx0ZXIo bWFya2VyKSkgeworICAgICAgICBpZiAoZmlsdGVyICYmIGZpbHRlcihtYXJrZXIpID09IEZpbHRl ck1hcmtlclJlc3VsdDo6S2VlcCkgewogICAgICAgICAgICAgaSsrOwogICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dE1hcmtlckNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNv bnRyb2xsZXIuaAppbmRleCA1ZGJjZDE0ZWY1NzgwODdjMWZhZTdlNDgyNThjMWI3OGEyZTkxNWVj Li43N2E0MTZlMWFkMzI2YWQzODJiYmZiNjk3ZTg1ZjY5MmI0MzEzNmYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5oCkBAIC00Miw2ICs0Miw3IEBA IGNsYXNzIFRleHQ7CiBzdHJ1Y3QgU2ltcGxlUmFuZ2U7CiAKIGVudW0gY2xhc3MgUmVtb3ZlUGFy dGlhbGx5T3ZlcmxhcHBpbmdNYXJrZXIgOiBib29sIHsgTm8sIFllcyB9OworZW51bSBjbGFzcyBG aWx0ZXJNYXJrZXJSZXN1bHQgOiBib29sIHsgS2VlcCwgUmVtb3ZlIH07CiAKIGNsYXNzIERvY3Vt ZW50TWFya2VyQ29udHJvbGxlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoRG9jdW1lbnRN YXJrZXJDb250cm9sbGVyKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CkBAIC02MywxMSArNjQs OSBAQCBwdWJsaWM6CiAgICAgLy8gcmVtb3ZlIHRoZSBtYXJrZXIuIElmIHRoZSBhcmd1bWVudCBp cyBmYWxzZSwgd2Ugd2lsbCBhZGp1c3QgdGhlIHNwYW4gb2YgdGhlIG1hcmtlciBzbyB0aGF0IGl0 IHJldGFpbnMKICAgICAvLyB0aGUgcG9ydGlvbiB0aGF0IGlzIG91dHNpZGUgb2YgdGhlIHJhbmdl LgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVtb3ZlTWFya2Vycyhjb25zdCBTaW1wbGVSYW5n ZSYsIE9wdGlvblNldDxEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZT4gPSBEb2N1bWVudE1hcmtl cjo6YWxsTWFya2VycygpLCBSZW1vdmVQYXJ0aWFsbHlPdmVybGFwcGluZ01hcmtlciA9IFJlbW92 ZVBhcnRpYWxseU92ZXJsYXBwaW5nTWFya2VyOjpObyk7Ci0gICAgdm9pZCByZW1vdmVNYXJrZXJz KE5vZGUmLCBPZmZzZXRSYW5nZSwgT3B0aW9uU2V0PERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBl PiA9IERvY3VtZW50TWFya2VyOjphbGxNYXJrZXJzKCksIGNvbnN0IEZ1bmN0aW9uPGJvb2woY29u c3QgRG9jdW1lbnRNYXJrZXImKT4mIGZpbHRlckZ1bmN0aW9uID0gbnVsbHB0ciwgUmVtb3ZlUGFy dGlhbGx5T3ZlcmxhcHBpbmdNYXJrZXIgPSBSZW1vdmVQYXJ0aWFsbHlPdmVybGFwcGluZ01hcmtl cjo6Tm8pOworICAgIHZvaWQgcmVtb3ZlTWFya2VycyhOb2RlJiwgT2Zmc2V0UmFuZ2UsIE9wdGlv blNldDxEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZT4gPSBEb2N1bWVudE1hcmtlcjo6YWxsTWFy a2VycygpLCBjb25zdCBGdW5jdGlvbjxGaWx0ZXJNYXJrZXJSZXN1bHQoY29uc3QgRG9jdW1lbnRN YXJrZXImKT4mIGZpbHRlckZ1bmN0aW9uID0gbnVsbHB0ciwgUmVtb3ZlUGFydGlhbGx5T3Zlcmxh cHBpbmdNYXJrZXIgPSBSZW1vdmVQYXJ0aWFsbHlPdmVybGFwcGluZ01hcmtlcjo6Tm8pOwogCi0g ICAgLy8gUmV0dXJuIHRydWUgZnJvbSBmaWx0ZXJGdW5jdGlvbiB0byByZW1vdmUgdGhlIG1hcmtl ci4KLSAgICAvLyBGSVhNRTogVGhpcyB3b3VsZCBiZSBjbGVhcmVyIGlmIHRoZSBgZmlsdGVyYCBm dW5jdGlvbiB3ZXJlIHJlZmFjdG9yZWQgdG8gcmV0dXJuIGEgc3Ryb25nbHkgdHlwZWQgZW51bS4K LSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGZpbHRlck1hcmtlcnMoY29uc3QgU2ltcGxlUmFuZ2Um LCBjb25zdCBGdW5jdGlvbjxib29sKGNvbnN0IERvY3VtZW50TWFya2VyJik+JiBmaWx0ZXJGdW5j dGlvbiwgT3B0aW9uU2V0PERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBlPiA9IERvY3VtZW50TWFy a2VyOjphbGxNYXJrZXJzKCksIFJlbW92ZVBhcnRpYWxseU92ZXJsYXBwaW5nTWFya2VyID0gUmVt b3ZlUGFydGlhbGx5T3ZlcmxhcHBpbmdNYXJrZXI6Ok5vKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIGZpbHRlck1hcmtlcnMoY29uc3QgU2ltcGxlUmFuZ2UmLCBjb25zdCBGdW5jdGlvbjxGaWx0 ZXJNYXJrZXJSZXN1bHQoY29uc3QgRG9jdW1lbnRNYXJrZXImKT4mIGZpbHRlckZ1bmN0aW9uLCBP cHRpb25TZXQ8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+ID0gRG9jdW1lbnRNYXJrZXI6OmFs bE1hcmtlcnMoKSwgUmVtb3ZlUGFydGlhbGx5T3ZlcmxhcHBpbmdNYXJrZXIgPSBSZW1vdmVQYXJ0 aWFsbHlPdmVybGFwcGluZ01hcmtlcjo6Tm8pOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBy ZW1vdmVNYXJrZXJzKE9wdGlvblNldDxEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZT4gPSBEb2N1 bWVudE1hcmtlcjo6YWxsTWFya2VycygpKTsKICAgICB2b2lkIHJlbW92ZU1hcmtlcnMoTm9kZSYs IE9wdGlvblNldDxEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZT4gPSBEb2N1bWVudE1hcmtlcjo6 YWxsTWFya2VycygpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL0NvY29hL1RleHRDaGVja2luZ0NvbnRyb2xsZXJQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1RleHRDaGVja2luZ0NvbnRyb2xsZXJQcm94eS5tbQpp bmRleCBiOTNlNmI3MjUzOTdhMWY4ZjJlOTMwODdjMDhlNzNkMzhjOWU1NDc3Li4wNDBmMzEzOGQ0 OWU2MjlmYWY1MWFjMTI0NGVkYTMxMmRmMzkwYjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9UZXh0Q2hlY2tpbmdDb250cm9sbGVyUHJveHkubW0K KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvVGV4dENoZWNraW5n Q29udHJvbGxlclByb3h5Lm1tCkBAIC0xNTgsOSArMTU4LDggQEAgdm9pZCBUZXh0Q2hlY2tpbmdD b250cm9sbGVyUHJveHk6OnJlbW92ZUFubm90YXRpb25SZWxhdGl2ZVRvU2VsZWN0aW9uKGNvbnN0 IFN0cmkKICAgICBSZWZQdHIgZG9jdW1lbnQgPSBDaGVja2VkUmVmKG1fcGFnZS5jb3JlUGFnZSgp LT5mb2N1c0NvbnRyb2xsZXIoKSktPmZvY3VzZWRPck1haW5GcmFtZSgpLmRvY3VtZW50KCk7CiAg ICAgZG9jdW1lbnQtPm1hcmtlcnMoKS5maWx0ZXJNYXJrZXJzKHJhbmdlQW5kT2Zmc2V0LT5yYW5n ZSwgWyZdIChjb25zdCBEb2N1bWVudE1hcmtlciYgbWFya2VyKSB7CiAgICAgICAgIGlmICghc3Rk Ojpob2xkc19hbHRlcm5hdGl2ZTxXZWJDb3JlOjpEb2N1bWVudE1hcmtlcjo6UGxhdGZvcm1UZXh0 Q2hlY2tpbmdEYXRhPihtYXJrZXIuZGF0YSgpKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgLy8gRklYTUU6IElzIHRoaXMgcmV0dXJuIHZhbHVlIGZsaXBwZWQ/Ci0gICAgICAg IHJldHVybiBzdGQ6OmdldDxXZWJDb3JlOjpEb2N1bWVudE1hcmtlcjo6UGxhdGZvcm1UZXh0Q2hl Y2tpbmdEYXRhPihtYXJrZXIuZGF0YSgpKS5rZXkgIT0gYW5ub3RhdGlvbjsKKyAgICAgICAgICAg IHJldHVybiBGaWx0ZXJNYXJrZXJSZXN1bHQ6OktlZXA7CisgICAgICAgIHJldHVybiBzdGQ6Omdl dDxXZWJDb3JlOjpEb2N1bWVudE1hcmtlcjo6UGxhdGZvcm1UZXh0Q2hlY2tpbmdEYXRhPihtYXJr ZXIuZGF0YSgpKS5rZXkgPT0gYW5ub3RhdGlvbiA/IEZpbHRlck1hcmtlclJlc3VsdDo6UmVtb3Zl IDogRmlsdGVyTWFya2VyUmVzdWx0OjpLZWVwOwogICAgIH0sIHR5cGVzKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29h Lm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvV2ViUGFnZUNvY29h Lm1tCmluZGV4IGE5Yjc2MjgzMTM0ODU3Y2EwZTZhZDMwMTY3MmMwNGQ3MDI3MDZmZjguLjIzMzM4 M2Y1NDZiYjZiODdiMWZkYmE0OWRiMGM1NzllY2IwOTc3ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1dlYlBhZ2VDb2NvYS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9XZWJQYWdlQ29jb2EubW0KQEAgLTMy Niw5ICszMjYsOCBAQCB2b2lkIFdlYlBhZ2U6OmNsZWFyRGljdGF0aW9uQWx0ZXJuYXRpdmVzKFZl Y3RvcjxEaWN0YXRpb25Db250ZXh0PiYmIGNvbnRleHRzKQogICAgIGF1dG8gZG9jdW1lbnRSYW5n ZSA9IG1ha2VSYW5nZVNlbGVjdGluZ05vZGVDb250ZW50cygqZG9jdW1lbnQpOwogICAgIGRvY3Vt ZW50LT5tYXJrZXJzKCkuZmlsdGVyTWFya2Vycyhkb2N1bWVudFJhbmdlLCBbJl0gKGF1dG8mIG1h cmtlcikgewogICAgICAgICBpZiAoIXN0ZDo6aG9sZHNfYWx0ZXJuYXRpdmU8RG9jdW1lbnRNYXJr ZXI6OkRpY3RhdGlvbkRhdGE+KG1hcmtlci5kYXRhKCkpKQotICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwotCi0gICAgICAgIHJldHVybiBzZXRPZkNvbnRleHRzVG9SZW1vdmUuY29udGFpbnMoc3Rk OjpnZXQ8V2ViQ29yZTo6RG9jdW1lbnRNYXJrZXI6OkRpY3RhdGlvbkRhdGE+KG1hcmtlci5kYXRh KCkpLmNvbnRleHQpOworICAgICAgICAgICAgcmV0dXJuIEZpbHRlck1hcmtlclJlc3VsdDo6S2Vl cDsKKyAgICAgICAgcmV0dXJuIHNldE9mQ29udGV4dHNUb1JlbW92ZS5jb250YWlucyhzdGQ6Omdl dDxXZWJDb3JlOjpEb2N1bWVudE1hcmtlcjo6RGljdGF0aW9uRGF0YT4obWFya2VyLmRhdGEoKSku Y29udGV4dCkgPyBGaWx0ZXJNYXJrZXJSZXN1bHQ6OlJlbW92ZSA6IEZpbHRlck1hcmtlclJlc3Vs dDo6S2VlcDsKICAgICB9LCBEb2N1bWVudE1hcmtlcjo6RGljdGF0aW9uQWx0ZXJuYXRpdmVzKTsK IH0KIAo=