198950 2019-06-17 19:04:14 -0700 Expose DataDetectors context generation on WKContentViewInteraction 2019-06-18 10:02:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton aestes bdakin dino tsavell webkit-bug-importer wenson_hsieh oldest_to_newest 1545525 0 thorton 2019-06-17 19:04:14 -0700 Expose DataDetectors context generation on WKContentViewInteraction 1545526 1 372314 thorton 2019-06-17 19:04:28 -0700 Created attachment 372314 Patch 1545527 2 thorton 2019-06-17 19:04:30 -0700 <rdar://problem/51116021> 1545528 3 372315 thorton 2019-06-17 19:05:49 -0700 Created attachment 372315 Patch 1545531 4 thorton 2019-06-17 19:34:08 -0700 https://trac.webkit.org/changeset/246531/webkit 1545644 5 tsavell 2019-06-18 09:48:38 -0700 Reverted r246531 for reason: Broke internal builds. Committed r246544: <https://trac.webkit.org/changeset/246544> 1545645 6 thorton 2019-06-18 10:02:22 -0700 Re-landed in https://trac.webkit.org/changeset/246546/webkit 372314 2019-06-17 19:04:28 -0700 2019-06-17 19:05:47 -0700 Patch bug-198950-20190617190427.patch text/plain 6855 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNmODZiNGUxZTU5ZDZjYWEz YTNkNDQ4ODI5NjQ1NWYwYzMwNmVmNDUuLjlkYjlmZDQ0YTdiNzA0OTRlNzAwYjE1ZDc5MzNmOTcy ZmMwYmQxNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDYtMTcgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIERhdGFEZXRl Y3RvcnMgY29udGV4dCBnZW5lcmF0aW9uIG9uIFdLQ29udGVudFZpZXdJbnRlcmFjdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4OTUwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81MTExNjAyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lz dGFudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5t bToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBjdXJyZW50UG9zaXRpb25JbmZv cm1hdGlvbl0pOgorICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IHNob3dEYXRhRGV0 ZWN0b3JzU2hlZXRdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRhdGFEZXRlY3Rpb25Db250ZXh0Rm9y UG9zaXRpb25JbmZvcm1hdGlvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkYXRhRGV0 ZWN0aW9uQ29udGV4dEZvckFjdGlvblNoZWV0QXNzaXN0YW50Ol0pOgorICAgICAgICBGb3IgdXNl IGJ5IG90aGVyIGNsaWVudHMsIGFkZCAtZGF0YURldGVjdGlvbkNvbnRleHRGb3JQb3NpdGlvbklu Zm9ybWF0aW9uOgorICAgICAgICBhbmQgbWFrZSAtZGF0YURldGVjdGlvbkNvbnRleHRGb3JBY3Rp b25TaGVldEFzc2lzdGFudDogdXNlIGl0LgorICAgICAgICBBbHNvLCBwdWxsIHRoZSBjb2RlIHRv IGF1Z21lbnQgdGhlIGNvbnRleHQgd2l0aCBzdXJyb3VuZGluZyB0ZXh0IG91dCBvZgorICAgICAg ICBmcm9tIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQuCisKIDIwMTktMDYtMTcgIEppZXdlbiBUYW4g IDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIFNPQXV0aG9yaXphdGlvbiBm cm9tIFdlYktpdEFkZGl0aW9ucyB0byBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oCmluZGV4IDE3YzFmM2I1ZTVjMTFl ZDhlZDFlNGZmNjg3ZWE4ZTNhNWJmMDA5ZmIuLmIwNGRkMTA1YTk0NzY4ZGQ5MGFiOWY2ZGI0ODNh ZGFjNjM0ZDk0ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Fj dGlvblNoZWV0QXNzaXN0YW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL QWN0aW9uU2hlZXRBc3Npc3RhbnQuaApAQCAtODIsNiArODIsNyBAQCBzdHJ1Y3QgSW50ZXJhY3Rp b25JbmZvcm1hdGlvbkF0UG9zaXRpb247CiAtIChCT09MKWlzU2hvd2luZ1NoZWV0OwogLSAodm9p ZClpbnRlcmFjdGlvbkRpZFN0YXJ0V2l0aFBvc2l0aW9uSW5mb3JtYXRpb246KGNvbnN0IFdlYktp dDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24mKWluZm9ybWF0aW9uOwogLSAoTlNB cnJheSAqKWN1cnJlbnRBdmFpbGFibGVBY3Rpb25UaXRsZXM7CistIChPcHRpb25hbDxXZWJLaXQ6 OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uPiljdXJyZW50UG9zaXRpb25JbmZvcm1h dGlvbjsKIEBlbmQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmlu ZGV4IGFkMGY0MWI5ZmE3MGRkN2NkYWFlODc2YWE3MzUwYzJiZmYyMWEwNDMuLmIzM2EzYjYwMWFj YjZhODNiOTYzZWYyNGU4ODQxNjQ0YmRjOWY3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCkBAIC0zMjUsNiArMzI1 LDExIEBAIC0gKE5TQXJyYXkgKiljdXJyZW50QXZhaWxhYmxlQWN0aW9uVGl0bGVzCiAgICAgcmV0 dXJuIGFycmF5OwogfQogCistIChPcHRpb25hbDxXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRp b25BdFBvc2l0aW9uPiljdXJyZW50UG9zaXRpb25JbmZvcm1hdGlvbgoreworICAgIHJldHVybiBf cG9zaXRpb25JbmZvcm1hdGlvbjsKK30KKwogLSAodm9pZClfY3JlYXRlU2hlZXRXaXRoRWxlbWVu dEFjdGlvbnM6KE5TQXJyYXkgKilhY3Rpb25zIGRlZmF1bHRUaXRsZTooTlNTdHJpbmcgKilkZWZh dWx0VGl0bGUgc2hvd0xpbmtUaXRsZTooQk9PTClzaG93TGlua1RpdGxlCiB7CiAgICAgYXV0byBk ZWxlZ2F0ZSA9IF9kZWxlZ2F0ZS5nZXQoKTsKQEAgLTY0NiwyMiArNjUxLDExIEBAIC0gKHZvaWQp c2hvd0RhdGFEZXRlY3RvcnNTaGVldAogICAgIERERGV0ZWN0aW9uQ29udHJvbGxlciAqY29udHJv bGxlciA9IFtnZXRERERldGVjdGlvbkNvbnRyb2xsZXJDbGFzcygpIHNoYXJlZENvbnRyb2xsZXJd OwogICAgIE5TRGljdGlvbmFyeSAqY29udGV4dCA9IG5pbDsKICAgICBOU1N0cmluZyAqdGV4dEF0 U2VsZWN0aW9uID0gbmlsOwotICAgIFJldGFpblB0cjxOU011dGFibGVEaWN0aW9uYXJ5PiBleHRl bmRlZENvbnRleHQ7CiAKICAgICBpZiAoW19kZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKGRhdGFEZXRlY3Rpb25Db250ZXh0Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KV0pCiAg ICAgICAgIGNvbnRleHQgPSBbX2RlbGVnYXRlIGRhdGFEZXRlY3Rpb25Db250ZXh0Rm9yQWN0aW9u U2hlZXRBc3Npc3RhbnQ6c2VsZl07CiAgICAgaWYgKFtfZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3RvcihzZWxlY3RlZFRleHRGb3JBY3Rpb25TaGVldEFzc2lzdGFudDopXSkKICAg ICAgICAgdGV4dEF0U2VsZWN0aW9uID0gW19kZWxlZ2F0ZSBzZWxlY3RlZFRleHRGb3JBY3Rpb25T aGVldEFzc2lzdGFudDpzZWxmXTsKLSAgICBpZiAoIV9wb3NpdGlvbkluZm9ybWF0aW9uLT50ZXh0 QmVmb3JlLmlzRW1wdHkoKSB8fCAhX3Bvc2l0aW9uSW5mb3JtYXRpb24tPnRleHRBZnRlci5pc0Vt cHR5KCkpIHsKLSAgICAgICAgZXh0ZW5kZWRDb250ZXh0ID0gYWRvcHROUyhbQHsKLSAgICAgICAg ICAgIGdldGtEYXRhRGV0ZWN0b3JzTGVhZGluZ1RleHQoKSA6IF9wb3NpdGlvbkluZm9ybWF0aW9u LT50ZXh0QmVmb3JlLAotICAgICAgICAgICAgZ2V0a0RhdGFEZXRlY3RvcnNUcmFpbGluZ1RleHQo KSA6IF9wb3NpdGlvbkluZm9ybWF0aW9uLT50ZXh0QWZ0ZXIsCi0gICAgICAgIH0gbXV0YWJsZUNv cHldKTsKLSAgICAgICAgCi0gICAgICAgIGlmIChjb250ZXh0KQotICAgICAgICAgICAgW2V4dGVu ZGVkQ29udGV4dCBhZGRFbnRyaWVzRnJvbURpY3Rpb25hcnk6Y29udGV4dF07Ci0gICAgICAgIGNv bnRleHQgPSBleHRlbmRlZENvbnRleHQuZ2V0KCk7Ci0gICAgfQogCiAgICAgaWYgKFtjb250cm9s bGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2hvdWxkSW1tZWRpYXRlbHlMYXVuY2hE ZWZhdWx0QWN0aW9uRm9yVVJMOildICYmIFtjb250cm9sbGVyIHNob3VsZEltbWVkaWF0ZWx5TGF1 bmNoRGVmYXVsdEFjdGlvbkZvclVSTDp0YXJnZXRVUkxdKSB7CiAgICAgICAgIGF1dG8gYWN0aW9u ID0gW2NvbnRyb2xsZXIgZGVmYXVsdEFjdGlvbkZvclVSTDp0YXJnZXRVUkwgcmVzdWx0czpuaWwg Y29udGV4dDpjb250ZXh0XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCAyNzE4YTU0MDBjZWQxZTlkZTZiNTY2 ODI2ZGVjZjUyZmY2Y2JhNzBiLi4zZTU3MDE3Y2FhZjBkZGE3N2JkMTI5MDlkZTNhNzFjNWY1ZTdi MTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5oCkBAIC00NzAsNiArNDcwLDcgQEAgRk9SX0VBQ0hfUFJJVkFURV9X S0NPTlRFTlRWSUVXX0FDVElPTihERUNMQVJFX1dLQ09OVEVOVFZJRVdfQUNUSU9OX0ZPUl9XRUJf VklFVykKIC0gKHZvaWQpX2FjY2Vzc2liaWxpdHlDbGVhclNlbGVjdGlvbjsKIC0gKFdLRm9ybUlu cHV0U2Vzc2lvbiAqKV9mb3JtSW5wdXRTZXNzaW9uOwogLSAodm9pZClfZGlkQ2hhbmdlV2ViVmll d0VkaXRhYmlsaXR5OworLSAoTlNEaWN0aW9uYXJ5ICopZGF0YURldGVjdGlvbkNvbnRleHRGb3JQ b3NpdGlvbkluZm9ybWF0aW9uOihXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0 aW9uKXBvc2l0aW9uSW5mb3JtYXRpb247CiAKIC0gKHZvaWQpd2lsbEZpbmlzaElnbm9yaW5nQ2Fs bG91dEJhckZhZGVBZnRlclBlcmZvcm1pbmdBY3Rpb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDYy YjNhZTE5ODc3YWFhMTg0NThiYWEzNGQ4ZTRkZGNkNTMyYWVhNzguLmQ1YzJjODJmNGVmMjVmZTZj NjhiZTI3ZWVhYzllOTZlYWZjMjhkZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNjEzOSwxMyArNjEz OSwyNyBAQCAtICh2b2lkKWFjdGlvblNoZWV0QXNzaXN0YW50RGlkU3RvcEludGVyYWN0aW9uOihX S0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YQogICAgIF9wYWdlLT5zdG9wSW50ZXJhY3Rp b24oKTsKIH0KIAotLSAoTlNEaWN0aW9uYXJ5ICopZGF0YURldGVjdGlvbkNvbnRleHRGb3JBY3Rp b25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudAorLSAo TlNEaWN0aW9uYXJ5ICopZGF0YURldGVjdGlvbkNvbnRleHRGb3JQb3NpdGlvbkluZm9ybWF0aW9u OihXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uKXBvc2l0aW9uSW5mb3Jt YXRpb24KIHsKLSAgICBOU0RpY3Rpb25hcnkgKmNvbnRleHQgPSBuaWw7CisgICAgUmV0YWluUHRy PE5TTXV0YWJsZURpY3Rpb25hcnk+IGNvbnRleHQ7CiAgICAgaWQgPFdLVUlEZWxlZ2F0ZVByaXZh dGU+IHVpRGVsZWdhdGUgPSBzdGF0aWNfY2FzdDxpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4+KFtf d2ViVmlldyBVSURlbGVnYXRlXSk7CiAgICAgaWYgKFt1aURlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoX2RhdGFEZXRlY3Rpb25Db250ZXh0Rm9yV2ViVmlldzopXSkKLSAgICAg ICAgY29udGV4dCA9IFt1aURlbGVnYXRlIF9kYXRhRGV0ZWN0aW9uQ29udGV4dEZvcldlYlZpZXc6 X3dlYlZpZXddOwotICAgIHJldHVybiBjb250ZXh0OworICAgICAgICBjb250ZXh0ID0gYWRvcHRO UyhbW3VpRGVsZWdhdGUgX2RhdGFEZXRlY3Rpb25Db250ZXh0Rm9yV2ViVmlldzpfd2ViVmlld10g bXV0YWJsZUNvcHldKTsKKyAgICAKKyAgICBpZiAoIWNvbnRleHQpCisgICAgICAgIGNvbnRleHQg PSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRdKTsKKyAgICAKKyAgICBpZiAo IXBvc2l0aW9uSW5mb3JtYXRpb24udGV4dEJlZm9yZS5pc0VtcHR5KCkpCisgICAgICAgIGNvbnRl eHQuZ2V0KClbZ2V0a0RhdGFEZXRlY3RvcnNMZWFkaW5nVGV4dCgpXSA9IHBvc2l0aW9uSW5mb3Jt YXRpb24udGV4dEJlZm9yZTsKKyAgICBpZiAoIXBvc2l0aW9uSW5mb3JtYXRpb24udGV4dEFmdGVy LmlzRW1wdHkoKSkKKyAgICAgICAgY29udGV4dC5nZXQoKVtnZXRrRGF0YURldGVjdG9yc1RyYWls aW5nVGV4dCgpXSA9IHBvc2l0aW9uSW5mb3JtYXRpb24udGV4dEFmdGVyOworICAgIAorICAgIHJl dHVybiBjb250ZXh0LmF1dG9yZWxlYXNlKCk7Cit9CisKKy0gKE5TRGljdGlvbmFyeSAqKWRhdGFE ZXRlY3Rpb25Db250ZXh0Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Np c3RhbnQgKilhc3Npc3RhbnQKK3sKKyAgICByZXR1cm4gW3NlbGYgZGF0YURldGVjdGlvbkNvbnRl eHRGb3JQb3NpdGlvbkluZm9ybWF0aW9uOmFzc2lzdGFudC5jdXJyZW50UG9zaXRpb25JbmZvcm1h dGlvbi52YWx1ZU9yKF9wb3NpdGlvbkluZm9ybWF0aW9uKV07CiB9CiAKIC0gKE5TU3RyaW5nICop c2VsZWN0ZWRUZXh0Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3Rh bnQgKilhc3Npc3RhbnQK 372315 2019-06-17 19:05:49 -0700 2019-06-17 19:29:30 -0700 Patch bug-198950-20190617190548.patch text/plain 6860 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNmODZiNGUxZTU5ZDZjYWEz YTNkNDQ4ODI5NjQ1NWYwYzMwNmVmNDUuLjlkYjlmZDQ0YTdiNzA0OTRlNzAwYjE1ZDc5MzNmOTcy ZmMwYmQxNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMDYtMTcgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIERhdGFEZXRl Y3RvcnMgY29udGV4dCBnZW5lcmF0aW9uIG9uIFdLQ29udGVudFZpZXdJbnRlcmFjdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4OTUwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81MTExNjAyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lz dGFudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5t bToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBjdXJyZW50UG9zaXRpb25JbmZv cm1hdGlvbl0pOgorICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IHNob3dEYXRhRGV0 ZWN0b3JzU2hlZXRdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRhdGFEZXRlY3Rpb25Db250ZXh0Rm9y UG9zaXRpb25JbmZvcm1hdGlvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkYXRhRGV0 ZWN0aW9uQ29udGV4dEZvckFjdGlvblNoZWV0QXNzaXN0YW50Ol0pOgorICAgICAgICBGb3IgdXNl IGJ5IG90aGVyIGNsaWVudHMsIGFkZCAtZGF0YURldGVjdGlvbkNvbnRleHRGb3JQb3NpdGlvbklu Zm9ybWF0aW9uOgorICAgICAgICBhbmQgbWFrZSAtZGF0YURldGVjdGlvbkNvbnRleHRGb3JBY3Rp b25TaGVldEFzc2lzdGFudDogdXNlIGl0LgorICAgICAgICBBbHNvLCBwdWxsIHRoZSBjb2RlIHRv IGF1Z21lbnQgdGhlIGNvbnRleHQgd2l0aCBzdXJyb3VuZGluZyB0ZXh0IG91dCBvZgorICAgICAg ICBmcm9tIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQuCisKIDIwMTktMDYtMTcgIEppZXdlbiBUYW4g IDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIFNPQXV0aG9yaXphdGlvbiBm cm9tIFdlYktpdEFkZGl0aW9ucyB0byBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oCmluZGV4IDE3YzFmM2I1ZTVjMTFl ZDhlZDFlNGZmNjg3ZWE4ZTNhNWJmMDA5ZmIuLmIwNGRkMTA1YTk0NzY4ZGQ5MGFiOWY2ZGI0ODNh ZGFjNjM0ZDk0ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Fj dGlvblNoZWV0QXNzaXN0YW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL QWN0aW9uU2hlZXRBc3Npc3RhbnQuaApAQCAtODIsNiArODIsNyBAQCBzdHJ1Y3QgSW50ZXJhY3Rp b25JbmZvcm1hdGlvbkF0UG9zaXRpb247CiAtIChCT09MKWlzU2hvd2luZ1NoZWV0OwogLSAodm9p ZClpbnRlcmFjdGlvbkRpZFN0YXJ0V2l0aFBvc2l0aW9uSW5mb3JtYXRpb246KGNvbnN0IFdlYktp dDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24mKWluZm9ybWF0aW9uOwogLSAoTlNB cnJheSAqKWN1cnJlbnRBdmFpbGFibGVBY3Rpb25UaXRsZXM7CistIChPcHRpb25hbDxXZWJLaXQ6 OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uPiljdXJyZW50UG9zaXRpb25JbmZvcm1h dGlvbjsKIEBlbmQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmlu ZGV4IGFkMGY0MWI5ZmE3MGRkN2NkYWFlODc2YWE3MzUwYzJiZmYyMWEwNDMuLmIzM2EzYjYwMWFj YjZhODNiOTYzZWYyNGU4ODQxNjQ0YmRjOWY3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCkBAIC0zMjUsNiArMzI1 LDExIEBAIC0gKE5TQXJyYXkgKiljdXJyZW50QXZhaWxhYmxlQWN0aW9uVGl0bGVzCiAgICAgcmV0 dXJuIGFycmF5OwogfQogCistIChPcHRpb25hbDxXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRp b25BdFBvc2l0aW9uPiljdXJyZW50UG9zaXRpb25JbmZvcm1hdGlvbgoreworICAgIHJldHVybiBf cG9zaXRpb25JbmZvcm1hdGlvbjsKK30KKwogLSAodm9pZClfY3JlYXRlU2hlZXRXaXRoRWxlbWVu dEFjdGlvbnM6KE5TQXJyYXkgKilhY3Rpb25zIGRlZmF1bHRUaXRsZTooTlNTdHJpbmcgKilkZWZh dWx0VGl0bGUgc2hvd0xpbmtUaXRsZTooQk9PTClzaG93TGlua1RpdGxlCiB7CiAgICAgYXV0byBk ZWxlZ2F0ZSA9IF9kZWxlZ2F0ZS5nZXQoKTsKQEAgLTY0NiwyMiArNjUxLDExIEBAIC0gKHZvaWQp c2hvd0RhdGFEZXRlY3RvcnNTaGVldAogICAgIERERGV0ZWN0aW9uQ29udHJvbGxlciAqY29udHJv bGxlciA9IFtnZXRERERldGVjdGlvbkNvbnRyb2xsZXJDbGFzcygpIHNoYXJlZENvbnRyb2xsZXJd OwogICAgIE5TRGljdGlvbmFyeSAqY29udGV4dCA9IG5pbDsKICAgICBOU1N0cmluZyAqdGV4dEF0 U2VsZWN0aW9uID0gbmlsOwotICAgIFJldGFpblB0cjxOU011dGFibGVEaWN0aW9uYXJ5PiBleHRl bmRlZENvbnRleHQ7CiAKICAgICBpZiAoW19kZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKGRhdGFEZXRlY3Rpb25Db250ZXh0Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KV0pCiAg ICAgICAgIGNvbnRleHQgPSBbX2RlbGVnYXRlIGRhdGFEZXRlY3Rpb25Db250ZXh0Rm9yQWN0aW9u U2hlZXRBc3Npc3RhbnQ6c2VsZl07CiAgICAgaWYgKFtfZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3RvcihzZWxlY3RlZFRleHRGb3JBY3Rpb25TaGVldEFzc2lzdGFudDopXSkKICAg ICAgICAgdGV4dEF0U2VsZWN0aW9uID0gW19kZWxlZ2F0ZSBzZWxlY3RlZFRleHRGb3JBY3Rpb25T aGVldEFzc2lzdGFudDpzZWxmXTsKLSAgICBpZiAoIV9wb3NpdGlvbkluZm9ybWF0aW9uLT50ZXh0 QmVmb3JlLmlzRW1wdHkoKSB8fCAhX3Bvc2l0aW9uSW5mb3JtYXRpb24tPnRleHRBZnRlci5pc0Vt cHR5KCkpIHsKLSAgICAgICAgZXh0ZW5kZWRDb250ZXh0ID0gYWRvcHROUyhbQHsKLSAgICAgICAg ICAgIGdldGtEYXRhRGV0ZWN0b3JzTGVhZGluZ1RleHQoKSA6IF9wb3NpdGlvbkluZm9ybWF0aW9u LT50ZXh0QmVmb3JlLAotICAgICAgICAgICAgZ2V0a0RhdGFEZXRlY3RvcnNUcmFpbGluZ1RleHQo KSA6IF9wb3NpdGlvbkluZm9ybWF0aW9uLT50ZXh0QWZ0ZXIsCi0gICAgICAgIH0gbXV0YWJsZUNv cHldKTsKLSAgICAgICAgCi0gICAgICAgIGlmIChjb250ZXh0KQotICAgICAgICAgICAgW2V4dGVu ZGVkQ29udGV4dCBhZGRFbnRyaWVzRnJvbURpY3Rpb25hcnk6Y29udGV4dF07Ci0gICAgICAgIGNv bnRleHQgPSBleHRlbmRlZENvbnRleHQuZ2V0KCk7Ci0gICAgfQogCiAgICAgaWYgKFtjb250cm9s bGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2hvdWxkSW1tZWRpYXRlbHlMYXVuY2hE ZWZhdWx0QWN0aW9uRm9yVVJMOildICYmIFtjb250cm9sbGVyIHNob3VsZEltbWVkaWF0ZWx5TGF1 bmNoRGVmYXVsdEFjdGlvbkZvclVSTDp0YXJnZXRVUkxdKSB7CiAgICAgICAgIGF1dG8gYWN0aW9u ID0gW2NvbnRyb2xsZXIgZGVmYXVsdEFjdGlvbkZvclVSTDp0YXJnZXRVUkwgcmVzdWx0czpuaWwg Y29udGV4dDpjb250ZXh0XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCAyNzE4YTU0MDBjZWQxZTlkZTZiNTY2 ODI2ZGVjZjUyZmY2Y2JhNzBiLi4zZTU3MDE3Y2FhZjBkZGE3N2JkMTI5MDlkZTNhNzFjNWY1ZTdi MTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5oCkBAIC00NzAsNiArNDcwLDcgQEAgRk9SX0VBQ0hfUFJJVkFURV9X S0NPTlRFTlRWSUVXX0FDVElPTihERUNMQVJFX1dLQ09OVEVOVFZJRVdfQUNUSU9OX0ZPUl9XRUJf VklFVykKIC0gKHZvaWQpX2FjY2Vzc2liaWxpdHlDbGVhclNlbGVjdGlvbjsKIC0gKFdLRm9ybUlu cHV0U2Vzc2lvbiAqKV9mb3JtSW5wdXRTZXNzaW9uOwogLSAodm9pZClfZGlkQ2hhbmdlV2ViVmll d0VkaXRhYmlsaXR5OworLSAoTlNEaWN0aW9uYXJ5ICopZGF0YURldGVjdGlvbkNvbnRleHRGb3JQ b3NpdGlvbkluZm9ybWF0aW9uOihXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0 aW9uKXBvc2l0aW9uSW5mb3JtYXRpb247CiAKIC0gKHZvaWQpd2lsbEZpbmlzaElnbm9yaW5nQ2Fs bG91dEJhckZhZGVBZnRlclBlcmZvcm1pbmdBY3Rpb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDYy YjNhZTE5ODc3YWFhMTg0NThiYWEzNGQ4ZTRkZGNkNTMyYWVhNzguLjgzYzAwMjU0MGViMGMxNGQx NDVjOGQxZjYzNDhmMmNlMDdmM2RlOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNjEzOSwxMyArNjEz OSwyNyBAQCAtICh2b2lkKWFjdGlvblNoZWV0QXNzaXN0YW50RGlkU3RvcEludGVyYWN0aW9uOihX S0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YQogICAgIF9wYWdlLT5zdG9wSW50ZXJhY3Rp b24oKTsKIH0KIAotLSAoTlNEaWN0aW9uYXJ5ICopZGF0YURldGVjdGlvbkNvbnRleHRGb3JBY3Rp b25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudAorLSAo TlNEaWN0aW9uYXJ5ICopZGF0YURldGVjdGlvbkNvbnRleHRGb3JQb3NpdGlvbkluZm9ybWF0aW9u OihXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uKXBvc2l0aW9uSW5mb3Jt YXRpb24KIHsKLSAgICBOU0RpY3Rpb25hcnkgKmNvbnRleHQgPSBuaWw7CisgICAgUmV0YWluUHRy PE5TTXV0YWJsZURpY3Rpb25hcnk+IGNvbnRleHQ7CiAgICAgaWQgPFdLVUlEZWxlZ2F0ZVByaXZh dGU+IHVpRGVsZWdhdGUgPSBzdGF0aWNfY2FzdDxpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4+KFtf d2ViVmlldyBVSURlbGVnYXRlXSk7CiAgICAgaWYgKFt1aURlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoX2RhdGFEZXRlY3Rpb25Db250ZXh0Rm9yV2ViVmlldzopXSkKLSAgICAg ICAgY29udGV4dCA9IFt1aURlbGVnYXRlIF9kYXRhRGV0ZWN0aW9uQ29udGV4dEZvcldlYlZpZXc6 X3dlYlZpZXddOwotICAgIHJldHVybiBjb250ZXh0OworICAgICAgICBjb250ZXh0ID0gYWRvcHRO UyhbW3VpRGVsZWdhdGUgX2RhdGFEZXRlY3Rpb25Db250ZXh0Rm9yV2ViVmlldzpfd2ViVmlld10g bXV0YWJsZUNvcHldKTsKKyAgICAKKyAgICBpZiAoIWNvbnRleHQpCisgICAgICAgIGNvbnRleHQg PSBhZG9wdE5TKFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF0pOworICAgIAorICAg IGlmICghcG9zaXRpb25JbmZvcm1hdGlvbi50ZXh0QmVmb3JlLmlzRW1wdHkoKSkKKyAgICAgICAg Y29udGV4dC5nZXQoKVtnZXRrRGF0YURldGVjdG9yc0xlYWRpbmdUZXh0KCldID0gcG9zaXRpb25J bmZvcm1hdGlvbi50ZXh0QmVmb3JlOworICAgIGlmICghcG9zaXRpb25JbmZvcm1hdGlvbi50ZXh0 QWZ0ZXIuaXNFbXB0eSgpKQorICAgICAgICBjb250ZXh0LmdldCgpW2dldGtEYXRhRGV0ZWN0b3Jz VHJhaWxpbmdUZXh0KCldID0gcG9zaXRpb25JbmZvcm1hdGlvbi50ZXh0QWZ0ZXI7CisgICAgCisg ICAgcmV0dXJuIGNvbnRleHQuYXV0b3JlbGVhc2UoKTsKK30KKworLSAoTlNEaWN0aW9uYXJ5ICop ZGF0YURldGVjdGlvbkNvbnRleHRGb3JBY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVl dEFzc2lzdGFudCAqKWFzc2lzdGFudAoreworICAgIHJldHVybiBbc2VsZiBkYXRhRGV0ZWN0aW9u Q29udGV4dEZvclBvc2l0aW9uSW5mb3JtYXRpb246YXNzaXN0YW50LmN1cnJlbnRQb3NpdGlvbklu Zm9ybWF0aW9uLnZhbHVlT3IoX3Bvc2l0aW9uSW5mb3JtYXRpb24pXTsKIH0KIAogLSAoTlNTdHJp bmcgKilzZWxlY3RlZFRleHRGb3JBY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFz c2lzdGFudCAqKWFzc2lzdGFudAo=