138765 2014-11-14 18:25:49 -0800 Implement data detectors and mailto action menus for WebKit1 2014-11-15 00:13:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin commit-queue mitz sam simon.fraser oldest_to_newest 1048972 0 thorton 2014-11-14 18:25:49 -0800 Implement data detectors and mailto action menus for WebKit1 1048973 1 241653 thorton 2014-11-14 18:26:25 -0800 Created attachment 241653 Patch 1048974 2 thorton 2014-11-14 18:28:13 -0800 rdar://problem/18877535 1048976 3 commit-queue 2014-11-14 18:29:33 -0800 Attachment 241653 did not pass style-queue: ERROR: Source/WebKit/mac/WebView/WebActionMenuController.mm:535: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebView/WebActionMenuController.mm:536: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebView/WebActionMenuController.mm:537: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 3 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1048992 4 241653 bdakin 2014-11-14 23:49:28 -0800 Comment on attachment 241653 Patch YAY 1048995 5 thorton 2014-11-15 00:13:35 -0800 http://trac.webkit.org/changeset/176153 241653 2014-11-14 18:26:25 -0800 2014-11-14 23:49:28 -0800 Patch bug-138765-20141114182633.patch text/plain 13309 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZTE0YTY3M2I2 YmU1NDA2NjgyMGE5YjAxOWEzNmIxMzAwZTFhOGY4MS4uMGVlMTdmOGNmZjIzZWE4YmIzMGZkODdk ZThjZmQ5NjljMmQ3Njk3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE0 LTExLTE0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAg IEltcGxlbWVudCBkYXRhIGRldGVjdG9ycyBhbmQgbWFpbHRvIGFjdGlvbiBtZW51cyBmb3IgV2Vi S2l0MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4 NzY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xODg3NzUzNT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViQWN0aW9uTWVudUNv bnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYkFjdGlvbk1lbnVDb250cm9sbGVyLm1t OgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciB3aWxsT3Blbk1lbnU6d2l0aEV2 ZW50Ol0pOgorICAgICAgICBUZWxsIERhdGFEZXRlY3RvcnMgdGhhdCB0aGUgbWVudSBpcyBnb2lu ZyB0byBvcGVuLgorICAgICAgICBTZWxlY3QgdGhlIHRleHQgKG9yIG5vdCkgYmFzZWQgb24gdGhl IG51bWJlciBvZiBpdGVtcyBpbiB0aGUgbWVudSwganVzdCBsaWtlIFdlYktpdDIuCisKKyAgICAg ICAgKC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgZGlkQ2xvc2VNZW51OndpdGhFdmVudDpdKToK KyAgICAgICAgVGVsbCBEYXRhRGV0ZWN0b3JzIHRoYXQgdGhlIG1lbnUgY2xvc2VkLgorCisgICAg ICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zRm9yTGlua10p OgorICAgICAgICBNb3ZlIHRoZXNlIGNoZWNrcyBvdXQgb2YgX2RlZmF1bHRNZW51SXRlbXNGb3JM aW5rLCBiZWNhdXNlIHdlIGV4cGVjdCB0aGlzCisgICAgICAgIHRvIGFsd2F5cyByZXR1cm4gYSBj b21wbGV0ZSBsaW5rIG1lbnUuCisKKyAgICAgICAgKC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIg X2RlZmF1bHRNZW51SXRlbXNGb3JNYWlsdG9MaW5rXSk6CisgICAgICAgIEltcGxlbWVudC4gTW9y ZSBvciBsZXNzIGNvcGllZCBmcm9tIFdlYktpdDIuCisKKyAgICAgICAgKC1bV2ViQWN0aW9uTWVu dUNvbnRyb2xsZXIgX3NlbGVjdERhdGFEZXRlY3RlZFRleHRdKToKKyAgICAgICAgU2VsZWN0IHRo ZSBzdGFzaGVkIHJhbmdlLgorCisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9k ZWZhdWx0TWVudUl0ZW1zRm9yRGF0YURldGVjdGVkVGV4dF0pOgorICAgICAgICBJbXBsZW1lbnQu IE1vcmUgb3IgbGVzcyBjb3BpZWQgZnJvbSBXZWJLaXQyLgorICAgICAgICBUaGUgeWVsbG93IGhp Z2hsaWdodCBpc24ndCBob29rZWQgdXAgeWV0LgorICAgICAgICBHaXZlIHRoZSBjbGllbnQgYSBj aGFuY2UgdG8gb3ZlcnJpZGUgdmlhIF93ZWJWaWV3OmFjdGlvbkNvbnRleHRGb3JIaXRUZXN0UmVz dWx0OnJhbmdlOi4KKworICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfc2VsZWN0 TG9va3VwVGV4dF0pOgorICAgICAgICBSZW1vdmUgYW4gdW5uZWNlc3NhcnkgcmV0dXJuLgorCisg ICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zXSk6Cisg ICAgICAgIENhbGwgaW50byB0aGUgdHdvIG5ldyBtZW51IHR5cGVzLgorCisgICAgICAgICogV2Vi Vmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oOgorCiAyMDE0LTExLTE0ICBCZXRoIERha2luICA8 YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBXSzE6IFdlYnBhZ2UgcHJldmlldyBjYW4gY29t ZSB1cCBpbiB3cm9uZyBsb2NhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGI0NjlhMTExZTJkYWFiZTdjOTEw NjFlOGVmNTg4OGQ1ODU0MTY1N2UuLmVlMzkwYjUwZTdlZWU2NDZmY2IwOGRkZWJlYTU4MDU2MmZh NTEzNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAxNC0xMS0xNCAgVGltIEhvcnRv biAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAorICAgICAgICBJbXBsZW1lbnQgZGF0YSBk ZXRlY3RvcnMgYW5kIG1haWx0byBhY3Rpb24gbWVudXMgZm9yIFdlYktpdDEKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODc2NQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMTg4Nzc1MzU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW06 CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNGb3JN YWlsdG9MaW5rXSk6CisKKzIwMTQtMTEtMTQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CisKICAgICAgICAgTW92ZSBEYXRhRGV0ZWN0b3JzIHNjYW5uaW5nIGNvZGUgdG8g V2ViQ29yZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM4NzMxCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xODg3NzUzNT4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIuaCBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIuaAppbmRleCAyOWYx ZGFjNTY1YTIxOTkyOTI4OWFjYzMyYzBhYTRhMDAzNGEzYTJjLi5kNWU0Yzc0YTE4MDdmZWYyZDhk YjhlZjRkY2M2MjJkNWNhZDc5YzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkFjdGlvbk1lbnVDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJBY3Rpb25NZW51Q29udHJvbGxlci5oCkBAIC0yOSwxNCArMjksMjEgQEAKICNpbXBv cnQgPFdlYkNvcmUvSGl0VGVzdFJlc3VsdC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgog CitAY2xhc3MgRERBY3Rpb25Db250ZXh0OwogQGNsYXNzIFdlYlZpZXc7CiAKK25hbWVzcGFjZSBX ZWJDb3JlIHsKK2NsYXNzIFJhbmdlOworfQorCiBAaW50ZXJmYWNlIFdlYkFjdGlvbk1lbnVDb250 cm9sbGVyIDogTlNPYmplY3QgPE5TU2hhcmluZ1NlcnZpY2VEZWxlZ2F0ZSwgTlNTaGFyaW5nU2Vy dmljZVBpY2tlckRlbGVnYXRlPiB7CiBAcHJpdmF0ZQogICAgIFdlYlZpZXcgKl93ZWJWaWV3Owog ICAgIFdlYkFjdGlvbk1lbnVUeXBlIF90eXBlOwogICAgIFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQg X2hpdFRlc3RSZXN1bHQ7CiAgICAgUmV0YWluUHRyPE5TU2hhcmluZ1NlcnZpY2VQaWNrZXI+IF9z aGFyaW5nU2VydmljZVBpY2tlcjsKKyAgICBSZXRhaW5QdHI8RERBY3Rpb25Db250ZXh0PiBfY3Vy cmVudEFjdGlvbkNvbnRleHQ7CisgICAgUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiBfY3VycmVudERl dGVjdGVkRGF0YVJhbmdlOwogfQogCiAtIChpZClpbml0V2l0aFdlYlZpZXc6KFdlYlZpZXcgKil3 ZWJWaWV3OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25N ZW51Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVu dUNvbnRyb2xsZXIubW0KaW5kZXggYjY1NGQyYzU4YzIyNzQ4MGQ0NzczMmMxMWUyOTRkZTgxY2M5 NGE1MS4uNmE4MzBhYmFkNWY0ZDhiN2IyNTdlMjBiODgxZjQxNzU5YzQ0ODMyNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25NZW51Q29udHJvbGxlci5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkFjdGlvbk1lbnVDb250cm9sbGVyLm1t CkBAIC0yNyw2ICsyNyw3IEBACiAKICNpbXBvcnQgIkRPTUVsZW1lbnRJbnRlcm5hbC5oIgogI2lt cG9ydCAiRE9NTm9kZUludGVybmFsLmgiCisjaW1wb3J0ICJET01SYW5nZUludGVybmFsLmgiCiAj aW1wb3J0ICJXZWJEb2N1bWVudEludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJFbGVtZW50RGljdGlv bmFyeS5oIgogI2ltcG9ydCAiV2ViRnJhbWVJbnRlcm5hbC5oIgpAQCAtMzcsNiArMzgsOCBAQAog I2ltcG9ydCAiV2ViVmlld0ludGVybmFsLmgiCiAjaW1wb3J0IDxJbWFnZUlPL0ltYWdlSU8uaD4K ICNpbXBvcnQgPEltYWdlS2l0L0ltYWdlS2l0Lmg+CisjaW1wb3J0IDxXZWJDb3JlL0RhdGFEZXRl Y3Rpb24uaD4KKyNpbXBvcnQgPFdlYkNvcmUvRGF0YURldGVjdG9yc1NQSS5oPgogI2ltcG9ydCA8 V2ViQ29yZS9EaWN0aW9uYXJ5TG9va3VwLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0VkaXRvci5oPgog I2ltcG9ydCA8V2ViQ29yZS9FbGVtZW50Lmg+CkBAIC0xNTQsNiArMTU3LDE5IEBAIHN0cnVjdCBE aWN0aW9uYXJ5UG9wdXBJbmZvIHsKICAgICBpZiAobWVudSAhPSBfd2ViVmlldy5hY3Rpb25NZW51 KQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAoX3R5cGUgPT0gV2ViQWN0aW9uTWVudURhdGFE ZXRlY3RlZEl0ZW0pIHsKKyAgICAgICAgaWYgKCFbZ2V0RERBY3Rpb25zTWFuYWdlckNsYXNzKCkg c2hvdWxkVXNlQWN0aW9uc1dpdGhDb250ZXh0Ol9jdXJyZW50QWN0aW9uQ29udGV4dC5nZXQoKV0p IHsKKyAgICAgICAgICAgIFttZW51IGNhbmNlbFRyYWNraW5nXTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChtZW51Lm51bWJlck9mSXRlbXMgPT0gMSkKKyAg ICAgICAgICAgIFtbX3dlYlZpZXcgX3NlbGVjdGVkT3JNYWluRnJhbWVdIF9jbGVhclNlbGVjdGlv bl07CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIFtzZWxmIF9zZWxlY3REYXRhRGV0ZWN0ZWRU ZXh0XTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmICghW3NlbGYgaXNNZW51Rm9y VGV4dENvbnRlbnRdKSB7CiAgICAgICAgIFtbX3dlYlZpZXcgX3NlbGVjdGVkT3JNYWluRnJhbWVd IF9jbGVhclNlbGVjdGlvbl07CiAgICAgICAgIHJldHVybjsKQEAgLTE3MCw2ICsxODYsOSBAQCBz dHJ1Y3QgRGljdGlvbmFyeVBvcHVwSW5mbyB7CiAgICAgaWYgKG1lbnUgIT0gX3dlYlZpZXcuYWN0 aW9uTWVudSkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKF90eXBlID09IFdlYkFjdGlvbk1l bnVEYXRhRGV0ZWN0ZWRJdGVtICYmIF9jdXJyZW50QWN0aW9uQ29udGV4dCkKKyAgICAgICAgW2dl dEREQWN0aW9uc01hbmFnZXJDbGFzcygpIGRpZFVzZUFjdGlvbnNdOworCiAgICAgX3R5cGUgPSBX ZWJBY3Rpb25NZW51Tm9uZTsKICAgICBfc2hhcmluZ1NlcnZpY2VQaWNrZXIgPSBuaWw7CiB9CkBA IC0yNDEsMTMgKzI2MCw2IEBAIHN0YXRpYyBJbnRSZWN0IGVsZW1lbnRCb3VuZGluZ0JveEluV2lu ZG93Q29vcmRpbmF0ZXNGcm9tTm9kZShOb2RlKiBub2RlKQogCiAtIChOU0FycmF5ICopX2RlZmF1 bHRNZW51SXRlbXNGb3JMaW5rCiB7Ci0gICAgTlNVUkwgKnVybCA9IF9oaXRUZXN0UmVzdWx0LmFi c29sdXRlTGlua1VSTCgpOwotICAgIGlmICghdXJsKQotICAgICAgICByZXR1cm4gQFsgXTsKLQot ICAgIGlmICghV2ViQ29yZTo6cHJvdG9jb2xJc0luSFRUUEZhbWlseShbdXJsIGFic29sdXRlU3Ry aW5nXSkpCi0gICAgICAgIHJldHVybiBAWyBdOwotCiAgICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+ IG9wZW5MaW5rSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJBY3Rp b25NZW51SXRlbVRhZ09wZW5MaW5rSW5EZWZhdWx0QnJvd3Nlcl07CiAgICAgUmV0YWluUHRyPE5T TWVudUl0ZW0+IHByZXZpZXdMaW5rSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZv clRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ1ByZXZpZXdMaW5rXTsKICAgICBSZXRhaW5QdHI8TlNN ZW51SXRlbT4gcmVhZGluZ0xpc3RJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9y VGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnQWRkTGlua1RvU2FmYXJpUmVhZGluZ0xpc3RdOwpAQCAt MjU1LDYgKzI2NywyMiBAQCBzdGF0aWMgSW50UmVjdCBlbGVtZW50Qm91bmRpbmdCb3hJbldpbmRv d0Nvb3JkaW5hdGVzRnJvbU5vZGUoTm9kZSogbm9kZSkKICAgICByZXR1cm4gQFsgb3BlbkxpbmtJ dGVtLmdldCgpLCBwcmV2aWV3TGlua0l0ZW0uZ2V0KCksIFtOU01lbnVJdGVtIHNlcGFyYXRvckl0 ZW1dLCByZWFkaW5nTGlzdEl0ZW0uZ2V0KCkgXTsKIH0KIAorI3ByYWdtYSBtYXJrIE1haWx0byBM aW5rIGFjdGlvbnMKKworLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9yTWFpbHRvTGlu aworeworICAgIE5vZGUqIG5vZGUgPSBfaGl0VGVzdFJlc3VsdC5pbm5lck5vZGUoKTsKKyAgICBp ZiAoIW5vZGUpCisgICAgICAgIHJldHVybiBAWyBdOworCisgICAgUmV0YWluUHRyPEREQWN0aW9u Q29udGV4dD4gYWN0aW9uQ29udGV4dCA9IFtbZ2V0RERBY3Rpb25Db250ZXh0Q2xhc3MoKSBhbGxv Y10gaW5pdF07CisgICAgW2FjdGlvbkNvbnRleHQgc2V0Rm9yQWN0aW9uTWVudUNvbnRlbnQ6WUVT XTsKKworICAgIC8vIEZJWE1FOiBTaG91bGQgdGhpcyBzaG93IGEgeWVsbG93IGhpZ2hsaWdodD8K KyAgICBbYWN0aW9uQ29udGV4dCBzZXRIaWdobGlnaHRGcmFtZTplbGVtZW50Qm91bmRpbmdCb3hJ bldpbmRvd0Nvb3JkaW5hdGVzRnJvbU5vZGUobm9kZSldOworICAgIHJldHVybiBbW2dldEREQWN0 aW9uc01hbmFnZXJDbGFzcygpIHNoYXJlZE1hbmFnZXJdIG1lbnVJdGVtc0ZvclRhcmdldFVSTDpf aGl0VGVzdFJlc3VsdC5hYnNvbHV0ZUxpbmtVUkwoKSBhY3Rpb25Db250ZXh0OmFjdGlvbkNvbnRl eHQuZ2V0KCldOworfQorCiAjcHJhZ21hIG1hcmsgSW1hZ2UgYWN0aW9ucwogCiAtIChOU0FycmF5 ICopX2RlZmF1bHRNZW51SXRlbXNGb3JJbWFnZQpAQCAtNDc1LDYgKzUwMyw0NiBAQCBzdGF0aWMg TlNTdHJpbmcgKnBhdGhUb1Bob3RvT25EaXNrKE5TU3RyaW5nICpzdWdnZXN0ZWRGaWxlbmFtZSkK ICAgICByZXR1cm4gQFsgY29weVRleHRJdGVtLmdldCgpLCBsb29rdXBUZXh0SXRlbS5nZXQoKSwg cGFzdGVJdGVtLmdldCgpLCB0ZXh0U3VnZ2VzdGlvbnNJdGVtLmdldCgpIF07CiB9CiAKKy0gKHZv aWQpX3NlbGVjdERhdGFEZXRlY3RlZFRleHQKK3sKKyAgICBbX3dlYlZpZXcgX21haW5Db3JlRnJh bWVdLT5zZWxlY3Rpb24oKS5zZXRTZWxlY3RlZFJhbmdlKF9jdXJyZW50RGV0ZWN0ZWREYXRhUmFu Z2UuZ2V0KCksIERPV05TVFJFQU0sIHRydWUpOworfQorCistIChOU0FycmF5ICopX2RlZmF1bHRN ZW51SXRlbXNGb3JEYXRhRGV0ZWN0ZWRUZXh0Cit7CisgICAgUmVmUHRyPFJhbmdlPiBkZXRlY3Rl ZERhdGFSYW5nZTsKKyAgICBGbG9hdFJlY3QgZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3g7CisgICAg UmV0YWluUHRyPEREQWN0aW9uQ29udGV4dD4gYWN0aW9uQ29udGV4dDsKKworICAgIGlmIChbW193 ZWJWaWV3IFVJRGVsZWdhdGVdIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6 YWN0aW9uQ29udGV4dEZvckhpdFRlc3RSZXN1bHQ6cmFuZ2U6KV0pIHsKKyAgICAgICAgUmV0YWlu UHRyPFdlYkVsZW1lbnREaWN0aW9uYXJ5PiBoaXRUZXN0RGljdGlvbmFyeSA9IGFkb3B0TlMoW1tX ZWJFbGVtZW50RGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhIaXRUZXN0UmVzdWx0Ol9oaXRUZXN0 UmVzdWx0XSk7CisKKyAgICAgICAgRE9NUmFuZ2UgKmN1c3RvbURhdGFEZXRlY3RvcnNSYW5nZTsK KyAgICAgICAgYWN0aW9uQ29udGV4dCA9IFtbX3dlYlZpZXcgVUlEZWxlZ2F0ZV0gX3dlYlZpZXc6 X3dlYlZpZXcgYWN0aW9uQ29udGV4dEZvckhpdFRlc3RSZXN1bHQ6aGl0VGVzdERpY3Rpb25hcnku Z2V0KCkgcmFuZ2U6JmN1c3RvbURhdGFEZXRlY3RvcnNSYW5nZV07CisKKyAgICAgICAgaWYgKGFj dGlvbkNvbnRleHQgJiYgY3VzdG9tRGF0YURldGVjdG9yc1JhbmdlKQorICAgICAgICAgICAgZGV0 ZWN0ZWREYXRhUmFuZ2UgPSBjb3JlKGN1c3RvbURhdGFEZXRlY3RvcnNSYW5nZSk7CisgICAgfQor CisgICAgLy8gSWYgdGhlIGNsaWVudCBkaWRuJ3QgZ2l2ZSB1cyBhbiBhY3Rpb24gY29udGV4dCwg dHJ5IHRvIHNjYW4gYXJvdW5kIHRoZSBoaXQgcG9pbnQuCisgICAgaWYgKCFhY3Rpb25Db250ZXh0 IHx8ICFkZXRlY3RlZERhdGFSYW5nZSkKKyAgICAgICAgYWN0aW9uQ29udGV4dCA9IERhdGFEZXRl Y3Rpb246OmRldGVjdEl0ZW1Bcm91bmRIaXRUZXN0UmVzdWx0KF9oaXRUZXN0UmVzdWx0LCBkZXRl Y3RlZERhdGFCb3VuZGluZ0JveCwgZGV0ZWN0ZWREYXRhUmFuZ2UpOworCisgICAgaWYgKCFhY3Rp b25Db250ZXh0IHx8ICFkZXRlY3RlZERhdGFSYW5nZSkKKyAgICAgICAgcmV0dXJuIEBbIF07CisK KyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGhpZGUvc2hvdyB0aGUgeWVsbG93IGhpZ2hsaWdodCBo ZXJlLgorICAgIF9jdXJyZW50QWN0aW9uQ29udGV4dCA9IFthY3Rpb25Db250ZXh0IGNvbnRleHRG b3JWaWV3Ol93ZWJWaWV3IGFsdE1vZGU6WUVTIGludGVyYWN0aW9uU3RhcnRlZEhhbmRsZXI6Xigp IHsKKyAgICB9IGludGVyYWN0aW9uQ2hhbmdlZEhhbmRsZXI6XigpIHsKKyAgICB9IGludGVyYWN0 aW9uU3RvcHBlZEhhbmRsZXI6XigpIHsKKyAgICB9XTsKKyAgICBfY3VycmVudERldGVjdGVkRGF0 YVJhbmdlID0gZGV0ZWN0ZWREYXRhUmFuZ2U7CisKKyAgICBbX2N1cnJlbnRBY3Rpb25Db250ZXh0 IHNldEhpZ2hsaWdodEZyYW1lOltfd2ViVmlldy53aW5kb3cgY29udmVydFJlY3RUb1NjcmVlbjpb X3dlYlZpZXcgY29udmVydFJlY3Q6ZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3ggdG9WaWV3Om5pbF1d XTsKKworICAgIHJldHVybiBbW2dldEREQWN0aW9uc01hbmFnZXJDbGFzcygpIHNoYXJlZE1hbmFn ZXJdIG1lbnVJdGVtc0ZvclJlc3VsdDpbX2N1cnJlbnRBY3Rpb25Db250ZXh0IG1haW5SZXN1bHRd IGFjdGlvbkNvbnRleHQ6X2N1cnJlbnRBY3Rpb25Db250ZXh0LmdldCgpXTsKK30KKwogLSAodm9p ZClfY29weVNlbGVjdGlvbjooaWQpc2VuZGVyCiB7CiAgICAgW193ZWJWaWV3IF9leGVjdXRlQ29y ZUNvbW1hbmRCeU5hbWU6QCJjb3B5IiB2YWx1ZTpuaWxdOwpAQCAtNTE1LDcgKzU4Myw2IEBAIHN0 YXRpYyBOU1N0cmluZyAqcGF0aFRvUGhvdG9PbkRpc2soTlNTdHJpbmcgKnN1Z2dlc3RlZEZpbGVu YW1lKQogICAgICAgICByZXR1cm47CiAKICAgICBmcmFtZS0+c2VsZWN0aW9uKCkuc2V0U2VsZWN0 ZWRSYW5nZShsb29rdXBSYW5nZS5nZXQoKSwgRE9XTlNUUkVBTSwgdHJ1ZSk7Ci0gICAgcmV0dXJu OwogfQogCiAtICh2b2lkKV9jaGFuZ2VTZWxlY3Rpb25Ub1N1Z2dlc3Rpb246KGlkKXNlbmRlcgpA QCAtNzI1LDExICs3OTIsMTYgQEAgc3RhdGljIE5TSW1hZ2UgKndlYktpdEJ1bmRsZUltYWdlTmFt ZWQoTlNTdHJpbmcgKm5hbWUpCiAtIChOU0FycmF5ICopX2RlZmF1bHRNZW51SXRlbXMKIHsKICAg ICBOU1VSTCAqdXJsID0gX2hpdFRlc3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCk7Ci0gICAgaWYg KHVybCkgeworICAgIGlmICh1cmwgJiYgV2ViQ29yZTo6cHJvdG9jb2xJc0luSFRUUEZhbWlseShb dXJsIGFic29sdXRlU3RyaW5nXSkpIHsKICAgICAgICAgX3R5cGUgPSBXZWJBY3Rpb25NZW51TGlu azsKICAgICAgICAgcmV0dXJuIFtzZWxmIF9kZWZhdWx0TWVudUl0ZW1zRm9yTGlua107CiAgICAg fQogCisgICAgaWYgKHVybCAmJiBXZWJDb3JlOjpwcm90b2NvbElzKFt1cmwgYWJzb2x1dGVTdHJp bmddLCAibWFpbHRvIikpIHsKKyAgICAgICAgX3R5cGUgPSBXZWJBY3Rpb25NZW51TWFpbHRvTGlu azsKKyAgICAgICAgcmV0dXJuIFtzZWxmIF9kZWZhdWx0TWVudUl0ZW1zRm9yTWFpbHRvTGlua107 CisgICAgfQorCiAgICAgaWYgKCFfaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZU1lZGlhVVJMKCkuaXNF bXB0eSgpKSB7CiAgICAgICAgIF90eXBlID0gV2ViQWN0aW9uTWVudVZpZGVvOwogICAgICAgICBy ZXR1cm4gW3NlbGYgX2RlZmF1bHRNZW51SXRlbXNGb3JWaWRlb107CkBAIC03NDIsNiArODE0LDEy IEBAIHN0YXRpYyBOU0ltYWdlICp3ZWJLaXRCdW5kbGVJbWFnZU5hbWVkKE5TU3RyaW5nICpuYW1l KQogCiAgICAgTm9kZSogbm9kZSA9IF9oaXRUZXN0UmVzdWx0LmlubmVyTm9kZSgpOwogICAgIGlm IChub2RlICYmIG5vZGUtPmlzVGV4dE5vZGUoKSkgeworICAgICAgICBOU0FycmF5ICpkYXRhRGV0 ZWN0b3JNZW51SXRlbXMgPSBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0ZvckRhdGFEZXRlY3RlZFRl eHRdOworICAgICAgICBpZiAoZGF0YURldGVjdG9yTWVudUl0ZW1zLmNvdW50KSB7CisgICAgICAg ICAgICBfdHlwZSA9IFdlYkFjdGlvbk1lbnVEYXRhRGV0ZWN0ZWRJdGVtOworICAgICAgICAgICAg cmV0dXJuIGRhdGFEZXRlY3Rvck1lbnVJdGVtczsKKyAgICAgICAgfQorCiAgICAgICAgIGlmIChf aGl0VGVzdFJlc3VsdC5pc0NvbnRlbnRFZGl0YWJsZSgpKSB7CiAgICAgICAgICAgICBOU0FycmF5 ICplZGl0YWJsZVRleHRXaXRoU3VnZ2VzdGlvbnMgPSBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0Zv ckVkaXRhYmxlVGV4dFdpdGhTdWdnZXN0aW9uc107CiAgICAgICAgICAgICBpZiAoZWRpdGFibGVU ZXh0V2l0aFN1Z2dlc3Rpb25zLmNvdW50KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgKaW5kZXggZGJiMTQ4YWQzNjY5NjYwMjhkZDNlMjdi ZjRkMjBmYmI0ZmE3MmNhOS4uZmI3YjNlNjFkNTAwNDYzODc3MmMyYWIyYTJhMzBjZGNjMGQ3MGMz NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJp dmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZh dGUuaApAQCAtMTM4LDcgKzEzOCw5IEBAIHR5cGVkZWYgZW51bSB7CiAgICAgV2ViQWN0aW9uTWVu dVdoaXRlc3BhY2VJbkVkaXRhYmxlQXJlYSwKICAgICBXZWJBY3Rpb25NZW51RWRpdGFibGVUZXh0 V2l0aFN1Z2dlc3Rpb25zLAogICAgIFdlYkFjdGlvbk1lbnVJbWFnZSwKLSAgICBXZWJBY3Rpb25N ZW51VmlkZW8KKyAgICBXZWJBY3Rpb25NZW51VmlkZW8sCisgICAgV2ViQWN0aW9uTWVudURhdGFE ZXRlY3RlZEl0ZW0sCisgICAgV2ViQWN0aW9uTWVudU1haWx0b0xpbmsKIH0gV2ViQWN0aW9uTWVu dVR5cGU7CiAKIC8vIE1lc3NhZ2UgU291cmNlcy4KQEAgLTE1OSw4ICsxNjEsMTAgQEAgZXh0ZXJu IE5TU3RyaW5nICpXZWJDb25zb2xlTWVzc2FnZUxvZ01lc3NhZ2VMZXZlbDsKIGV4dGVybiBOU1N0 cmluZyAqV2ViQ29uc29sZU1lc3NhZ2VXYXJuaW5nTWVzc2FnZUxldmVsOwogZXh0ZXJuIE5TU3Ry aW5nICpXZWJDb25zb2xlTWVzc2FnZUVycm9yTWVzc2FnZUxldmVsOwogCitAY2xhc3MgRERBY3Rp b25Db250ZXh0OwogQGNsYXNzIERPTUVsZW1lbnQ7CiBAY2xhc3MgRE9NTm9kZTsKK0BjbGFzcyBE T01SYW5nZTsKIEBjbGFzcyBXZWJTZWN1cml0eU9yaWdpbjsKIAogI2lmIEVOQUJMRV9GVUxMU0NS RUVOX0FQSQpAQCAtMjIzLDYgKzIyNyw3IEBAIGV4dGVybiBOU1N0cmluZyAqV2ViQ29uc29sZU1l c3NhZ2VFcnJvck1lc3NhZ2VMZXZlbDsKIC0gKHZvaWQpd2ViVmlldzooV2ViVmlldyAqKXNlbmRl ciBjb250ZXh0TWVudUl0ZW1TZWxlY3RlZDooTlNNZW51SXRlbSAqKWl0ZW0gZm9yRWxlbWVudDoo TlNEaWN0aW9uYXJ5ICopZWxlbWVudDsKIC0gKHZvaWQpd2ViVmlldzooV2ViVmlldyAqKXNlbmRl ciBzYXZlRnJhbWVWaWV3OihXZWJGcmFtZVZpZXcgKilmcmFtZVZpZXcgc2hvd2luZ1BhbmVsOihC T09MKXNob3dpbmdQYW5lbDsKIC0gKE5TQXJyYXkgKilfd2ViVmlldzooV2ViVmlldyAqKXNlbmRl ciBhY3Rpb25NZW51SXRlbXNGb3JIaXRUZXN0UmVzdWx0OihOU0RpY3Rpb25hcnkgKiloaXRUZXN0 UmVzdWx0IHdpdGhUeXBlOihXZWJBY3Rpb25NZW51VHlwZSl0eXBlIGRlZmF1bHRBY3Rpb25NZW51 SXRlbXM6KE5TQXJyYXkgKilkZWZhdWx0TWVudUl0ZW1zOworLSAoRERBY3Rpb25Db250ZXh0ICop X3dlYlZpZXc6KFdlYlZpZXcgKilzZW5kZXIgYWN0aW9uQ29udGV4dEZvckhpdFRlc3RSZXN1bHQ6 KE5TRGljdGlvbmFyeSAqKWhpdFRlc3RSZXN1bHQgcmFuZ2U6KERPTVJhbmdlICoqKXJhbmdlOwog I2VuZGlmCiAtIChCT09MKXdlYlZpZXc6KFdlYlZpZXcgKilzZW5kZXIgZGlkUHJlc3NNaXNzaW5n UGx1Z2luQnV0dG9uOihET01FbGVtZW50ICopZWxlbWVudDsKIC8qIQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCmluZGV4 IDk2ZWE0MDBkYjc5Mzg4ZTg0YzkzNmRlNjJiMWQxM2JiZTZkMzkyZDkuLmQ4ZDk0ZDMwMjFjZTUz NDEwYmYyODIzNzgzNDUwNWU0MjFhY2QzOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KQEAgLTcwNiw2ICs3MDYs NyBAQCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhUb1Bob3RvT25EaXNrKE5TU3RyaW5nICpzdWdnZXN0 ZWRGaWxlbmFtZSkKIHsKICAgICBSZWZQdHI8V2ViSGl0VGVzdFJlc3VsdD4gaGl0VGVzdFJlc3Vs dCA9IFtzZWxmIF93ZWJIaXRUZXN0UmVzdWx0XTsKIAorICAgIC8vIEZJWE1FOiBTaG91bGQgdGhp cyBzaG93IGEgeWVsbG93IGhpZ2hsaWdodD8KICAgICBSZXRhaW5QdHI8RERBY3Rpb25Db250ZXh0 PiBhY3Rpb25Db250ZXh0ID0gW1tnZXREREFjdGlvbkNvbnRleHRDbGFzcygpIGFsbG9jXSBpbml0 XTsKICAgICBbYWN0aW9uQ29udGV4dCBzZXRGb3JBY3Rpb25NZW51Q29udGVudDpZRVNdOwogICAg IFthY3Rpb25Db250ZXh0IHNldEhpZ2hsaWdodEZyYW1lOltfd2tWaWV3LndpbmRvdyBjb252ZXJ0 UmVjdFRvU2NyZWVuOltfd2tWaWV3IGNvbnZlcnRSZWN0OmhpdFRlc3RSZXN1bHQtPmVsZW1lbnRC b3VuZGluZ0JveCgpIHRvVmlldzpuaWxdXV07Cg==