199080 2019-06-20 14:31:13 -0700 WebKit context menu highlights include extra padding 2019-06-21 14:22:58 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton commit-queue dino webkit-bug-importer wenson_hsieh oldest_to_newest 1546656 0 thorton 2019-06-20 14:31:13 -0700 WebKit context menu highlights include extra padding 1546657 1 372584 thorton 2019-06-20 14:31:36 -0700 Created attachment 372584 Patch 1546658 2 thorton 2019-06-20 14:31:38 -0700 <rdar://problem/51140126> 1546667 3 372584 dino 2019-06-20 14:47:59 -0700 Comment on attachment 372584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372584&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2069 > + request.linkIndicatorShouldHaveLegacyMargins = !self._shouldUseContextMenus; It doesn't matter but _shouldUseContextMenus is a method. It probably should be actually declared as a property as well. Is this code within HAVE(LINK_PREVIEW)? I know the others are. 1546671 4 372584 thorton 2019-06-20 14:54:18 -0700 Comment on attachment 372584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372584&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2069 >> + request.linkIndicatorShouldHaveLegacyMargins = !self._shouldUseContextMenus; > > It doesn't matter but _shouldUseContextMenus is a method. It probably should be actually declared as a property as well. > > Is this code within HAVE(LINK_PREVIEW)? I know the others are. It's not. Perhaps I'll move _shouldUseContextMenus out of HAVE(LINK_PREVIEW) (and make it a property) 1546973 5 372645 thorton 2019-06-21 13:50:11 -0700 Created attachment 372645 Patch 1546991 6 372645 commit-queue 2019-06-21 14:22:57 -0700 Comment on attachment 372645 Patch Clearing flags on attachment: 372645 Committed r246697: <https://trac.webkit.org/changeset/246697> 1546992 7 commit-queue 2019-06-21 14:22:58 -0700 All reviewed patches have been landed. Closing bug. 372584 2019-06-20 14:31:36 -0700 2019-06-21 13:50:09 -0700 Patch bug-199080-20190620143136.patch text/plain 8345 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRkODUzYTE0NmI3ZGExYWZm ZmUyM2M0ZjQ5ZmQ4MjM1MjE1YWY3YjEuLjQ1YzEwYzRkNzkwZTlhMGRlNzBkY2MwZDU2ZjQ5Zjc4 NWRiMDJkMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTktMDYtMjAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0IGNvbnRleHQg bWVudSBoaWdobGlnaHRzIGluY2x1ZGUgZXh0cmEgcGFkZGluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDgwCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS81MTE0MDEyNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QuY3BwOgor ICAgICAgICAoV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdDo6ZW5jb2RlIGNv bnN0KToKKyAgICAgICAgKFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3Q6OmRl Y29kZSk6CisgICAgICAgIChXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0Ojpp c1ZhbGlkRm9yUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRp b25SZXF1ZXN0Ojppc0FwcHJveGltYXRlbHlWYWxpZEZvclJlcXVlc3QpOgorICAgICAgICAqIFNo YXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBnZXN0dXJlUmVjb2duaXplclNob3VsZEJlZ2luOl0pOgorICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IHBvc2l0aW9uSW5mb3JtYXRpb25Gb3JBY3Rpb25TaGVldEFzc2lzdGFudDpdKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyB1cGRhdGVQb3NpdGlvbkluZm9ybWF0aW9uRm9yQWN0 aW9uU2hlZXRBc3Npc3RhbnQ6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2NvbnRleHRN ZW51SW50ZXJhY3Rpb246Y29uZmlndXJhdGlvbkZvck1lbnVBdExvY2F0aW9uOmNvbXBsZXRpb246 XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2ludGVyYWN0aW9uU2hvdWxkQmVnaW5Gcm9t UHJldmlld0l0ZW1Db250cm9sbGVyOmZvclBvc2l0aW9uOl0pOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6bGlua0luZGlj YXRvclBvc2l0aW9uSW5mb3JtYXRpb24pOgorICAgICAgICBEaXNhYmxlIHRoZSBtYXJnaW4gZ29p bmcgZm9yd2FyZCwgYnV0IGxlYXZlIGl0IGlmIHdlJ3JlIHVzaW5nIHRoZSBsZWdhY3kKKyAgICAg ICAgQVBJLCBiZWNhdXNlIHRoZXJlIGlzIG5vIHdheSB0byBhZGQgbWFyZ2luIGF0IHRoZSBwbGF0 Zm9ybSBsZXZlbCB3aXRoCisgICAgICAgIHRoZSBsZWdhY3kgQVBJLgorCisgICAgICAgIEluIHRo ZSBmdXR1cmUgd2Ugc2hvdWxkIGFsd2F5cyBoYXZlIG5vIG1hcmdpbiBpbiBvdXIgaW5kaWNhdG9y LCBhbmQganVzdAorICAgICAgICBhcHBseSBpdCBpbiB3aGF0ZXZlciBjb25zdW1lcyB0aGUgaW5k aWNhdG9yLCBzbyB0aGF0IHRoZXJlIGlzIG5vCisgICAgICAgIGRpc2FncmVlbWVudCBiZXR3ZWVu IGNsaWVudHMgYWJvdXQgdGhlIHNpemUgb2YgdGhlIG1hcmdpbi4KKwogMjAxOS0wNi0yMCAgQWxl eGFuZGVyIE1pa2hheWxlbmtvICA8ZXhhbG03NjU5QGdtYWlsLmNvbT4KIAogICAgICAgICBbR1RL XSBFbmFibGUgbmF2aWdhdGlvbiBzd2lwZSBsYXlvdXQgdGVzdHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QuY3Bw CmluZGV4IDdmMTA2M2FmYTE2YjdjZGE0M2NjODJiNDA2NmEzMTYyMmNmMjQwYmUuLjQ0MmZiZmMy MTdiZGViMzlhOTg3OTQ3MDAwOGNlNGZiMjkzYTBlMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0LmNwcApA QCAtMzgsNiArMzgsNyBAQCB2b2lkIEludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0OjplbmNv ZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgcG9pbnQ7CiAg ICAgZW5jb2RlciA8PCBpbmNsdWRlU25hcHNob3Q7CiAgICAgZW5jb2RlciA8PCBpbmNsdWRlTGlu a0luZGljYXRvcjsKKyAgICBlbmNvZGVyIDw8IGxpbmtJbmRpY2F0b3JTaG91bGRIYXZlTGVnYWN5 TWFyZ2luczsKICAgICBlbmNvZGVyIDw8IHJlYWRvbmx5OwogfQogCkBAIC01MSw2ICs1Miw5IEBA IGJvb2wgSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3Q6OmRlY29kZShJUEM6OkRlY29kZXIm IGRlY29kZXIsIEludGVyYWN0aW9uSW5mCiAKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3Vs dC5pbmNsdWRlTGlua0luZGljYXRvcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5saW5rSW5kaWNhdG9yU2hvdWxkSGF2ZUxlZ2Fj eU1hcmdpbnMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5yZWFkb25seSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTY4LDYgKzcy LDkgQEAgYm9vbCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdDo6aXNWYWxpZEZvclJlcXVl c3QoY29uc3QgSW50ZXJhY3Rpb25JbmZvcm1hdGkKIAogICAgIGlmIChvdGhlci5pbmNsdWRlTGlu a0luZGljYXRvciAmJiAhaW5jbHVkZUxpbmtJbmRpY2F0b3IpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAKKyAgICBpZiAob3RoZXIubGlua0luZGljYXRvclNob3VsZEhhdmVMZWdhY3lNYXJn aW5zICE9IGxpbmtJbmRpY2F0b3JTaG91bGRIYXZlTGVnYWN5TWFyZ2lucykKKyAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgaWYgKCFvdGhlci5yZWFkb25seSAmJiByZWFkb25seSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtODYsNiArOTMsOSBAQCBib29sIEludGVyYWN0aW9uSW5mb3Jt YXRpb25SZXF1ZXN0Ojppc0FwcHJveGltYXRlbHlWYWxpZEZvclJlcXVlc3QoY29uc3QgSW50ZXJh YwogICAgIGlmICghb3RoZXIucmVhZG9ubHkgJiYgcmVhZG9ubHkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICAKKyAgICBpZiAob3RoZXIubGlua0luZGljYXRvclNob3VsZEhhdmVMZWdhY3lN YXJnaW5zICE9IGxpbmtJbmRpY2F0b3JTaG91bGRIYXZlTGVnYWN5TWFyZ2lucykKKyAgICAgICAg cmV0dXJuIGZhbHNlOworICAgIAogICAgIHJldHVybiAob3RoZXIucG9pbnQgLSBwb2ludCkuZGlh Z29uYWxMZW5ndGhTcXVhcmVkKCkgPD0gNDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0LmggYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QuaAppbmRleCAxNWJi ZTA5NDM4NDhlMzFkZjQyOTliM2U5ZWExY2M2MDdhZjIxM2JhLi5iMzE4YjQwZTMxYWU3MTJhZWRi NzE0MGY5MWEyMGRmMzgzNGRmNGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9p b3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QuaApAQCAtNDIsNiArNDIsOCBA QCBzdHJ1Y3QgSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QgewogICAgIGJvb2wgaW5jbHVk ZVNuYXBzaG90IHsgZmFsc2UgfTsKICAgICBib29sIGluY2x1ZGVMaW5rSW5kaWNhdG9yIHsgZmFs c2UgfTsKIAorICAgIGJvb2wgbGlua0luZGljYXRvclNob3VsZEhhdmVMZWdhY3lNYXJnaW5zIHsg ZmFsc2UgfTsKKwogICAgIC8vIEZJWE1FOiBUaGlzIHJlYWRvbmx5IGZsYWcgb3VnaHQgdG8gYmUg dHJ1ZSBieSBkZWZhdWx0LCBidXQgdGhlcmUgYXJlIGEgbnVtYmVyIG9mIGludGVyYWN0aW9ucyAo ZS5nLiBzZWxlY3Rpb24pIHRoYXQgY3VycmVudGx5CiAgICAgLy8gcmVseSBvbiB0aGUgZmFjdCB0 aGF0IGludGVyYWN0aW9uIGluZm9ybWF0aW9uIHJlcXVlc3RzIGFkZGl0aW9uYWxseSBjaGFuZ2Ug dGhlIGZvY3VzZWQgZnJhbWUuIFdlIHNob3VsZCBleHBsaWNpdGx5IHR1cm4gdGhlCiAgICAgLy8g cmVhZG9ubHkgYml0IG9mZiBpbiB0aGVzZSBzY2VuYXJpb3MsIGFuZCBtYWtlIHN1cmUgdGhhdCBh bGwgb3RoZXIgcG9zaXRpb24gaW5mb3JtYXRpb24gcmVxdWVzdHMgZG9uJ3QgbW92ZSBmb2N1cyBh cm91bmQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCAzMTExYTQ4ZDEyN2E4NjY5YjZjZWUzYjJkNjA4Nzcx YmNiYmE3YzhlLi4zYmRjNWMyMjI3ZDdkNTg0YjlhZjI4N2VjMzA1MzdhZWNmMmZlMjUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0KQEAgLTIwNjYsNiArMjA2Niw3IEBAIC0gKEJPT0wpZ2VzdHVyZVJlY29nbml6 ZXJTaG91bGRCZWdpbjooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyCiAg ICAgICAgIGlmIChzZWxmLnRyYWl0Q29sbGVjdGlvbi5mb3JjZVRvdWNoQ2FwYWJpbGl0eSA9PSBV SUZvcmNlVG91Y2hDYXBhYmlsaXR5QXZhaWxhYmxlKSB7CiAgICAgICAgICAgICByZXF1ZXN0Lmlu Y2x1ZGVTbmFwc2hvdCA9IHRydWU7CiAgICAgICAgICAgICByZXF1ZXN0LmluY2x1ZGVMaW5rSW5k aWNhdG9yID0gdHJ1ZTsKKyAgICAgICAgICAgIHJlcXVlc3QubGlua0luZGljYXRvclNob3VsZEhh dmVMZWdhY3lNYXJnaW5zID0gIXNlbGYuX3Nob3VsZFVzZUNvbnRleHRNZW51czsKICAgICAgICAg fQogCiAgICAgICAgIFtzZWxmIHJlcXVlc3RBc3luY2hyb25vdXNQb3NpdGlvbkluZm9ybWF0aW9u VXBkYXRlOnJlcXVlc3RdOwpAQCAtNjA2Miw2ICs2MDYzLDcgQEAgLSAoT3B0aW9uYWw8V2ViS2l0 OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbj4pcG9zaXRpb25JbmZvcm1hdGlvbkZv ckFjdGkKICAgICBXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0IHJlcXVlc3Qo X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCk7CiAgICAgcmVxdWVzdC5pbmNsdWRl U25hcHNob3QgPSB0cnVlOwogICAgIHJlcXVlc3QuaW5jbHVkZUxpbmtJbmRpY2F0b3IgPSBhc3Np c3RhbnQubmVlZHNMaW5rSW5kaWNhdG9yOworICAgIHJlcXVlc3QubGlua0luZGljYXRvclNob3Vs ZEhhdmVMZWdhY3lNYXJnaW5zID0gIXNlbGYuX3Nob3VsZFVzZUNvbnRleHRNZW51czsKICAgICBp ZiAoIVtzZWxmIGVuc3VyZVBvc2l0aW9uSW5mb3JtYXRpb25Jc1VwVG9EYXRlOnJlcXVlc3RdKQog ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCkBAIC02MDc0LDYgKzYwNzYsNyBAQCAtICh2 b2lkKXVwZGF0ZVBvc2l0aW9uSW5mb3JtYXRpb25Gb3JBY3Rpb25TaGVldEFzc2lzdGFudDooV0tB Y3Rpb25TaGVldEFzc2lzdGFudAogICAgIFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJl cXVlc3QgcmVxdWVzdChfcG9zaXRpb25JbmZvcm1hdGlvbi5yZXF1ZXN0LnBvaW50KTsKICAgICBy ZXF1ZXN0LmluY2x1ZGVTbmFwc2hvdCA9IHRydWU7CiAgICAgcmVxdWVzdC5pbmNsdWRlTGlua0lu ZGljYXRvciA9IGFzc2lzdGFudC5uZWVkc0xpbmtJbmRpY2F0b3I7CisgICAgcmVxdWVzdC5saW5r SW5kaWNhdG9yU2hvdWxkSGF2ZUxlZ2FjeU1hcmdpbnMgPSAhc2VsZi5fc2hvdWxkVXNlQ29udGV4 dE1lbnVzOwogCiAgICAgW3NlbGYgcmVxdWVzdEFzeW5jaHJvbm91c1Bvc2l0aW9uSW5mb3JtYXRp b25VcGRhdGU6cmVxdWVzdF07CiB9CkBAIC03Njk0LDYgKzc2OTcsNyBAQCAtICh2b2lkKV9jb250 ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlv biBjb25maWd1cgogICAgIFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QgcmVx dWVzdCB7IFdlYkNvcmU6OnJvdW5kZWRJbnRQb2ludChwb3NpdGlvbikgfTsKICAgICByZXF1ZXN0 LmluY2x1ZGVTbmFwc2hvdCA9IHRydWU7CiAgICAgcmVxdWVzdC5pbmNsdWRlTGlua0luZGljYXRv ciA9IHRydWU7CisgICAgcmVxdWVzdC5saW5rSW5kaWNhdG9yU2hvdWxkSGF2ZUxlZ2FjeU1hcmdp bnMgPSAhc2VsZi5fc2hvdWxkVXNlQ29udGV4dE1lbnVzOwogCiAgICAgW3NlbGYgZG9BZnRlclBv c2l0aW9uSW5mb3JtYXRpb25VcGRhdGU6W3dlYWtTZWxmID0gV2Vha09iakNQdHI8V0tDb250ZW50 Vmlldz4oc2VsZiksIGNvbXBsZXRpb24gPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbildIChXZWJL aXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uKSB7CiAgICAgICAgIGF1dG8gc3Ry b25nU2VsZiA9IHdlYWtTZWxmLmdldCgpOwpAQCAtODA0OSw2ICs4MDUzLDcgQEAgLSAoQk9PTClf aW50ZXJhY3Rpb25TaG91bGRCZWdpbkZyb21QcmV2aWV3SXRlbUNvbnRyb2xsZXI6KFVJUHJldmll d0l0ZW1Db250cm9sbGUKICAgICBXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0 IHJlcXVlc3QoV2ViQ29yZTo6cm91bmRlZEludFBvaW50KHBvc2l0aW9uKSk7CiAgICAgcmVxdWVz dC5pbmNsdWRlU25hcHNob3QgPSB0cnVlOwogICAgIHJlcXVlc3QuaW5jbHVkZUxpbmtJbmRpY2F0 b3IgPSB0cnVlOworICAgIHJlcXVlc3QubGlua0luZGljYXRvclNob3VsZEhhdmVMZWdhY3lNYXJn aW5zID0gIXNlbGYuX3Nob3VsZFVzZUNvbnRleHRNZW51czsKICAgICBpZiAoIVtzZWxmIGVuc3Vy ZVBvc2l0aW9uSW5mb3JtYXRpb25Jc1VwVG9EYXRlOnJlcXVlc3RdKQogICAgICAgICByZXR1cm4g Tk87CiAgICAgaWYgKCFfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0xpbmsgJiYgIV9wb3NpdGlvbklu Zm9ybWF0aW9uLmlzSW1hZ2UgJiYgIV9wb3NpdGlvbkluZm9ybWF0aW9uLmlzQXR0YWNobWVudCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdl SU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0KaW5kZXggNWFhY2E0YjcwMmI5ZWIzMTU0NDcwODc2Y2Q4ZTBkZTcwNDZjNDNjZi4uYWQxN2I2 ZTczYWM3ZjJhYjYwMzE5M2ZiZWZkNmY5YWExMjc1Y2NhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTI0OTIsNyArMjQ5 Miw3IEBAIHN0YXRpYyB2b2lkIGxpbmtJbmRpY2F0b3JQb3NpdGlvbkluZm9ybWF0aW9uKFdlYlBh Z2UmIHBhZ2UsIEVsZW1lbnQmIGVsZW1lbnQsIEVsCiAKICAgICBhdXRvIGxpbmtSYW5nZSA9IHJh bmdlT2ZDb250ZW50cyhsaW5rRWxlbWVudCk7CiAgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3Ig PSBwYWdlLmNvcmVQYWdlKCktPmRldmljZVNjYWxlRmFjdG9yKCk7Ci0gICAgY29uc3QgZmxvYXQg bWFyZ2luSW5Qb2ludHMgPSA0OworICAgIGNvbnN0IGZsb2F0IG1hcmdpbkluUG9pbnRzID0gcmVx dWVzdC5saW5rSW5kaWNhdG9yU2hvdWxkSGF2ZUxlZ2FjeU1hcmdpbnMgPyA0IDogMDsKIAogICAg IGF1dG8gdGV4dEluZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhSYW5nZShsaW5r UmFuZ2UuZ2V0KCksCiAgICAgICAgIFRleHRJbmRpY2F0b3JPcHRpb25UaWdodGx5Rml0Q29udGVu dCB8IFRleHRJbmRpY2F0b3JPcHRpb25SZXNwZWN0VGV4dENvbG9yIHwgVGV4dEluZGljYXRvck9w dGlvblBhaW50QmFja2dyb3VuZHMgfAo= 372645 2019-06-21 13:50:11 -0700 2019-06-21 14:22:57 -0700 Patch bug-199080-20190621135010.patch text/plain 11920 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2Njg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRmZDg4MTViNzZmODJjZDU1 OGQxMzM3OTVkNzVkZDNlNzE1Njk1NTEuLjkwOTE5NTUzOTZiODczYjY4ZWM5YzI4NGExMzVmOGJl ODgzMmNlZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTktMDYtMjEgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0IGNvbnRleHQg bWVudSBoaWdobGlnaHRzIGluY2x1ZGUgZXh0cmEgcGFkZGluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDgwCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS81MTE0MDEyNj4KKworICAgICAgICBSZXZpZXdlZCBieSBEZWFuIEphY2tzb24uCisKKyAg ICAgICAgKiBTaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3Q6OmVuY29kZSBjb25z dCk6CisgICAgICAgIChXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0OjpkZWNv ZGUpOgorICAgICAgICAoV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdDo6aXNW YWxpZEZvclJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9u UmVxdWVzdDo6aXNBcHByb3hpbWF0ZWx5VmFsaWRGb3JSZXF1ZXN0KToKKyAgICAgICAgKiBTaGFy ZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0Lmg6CisgICAgICAgICogVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgZ2VzdHVyZVJlY29nbml6ZXJTaG91bGRCZWdpbjpdKToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBwb3NpdGlvbkluZm9ybWF0aW9uRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6XSk6Cisg ICAgICAgICgtW1dLQ29udGVudFZpZXcgdXBkYXRlUG9zaXRpb25JbmZvcm1hdGlvbkZvckFjdGlv blNoZWV0QXNzaXN0YW50Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9jb250ZXh0TWVu dUludGVyYWN0aW9uOmNvbmZpZ3VyYXRpb25Gb3JNZW51QXRMb2NhdGlvbjpjb21wbGV0aW9uOl0p OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9pbnRlcmFjdGlvblNob3VsZEJlZ2luRnJvbVBy ZXZpZXdJdGVtQ29udHJvbGxlcjpmb3JQb3NpdGlvbjpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OmxpbmtJbmRpY2F0 b3JQb3NpdGlvbkluZm9ybWF0aW9uKToKKyAgICAgICAgRGlzYWJsZSB0aGUgbWFyZ2luIGdvaW5n IGZvcndhcmQsIGJ1dCBsZWF2ZSBpdCBpZiB3ZSdyZSB1c2luZyB0aGUgbGVnYWN5CisgICAgICAg IEFQSSwgYmVjYXVzZSB0aGVyZSBpcyBubyB3YXkgdG8gYWRkIG1hcmdpbiBhdCB0aGUgcGxhdGZv cm0gbGV2ZWwgd2l0aAorICAgICAgICB0aGUgbGVnYWN5IEFQSS4KKworICAgICAgICBJbiB0aGUg ZnV0dXJlIHdlIHNob3VsZCBhbHdheXMgaGF2ZSBubyBtYXJnaW4gaW4gb3VyIGluZGljYXRvciwg YW5kIGp1c3QKKyAgICAgICAgYXBwbHkgaXQgaW4gd2hhdGV2ZXIgY29uc3VtZXMgdGhlIGluZGlj YXRvciwgc28gdGhhdCB0aGVyZSBpcyBubworICAgICAgICBkaXNhZ3JlZW1lbnQgYmV0d2VlbiBj bGllbnRzIGFib3V0IHRoZSBzaXplIG9mIHRoZSBtYXJnaW4uCisKIDIwMTktMDYtMjEgIEtlaXRo IFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZHJlc3MgcmVmZXJlbmNl IHRvIFVJQ29sb3IuZ3JvdXBUYWJsZVZpZXdCYWNrZ3JvdW5kQ29sb3IgaW4gV0tQYXNzd29yZFZp ZXcubW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbklu Zm9ybWF0aW9uUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rp b25JbmZvcm1hdGlvblJlcXVlc3QuY3BwCmluZGV4IDdmMTA2M2FmYTE2YjdjZGE0M2NjODJiNDA2 NmEzMTYyMmNmMjQwYmUuLjNkNzA0ZTZlNmU2ZGEzOGE4YmM3ZGQ0MDIxYWYxZTFiNTM0MzYyNWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0 aW9uUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9u SW5mb3JtYXRpb25SZXF1ZXN0LmNwcApAQCAtMzgsNiArMzgsNyBAQCB2b2lkIEludGVyYWN0aW9u SW5mb3JtYXRpb25SZXF1ZXN0OjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAog ICAgIGVuY29kZXIgPDwgcG9pbnQ7CiAgICAgZW5jb2RlciA8PCBpbmNsdWRlU25hcHNob3Q7CiAg ICAgZW5jb2RlciA8PCBpbmNsdWRlTGlua0luZGljYXRvcjsKKyAgICBlbmNvZGVyIDw8IGxpbmtJ bmRpY2F0b3JTaG91bGRIYXZlTGVnYWN5TWFyZ2luczsKICAgICBlbmNvZGVyIDw8IHJlYWRvbmx5 OwogfQogCkBAIC01Miw2ICs1Myw5IEBAIGJvb2wgSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVl c3Q6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIEludGVyYWN0aW9uSW5mCiAgICAgaWYg KCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaW5jbHVkZUxpbmtJbmRpY2F0b3IpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5saW5rSW5kaWNh dG9yU2hvdWxkSGF2ZUxlZ2FjeU1hcmdpbnMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5yZWFkb25seSkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIApAQCAtNjksNiArNzMsOSBAQCBib29sIEludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1 ZXN0Ojppc1ZhbGlkRm9yUmVxdWVzdChjb25zdCBJbnRlcmFjdGlvbkluZm9ybWF0aQogICAgIGlm IChvdGhlci5pbmNsdWRlTGlua0luZGljYXRvciAmJiAhaW5jbHVkZUxpbmtJbmRpY2F0b3IpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmIChvdGhlci5saW5rSW5kaWNhdG9yU2hvdWxk SGF2ZUxlZ2FjeU1hcmdpbnMgIT0gbGlua0luZGljYXRvclNob3VsZEhhdmVMZWdhY3lNYXJnaW5z KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIW90aGVyLnJlYWRvbmx5ICYmIHJl YWRvbmx5KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTg1LDYgKzkyLDkgQEAgYm9vbCBJ bnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdDo6aXNBcHByb3hpbWF0ZWx5VmFsaWRGb3JSZXF1 ZXN0KGNvbnN0IEludGVyYWMKIAogICAgIGlmICghb3RoZXIucmVhZG9ubHkgJiYgcmVhZG9ubHkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmIChvdGhlci5saW5rSW5kaWNhdG9yU2hv dWxkSGF2ZUxlZ2FjeU1hcmdpbnMgIT0gbGlua0luZGljYXRvclNob3VsZEhhdmVMZWdhY3lNYXJn aW5zKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCiAgICAgcmV0dXJuIChvdGhlci5wb2lu dCAtIHBvaW50KS5kaWFnb25hbExlbmd0aFNxdWFyZWQoKSA8PSA0OwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0Lmgg Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3Qu aAppbmRleCAxNWJiZTA5NDM4NDhlMzFkZjQyOTliM2U5ZWExY2M2MDdhZjIxM2JhLi5iMzE4YjQw ZTMxYWU3MTJhZWRiNzE0MGY5MWEyMGRmMzgzNGRmNGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QuaApAQCAt NDIsNiArNDIsOCBAQCBzdHJ1Y3QgSW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QgewogICAg IGJvb2wgaW5jbHVkZVNuYXBzaG90IHsgZmFsc2UgfTsKICAgICBib29sIGluY2x1ZGVMaW5rSW5k aWNhdG9yIHsgZmFsc2UgfTsKIAorICAgIGJvb2wgbGlua0luZGljYXRvclNob3VsZEhhdmVMZWdh Y3lNYXJnaW5zIHsgZmFsc2UgfTsKKwogICAgIC8vIEZJWE1FOiBUaGlzIHJlYWRvbmx5IGZsYWcg b3VnaHQgdG8gYmUgdHJ1ZSBieSBkZWZhdWx0LCBidXQgdGhlcmUgYXJlIGEgbnVtYmVyIG9mIGlu dGVyYWN0aW9ucyAoZS5nLiBzZWxlY3Rpb24pIHRoYXQgY3VycmVudGx5CiAgICAgLy8gcmVseSBv biB0aGUgZmFjdCB0aGF0IGludGVyYWN0aW9uIGluZm9ybWF0aW9uIHJlcXVlc3RzIGFkZGl0aW9u YWxseSBjaGFuZ2UgdGhlIGZvY3VzZWQgZnJhbWUuIFdlIHNob3VsZCBleHBsaWNpdGx5IHR1cm4g dGhlCiAgICAgLy8gcmVhZG9ubHkgYml0IG9mZiBpbiB0aGVzZSBzY2VuYXJpb3MsIGFuZCBtYWtl IHN1cmUgdGhhdCBhbGwgb3RoZXIgcG9zaXRpb24gaW5mb3JtYXRpb24gcmVxdWVzdHMgZG9uJ3Qg bW92ZSBmb2N1cyBhcm91bmQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggZTk2ZGVkYjY2YTYxOWNkZTljZmU5 NDc1OGFjNDNlNjM1NjA2NGY0My4uMDVkNzAyY2EwMWM5ZjRmN2NkNWM5M2Q4ZTNhMWRiYzE2MDdj MzViNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24uaApAQCAtNTE2LDYgKzUxNiw4IEBAIEZPUl9FQUNIX1BSSVZBVEVf V0tDT05URU5UVklFV19BQ1RJT04oREVDTEFSRV9XS0NPTlRFTlRWSUVXX0FDVElPTl9GT1JfV0VC X1ZJRVcpCiAKIC0gKHZvaWQpX2RpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yTWFpbkZyYW1lOwog CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIGdldHRlcj1fc2hvdWxkVXNlQ29udGV4 dE1lbnVzKSBCT09MIF9zaG91bGRVc2VDb250ZXh0TWVudXM7CisKIEBlbmQKIAogQGludGVyZmFj ZSBXS0NvbnRlbnRWaWV3IChXS1Rlc3RpbmcpCkBAIC01NDAsNyArNTQyLDYgQEAgRk9SX0VBQ0hf UFJJVkFURV9XS0NPTlRFTlRWSUVXX0FDVElPTihERUNMQVJFX1dLQ09OVEVOVFZJRVdfQUNUSU9O X0ZPUl9XRUJfVklFVykKICNlbHNlCiBAaW50ZXJmYWNlIFdLQ29udGVudFZpZXcgKFdLSW50ZXJh Y3Rpb25QcmV2aWV3KSA8VUlQcmV2aWV3SXRlbURlbGVnYXRlPgogI2VuZGlmCi0tIChib29sKV9z aG91bGRVc2VDb250ZXh0TWVudXM7CiAtICh2b2lkKV9yZWdpc3RlclByZXZpZXc7CiAtICh2b2lk KV91bnJlZ2lzdGVyUHJldmlldzsKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGMwNWYxYzgyYWE4 ODI3MDg1Y2ExODM5NWUyMTFmN2I1ZTQ1ODBhOTAuLmM1YjY0NzA3NGRjNTM0YTA3YjZlMjdhMDhj Yzg3NWM1YjNjYzIwOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNzcwLDcgKzc3MCw3IEBAIC0gKHZv aWQpc2V0dXBJbnRlcmFjdGlvbgogICAgIFtfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29n bml6ZXIgc2V0RGVsZWdhdGU6c2VsZl07CiAKICNpZiBIQVZFKExJTktfUFJFVklFVykKLSAgICBp ZiAoIVtzZWxmIF9zaG91bGRVc2VDb250ZXh0TWVudXNdKSB7CisgICAgaWYgKCFzZWxmLl9zaG91 bGRVc2VDb250ZXh0TWVudXMpIHsKICAgICAgICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6ZXI6 X2hpZ2hsaWdodExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKICAgICAgICAgW3Nl bGYgX2NyZWF0ZUFuZENvbmZpZ3VyZUxvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyXTsKICAgICB9 CkBAIC0yMDY2LDYgKzIwNjYsNyBAQCAtIChCT09MKWdlc3R1cmVSZWNvZ25pemVyU2hvdWxkQmVn aW46KFVJR2VzdHVyZVJlY29nbml6ZXIgKilnZXN0dXJlUmVjb2duaXplcgogICAgICAgICBpZiAo c2VsZi50cmFpdENvbGxlY3Rpb24uZm9yY2VUb3VjaENhcGFiaWxpdHkgPT0gVUlGb3JjZVRvdWNo Q2FwYWJpbGl0eUF2YWlsYWJsZSkgewogICAgICAgICAgICAgcmVxdWVzdC5pbmNsdWRlU25hcHNo b3QgPSB0cnVlOwogICAgICAgICAgICAgcmVxdWVzdC5pbmNsdWRlTGlua0luZGljYXRvciA9IHRy dWU7CisgICAgICAgICAgICByZXF1ZXN0LmxpbmtJbmRpY2F0b3JTaG91bGRIYXZlTGVnYWN5TWFy Z2lucyA9ICFzZWxmLl9zaG91bGRVc2VDb250ZXh0TWVudXM7CiAgICAgICAgIH0KIAogICAgICAg ICBbc2VsZiByZXF1ZXN0QXN5bmNocm9ub3VzUG9zaXRpb25JbmZvcm1hdGlvblVwZGF0ZTpyZXF1 ZXN0XTsKQEAgLTYwNTksNiArNjA2MCw3IEBAIC0gKE9wdGlvbmFsPFdlYktpdDo6SW50ZXJhY3Rp b25JbmZvcm1hdGlvbkF0UG9zaXRpb24+KXBvc2l0aW9uSW5mb3JtYXRpb25Gb3JBY3RpCiAgICAg V2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCByZXF1ZXN0KF9wb3NpdGlvbklu Zm9ybWF0aW9uLnJlcXVlc3QucG9pbnQpOwogICAgIHJlcXVlc3QuaW5jbHVkZVNuYXBzaG90ID0g dHJ1ZTsKICAgICByZXF1ZXN0LmluY2x1ZGVMaW5rSW5kaWNhdG9yID0gYXNzaXN0YW50Lm5lZWRz TGlua0luZGljYXRvcjsKKyAgICByZXF1ZXN0LmxpbmtJbmRpY2F0b3JTaG91bGRIYXZlTGVnYWN5 TWFyZ2lucyA9ICFzZWxmLl9zaG91bGRVc2VDb250ZXh0TWVudXM7CiAgICAgaWYgKCFbc2VsZiBl bnN1cmVQb3NpdGlvbkluZm9ybWF0aW9uSXNVcFRvRGF0ZTpyZXF1ZXN0XSkKICAgICAgICAgcmV0 dXJuIFdURjo6bnVsbG9wdDsKIApAQCAtNjA3MSw2ICs2MDczLDcgQEAgLSAodm9pZCl1cGRhdGVQ b3NpdGlvbkluZm9ybWF0aW9uRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRB c3Npc3RhbnQKICAgICBXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0IHJlcXVl c3QoX3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCk7CiAgICAgcmVxdWVzdC5pbmNs dWRlU25hcHNob3QgPSB0cnVlOwogICAgIHJlcXVlc3QuaW5jbHVkZUxpbmtJbmRpY2F0b3IgPSBh c3Npc3RhbnQubmVlZHNMaW5rSW5kaWNhdG9yOworICAgIHJlcXVlc3QubGlua0luZGljYXRvclNo b3VsZEhhdmVMZWdhY3lNYXJnaW5zID0gIXNlbGYuX3Nob3VsZFVzZUNvbnRleHRNZW51czsKIAog ICAgIFtzZWxmIHJlcXVlc3RBc3luY2hyb25vdXNQb3NpdGlvbkluZm9ybWF0aW9uVXBkYXRlOnJl cXVlc3RdOwogfQpAQCAtNjE4OSw2ICs2MTkyLDE0IEBAIC0gKHZvaWQpYWN0aW9uU2hlZXRBc3Np c3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3RhbnQgZ2V0QWx0ZXJuYXRlVVJM CiAgICAgICAgIGNvbXBsZXRpb24obmlsLCBuaWwpOwogfQogCistIChCT09MKV9zaG91bGRVc2VD b250ZXh0TWVudXMKK3sKKyNpZiBIQVZFKExJTktfUFJFVklFVykgJiYgVVNFKFVJQ09OVEVYVE1F TlUpCisgICAgcmV0dXJuIGxpbmtlZE9uT3JBZnRlcihXZWJLaXQ6OlNES1ZlcnNpb246OkZpcnN0 VGhhdEhhc1VJQ29udGV4dE1lbnVJbnRlcmFjdGlvbik7CisjZW5kaWYKKyAgICByZXR1cm4gTk87 Cit9CisKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogCiBzdGF0aWMgQk9PTCBzaG91bGRFbmFi bGVEcmFnSW50ZXJhY3Rpb25Gb3JQb2xpY3koX1dLRHJhZ0ludGVyYWN0aW9uUG9saWN5IHBvbGlj eSkKQEAgLTczNjcsNyArNzM3OCw3IEBAIC0gKE5TRGljdGlvbmFyeSAqKV9jb250ZW50c09mVXNl ckludGVyZmFjZUl0ZW06KE5TU3RyaW5nICopdXNlckludGVyZmFjZUl0ZW0KIAogI2lmIEhBVkUo TElOS19QUkVWSUVXKQogICAgIGlmIChbdXNlckludGVyZmFjZUl0ZW0gaXNFcXVhbFRvU3RyaW5n OkAibGlua1ByZXZpZXdQb3BvdmVyQ29udGVudHMiXSkgewotICAgICAgICBpZiAoW3NlbGYgX3No b3VsZFVzZUNvbnRleHRNZW51c10pCisgICAgICAgIGlmIChzZWxmLl9zaG91bGRVc2VDb250ZXh0 TWVudXMpCiAgICAgICAgICAgICByZXR1cm4gQHsgdXNlckludGVyZmFjZUl0ZW06IEB7IEAicGFn ZVVSTCI6IFdURjo6dXNlclZpc2libGVTdHJpbmcoX3Bvc2l0aW9uSW5mb3JtYXRpb24udXJsKSB9 IH07CiAKICAgICAgICAgTlNTdHJpbmcgKnVybCA9IFtfcHJldmlld0l0ZW1Db250cm9sbGVyIHBy ZXZpZXdEYXRhXVtVSVByZXZpZXdEYXRhTGlua107CkBAIC03NDEyLDIxICs3NDIzLDEzIEBAIHN0 YXRpYyBOU1N0cmluZyAqcHJldmlld0lkZW50aWZpZXJGb3JFbGVtZW50QWN0aW9uKF9XS0VsZW1l bnRBY3Rpb24gKmFjdGlvbikKIAogQGltcGxlbWVudGF0aW9uIFdLQ29udGVudFZpZXcgKFdLSW50 ZXJhY3Rpb25QcmV2aWV3KQogCi0tIChib29sKV9zaG91bGRVc2VDb250ZXh0TWVudXMKLXsKLSNp ZiBVU0UoVUlDT05URVhUTUVOVSkKLSAgICByZXR1cm4gbGlua2VkT25PckFmdGVyKFdlYktpdDo6 U0RLVmVyc2lvbjo6Rmlyc3RUaGF0SGFzVUlDb250ZXh0TWVudUludGVyYWN0aW9uKTsKLSNlbmRp ZgotICAgIHJldHVybiBmYWxzZTsKLX0KLQogLSAodm9pZClfcmVnaXN0ZXJQcmV2aWV3CiB7CiAg ICAgaWYgKCFfd2ViVmlldy5hbGxvd3NMaW5rUHJldmlldykKICAgICAgICAgcmV0dXJuOwogCiAj aWYgVVNFKFVJQ09OVEVYVE1FTlUpCi0gICAgaWYgKFtzZWxmIF9zaG91bGRVc2VDb250ZXh0TWVu dXNdKSB7CisgICAgaWYgKHNlbGYuX3Nob3VsZFVzZUNvbnRleHRNZW51cykgewogICAgICAgICBf Y29udGV4dE1lbnVJbnRlcmFjdGlvbiA9IGFkb3B0TlMoW1tVSUNvbnRleHRNZW51SW50ZXJhY3Rp b24gYWxsb2NdIGluaXRXaXRoRGVsZWdhdGU6c2VsZl0pOwogICAgICAgICBfY29udGV4dE1lbnVI YXNSZXF1ZXN0ZWRMZWdhY3lEYXRhID0gTk87CiAgICAgICAgIFtzZWxmIGFkZEludGVyYWN0aW9u Ol9jb250ZXh0TWVudUludGVyYWN0aW9uLmdldCgpXTsKQEAgLTc0NDUsOSArNzQ0OCw2IEBAIC0g KHZvaWQpX3JlZ2lzdGVyUHJldmlldwogICAgIH0KICNlbmRpZgogCi0gICAgaWYgKCFfd2ViVmll dy5hbGxvd3NMaW5rUHJldmlldykKLSAgICAgICAgcmV0dXJuOwotCiAgICAgX3ByZXZpZXdJdGVt Q29udHJvbGxlciA9IGFkb3B0TlMoW1tVSVByZXZpZXdJdGVtQ29udHJvbGxlciBhbGxvY10gaW5p dFdpdGhWaWV3OnNlbGZdKTsKICAgICBbX3ByZXZpZXdJdGVtQ29udHJvbGxlciBzZXREZWxlZ2F0 ZTpzZWxmXTsKICAgICBfcHJldmlld0dlc3R1cmVSZWNvZ25pemVyID0gX3ByZXZpZXdJdGVtQ29u dHJvbGxlci5nZXQoKS5wcmVzZW50YXRpb25HZXN0dXJlUmVjb2duaXplcjsKQEAgLTc0NTgsNyAr NzQ1OCw3IEBAIC0gKHZvaWQpX3JlZ2lzdGVyUHJldmlldwogLSAodm9pZClfdW5yZWdpc3RlclBy ZXZpZXcKIHsKICNpZiBVU0UoVUlDT05URVhUTUVOVSkKLSAgICBpZiAoW3NlbGYgX3Nob3VsZFVz ZUNvbnRleHRNZW51c10pIHsKKyAgICBpZiAoc2VsZi5fc2hvdWxkVXNlQ29udGV4dE1lbnVzKSB7 CiAgICAgICAgIGlmICghX2NvbnRleHRNZW51SW50ZXJhY3Rpb24pCiAgICAgICAgICAgICByZXR1 cm47CiAKQEAgLTc2OTcsNiArNzY5Nyw3IEBAIC0gKHZvaWQpX2NvbnRleHRNZW51SW50ZXJhY3Rp b246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIGNvbmZpZ3VyCiAgICAg V2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCByZXF1ZXN0IHsgV2ViQ29yZTo6 cm91bmRlZEludFBvaW50KHBvc2l0aW9uKSB9OwogICAgIHJlcXVlc3QuaW5jbHVkZVNuYXBzaG90 ID0gdHJ1ZTsKICAgICByZXF1ZXN0LmluY2x1ZGVMaW5rSW5kaWNhdG9yID0gdHJ1ZTsKKyAgICBy ZXF1ZXN0LmxpbmtJbmRpY2F0b3JTaG91bGRIYXZlTGVnYWN5TWFyZ2lucyA9ICFzZWxmLl9zaG91 bGRVc2VDb250ZXh0TWVudXM7CiAKICAgICBbc2VsZiBkb0FmdGVyUG9zaXRpb25JbmZvcm1hdGlv blVwZGF0ZTpbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0NvbnRlbnRWaWV3PihzZWxmKSwgY29t cGxldGlvbiA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uKV0gKFdlYktpdDo6SW50ZXJhY3Rpb25J bmZvcm1hdGlvbkF0UG9zaXRpb24pIHsKICAgICAgICAgYXV0byBzdHJvbmdTZWxmID0gd2Vha1Nl bGYuZ2V0KCk7CkBAIC04MDUyLDYgKzgwNTMsNyBAQCAtIChCT09MKV9pbnRlcmFjdGlvblNob3Vs ZEJlZ2luRnJvbVByZXZpZXdJdGVtQ29udHJvbGxlcjooVUlQcmV2aWV3SXRlbUNvbnRyb2xsZQog ICAgIFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QgcmVxdWVzdChXZWJDb3Jl Ojpyb3VuZGVkSW50UG9pbnQocG9zaXRpb24pKTsKICAgICByZXF1ZXN0LmluY2x1ZGVTbmFwc2hv dCA9IHRydWU7CiAgICAgcmVxdWVzdC5pbmNsdWRlTGlua0luZGljYXRvciA9IHRydWU7CisgICAg cmVxdWVzdC5saW5rSW5kaWNhdG9yU2hvdWxkSGF2ZUxlZ2FjeU1hcmdpbnMgPSAhc2VsZi5fc2hv dWxkVXNlQ29udGV4dE1lbnVzOwogICAgIGlmICghW3NlbGYgZW5zdXJlUG9zaXRpb25JbmZvcm1h dGlvbklzVXBUb0RhdGU6cmVxdWVzdF0pCiAgICAgICAgIHJldHVybiBOTzsKICAgICBpZiAoIV9w b3NpdGlvbkluZm9ybWF0aW9uLmlzTGluayAmJiAhX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNJbWFn ZSAmJiAhX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNBdHRhY2htZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCA1YWFjYTRi NzAyYjllYjMxNTQ0NzA4NzZjZDhlMGRlNzA0NmM0M2NmLi5hZDE3YjZlNzNhYzdmMmFiNjAzMTkz ZmJlZmQ2ZjlhYTEyNzVjY2FmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjQ5Miw3ICsyNDkyLDcgQEAgc3RhdGljIHZv aWQgbGlua0luZGljYXRvclBvc2l0aW9uSW5mb3JtYXRpb24oV2ViUGFnZSYgcGFnZSwgRWxlbWVu dCYgZWxlbWVudCwgRWwKIAogICAgIGF1dG8gbGlua1JhbmdlID0gcmFuZ2VPZkNvbnRlbnRzKGxp bmtFbGVtZW50KTsKICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9IHBhZ2UuY29yZVBhZ2Uo KS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICBjb25zdCBmbG9hdCBtYXJnaW5JblBvaW50cyA9 IDQ7CisgICAgY29uc3QgZmxvYXQgbWFyZ2luSW5Qb2ludHMgPSByZXF1ZXN0LmxpbmtJbmRpY2F0 b3JTaG91bGRIYXZlTGVnYWN5TWFyZ2lucyA/IDQgOiAwOwogCiAgICAgYXV0byB0ZXh0SW5kaWNh dG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKGxpbmtSYW5nZS5nZXQoKSwKICAg ICAgICAgVGV4dEluZGljYXRvck9wdGlvblRpZ2h0bHlGaXRDb250ZW50IHwgVGV4dEluZGljYXRv ck9wdGlvblJlc3BlY3RUZXh0Q29sb3IgfCBUZXh0SW5kaWNhdG9yT3B0aW9uUGFpbnRCYWNrZ3Jv dW5kcyB8Cg==