139240 2014-12-03 16:20:56 -0800 Implement action menus for tel: URLs 2014-12-03 18:33:14 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin commit-queue oldest_to_newest 1052335 0 thorton 2014-12-03 16:20:56 -0800 Implement action menus for tel: URLs 1052336 1 242537 thorton 2014-12-03 16:21:31 -0800 Created attachment 242537 Patch 1052337 2 commit-queue 2014-12-03 16:23:50 -0800 Attachment 242537 did not pass style-queue: ERROR: Source/WebKit/mac/WebView/WebActionMenuController.mm:310: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebView/WebActionMenuController.mm:311: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebView/WebActionMenuController.mm:312: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:870: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:871: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:872: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 6 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1052339 3 thorton 2014-12-03 16:32:59 -0800 http://trac.webkit.org/changeset/176763 1052385 4 thorton 2014-12-03 18:28:53 -0800 And http://trac.webkit.org/changeset/176775 1052388 5 thorton 2014-12-03 18:33:14 -0800 And http://trac.webkit.org/changeset/176777 242537 2014-12-03 16:21:31 -0800 2014-12-03 16:28:04 -0800 Patch bug-139240-20141203162203.patch text/plain 10506 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZTVhOTY2ODNi NGJhZmIyY2UyYzVlMTg1YTU2ZDgxMjY5ZTgyNWMzOS4uZmU4NDc1OTA1MTI5YTQ0NjA0ODk4YzNl MTFkNDFlZmM4NmI0NWYwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0 LTEyLTAzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAg IEltcGxlbWVudCBhY3Rpb24gbWVudXMgZm9yIHRlbDogVVJMcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5MjQwCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8xOTExNTY2Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFdlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW06CisgICAgICAgICgt W1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zRm9yRGF0YURldGVjdGFi bGVMaW5rXSk6CisgICAgICAgIFJlbmFtZSB0aGlzIGZ1bmN0aW9uIGFzIGl0IHdpbGwgd29yayBm b3IgYm90aCBtYWlsdG8gYW5kIHRlbCBVUkxzLgorICAgICAgICBBZGp1c3QgaXQgdG8gdXNlIGNv bnRleHRGb3JWaWV3Oi4KKworICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciB3ZWJW aWV3OndpbGxIYW5kbGVNb3VzZURvd246XSk6CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250 cm9sbGVyIHByZXBhcmVGb3JNZW51OndpdGhFdmVudDpdKToKKyAgICAgICAgKC1bV2ViQWN0aW9u TWVudUNvbnRyb2xsZXIgZGlkQ2xvc2VNZW51OndpdGhFdmVudDpdKToKKyAgICAgICAgKC1bV2Vi QWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNdKToKKyAgICAgICAgRG9uJ3Qg Y2hlY2sgdGhlIG1lbnUgdHlwZSB3aGVuIGdvaW5nIHRvIGludGVyYWN0IHdpdGggX2N1cnJlbnRB Y3Rpb25Db250ZXh0LgorICAgICAgICBXZSdsbCBvbmx5IGhhdmUgYSBfY3VycmVudEFjdGlvbkNv bnRleHQgaWYgd2UgaGF2ZSBhIGRhdGEgZGV0ZWN0ZWQgaXRlbSwKKyAgICAgICAgYW5kIHRoZXJl IGFyZSBtdWx0aXBsZSBtZW51IHR5cGVzIHRoYXQgZW5kIHVwIHVzaW5nIEREQWN0aW9uQ29udGV4 dC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaDoKKyAgICAgICAg QWRkIGEgbmV3IHR5cGUuCisKIDIwMTQtMTItMDIgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9o b3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgYnVpbGQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MzdlMTY3MDQxNDZiZDkwYTcyYjQ0ODQyYjQ3MTg3MTM4YzBkMzQyNC4uOGI5MTg5ZjcxODQ3ODcz M2YzMTJmMzgwOGNiN2NhMDBkMzdjYTFmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAy MDE0LTEyLTAzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCisgICAg ICAgIEltcGxlbWVudCBhY3Rpb24gbWVudXMgZm9yIHRlbDogVVJMcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5MjQwCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xOTExNTY2Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS0FjdGlvbk1lbnVUeXBlcy5oOgorICAgICAgICBB ZGQgYSBuZXcgdHlwZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29u dHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciBfZGVmYXVsdE1l bnVJdGVtc0ZvckRhdGFEZXRlY3RhYmxlTGlua10pOgorICAgICAgICBSZW5hbWUgdGhpcyBmdW5j dGlvbiBhcyBpdCB3aWxsIHdvcmsgZm9yIGJvdGggbWFpbHRvIGFuZCB0ZWwgVVJMcy4KKyAgICAg ICAgQWRqdXN0IGl0IHRvIHVzZSBjb250ZXh0Rm9yVmlldzouCisKKyAgICAgICAgKC1bV0tBY3Rp b25NZW51Q29udHJvbGxlciBfY2xlYXJBY3Rpb25NZW51U3RhdGVdKToKKyAgICAgICAgKC1bV0tB Y3Rpb25NZW51Q29udHJvbGxlciBtZW51TmVlZHNVcGRhdGU6XSk6CisgICAgICAgICgtW1dLQWN0 aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNdKToKKyAgICAgICAgRG9uJ3QgY2hl Y2sgdGhlIG1lbnUgdHlwZSB3aGVuIGdvaW5nIHRvIGludGVyYWN0IHdpdGggX2N1cnJlbnRBY3Rp b25Db250ZXh0LgorICAgICAgICBXZSdsbCBvbmx5IGhhdmUgYSBfY3VycmVudEFjdGlvbkNvbnRl eHQgaWYgd2UgaGF2ZSBhIGRhdGEgZGV0ZWN0ZWQgaXRlbSwKKyAgICAgICAgYW5kIHRoZXJlIGFy ZSBtdWx0aXBsZSBtZW51IHR5cGVzIHRoYXQgZW5kIHVwIHVzaW5nIEREQWN0aW9uQ29udGV4dC4K KworMjAxNC0xMi0wMyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwog ICAgICAgICBLZXlib2FyZCBpbnB1dCBzaG91bGQgYmUgZGlzYWJsZWQgaW4gdGhlIHByZXZpZXcg cG9wb3ZlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM5MjE5CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xOTA1MjM4MT4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW0gYi9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkFjdGlvbk1lbnVDb250cm9sbGVyLm1tCmluZGV4IGJi ZmY3YjI3ODcyMjQ3ZWVjZWUzMDc0NDQzZGZkOTgxMWE0MzJhNGEuLjgxODdjZmU5ODEzZmQwYmQx OTFiM2Q1MWMwYzk2OThmZDkxNDViYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJBY3Rpb25NZW51Q29udHJvbGxlci5tbQpAQCAtMTI1LDcgKzEyNSw3IEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJW aWV3IHdpbGxIYW5kbGVNb3VzZURvd246KE5TRXZlbnQgKilldmVudAogewotICAgIGlmIChfdHlw ZSA9PSBXZWJBY3Rpb25NZW51RGF0YURldGVjdGVkSXRlbSAmJiBfY3VycmVudEFjdGlvbkNvbnRl eHQgJiYgX2hhc0FjdGl2YXRlZEFjdGlvbkNvbnRleHQpIHsKKyAgICBpZiAoX2N1cnJlbnRBY3Rp b25Db250ZXh0ICYmIF9oYXNBY3RpdmF0ZWRBY3Rpb25Db250ZXh0KSB7CiAgICAgICAgIFtnZXRE REFjdGlvbnNNYW5hZ2VyQ2xhc3MoKSBkaWRVc2VBY3Rpb25zXTsKICAgICAgICAgX2hhc0FjdGl2 YXRlZEFjdGlvbkNvbnRleHQgPSBOTzsKICAgICB9CkBAIC0xNTgsNyArMTU4LDcgQEAgdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgZm9yIChOU01lbnVJdGVtICppdGVtIGluIG1lbnVJdGVt cykKICAgICAgICAgW2FjdGlvbk1lbnUgYWRkSXRlbTppdGVtXTsKIAotICAgIGlmIChfdHlwZSA9 PSBXZWJBY3Rpb25NZW51RGF0YURldGVjdGVkSXRlbSAmJiBfY3VycmVudEFjdGlvbkNvbnRleHQp IHsKKyAgICBpZiAoX2N1cnJlbnRBY3Rpb25Db250ZXh0KSB7CiAgICAgICAgIF9oYXNBY3RpdmF0 ZWRBY3Rpb25Db250ZXh0ID0gWUVTOwogICAgICAgICBpZiAoIVtnZXREREFjdGlvbnNNYW5hZ2Vy Q2xhc3MoKSBzaG91bGRVc2VBY3Rpb25zV2l0aENvbnRleHQ6X2N1cnJlbnRBY3Rpb25Db250ZXh0 LmdldCgpXSkgewogICAgICAgICAgICAgW21lbnUgY2FuY2VsVHJhY2tpbmddOwpAQCAtMjI5LDcg KzIyOSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogICAgIGlmIChtZW51ICE9IF93ZWJW aWV3LmFjdGlvbk1lbnUpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChfdHlwZSA9PSBXZWJB Y3Rpb25NZW51RGF0YURldGVjdGVkSXRlbSAmJiBfY3VycmVudEFjdGlvbkNvbnRleHQgJiYgX2hh c0FjdGl2YXRlZEFjdGlvbkNvbnRleHQpIHsKKyAgICBpZiAoX2N1cnJlbnRBY3Rpb25Db250ZXh0 ICYmIF9oYXNBY3RpdmF0ZWRBY3Rpb25Db250ZXh0KSB7CiAgICAgICAgIFtnZXREREFjdGlvbnNN YW5hZ2VyQ2xhc3MoKSBkaWRVc2VBY3Rpb25zXTsKICAgICAgICAgX2hhc0FjdGl2YXRlZEFjdGlv bkNvbnRleHQgPSBOTzsKICAgICB9CkBAIC0yOTYsMTkgKzI5NiwyNCBAQCBzdGF0aWMgSW50UmVj dCBlbGVtZW50Qm91bmRpbmdCb3hJbldpbmRvd0Nvb3JkaW5hdGVzRnJvbU5vZGUoTm9kZSogbm9k ZSkKICAgICByZXR1cm4gQFsgb3BlbkxpbmtJdGVtLmdldCgpLCBzaG91bGRVc2VTdGFuZGFyZFF1 aWNrTG9va1ByZXZpZXcgPyBxbFByZXZpZXdMaW5rSXRlbS5nZXQoKSA6IHByZXZpZXdMaW5rSXRl bS5nZXQoKSwgW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0sIHJlYWRpbmdMaXN0SXRlbS5nZXQo KSBdOwogfQogCi0jcHJhZ21hIG1hcmsgTWFpbHRvIExpbmsgYWN0aW9ucworI3ByYWdtYSBtYXJr IG1haWx0bzogYW5kIHRlbDogTGluayBhY3Rpb25zCiAKLS0gKE5TQXJyYXkgKilfZGVmYXVsdE1l bnVJdGVtc0Zvck1haWx0b0xpbmsKKy0gKE5TQXJyYXkgKilfZGVmYXVsdE1lbnVJdGVtc0ZvckRh dGFEZXRlY3RhYmxlTGluawogewogICAgIE5vZGUqIG5vZGUgPSBfaGl0VGVzdFJlc3VsdC5pbm5l ck5vZGUoKTsKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBAWyBdOwogCiAgICAgUmV0 YWluUHRyPEREQWN0aW9uQ29udGV4dD4gYWN0aW9uQ29udGV4dCA9IFtbZ2V0RERBY3Rpb25Db250 ZXh0Q2xhc3MoKSBhbGxvY10gaW5pdF07Ci0gICAgW2FjdGlvbkNvbnRleHQgc2V0QWx0TW9kZTpZ RVNdOwogCiAgICAgLy8gRklYTUU6IFNob3VsZCB0aGlzIHNob3cgYSB5ZWxsb3cgaGlnaGxpZ2h0 PworICAgIF9jdXJyZW50QWN0aW9uQ29udGV4dCA9IFthY3Rpb25Db250ZXh0IGNvbnRleHRGb3JW aWV3Ol93ZWJWaWV3IGFsdE1vZGU6WUVTIGludGVyYWN0aW9uU3RhcnRlZEhhbmRsZXI6XigpIHsK KyAgICB9IGludGVyYWN0aW9uQ2hhbmdlZEhhbmRsZXI6XigpIHsKKyAgICB9IGludGVyYWN0aW9u U3RvcHBlZEhhbmRsZXI6XigpIHsKKyAgICB9XTsKKwogICAgIFthY3Rpb25Db250ZXh0IHNldEhp Z2hsaWdodEZyYW1lOmVsZW1lbnRCb3VuZGluZ0JveEluV2luZG93Q29vcmRpbmF0ZXNGcm9tTm9k ZShub2RlKV07CisKICAgICByZXR1cm4gW1tnZXREREFjdGlvbnNNYW5hZ2VyQ2xhc3MoKSBzaGFy ZWRNYW5hZ2VyXSBtZW51SXRlbXNGb3JUYXJnZXRVUkw6X2hpdFRlc3RSZXN1bHQuYWJzb2x1dGVM aW5rVVJMKCkgYWN0aW9uQ29udGV4dDphY3Rpb25Db250ZXh0LmdldCgpXTsKIH0KIApAQCAtODUz LDcgKzg1OCwxMiBAQCBzdGF0aWMgRGljdGlvbmFyeVBvcHVwSW5mbyBwZXJmb3JtRGljdGlvbmFy eUxvb2t1cEZvclJhbmdlKEZyYW1lKiBmcmFtZSwgUmFuZ2UmCiAKICAgICBpZiAodXJsICYmIFdl YkNvcmU6OnByb3RvY29sSXMoW3VybCBhYnNvbHV0ZVN0cmluZ10sICJtYWlsdG8iKSkgewogICAg ICAgICBfdHlwZSA9IFdlYkFjdGlvbk1lbnVNYWlsdG9MaW5rOwotICAgICAgICByZXR1cm4gW3Nl bGYgX2RlZmF1bHRNZW51SXRlbXNGb3JNYWlsdG9MaW5rXTsKKyAgICAgICAgcmV0dXJuIFtzZWxm IF9kZWZhdWx0TWVudUl0ZW1zRm9yRGF0YURldGVjdGFibGVMaW5rXTsKKyAgICB9CisKKyAgICBp ZiAodXJsICYmIFdlYkNvcmU6OnByb3RvY29sSXMoW3VybCBhYnNvbHV0ZVN0cmluZ10sICJ0ZWwi KSkgeworICAgICAgICBfdHlwZSA9IFdlYkFjdGlvbk1lbnVUZWxMaW5rOworICAgICAgICByZXR1 cm4gW3NlbGYgX2RlZmF1bHRNZW51SXRlbXNGb3JEYXRhRGV0ZWN0YWJsZUxpbmtdOwogICAgIH0K IAogICAgIGlmICghX2hpdFRlc3RSZXN1bHQuYWJzb2x1dGVNZWRpYVVSTCgpLmlzRW1wdHkoKSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJp dmF0ZS5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5o CmluZGV4IGZiN2IzZTYxZDUwMDQ2Mzg3NzJjMmFiMmEyYTMwY2RjYzBkNzBjMzUuLjFmYjNhNGIy ODdlNzUzZmVlNGJkMDc5OWJhODM2NTRmODBlYjQ3ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmgKQEAgLTE0MCw3ICsxNDAsOCBAQCB0 eXBlZGVmIGVudW0gewogICAgIFdlYkFjdGlvbk1lbnVJbWFnZSwKICAgICBXZWJBY3Rpb25NZW51 VmlkZW8sCiAgICAgV2ViQWN0aW9uTWVudURhdGFEZXRlY3RlZEl0ZW0sCi0gICAgV2ViQWN0aW9u TWVudU1haWx0b0xpbmsKKyAgICBXZWJBY3Rpb25NZW51TWFpbHRvTGluaywKKyAgICBXZWJBY3Rp b25NZW51VGVsTGluawogfSBXZWJBY3Rpb25NZW51VHlwZTsKIAogLy8gTWVzc2FnZSBTb3VyY2Vz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLQWN0aW9uTWVudVR5 cGVzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tBY3Rpb25NZW51VHlwZXMuaApp bmRleCAyMDMwNDdkNDRlMTExMTRlNWU0M2Y0MTg5MDVmMTY0YzFlYTFmMjE5Li41YjVlYjczNjZh MTVhYTVmOWRmNDYxNzE2NGY2MmU3MTk5NTFjODgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvQVBJL2MvV0tBY3Rpb25NZW51VHlwZXMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvQVBJL2MvV0tBY3Rpb25NZW51VHlwZXMuaApAQCAtNDIsNyArNDIsOCBAQCBlbnVtIHsK ICAgICBrV0tBY3Rpb25NZW51RWRpdGFibGVUZXh0V2l0aFN1Z2dlc3Rpb25zLAogICAgIGtXS0Fj dGlvbk1lbnVXaGl0ZXNwYWNlSW5FZGl0YWJsZUFyZWEsCiAgICAga1dLQWN0aW9uTWVudVZpZGVv LAotICAgIGtXS0FjdGlvbk1lbnVNYWlsdG9MaW5rCisgICAga1dLQWN0aW9uTWVudU1haWx0b0xp bmssCisgICAga1dLQWN0aW9uTWVudVRlbExpbmsKIH07CiB0eXBlZGVmIHVpbnQzMl90IF9XS0Fj dGlvbk1lbnVUeXBlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KaW5kZXggYjEzYjViZTE1M2FhZDUyMzI2MDk1YWNk MzNlNTFiYTUxZDdiNzJjYi4uNDZlNmFjMzU5ODlkODM3Zjg3YjAyNTExZGYwNDQ0YmViMWY2Y2Uz OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVD b250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25N ZW51Q29udHJvbGxlci5tbQpAQCAtMzIxLDcgKzMyMSw3IEBAIHN0YXRpYyBjb25zdCBDR0Zsb2F0 IHByZXZpZXdWaWV3VGl0bGVIZWlnaHQgPSAzNDsKIAogLSAodm9pZClfY2xlYXJBY3Rpb25NZW51 U3RhdGUKIHsKLSAgICBpZiAoX3R5cGUgPT0ga1dLQWN0aW9uTWVudURhdGFEZXRlY3RlZEl0ZW0g JiYgX2N1cnJlbnRBY3Rpb25Db250ZXh0ICYmIF9oYXNBY3RpdmF0ZWRBY3Rpb25Db250ZXh0KSB7 CisgICAgaWYgKF9jdXJyZW50QWN0aW9uQ29udGV4dCAmJiBfaGFzQWN0aXZhdGVkQWN0aW9uQ29u dGV4dCkgewogICAgICAgICBbZ2V0RERBY3Rpb25zTWFuYWdlckNsYXNzKCkgZGlkVXNlQWN0aW9u c107CiAgICAgICAgIF9oYXNBY3RpdmF0ZWRBY3Rpb25Db250ZXh0ID0gTk87CiAgICAgfQpAQCAt ODU5LDE3ICs4NTksMjIgQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoVG9QaG90b09uRGlzayhOU1N0 cmluZyAqc3VnZ2VzdGVkRmlsZW5hbWUpCiAgICAgcmV0dXJuIEBbIFtOU01lbnVJdGVtIHNlcGFy YXRvckl0ZW1dLCBbTlNNZW51SXRlbSBzZXBhcmF0b3JJdGVtXSwgcGFzdGVJdGVtLmdldCgpIF07 CiB9CiAKLSNwcmFnbWEgbWFyayBNYWlsdG8gTGluayBhY3Rpb25zCisjcHJhZ21hIG1hcmsgbWFp bHRvOiBhbmQgdGVsOiBMaW5rIGFjdGlvbnMKIAotLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0 ZW1zRm9yTWFpbHRvTGluaworLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9yRGF0YURl dGVjdGFibGVMaW5rCiB7CiAgICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1 bHQgPSBbc2VsZiBfd2ViSGl0VGVzdFJlc3VsdF07CisgICAgUmV0YWluUHRyPEREQWN0aW9uQ29u dGV4dD4gYWN0aW9uQ29udGV4dCA9IFtbZ2V0RERBY3Rpb25Db250ZXh0Q2xhc3MoKSBhbGxvY10g aW5pdF07CiAKICAgICAvLyBGSVhNRTogU2hvdWxkIHRoaXMgc2hvdyBhIHllbGxvdyBoaWdobGln aHQ/Ci0gICAgUmV0YWluUHRyPEREQWN0aW9uQ29udGV4dD4gYWN0aW9uQ29udGV4dCA9IFtbZ2V0 RERBY3Rpb25Db250ZXh0Q2xhc3MoKSBhbGxvY10gaW5pdF07Ci0gICAgW2FjdGlvbkNvbnRleHQg c2V0QWx0TW9kZTpZRVNdOwotICAgIFthY3Rpb25Db250ZXh0IHNldEhpZ2hsaWdodEZyYW1lOltf d2tWaWV3LndpbmRvdyBjb252ZXJ0UmVjdFRvU2NyZWVuOltfd2tWaWV3IGNvbnZlcnRSZWN0Omhp dFRlc3RSZXN1bHQtPmVsZW1lbnRCb3VuZGluZ0JveCgpIHRvVmlldzpuaWxdXV07Ci0gICAgcmV0 dXJuIFtbZ2V0RERBY3Rpb25zTWFuYWdlckNsYXNzKCkgc2hhcmVkTWFuYWdlcl0gbWVudUl0ZW1z Rm9yVGFyZ2V0VVJMOmhpdFRlc3RSZXN1bHQtPmFic29sdXRlTGlua1VSTCgpIGFjdGlvbkNvbnRl eHQ6YWN0aW9uQ29udGV4dC5nZXQoKV07CisgICAgX2N1cnJlbnRBY3Rpb25Db250ZXh0ID0gW2Fj dGlvbkNvbnRleHQgY29udGV4dEZvclZpZXc6X3drVmlldyBhbHRNb2RlOllFUyBpbnRlcmFjdGlv blN0YXJ0ZWRIYW5kbGVyOl4oKSB7CisgICAgfSBpbnRlcmFjdGlvbkNoYW5nZWRIYW5kbGVyOl4o KSB7CisgICAgfSBpbnRlcmFjdGlvblN0b3BwZWRIYW5kbGVyOl4oKSB7CisgICAgfV07CisKKyAg ICBbX2N1cnJlbnRBY3Rpb25Db250ZXh0IHNldEhpZ2hsaWdodEZyYW1lOltfd2tWaWV3LndpbmRv dyBjb252ZXJ0UmVjdFRvU2NyZWVuOltfd2tWaWV3IGNvbnZlcnRSZWN0Ol9oaXRUZXN0UmVzdWx0 LmRldGVjdGVkRGF0YUJvdW5kaW5nQm94IHRvVmlldzpuaWxdXV07CisKKyAgICByZXR1cm4gW1tn ZXREREFjdGlvbnNNYW5hZ2VyQ2xhc3MoKSBzaGFyZWRNYW5hZ2VyXSBtZW51SXRlbXNGb3JUYXJn ZXRVUkw6aGl0VGVzdFJlc3VsdC0+YWJzb2x1dGVMaW5rVVJMKCkgYWN0aW9uQ29udGV4dDpfY3Vy cmVudEFjdGlvbkNvbnRleHQuZ2V0KCldOwogfQogCiAjcHJhZ21hIG1hcmsgTlNNZW51RGVsZWdh dGUgaW1wbGVtZW50YXRpb24KQEAgLTg5MSw3ICs4OTYsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKnBh dGhUb1Bob3RvT25EaXNrKE5TU3RyaW5nICpzdWdnZXN0ZWRGaWxlbmFtZSkKICAgICBpZiAoX3N0 YXRlICE9IEFjdGlvbk1lbnVTdGF0ZTo6UmVhZHkpCiAgICAgICAgIFtzZWxmIF91cGRhdGVBY3Rp b25NZW51SXRlbXNdOwogCi0gICAgaWYgKF90eXBlID09IGtXS0FjdGlvbk1lbnVEYXRhRGV0ZWN0 ZWRJdGVtICYmIF9jdXJyZW50QWN0aW9uQ29udGV4dCkgeworICAgIGlmIChfY3VycmVudEFjdGlv bkNvbnRleHQpIHsKICAgICAgICAgX2hhc0FjdGl2YXRlZEFjdGlvbkNvbnRleHQgPSBZRVM7CiAg ICAgICAgIGlmICghW2dldEREQWN0aW9uc01hbmFnZXJDbGFzcygpIHNob3VsZFVzZUFjdGlvbnNX aXRoQ29udGV4dDpfY3VycmVudEFjdGlvbkNvbnRleHQuZ2V0KCldKSB7CiAgICAgICAgICAgICBb bWVudSBjYW5jZWxUcmFja2luZ107CkBAIC0xMTAwLDcgKzExMDUsMTIgQEAgc3RhdGljIE5TU3Ry aW5nICpwYXRoVG9QaG90b09uRGlzayhOU1N0cmluZyAqc3VnZ2VzdGVkRmlsZW5hbWUpCiAKICAg ICAgICAgaWYgKHByb3RvY29sSXMoYWJzb2x1dGVMaW5rVVJMLCAibWFpbHRvIikpIHsKICAgICAg ICAgICAgIF90eXBlID0ga1dLQWN0aW9uTWVudU1haWx0b0xpbms7Ci0gICAgICAgICAgICByZXR1 cm4gW3NlbGYgX2RlZmF1bHRNZW51SXRlbXNGb3JNYWlsdG9MaW5rXTsKKyAgICAgICAgICAgIHJl dHVybiBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0ZvckRhdGFEZXRlY3RhYmxlTGlua107CisgICAg ICAgIH0KKworICAgICAgICBpZiAocHJvdG9jb2xJcyhhYnNvbHV0ZUxpbmtVUkwsICJ0ZWwiKSkg eworICAgICAgICAgICAgX3R5cGUgPSBrV0tBY3Rpb25NZW51VGVsTGluazsKKyAgICAgICAgICAg IHJldHVybiBbc2VsZiBfZGVmYXVsdE1lbnVJdGVtc0ZvckRhdGFEZXRlY3RhYmxlTGlua107CiAg ICAgICAgIH0KICAgICB9CiAK