138668 2014-11-12 14:15:20 -0800 WK1: Support default actions for images 2014-11-12 14:52:53 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned andersca bdakin commit-queue thorton oldest_to_newest 1048255 0 bdakin 2014-11-12 14:15:20 -0800 WK1: Support default actions for images rdar://problem/18785434 1048256 1 241442 bdakin 2014-11-12 14:18:30 -0800 Created attachment 241442 Patch 1048257 2 commit-queue 2014-11-12 14:20:02 -0800 Attachment 241442 did not pass style-queue: ERROR: Source/WebKit/mac/WebView/WebActionMenuController.mm:47: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1048258 3 241442 thorton 2014-11-12 14:23:40 -0800 Comment on attachment 241442 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241442&action=review > Source/WebKit/mac/WebView/WebActionMenuController.mm:62 > +SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, ImageKit) Newline above here, I think. > Source/WebKit/mac/WebView/WebActionMenuController.mm:303 > +static NSString *temporaryPhotosDirectoryPath() Now we have this three times :D We should merge them all back down again eventually. 1048271 4 bdakin 2014-11-12 14:52:53 -0800 Thanks Tim! http://trac.webkit.org/changeset/176041 241442 2014-11-12 14:18:30 -0800 2014-11-12 14:23:40 -0800 Patch for-review.txt text/plain 14400 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjAzOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTExLTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXSzE6IFN1cHBvcnQgZGVmYXVsdCBh Y3Rpb25zIGZvciBpbWFnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzODY2OAorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJk YXI6Ly9wcm9ibGVtLzE4Nzg1NDM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3ltYm9sIG5lZWRlZCBmb3IgY29weWluZyBpbWFnZS4KKyAgICAgICAg KiBXZWJDb3JlLmV4cC5pbjoKKwogMjAxNC0xMS0wNSAgQWRhIENoYW4gIDxhZGFjaGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgbmV3IHBsdWctaW4gQVBJIGZvciBtdXRpbmcgcGx1 Zy1pbnMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiAxNzU5NjgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMTI3OSw2ICsxMjc5 LDcgQEAgX19aTjdXZWJDb3JlNkVkaXRvcjdDb21tYW5kQzFFdgogX19aTjdXZWJDb3JlNkVkaXRv cjdjb21tYW5kRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlNkVkaXRvcjdjb3B5VVJMRVJL TlNfM1VSTEVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTZFZGl0b3I3b3V0ZGVudEV2Citf X1pON1dlYkNvcmU2RWRpdG9yOWNvcHlJbWFnZUVSS05TXzEzSGl0VGVzdFJlc3VsdEUKIF9fWk43 V2ViQ29yZTZKU05vZGU2c19pbmZvRQogX19aTjdXZWJDb3JlNkpTTm9kZTl0b1dyYXBwZWRFTjNK U0M3SlNWYWx1ZUUKIF9fWk43V2ViQ29yZTZMZW5ndGhDMUVOM1dURjdQYXNzUmVmSU5TXzE2Q2Fs Y3VsYXRpb25WYWx1ZUVFRQpJbmRleDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMTc2MDM5KQor KysgU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MjkgQEAKKzIwMTQtMTEtMTIgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAg ICAgIFdLMTogU3VwcG9ydCBkZWZhdWx0IGFjdGlvbnMgZm9yIGltYWdlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NjY4CisgICAgICAgIC1hbmQg Y29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMTg3ODU0MzQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViQWN0 aW9uTWVudUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYkFjdGlvbk1lbnVDb250 cm9sbGVyLm1tOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBkaWRDbG9zZU1l bnU6d2l0aEV2ZW50Ol0pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfZGVm YXVsdE1lbnVJdGVtc0ZvckltYWdlOl0pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51Q29udHJv bGxlciBfY29weUltYWdlOl0pOgorICAgICAgICAodGVtcG9yYXJ5UGhvdG9zRGlyZWN0b3J5UGF0 aCk6CisgICAgICAgIChwYXRoVG9QaG90b09uRGlzayk6CisgICAgICAgICgtW1dlYkFjdGlvbk1l bnVDb250cm9sbGVyIF9jYW5BZGRNZWRpYVRvUGhvdG9zXSk6CisgICAgICAgICgtW1dlYkFjdGlv bk1lbnVDb250cm9sbGVyIF9hZGRJbWFnZVRvUGhvdG9zOl0pOgorICAgICAgICAoLVtXZWJBY3Rp b25NZW51Q29udHJvbGxlciBfc2F2ZUltYWdlVG9Eb3dubG9hZHM6XSk6CisgICAgICAgICgtW1dl YkFjdGlvbk1lbnVDb250cm9sbGVyIHNoYXJpbmdTZXJ2aWNlUGlja2VyOnNoYXJpbmdTZXJ2aWNl c0Zvckl0ZW1zOm1hc2s6cHJvcG9zZWRTaGFyaW5nU2VydmljZXM6XSk6CisgICAgICAgICgtW1dl YkFjdGlvbk1lbnVDb250cm9sbGVyIHNoYXJpbmdTZXJ2aWNlUGlja2VyOmRlbGVnYXRlRm9yU2hh cmluZ1NlcnZpY2U6XSk6CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9sbGVyIHNoYXJp bmdTZXJ2aWNlOnNvdXJjZVdpbmRvd0ZvclNoYXJlSXRlbXM6c2hhcmluZ0NvbnRlbnRTY29wZTpd KToKKyAgICAgICAgKC1bV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIgX2NyZWF0ZUFjdGlvbk1lbnVJ dGVtRm9yVGFnOndpdGhIaXRUZXN0UmVzdWx0Ol0pOgorICAgICAgICAoLVtXZWJBY3Rpb25NZW51 Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJdGVtc0ZvckhpdFRlc3RSZXN1bHQ6XSk6CisgICAgICAg ICogV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oOgorCiAyMDE0LTExLTExICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBBY3Rpb24gbWVudSBoaXQgdGVzdGlu ZyBpcyBub3Qgd29ya2luZyBwcm9wZXJseSB3aXRoIGFsbCBXSzEgYXBwcwpJbmRleDogU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25NZW51Q29udHJvbGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIuaAko cmV2aXNpb24gMTc1OTY4KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25N ZW51Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNCwxNSArMjQsMTkgQEAKICAqLwog CiAjaW1wb3J0ICJXZWJVSURlbGVnYXRlUHJpdmF0ZS5oIgorCisjaW1wb3J0IDxBcHBLaXQvTlNT aGFyaW5nU2VydmljZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9IaXRUZXN0UmVzdWx0Lmg+CisjaW1w b3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKIEBjbGFzcyBXZWJWaWV3OwogCi1AaW50ZXJmYWNlIFdl YkFjdGlvbk1lbnVDb250cm9sbGVyIDogTlNPYmplY3QgeworQGludGVyZmFjZSBXZWJBY3Rpb25N ZW51Q29udHJvbGxlciA6IE5TT2JqZWN0IDxOU1NoYXJpbmdTZXJ2aWNlRGVsZWdhdGUsIE5TU2hh cmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZT4gewogQHByaXZhdGUKICAgICBXZWJWaWV3ICpfd2Vi VmlldzsKICAgICBXZWJBY3Rpb25NZW51VHlwZSBfdHlwZTsKICAgICBXZWJDb3JlOjpIaXRUZXN0 UmVzdWx0IF9oaXRUZXN0UmVzdWx0OworICAgIFJldGFpblB0cjxOU1NoYXJpbmdTZXJ2aWNlUGlj a2VyPiBfc2hhcmluZ1NlcnZpY2VQaWNrZXI7CiB9CiAKIC0gKGlkKWluaXRXaXRoV2ViVmlldzoo V2ViVmlldyAqKXdlYlZpZXc7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkFj dGlvbk1lbnVDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW0JKHJldmlzaW9uIDE3NTk5NikKKysrIFNv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW0JKHdvcmtp bmcgY29weSkKQEAgLTM1LDYgKzM1LDggQEAKICNpbXBvcnQgIldlYlN5c3RlbUludGVyZmFjZS5o IgogI2ltcG9ydCAiV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaCIKICNpbXBvcnQgIldlYlZpZXdJbnRl cm5hbC5oIgorI2ltcG9ydCA8SW1hZ2VJTy9JbWFnZUlPLmg+CisjaW1wb3J0IDxJbWFnZUtpdC9J bWFnZUtpdC5oPgogI2ltcG9ydCA8V2ViQ29yZS9EaWN0aW9uYXJ5TG9va3VwLmg+CiAjaW1wb3J0 IDxXZWJDb3JlL0VkaXRvci5oPgogI2ltcG9ydCA8V2ViQ29yZS9FbGVtZW50Lmg+CkBAIC00Miw2 ICs0NCw4IEBACiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0Zy YW1lVmlldy5oPgogI2ltcG9ydCA8V2ViQ29yZS9IVE1MQ29udmVydGVyLmg+CisjaW1wb3J0IDxX ZWJDb3JlL05TU2hhcmluZ1NlcnZpY2VTUEkuaD4KKyNpbXBvcnQgPFdlYkNvcmUvTlNTaGFyaW5n U2VydmljZVBpY2tlclNQSS5oPgogI2ltcG9ydCA8V2ViQ29yZS9OU1ZpZXdTUEkuaD4KICNpbXBv cnQgPFdlYkNvcmUvUGFnZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9SYW5nZS5oPgpAQCAtNTUsNiAr NTksOCBAQAogCiBTT0ZUX0xJTktfRlJBTUVXT1JLX0lOX1VNQlJFTExBKFF1YXJ0eiwgUXVpY2tM b29rVUkpCiBTT0ZUX0xJTktfQ0xBU1MoUXVpY2tMb29rVUksIFFMUHJldmlld0J1YmJsZSkKK1NP RlRfTElOS19GUkFNRVdPUktfSU5fVU1CUkVMTEEoUXVhcnR6LCBJbWFnZUtpdCkKK1NPRlRfTElO S19DTEFTUyhJbWFnZUtpdCwgSUtTbGlkZXNob3cpCiAKIEBjbGFzcyBRTFByZXZpZXdCdWJibGU7 CiBAaW50ZXJmYWNlIE5TT2JqZWN0IChXS1FMUHJldmlld0J1YmJsZURldGFpbHMpCkBAIC0xNTUs NiArMTYxLDcgQEAgLSAodm9pZClkaWRDbG9zZU1lbnU6KE5TTWVudSAqKW1lbnUgd2l0aAogICAg ICAgICByZXR1cm47CiAKICAgICBfdHlwZSA9IFdlYkFjdGlvbk1lbnVOb25lOworICAgIF9zaGFy aW5nU2VydmljZVBpY2tlciA9IG5pbDsKIH0KIAogI3ByYWdtYSBtYXJrIExpbmsgYWN0aW9ucwpA QCAtMjU2LDYgKzI2MywxMjcgQEAgLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9yTGlu azooVwogICAgIHJldHVybiBAWyBvcGVuTGlua0l0ZW0uZ2V0KCksIHByZXZpZXdMaW5rSXRlbS5n ZXQoKSwgW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV0sIHJlYWRpbmdMaXN0SXRlbS5nZXQoKSBd OwogfQogCisjcHJhZ21hIG1hcmsgSW1hZ2UgYWN0aW9ucworCistIChOU0FycmF5ICopX2RlZmF1 bHRNZW51SXRlbXNGb3JJbWFnZTooV2ViRWxlbWVudERpY3Rpb25hcnkgKiloaXRUZXN0UmVzdWx0 Cit7CisgICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IGNvcHlJbWFnZUl0ZW0gPSBbc2VsZiBfY3Jl YXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdDb3B5SW1hZ2Ugd2l0 aEhpdFRlc3RSZXN1bHQ6aGl0VGVzdFJlc3VsdF07CisKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRl bT4gYWRkVG9QaG90b3NJdGVtOworICAgIGlmIChbc2VsZiBfY2FuQWRkTWVkaWFUb1Bob3Rvc10p CisgICAgICAgIGFkZFRvUGhvdG9zSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZv clRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ0FkZEltYWdlVG9QaG90b3Mgd2l0aEhpdFRlc3RSZXN1 bHQ6aGl0VGVzdFJlc3VsdF07CisgICAgZWxzZQorICAgICAgICBhZGRUb1Bob3Rvc0l0ZW0gPSBb TlNNZW51SXRlbSBzZXBhcmF0b3JJdGVtXTsKKworICAgIFJldGFpblB0cjxOU01lbnVJdGVtPiBz YXZlVG9Eb3dubG9hZHNJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOldl YkFjdGlvbk1lbnVJdGVtVGFnU2F2ZUltYWdlVG9Eb3dubG9hZHMgd2l0aEhpdFRlc3RSZXN1bHQ6 aGl0VGVzdFJlc3VsdF07CisgICAgaWYgKCFfd2ViVmlldy5kb3dubG9hZERlbGVnYXRlKQorICAg ICAgICBbc2F2ZVRvRG93bmxvYWRzSXRlbSBzZXRFbmFibGVkOk5PXTsKKworCisgICAgUmV0YWlu UHRyPE5TTWVudUl0ZW0+IHNoYXJlSXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZv clRhZzpXZWJBY3Rpb25NZW51SXRlbVRhZ1NoYXJlSW1hZ2Ugd2l0aEhpdFRlc3RSZXN1bHQ6aGl0 VGVzdFJlc3VsdF07CisgICAgaWYgKEltYWdlKiBpbWFnZSA9IF9oaXRUZXN0UmVzdWx0LmltYWdl KCkpIHsKKyAgICAgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGNnSW1hZ2UgPSBpbWFnZS0+Z2V0 Q0dJbWFnZVJlZigpOworICAgICAgICBSZXRhaW5QdHI8TlNJbWFnZT4gbnNJbWFnZSA9IGFkb3B0 TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6Y2dJbWFnZS5nZXQoKSBzaXplOk5T WmVyb1NpemVdKTsKKyAgICAgICAgX3NoYXJpbmdTZXJ2aWNlUGlja2VyID0gYWRvcHROUyhbW05T U2hhcmluZ1NlcnZpY2VQaWNrZXIgYWxsb2NdIGluaXRXaXRoSXRlbXM6QFsgbnNJbWFnZS5nZXQo KSBdXSk7CisgICAgICAgIFtfc2hhcmluZ1NlcnZpY2VQaWNrZXIgc2V0RGVsZWdhdGU6c2VsZl07 CisgICAgICAgIFtzaGFyZUl0ZW0gc2V0U3VibWVudTpbX3NoYXJpbmdTZXJ2aWNlUGlja2VyIG1l bnVdXTsKKyAgICB9CisKKyAgICByZXR1cm4gQFsgY29weUltYWdlSXRlbS5nZXQoKSwgYWRkVG9Q aG90b3NJdGVtLmdldCgpLCBzYXZlVG9Eb3dubG9hZHNJdGVtLmdldCgpLCBzaGFyZUl0ZW0uZ2V0 KCkgXTsKK30KKworLSAodm9pZClfY29weUltYWdlOihpZClzZW5kZXIKK3sKKyAgICBGcmFtZSog ZnJhbWUgPSBjb3JlKFtfd2ViVmlldyBfc2VsZWN0ZWRPck1haW5GcmFtZV0pOworICAgIGlmICgh ZnJhbWUpCisgICAgICAgIHJldHVybjsKKyAgICBmcmFtZS0+ZWRpdG9yKCkuY29weUltYWdlKF9o aXRUZXN0UmVzdWx0KTsKK30KKworc3RhdGljIE5TU3RyaW5nICp0ZW1wb3JhcnlQaG90b3NEaXJl Y3RvcnlQYXRoKCkKK3sKKyAgICBzdGF0aWMgTlNTdHJpbmcgKnRlbXBvcmFyeVBob3Rvc0RpcmVj dG9yeVBhdGg7CisKKyAgICBpZiAoIXRlbXBvcmFyeVBob3Rvc0RpcmVjdG9yeVBhdGgpIHsKKyAg ICAgICAgTlNTdHJpbmcgKnRlbXBvcmFyeURpcmVjdG9yeVRlbXBsYXRlID0gW05TVGVtcG9yYXJ5 RGlyZWN0b3J5KCkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiV2ViS2l0UGhvdG9z LVhYWFhYWCJdOworICAgICAgICBDU3RyaW5nIHRlbXBsYXRlUmVwcmVzZW50YXRpb24gPSBbdGVt cG9yYXJ5RGlyZWN0b3J5VGVtcGxhdGUgZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uXTsKKworICAg ICAgICBpZiAobWtkdGVtcCh0ZW1wbGF0ZVJlcHJlc2VudGF0aW9uLm11dGFibGVEYXRhKCkpKQor ICAgICAgICAgICAgdGVtcG9yYXJ5UGhvdG9zRGlyZWN0b3J5UGF0aCA9IFtbW05TRmlsZU1hbmFn ZXIgZGVmYXVsdE1hbmFnZXJdIHN0cmluZ1dpdGhGaWxlU3lzdGVtUmVwcmVzZW50YXRpb246dGVt cGxhdGVSZXByZXNlbnRhdGlvbi5kYXRhKCkgbGVuZ3RoOnRlbXBsYXRlUmVwcmVzZW50YXRpb24u bGVuZ3RoKCldIGNvcHldOworICAgIH0KKworICAgIHJldHVybiB0ZW1wb3JhcnlQaG90b3NEaXJl Y3RvcnlQYXRoOworfQorCitzdGF0aWMgTlNTdHJpbmcgKnBhdGhUb1Bob3RvT25EaXNrKE5TU3Ry aW5nICpzdWdnZXN0ZWRGaWxlbmFtZSkKK3sKKyAgICBOU1N0cmluZyAqcGhvdG9EaXJlY3RvcnlQ YXRoID0gdGVtcG9yYXJ5UGhvdG9zRGlyZWN0b3J5UGF0aCgpOworICAgIGlmICghcGhvdG9EaXJl Y3RvcnlQYXRoKSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiQ2Fubm90IGNyZWF0ZSB0ZW1wb3Jh cnkgcGhvdG8gZG93bmxvYWQgZGlyZWN0b3J5LiIpOworICAgICAgICByZXR1cm4gbmlsOworICAg IH0KKworICAgIE5TU3RyaW5nICpwYXRoID0gW3Bob3RvRGlyZWN0b3J5UGF0aCBzdHJpbmdCeUFw cGVuZGluZ1BhdGhDb21wb25lbnQ6c3VnZ2VzdGVkRmlsZW5hbWVdOworCisgICAgTlNGaWxlTWFu YWdlciAqZmlsZU1hbmFnZXIgPSBbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl07CisgICAg aWYgKFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOnBhdGhdKSB7CisgICAgICAgIE5TU3Ry aW5nICpwYXRoVGVtcGxhdGVQcmVmaXggPSBbcGhvdG9EaXJlY3RvcnlQYXRoIHN0cmluZ0J5QXBw ZW5kaW5nUGF0aENvbXBvbmVudDpAIlhYWFhYWC0iXTsKKyAgICAgICAgTlNTdHJpbmcgKnBhdGhU ZW1wbGF0ZSA9IFtwYXRoVGVtcGxhdGVQcmVmaXggc3RyaW5nQnlBcHBlbmRpbmdTdHJpbmc6c3Vn Z2VzdGVkRmlsZW5hbWVdOworICAgICAgICBDU3RyaW5nIHBhdGhUZW1wbGF0ZVJlcHJlc2VudGF0 aW9uID0gW3BhdGhUZW1wbGF0ZSBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb25dOworCisgICAgICAg IGludCBmZCA9IG1rc3RlbXBzKHBhdGhUZW1wbGF0ZVJlcHJlc2VudGF0aW9uLm11dGFibGVEYXRh KCksIHBhdGhUZW1wbGF0ZVJlcHJlc2VudGF0aW9uLmxlbmd0aCgpIC0gc3RybGVuKFtwYXRoVGVt cGxhdGVQcmVmaXggZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uXSkgKyAxKTsKKyAgICAgICAgaWYg KGZkIDwgMCkgeworICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJDYW5ub3QgY3JlYXRlIHBob3Rv IGZpbGUgaW4gdGhlIHRlbXBvcmFyeSBkaXJlY3RvcnkgKCVAKS4iLCBzdWdnZXN0ZWRGaWxlbmFt ZSk7CisgICAgICAgICAgICByZXR1cm4gbmlsOworICAgICAgICB9CisKKyAgICAgICAgY2xvc2Uo ZmQpOworICAgICAgICBwYXRoID0gW2ZpbGVNYW5hZ2VyIHN0cmluZ1dpdGhGaWxlU3lzdGVtUmVw cmVzZW50YXRpb246cGF0aFRlbXBsYXRlUmVwcmVzZW50YXRpb24uZGF0YSgpIGxlbmd0aDpwYXRo VGVtcGxhdGVSZXByZXNlbnRhdGlvbi5sZW5ndGgoKV07CisgICAgfQorCisgICAgcmV0dXJuIHBh dGg7Cit9CisKKy0gKEJPT0wpX2NhbkFkZE1lZGlhVG9QaG90b3MKK3sKKyAgICByZXR1cm4gW2dl dElLU2xpZGVzaG93Q2xhc3MoKSBjYW5FeHBvcnRUb0FwcGxpY2F0aW9uOkAiY29tLmFwcGxlLlBo b3RvcyJdOworfQorCistICh2b2lkKV9hZGRJbWFnZVRvUGhvdG9zOihpZClzZW5kZXIKK3sKKyAg ICBpZiAoIVtzZWxmIF9jYW5BZGRNZWRpYVRvUGhvdG9zXSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgSW1hZ2UqIGltYWdlID0gX2hpdFRlc3RSZXN1bHQuaW1hZ2UoKTsKKyAgICBpZiAoIWltYWdl KQorICAgICAgICByZXR1cm47CisKKyAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY2dJbWFnZSA9 IGltYWdlLT5nZXRDR0ltYWdlUmVmKCk7CisKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9n ZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZX0RFRkFVTFQsIDApLCBeewor ICAgICAgICBOU1N0cmluZyAqIGNvbnN0IHN1Z2dlc3RlZEZpbGVuYW1lID0gQCJpbWFnZS5qcGci OworCisgICAgICAgIE5TU3RyaW5nICpmaWxlUGF0aCA9IHBhdGhUb1Bob3RvT25EaXNrKHN1Z2dl c3RlZEZpbGVuYW1lKTsKKyAgICAgICAgaWYgKCFmaWxlUGF0aCkKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBOU1VSTCAqZmlsZVVSTCA9IFtOU1VSTCBmaWxlVVJMV2l0aFBhdGg6Zmls ZVBhdGhdOworICAgICAgICBhdXRvIGRlc3QgPSBhZG9wdENGKENHSW1hZ2VEZXN0aW5hdGlvbkNy ZWF0ZVdpdGhVUkwoKENGVVJMUmVmKWZpbGVVUkwsIGtVVFR5cGVKUEVHLCAxLCBudWxscHRyKSk7 CisgICAgICAgIENHSW1hZ2VEZXN0aW5hdGlvbkFkZEltYWdlKGRlc3QuZ2V0KCksIGNnSW1hZ2Uu Z2V0KCksIG51bGxwdHIpOworICAgICAgICBDR0ltYWdlRGVzdGluYXRpb25GaW5hbGl6ZShkZXN0 LmdldCgpKTsKKworICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1 ZSgpLCBeeworICAgICAgICAgICAgLy8gVGhpcyBBUEkgcHJvdmlkZXMgbm8gd2F5IHRvIHJlcG9y dCBmYWlsdXJlLCBidXQgaWYgMTg0MjA3NzggaXMgZml4ZWQgc28gdGhhdCBpdCBkb2VzLCB3ZSBz aG91bGQgaGFuZGxlIHRoaXMuCisgICAgICAgICAgICBbZ2V0SUtTbGlkZXNob3dDbGFzcygpIGV4 cG9ydFNsaWRlc2hvd0l0ZW06ZmlsZVBhdGggdG9BcHBsaWNhdGlvbjpAImNvbS5hcHBsZS5QaG90 b3MiXTsKKyAgICAgICAgfSk7CisgICAgfSk7Cit9CisKKy0gKHZvaWQpX3NhdmVJbWFnZVRvRG93 bmxvYWRzOihpZClzZW5kZXIKK3sKKyAgICBbX3dlYlZpZXcgX2Rvd25sb2FkVVJMOl9oaXRUZXN0 UmVzdWx0LmFic29sdXRlSW1hZ2VVUkwoKV07Cit9CisKICNwcmFnbWEgbWFyayBUZXh0IGFjdGlv bnMKIAogLSAoTlNBcnJheSAqKV9kZWZhdWx0TWVudUl0ZW1zRm9yVGV4dDooV2ViRWxlbWVudERp Y3Rpb25hcnkgKiloaXRUZXN0UmVzdWx0CkBAIC00MzEsNiArNTU5LDMzIEBAIC0gKE5TQXJyYXkg KilfZGVmYXVsdE1lbnVJdGVtc0ZvcldoaXRlc3AKICAgICByZXR1cm4gQFsgW05TTWVudUl0ZW0g c2VwYXJhdG9ySXRlbV0sIFtOU01lbnVJdGVtIHNlcGFyYXRvckl0ZW1dLCBwYXN0ZUl0ZW0uZ2V0 KCkgXTsKIH0KIAorI3ByYWdtYSBtYXJrIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZSBp bXBsZW1lbnRhdGlvbgorCistIChOU0FycmF5ICopc2hhcmluZ1NlcnZpY2VQaWNrZXI6KE5TU2hh cmluZ1NlcnZpY2VQaWNrZXIgKilzaGFyaW5nU2VydmljZVBpY2tlciBzaGFyaW5nU2VydmljZXNG b3JJdGVtczooTlNBcnJheSAqKWl0ZW1zIG1hc2s6KE5TU2hhcmluZ1NlcnZpY2VNYXNrKW1hc2sg cHJvcG9zZWRTaGFyaW5nU2VydmljZXM6KE5TQXJyYXkgKilwcm9wb3NlZFNlcnZpY2VzCit7Cisg ICAgUmV0YWluUHRyPE5TTXV0YWJsZUFycmF5PiBzZXJ2aWNlcyA9IGFkb3B0TlMoW1tOU011dGFi bGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTpwcm9wb3NlZFNlcnZpY2VzLmNvdW50XSk7 CisKKyAgICBmb3IgKE5TU2hhcmluZ1NlcnZpY2UgKnNlcnZpY2UgaW4gcHJvcG9zZWRTZXJ2aWNl cykgeworICAgICAgICBpZiAoW3NlcnZpY2UubmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNTaGFyaW5n U2VydmljZU5hbWVBZGRUb0lQaG90b10pCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg W3NlcnZpY2VzIGFkZE9iamVjdDpzZXJ2aWNlXTsKKyAgICB9CisKKyAgICByZXR1cm4gc2Vydmlj ZXMuYXV0b3JlbGVhc2UoKTsKK30KKworLSAoaWQgPE5TU2hhcmluZ1NlcnZpY2VEZWxlZ2F0ZT4p c2hhcmluZ1NlcnZpY2VQaWNrZXI6KE5TU2hhcmluZ1NlcnZpY2VQaWNrZXIgKilzaGFyaW5nU2Vy dmljZVBpY2tlciBkZWxlZ2F0ZUZvclNoYXJpbmdTZXJ2aWNlOihOU1NoYXJpbmdTZXJ2aWNlICop c2hhcmluZ1NlcnZpY2UKK3sKKyAgICByZXR1cm4gc2VsZjsKK30KKworI3ByYWdtYSBtYXJrIE5T U2hhcmluZ1NlcnZpY2VEZWxlZ2F0ZSBpbXBsZW1lbnRhdGlvbgorCistIChOU1dpbmRvdyAqKXNo YXJpbmdTZXJ2aWNlOihOU1NoYXJpbmdTZXJ2aWNlICopc2hhcmluZ1NlcnZpY2Ugc291cmNlV2lu ZG93Rm9yU2hhcmVJdGVtczooTlNBcnJheSAqKWl0ZW1zIHNoYXJpbmdDb250ZW50U2NvcGU6KE5T U2hhcmluZ0NvbnRlbnRTY29wZSAqKXNoYXJpbmdDb250ZW50U2NvcGUKK3sKKyAgICByZXR1cm4g X3dlYlZpZXcud2luZG93OworfQorCiAjcHJhZ21hIG1hcmsgTWVudSBJdGVtcwogCiAtIChSZXRh aW5QdHI8TlNNZW51SXRlbT4pX2NyZWF0ZUFjdGlvbk1lbnVJdGVtRm9yVGFnOih1aW50MzJfdCl0 YWcgd2l0aEhpdFRlc3RSZXN1bHQ6KFdlYkVsZW1lbnREaWN0aW9uYXJ5ICopaGl0VGVzdFJlc3Vs dApAQCAtNDg1LDYgKzY0MCwyOSBAQCAtIChSZXRhaW5QdHI8TlNNZW51SXRlbT4pX2NyZWF0ZUFj dGlvbk1lCiAgICAgICAgIGltYWdlID0gW05TSW1hZ2UgaW1hZ2VOYW1lZDpAIk5TQWN0aW9uTWVu dVNwZWxsaW5nIl07CiAgICAgICAgIGJyZWFrOwogCisgICAgY2FzZSBXZWJBY3Rpb25NZW51SXRl bVRhZ0NvcHlJbWFnZToKKyAgICAgICAgc2VsZWN0b3IgPSBAc2VsZWN0b3IoX2NvcHlJbWFnZTop OworICAgICAgICB0aXRsZSA9IFdFQl9VSV9TVFJJTkdfS0VZKCJDb3B5IiwgIkNvcHkgKGltYWdl IGFjdGlvbiBtZW51IGl0ZW0pIiwgImltYWdlIGFjdGlvbiBtZW51IGl0ZW0iKTsKKyAgICAgICAg aW1hZ2UgPSBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNBY3Rpb25NZW51Q29weSJdOworICAgICAg ICBicmVhazsKKworICAgIGNhc2UgV2ViQWN0aW9uTWVudUl0ZW1UYWdBZGRJbWFnZVRvUGhvdG9z OgorICAgICAgICBzZWxlY3RvciA9IEBzZWxlY3RvcihfYWRkSW1hZ2VUb1Bob3RvczopOworICAg ICAgICB0aXRsZSA9IFdFQl9VSV9TVFJJTkdfS0VZKCJBZGQgdG8gUGhvdG9zIiwgIkFkZCB0byBQ aG90b3MgKGFjdGlvbiBtZW51IGl0ZW0pIiwgImFjdGlvbiBtZW51IGl0ZW0iKTsKKyAgICAgICAg aW1hZ2UgPSBbTlNJbWFnZSBpbWFnZU5hbWVkOkAiTlNBY3Rpb25NZW51QWRkVG9QaG90b3MiXTsK KyAgICAgICAgYnJlYWs7CisKKyAgICBjYXNlIFdlYkFjdGlvbk1lbnVJdGVtVGFnU2F2ZUltYWdl VG9Eb3dubG9hZHM6CisgICAgICAgIHNlbGVjdG9yID0gQHNlbGVjdG9yKF9zYXZlSW1hZ2VUb0Rv d25sb2FkczopOworICAgICAgICB0aXRsZSA9IFdFQl9VSV9TVFJJTkdfS0VZKCJTYXZlIHRvIERv d25sb2FkcyIsICJTYXZlIHRvIERvd25sb2FkcyAoaW1hZ2UgYWN0aW9uIG1lbnUgaXRlbSkiLCAi aW1hZ2UgYWN0aW9uIG1lbnUgaXRlbSIpOworICAgICAgICBpbWFnZSA9IFtOU0ltYWdlIGltYWdl TmFtZWQ6QCJOU0FjdGlvbk1lbnVTYXZlVG9Eb3dubG9hZHMiXTsKKyAgICAgICAgYnJlYWs7CisK KyAgICBjYXNlIFdlYkFjdGlvbk1lbnVJdGVtVGFnU2hhcmVJbWFnZToKKyAgICAgICAgdGl0bGUg PSBXRUJfVUlfU1RSSU5HX0tFWSgiU2hhcmUgKGltYWdlIGFjdGlvbiBtZW51IGl0ZW0pIiwgIlNo YXJlIChpbWFnZSBhY3Rpb24gbWVudSBpdGVtKSIsICJpbWFnZSBhY3Rpb24gbWVudSBpdGVtIik7 CisgICAgICAgIGltYWdlID0gW05TSW1hZ2UgaW1hZ2VOYW1lZDpAIk5TQWN0aW9uTWVudVNoYXJl Il07CisgICAgICAgIGJyZWFrOworCiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBuaWw7CkBAIC01MTEsNiArNjg5LDExIEBAIC0gKE5T QXJyYXkgKilfZGVmYXVsdE1lbnVJdGVtc0ZvckhpdFRlc3QKICAgICAgICAgcmV0dXJuIFtzZWxm IF9kZWZhdWx0TWVudUl0ZW1zRm9yTGluazpoaXRUZXN0UmVzdWx0XTsKICAgICB9CiAKKyAgICBp ZiAoX2hpdFRlc3RSZXN1bHQuaW1hZ2UoKSAmJiAhX2hpdFRlc3RSZXN1bHQuYWJzb2x1dGVJbWFn ZVVSTCgpLmlzRW1wdHkoKSkgeworICAgICAgICBfdHlwZSA9IFdlYkFjdGlvbk1lbnVJbWFnZTsK KyAgICAgICAgcmV0dXJuIFtzZWxmIF9kZWZhdWx0TWVudUl0ZW1zRm9ySW1hZ2U6aGl0VGVzdFJl c3VsdF07CisgICAgfQorCiAgICAgTm9kZSogbm9kZSA9IF9oaXRUZXN0UmVzdWx0LmlubmVyTm9k ZSgpOwogICAgIGlmIChub2RlICYmIG5vZGUtPmlzVGV4dE5vZGUoKSkgewogICAgICAgICBpZiAo X2hpdFRlc3RSZXN1bHQuaXNDb250ZW50RWRpdGFibGUoKSkgewpJbmRleDogU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaAkocmV2aXNpb24gMTc1 OTY4KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJVSURlbGVnYXRlUHJpdmF0ZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNyArMTIwLDExIEBAIGVudW0gewogICAgIFdlYkFjdGlv bk1lbnVJdGVtVGFnQ29weVRleHQsCiAgICAgV2ViQWN0aW9uTWVudUl0ZW1UYWdMb29rdXBUZXh0 LAogICAgIFdlYkFjdGlvbk1lbnVJdGVtVGFnUGFzdGUsCi0gICAgV2ViQWN0aW9uTWVudUl0ZW1U YWdUZXh0U3VnZ2VzdGlvbnMKKyAgICBXZWJBY3Rpb25NZW51SXRlbVRhZ1RleHRTdWdnZXN0aW9u cywKKyAgICBXZWJBY3Rpb25NZW51SXRlbVRhZ0NvcHlJbWFnZSwKKyAgICBXZWJBY3Rpb25NZW51 SXRlbVRhZ0FkZEltYWdlVG9QaG90b3MsCisgICAgV2ViQWN0aW9uTWVudUl0ZW1UYWdTYXZlSW1h Z2VUb0Rvd25sb2FkcywKKyAgICBXZWJBY3Rpb25NZW51SXRlbVRhZ1NoYXJlSW1hZ2UKIH07CiAK IHR5cGVkZWYgZW51bSB7CkBAIC0xMjksNyArMTMzLDggQEAgdHlwZWRlZiBlbnVtIHsKICAgICBX ZWJBY3Rpb25NZW51UmVhZE9ubHlUZXh0LAogICAgIFdlYkFjdGlvbk1lbnVFZGl0YWJsZVRleHQs CiAgICAgV2ViQWN0aW9uTWVudVdoaXRlc3BhY2VJbkVkaXRhYmxlQXJlYSwKLSAgICBXZWJBY3Rp b25NZW51RWRpdGFibGVUZXh0V2l0aFN1Z2dlc3Rpb25zCisgICAgV2ViQWN0aW9uTWVudUVkaXRh YmxlVGV4dFdpdGhTdWdnZXN0aW9ucywKKyAgICBXZWJBY3Rpb25NZW51SW1hZ2UKIH0gV2ViQWN0 aW9uTWVudVR5cGU7CiAKIC8vIE1lc3NhZ2UgU291cmNlcy4K