156813 2016-04-20 14:58:56 -0700 showCandidates() should take a range and the string should be the whole paragraph 2016-04-21 12:39:12 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin commit-queue thorton oldest_to_newest 1185557 0 bdakin 2016-04-20 14:58:56 -0700 showCandidates() should take a range and the string should be the whole paragraph 1185576 1 276860 bdakin 2016-04-20 15:46:55 -0700 Created attachment 276860 Patch 1185578 2 commit-queue 2016-04-20 15:49:13 -0700 Attachment 276860 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:2164: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm:1161: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm:1192: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1185584 3 276861 bdakin 2016-04-20 16:04:43 -0700 Created attachment 276861 Patch 1185585 4 commit-queue 2016-04-20 16:05:58 -0700 Attachment 276861 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:2164: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm:1161: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm:1192: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1185882 5 bdakin 2016-04-21 12:39:12 -0700 Thanks Tim! http://trac.webkit.org/changeset/199828 276860 2016-04-20 15:46:55 -0700 2016-04-20 16:04:43 -0700 Patch webkits-editing-for-review.txt text/plain 11324 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTc5MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE2LTA0LTIwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBzaG93Q2FuZGlkYXRlcygpIHNob3Vs ZCB0YWtlIGEgcmFuZ2UgYW5kIHRoZSBzdHJpbmcgc2hvdWxkIGJlIHRoZSB3aG9sZSAKKyAgICAg ICAgcGFyYWdyYXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTY4MTMKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8v cHJvYmxlbS8yNTc2MDUzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1w bDo6dXBkYXRlV2ViVmlld0ltcGxBZGRpdGlvbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6c2hvd0NhbmRpZGF0ZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cmVx dWVzdENhbmRpZGF0ZXNGb3JTZWxlY3Rpb25JZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjpoYW5kbGVSZXF1ZXN0ZWRDYW5kaWRhdGVzKToKKwogMjAxNi0wNC0yMCAgQnJh ZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW9kZXJuIElEQiAoV29y a2Vycyk6IEVuYWJsZSBJTkRFWEVEX0RBVEFCQVNFX0lOX1dPUktFUlMgY29tcGlsZSB0aW1lIGZs YWcsIGJ1dCBkaXNhYmxlZCBpbiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzLgpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgJKHJldmlzaW9uIDE5OTc4 MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00NzIsNyArNDcyLDcgQEAgcHVibGljOgogICAgIHZvaWQgcmlnaHRNb3Vz ZVVwKE5TRXZlbnQgKik7CiAKICAgICB2b2lkIHVwZGF0ZVdlYlZpZXdJbXBsQWRkaXRpb25zKCk7 Ci0gICAgdm9pZCBzaG93Q2FuZGlkYXRlcyhOU0FycmF5ICpjYW5kaWRhdGVzLCBOU1N0cmluZyAq LCBOU1JlY3QgcmVjdE9mVHlwZWRTdHJpbmcsIE5TVmlldyAqLCB2b2lkICheY29tcGxldGlvbkhh bmRsZXIpKE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRpZGF0ZSkpOworICAgIHZv aWQgc2hvd0NhbmRpZGF0ZXMoTlNBcnJheSAqY2FuZGlkYXRlcywgTlNTdHJpbmcgKiwgTlNSZWN0 IHJlY3RPZlR5cGVkU3RyaW5nLCBOU1JhbmdlIHNlbGVjdGVkUmFuZ2UsIE5TVmlldyAqLCB2b2lk ICheY29tcGxldGlvbkhhbmRsZXIpKE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRp ZGF0ZSkpOwogICAgIHZvaWQgd2ViVmlld0ltcGxBZGRpdGlvbnNXaWxsRGVzdHJveVZpZXcoKTsK IAogICAgIGJvb2wgd2luZG93SXNGcm9udFdpbmRvd1VuZGVyTW91c2UoTlNFdmVudCAqKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0JKHJl dmlzaW9uIDE5OTc4MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3 SW1wbC5tbQkod29ya2luZyBjb3B5KQpAQCAtOTEsNiArOTEsMTAgQEAKICNpbXBvcnQgPFdlYktp dFN5c3RlbUludGVyZmFjZS5oPgogI2ltcG9ydCA8c3lzL3N0YXQuaD4KIAorI2lmIFVTRShBUFBM RV9JTlRFUk5BTF9TREspCisjaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV2ViVmlld0ltcGxJbmNs dWRlcy5oPgorI2VuZGlmCisKIFNPRlRfTElOS19DT05TVEFOVF9NQVlfRkFJTChMb29rdXAsIExV Tm90aWZpY2F0aW9uUG9wb3ZlcldpbGxDbG9zZSwgTlNTdHJpbmcgKikKIAogQGludGVyZmFjZSBO U0FwcGxpY2F0aW9uICgpCkBAIC00MzUsNyArNDM5LDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6dXBk YXRlV2ViVmlld0ltcGxBZGRpdAogewogfQogCi12b2lkIFdlYlZpZXdJbXBsOjpzaG93Q2FuZGlk YXRlcyhOU0FycmF5ICpjYW5kaWRhdGVzLCBOU1N0cmluZyAqc3RyaW5nLCBOU1JlY3QgcmVjdE9m VHlwZWRTdHJpbmcsIE5TVmlldyAqdmlldywgdm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShOU1Rl eHRDaGVja2luZ1Jlc3VsdCAqYWNjZXB0ZWRDYW5kaWRhdGUpKQordm9pZCBXZWJWaWV3SW1wbDo6 c2hvd0NhbmRpZGF0ZXMoTlNBcnJheSAqY2FuZGlkYXRlcywgTlNTdHJpbmcgKnN0cmluZywgTlNS ZWN0IHJlY3RPZlR5cGVkU3RyaW5nLCBOU1JhbmdlIHNlbGVjdGVkUmFuZ2UsIE5TVmlldyAqdmll dywgdm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShOU1RleHRDaGVja2luZ1Jlc3VsdCAqYWNjZXB0 ZWRDYW5kaWRhdGUpKQogewogfQogCkBAIC0yMTU0LDEwICsyMTU4LDEwIEBAIHZvaWQgV2ViVmll d0ltcGw6OnJlcXVlc3RDYW5kaWRhdGVzRm9yU2UKICAgICBtX2xhc3RTdHJpbmdGb3JDYW5kaWRh dGVSZXF1ZXN0ID0gcG9zdExheW91dERhdGEuc3RyaW5nRm9yQ2FuZGlkYXRlUmVxdWVzdDsKIAog I2lmIEhBVkUoQURWQU5DRURfU1BFTExfQ0hFQ0tJTkcpCi0gICAgTlNSYW5nZSByYW5nZUZvckNh bmRpZGF0ZXMgPSBOU01ha2VSYW5nZShwb3N0TGF5b3V0RGF0YS5jYW5kaWRhdGVSZXF1ZXN0U3Rh cnRQb3NpdGlvbiwgcG9zdExheW91dERhdGEuc2VsZWN0ZWRUZXh0TGVuZ3RoKTsKKyAgICBOU1Jh bmdlIHNlbGVjdGVkUmFuZ2UgPSBOU01ha2VSYW5nZShwb3N0TGF5b3V0RGF0YS5jYW5kaWRhdGVS ZXF1ZXN0U3RhcnRQb3NpdGlvbiwgcG9zdExheW91dERhdGEuc2VsZWN0ZWRUZXh0TGVuZ3RoKTsK ICAgICBOU1RleHRDaGVja2luZ1R5cGVzIGNoZWNraW5nVHlwZXMgPSBOU1RleHRDaGVja2luZ1R5 cGVTcGVsbGluZyB8IE5TVGV4dENoZWNraW5nVHlwZVJlcGxhY2VtZW50IHwgTlNUZXh0Q2hlY2tp bmdUeXBlQ29ycmVjdGlvbjsKICAgICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cigpOwot ICAgIFtbTlNTcGVsbENoZWNrZXIgc2hhcmVkU3BlbGxDaGVja2VyXSByZXF1ZXN0Q2FuZGlkYXRl c0ZvclNlbGVjdGVkUmFuZ2U6cmFuZ2VGb3JDYW5kaWRhdGVzIGluU3RyaW5nOnBvc3RMYXlvdXRE YXRhLnBhcmFncmFwaENvbnRleHRGb3JDYW5kaWRhdGVSZXF1ZXN0IHR5cGVzOmNoZWNraW5nVHlw ZXMgb3B0aW9uczpuaWwgaW5TcGVsbERvY3VtZW50V2l0aFRhZzpzcGVsbENoZWNrZXJEb2N1bWVu dFRhZygpIGNvbXBsZXRpb25IYW5kbGVyOlt3ZWFrVGhpc10oTlNJbnRlZ2VyIHNlcXVlbmNlTnVt YmVyLCBOU0FycmF5PE5TVGV4dENoZWNraW5nUmVzdWx0ICo+ICpjYW5kaWRhdGVzKSB7CisgICAg W1tOU1NwZWxsQ2hlY2tlciBzaGFyZWRTcGVsbENoZWNrZXJdIHJlcXVlc3RDYW5kaWRhdGVzRm9y U2VsZWN0ZWRSYW5nZTpzZWxlY3RlZFJhbmdlIGluU3RyaW5nOnBvc3RMYXlvdXREYXRhLnBhcmFn cmFwaENvbnRleHRGb3JDYW5kaWRhdGVSZXF1ZXN0IHR5cGVzOmNoZWNraW5nVHlwZXMgb3B0aW9u czpuaWwgaW5TcGVsbERvY3VtZW50V2l0aFRhZzpzcGVsbENoZWNrZXJEb2N1bWVudFRhZygpIGNv bXBsZXRpb25IYW5kbGVyOlt3ZWFrVGhpc10oTlNJbnRlZ2VyIHNlcXVlbmNlTnVtYmVyLCBOU0Fy cmF5PE5TVGV4dENoZWNraW5nUmVzdWx0ICo+ICpjYW5kaWRhdGVzKSB7CiAgICAgICAgIGRpc3Bh dGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAgICBpZiAo IXdlYWtUaGlzKQogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTIxODIsOCArMjE4Niw5IEBA IHZvaWQgV2ViVmlld0ltcGw6OmhhbmRsZVJlcXVlc3RlZENhbmRpZGEKICAgICBpZiAobV9sYXN0 U3RyaW5nRm9yQ2FuZGlkYXRlUmVxdWVzdCAhPSBwb3N0TGF5b3V0RGF0YS5zdHJpbmdGb3JDYW5k aWRhdGVSZXF1ZXN0KQogICAgICAgICByZXR1cm47CiAKKyAgICBOU1JhbmdlIHNlbGVjdGVkUmFu Z2UgPSBOU01ha2VSYW5nZShwb3N0TGF5b3V0RGF0YS5jYW5kaWRhdGVSZXF1ZXN0U3RhcnRQb3Np dGlvbiwgcG9zdExheW91dERhdGEuc2VsZWN0ZWRUZXh0TGVuZ3RoKTsKICAgICBhdXRvIHdlYWtU aGlzID0gY3JlYXRlV2Vha1B0cigpOwotICAgIHNob3dDYW5kaWRhdGVzKGNhbmRpZGF0ZXMsIHBv c3RMYXlvdXREYXRhLnN0cmluZ0ZvckNhbmRpZGF0ZVJlcXVlc3QsIHBvc3RMYXlvdXREYXRhLnNl bGVjdGlvbkNsaXBSZWN0LCBtX3ZpZXcsIFt3ZWFrVGhpc10oTlNUZXh0Q2hlY2tpbmdSZXN1bHQg KmFjY2VwdGVkQ2FuZGlkYXRlKSB7CisgICAgc2hvd0NhbmRpZGF0ZXMoY2FuZGlkYXRlcywgcG9z dExheW91dERhdGEucGFyYWdyYXBoQ29udGV4dEZvckNhbmRpZGF0ZVJlcXVlc3QsIHBvc3RMYXlv dXREYXRhLnNlbGVjdGlvbkNsaXBSZWN0LCBzZWxlY3RlZFJhbmdlLCBtX3ZpZXcsIFt3ZWFrVGhp c10oTlNUZXh0Q2hlY2tpbmdSZXN1bHQgKmFjY2VwdGVkQ2FuZGlkYXRlKSB7CiAgICAgICAgIGRp c3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAgICBp ZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cJKHJldmlzaW9uIDE5OTc5MCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE2LTA0LTIwICBCZXRoIERha2luICA8YmRh a2luQGFwcGxlLmNvbT4KKworICAgICAgICBzaG93Q2FuZGlkYXRlcygpIHNob3VsZCB0YWtlIGEg cmFuZ2UgYW5kIHRoZSBzdHJpbmcgc2hvdWxkIGJlIHRoZSB3aG9sZSAKKyAgICAgICAgcGFyYWdy YXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTY4 MTMKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJvYmxlbS8y NTc2MDUzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENhY2hlIHRoZSByYW5nZSBhbmQgdGhlIHBhcmFncmFwaCBzaW5jZSB3ZSBjb21wdXRlIHRoZW0g aW4gCisgICAgICAgIHJlcXVlc3RDYW5kaWRhdGVzRm9yU2VsZWN0aW9uLCBhbmQgdGhlbiB3ZSBj YW4gdXNlIHRoZW0gYWdhaW4gaW4gCisgICAgICAgIGhhbmRsZVJlcXVlc3RlZENhbmRpZGF0ZXMu CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lmg6CisgICAgICAgICog V2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lm1tOgorICAgICAgICAoV2ViRWRpdG9yQ2xp ZW50OjpyZXF1ZXN0Q2FuZGlkYXRlc0ZvclNlbGVjdGlvbik6CisgICAgICAgIChXZWJFZGl0b3JD bGllbnQ6OmhhbmRsZVJlcXVlc3RlZENhbmRpZGF0ZXMpOgorICAgICAgICAqIFdlYlZpZXcvV2Vi Vmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyB1cGRhdGVXZWJWaWV3QWRkaXRpb25zXSk6Cisg ICAgICAgICgtW1dlYlZpZXcgc2hvd0NhbmRpZGF0ZXM6Zm9yU3RyaW5nOmluUmVjdDpmb3JTZWxl Y3RlZFJhbmdlOnZpZXc6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dlYlZpZXcg c2hvd0NhbmRpZGF0ZXM6Zm9yU3RyaW5nOmluUmVjdDp2aWV3OmNvbXBsZXRpb25IYW5kbGVyOl0p OiBEZWxldGVkLgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlld0ludGVybmFsLmg6CisKIDIwMTYt MDQtMjAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1vZGVy biBJREIgKFdvcmtlcnMpOiBFbmFibGUgSU5ERVhFRF9EQVRBQkFTRV9JTl9XT1JLRVJTIGNvbXBp bGUgdGltZSBmbGFnLCBidXQgZGlzYWJsZWQgaW4gUnVudGltZUVuYWJsZWRGZWF0dXJlcy4KSW5k ZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNs aWVudC5oCShyZXZpc2lvbiAxOTk3ODApCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJFZGl0b3JDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTg3LDYgKzE4NywxMCBA QCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBXZWJDb3JlOjpWaXNpYmxlU2VsZWN0aW9uIG1fbGFz dFNlbGVjdGlvbkZvclJlcXVlc3RlZENhbmRpZGF0ZXM7CisjaWYgUExBVEZPUk0oTUFDKQorICAg IFJldGFpblB0cjxOU1N0cmluZz4gbV9wYXJhZ3JhcGhDb250ZXh0Rm9yQ2FuZGlkYXRlUmVxdWVz dDsKKyAgICBOU1JhbmdlIG1fcmFuZ2VGb3JDYW5kaWRhdGVzOworI2VuZGlmCiAKICAgICBXZWFr UHRyRmFjdG9yeTxXZWJFZGl0b3JDbGllbnQ+IG1fd2Vha1B0ckZhY3Rvcnk7CiB9OwpJbmRleDog U291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVu dC5tbQkocmV2aXNpb24gMTk5NzgwKQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViRWRpdG9yQ2xpZW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUzLDEyICsxMTUzLDEy IEBAIHZvaWQgV2ViRWRpdG9yQ2xpZW50OjpyZXF1ZXN0Q2FuZGlkYXRlc0YKIAogICAgIGludCBs ZW5ndGhUb1NlbGVjdGlvblN0YXJ0ID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFu Z2UocGFyYWdyYXBoU3RhcnQsIHNlbGVjdGlvblN0YXJ0KS5nZXQoKSk7CiAgICAgaW50IGxlbmd0 aFRvU2VsZWN0aW9uRW5kID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UocGFy YWdyYXBoU3RhcnQsIHNlbGVjdGlvbkVuZCkuZ2V0KCkpOwotICAgIE5TUmFuZ2UgcmFuZ2VGb3JD YW5kaWRhdGVzID0gTlNNYWtlUmFuZ2UobGVuZ3RoVG9TZWxlY3Rpb25TdGFydCwgbGVuZ3RoVG9T ZWxlY3Rpb25FbmQgLSBsZW5ndGhUb1NlbGVjdGlvblN0YXJ0KTsKLSAgICBTdHJpbmcgZnVsbFBs YWluVGV4dFN0cmluZ09mUGFyYWdyYXBoID0gcGxhaW5UZXh0KG1ha2VSYW5nZShwYXJhZ3JhcGhT dGFydCwgcGFyYWdyYXBoRW5kKS5nZXQoKSk7CisgICAgTlNSYW5nZSBtX3JhbmdlRm9yQ2FuZGlk YXRlcyA9IE5TTWFrZVJhbmdlKGxlbmd0aFRvU2VsZWN0aW9uU3RhcnQsIGxlbmd0aFRvU2VsZWN0 aW9uRW5kIC0gbGVuZ3RoVG9TZWxlY3Rpb25TdGFydCk7CisgICAgbV9wYXJhZ3JhcGhDb250ZXh0 Rm9yQ2FuZGlkYXRlUmVxdWVzdCA9IHBsYWluVGV4dChtYWtlUmFuZ2UocGFyYWdyYXBoU3RhcnQs IHBhcmFncmFwaEVuZCkuZ2V0KCkpOwogCiAgICAgTlNUZXh0Q2hlY2tpbmdUeXBlcyBjaGVja2lu Z1R5cGVzID0gTlNUZXh0Q2hlY2tpbmdUeXBlU3BlbGxpbmcgfCBOU1RleHRDaGVja2luZ1R5cGVS ZXBsYWNlbWVudCB8IE5TVGV4dENoZWNraW5nVHlwZUNvcnJlY3Rpb247CiAgICAgYXV0byB3ZWFr RWRpdG9yID0gbV93ZWFrUHRyRmFjdG9yeS5jcmVhdGVXZWFrUHRyKCk7Ci0gICAgW1tOU1NwZWxs Q2hlY2tlciBzaGFyZWRTcGVsbENoZWNrZXJdIHJlcXVlc3RDYW5kaWRhdGVzRm9yU2VsZWN0ZWRS YW5nZTpyYW5nZUZvckNhbmRpZGF0ZXMgaW5TdHJpbmc6ZnVsbFBsYWluVGV4dFN0cmluZ09mUGFy YWdyYXBoIHR5cGVzOmNoZWNraW5nVHlwZXMgb3B0aW9uczpuaWwgaW5TcGVsbERvY3VtZW50V2l0 aFRhZzpzcGVsbENoZWNrZXJEb2N1bWVudFRhZygpIGNvbXBsZXRpb25IYW5kbGVyOlt3ZWFrRWRp dG9yXShOU0ludGVnZXIgc2VxdWVuY2VOdW1iZXIsIE5TQXJyYXk8TlNUZXh0Q2hlY2tpbmdSZXN1 bHQgKj4gKmNhbmRpZGF0ZXMpIHsKKyAgICBbW05TU3BlbGxDaGVja2VyIHNoYXJlZFNwZWxsQ2hl Y2tlcl0gcmVxdWVzdENhbmRpZGF0ZXNGb3JTZWxlY3RlZFJhbmdlOm1fcmFuZ2VGb3JDYW5kaWRh dGVzIGluU3RyaW5nOm1fcGFyYWdyYXBoQ29udGV4dEZvckNhbmRpZGF0ZVJlcXVlc3QuZ2V0KCkg dHlwZXM6Y2hlY2tpbmdUeXBlcyBvcHRpb25zOm5pbCBpblNwZWxsRG9jdW1lbnRXaXRoVGFnOnNw ZWxsQ2hlY2tlckRvY3VtZW50VGFnKCkgY29tcGxldGlvbkhhbmRsZXI6W3dlYWtFZGl0b3JdKE5T SW50ZWdlciBzZXF1ZW5jZU51bWJlciwgTlNBcnJheTxOU1RleHRDaGVja2luZ1Jlc3VsdCAqPiAq Y2FuZGlkYXRlcykgewogICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9x dWV1ZSgpLCBeewogICAgICAgICAgICAgaWYgKCF3ZWFrRWRpdG9yKQogICAgICAgICAgICAgICAg IHJldHVybjsKQEAgLTExODksNyArMTE4OSw3IEBAIHZvaWQgV2ViRWRpdG9yQ2xpZW50OjpoYW5k bGVSZXF1ZXN0ZWRDYW4KICAgICAgICAgcmVjdEZvclNlbGVjdGlvbkNhbmRpZGF0ZXMgPSBmcmFt ZS0+dmlldygpLT5jb250ZW50c1RvV2luZG93KHF1YWRzWzBdLmVuY2xvc2luZ0JvdW5kaW5nQm94 KCkpOwogCiAgICAgYXV0byB3ZWFrRWRpdG9yID0gbV93ZWFrUHRyRmFjdG9yeS5jcmVhdGVXZWFr UHRyKCk7Ci0gICAgW21fd2ViVmlldyBzaG93Q2FuZGlkYXRlczpjYW5kaWRhdGVzIGZvclN0cmlu ZzpmcmFtZS0+ZWRpdG9yKCkuc3RyaW5nRm9yQ2FuZGlkYXRlUmVxdWVzdCgpIGluUmVjdDpyZWN0 Rm9yU2VsZWN0aW9uQ2FuZGlkYXRlcyB2aWV3Om1fd2ViVmlldyBjb21wbGV0aW9uSGFuZGxlcjpb d2Vha0VkaXRvcl0oTlNUZXh0Q2hlY2tpbmdSZXN1bHQgKmFjY2VwdGVkQ2FuZGlkYXRlKSB7Cisg ICAgW21fd2ViVmlldyBzaG93Q2FuZGlkYXRlczpjYW5kaWRhdGVzIGZvclN0cmluZzptX3BhcmFn cmFwaENvbnRleHRGb3JDYW5kaWRhdGVSZXF1ZXN0LmdldCgpIGluUmVjdDpyZWN0Rm9yU2VsZWN0 aW9uQ2FuZGlkYXRlcyBmb3JTZWxlY3RlZFJhbmdlOm1fcmFuZ2VGb3JDYW5kaWRhdGVzIHZpZXc6 bV93ZWJWaWV3IGNvbXBsZXRpb25IYW5kbGVyOlt3ZWFrRWRpdG9yXShOU1RleHRDaGVja2luZ1Jl c3VsdCAqYWNjZXB0ZWRDYW5kaWRhdGUpIHsKICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0 Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKICAgICAgICAgICAgIGlmICghd2Vha0VkaXRvcikKICAg ICAgICAgICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCShyZXZpc2lvbiAxOTk3ODApCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTY2OTIsNyArNjY5Miw3IEBAIC0gKHZvaWQpdXBkYXRl V2ViVmlld0FkZGl0aW9ucwogewogfQogCi0tICh2b2lkKXNob3dDYW5kaWRhdGVzOihOU0FycmF5 ICopY2FuZGlkYXRlcyBmb3JTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIGluUmVjdDooTlNSZWN0 KXJlY3RPZlR5cGVkU3RyaW5nIHZpZXc6KE5TVmlldyAqKXZpZXcgY29tcGxldGlvbkhhbmRsZXI6 KHZvaWQgKF4pKE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRpZGF0ZSkpY29tcGxl dGlvbkJsb2NrCistICh2b2lkKXNob3dDYW5kaWRhdGVzOihOU0FycmF5ICopY2FuZGlkYXRlcyBm b3JTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIGluUmVjdDooTlNSZWN0KXJlY3RPZlR5cGVkU3Ry aW5nIGZvclNlbGVjdGVkUmFuZ2U6KE5TUmFuZ2UpcmFuZ2UgdmlldzooTlNWaWV3ICopdmlldyBj b21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNUZXh0Q2hlY2tpbmdSZXN1bHQgKmFjY2VwdGVk Q2FuZGlkYXRlKSljb21wbGV0aW9uQmxvY2sKIHsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oCShyZXZpc2lvbiAxOTk3ODApCisrKyBTb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBA IC0yOTEsNSArMjkxLDUgQEAgQGludGVyZmFjZSBXZWJWaWV3IChXZWJWaWV3T3RoZXJJbnRlcm5h bAogCiBAaW50ZXJmYWNlIFdlYlZpZXcgKFdlYlVwZGF0ZVdlYlZpZXdBZGRpdGlvbnMpCiAtICh2 b2lkKXVwZGF0ZVdlYlZpZXdBZGRpdGlvbnM7Ci0tICh2b2lkKXNob3dDYW5kaWRhdGVzOihOU0Fy cmF5ICopY2FuZGlkYXRlcyBmb3JTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIGluUmVjdDooTlNS ZWN0KXJlY3RPZlR5cGVkU3RyaW5nIHZpZXc6KE5TVmlldyAqKXZpZXcgY29tcGxldGlvbkhhbmRs ZXI6KHZvaWQgKF4pKE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRpZGF0ZSkpY29t cGxldGlvbkJsb2NrOworLSAodm9pZClzaG93Q2FuZGlkYXRlczooTlNBcnJheSAqKWNhbmRpZGF0 ZXMgZm9yU3RyaW5nOihOU1N0cmluZyAqKXN0cmluZyBpblJlY3Q6KE5TUmVjdClyZWN0T2ZUeXBl ZFN0cmluZyBmb3JTZWxlY3RlZFJhbmdlOihOU1JhbmdlKXJhbmdlIHZpZXc6KE5TVmlldyAqKXZp ZXcgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2Nl cHRlZENhbmRpZGF0ZSkpY29tcGxldGlvbkJsb2NrOwogQGVuZAo= 276861 2016-04-20 16:04:43 -0700 2016-04-21 11:07:33 -0700 Patch webkits-editing-for-review-2.txt text/plain 11369 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTc5MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE2LTA0LTIwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBzaG93Q2FuZGlkYXRlcygpIHNob3Vs ZCB0YWtlIGEgcmFuZ2UgYW5kIHRoZSBzdHJpbmcgc2hvdWxkIGJlIHRoZSB3aG9sZSAKKyAgICAg ICAgcGFyYWdyYXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTY4MTMKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8v cHJvYmxlbS8yNTc2MDUzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1w bDo6dXBkYXRlV2ViVmlld0ltcGxBZGRpdGlvbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6c2hvd0NhbmRpZGF0ZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cmVx dWVzdENhbmRpZGF0ZXNGb3JTZWxlY3Rpb25JZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjpoYW5kbGVSZXF1ZXN0ZWRDYW5kaWRhdGVzKToKKwogMjAxNi0wNC0yMCAgQnJh ZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW9kZXJuIElEQiAoV29y a2Vycyk6IEVuYWJsZSBJTkRFWEVEX0RBVEFCQVNFX0lOX1dPUktFUlMgY29tcGlsZSB0aW1lIGZs YWcsIGJ1dCBkaXNhYmxlZCBpbiBSdW50aW1lRW5hYmxlZEZlYXR1cmVzLgpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgJKHJldmlzaW9uIDE5OTc4 MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00NzIsNyArNDcyLDcgQEAgcHVibGljOgogICAgIHZvaWQgcmlnaHRNb3Vz ZVVwKE5TRXZlbnQgKik7CiAKICAgICB2b2lkIHVwZGF0ZVdlYlZpZXdJbXBsQWRkaXRpb25zKCk7 Ci0gICAgdm9pZCBzaG93Q2FuZGlkYXRlcyhOU0FycmF5ICpjYW5kaWRhdGVzLCBOU1N0cmluZyAq LCBOU1JlY3QgcmVjdE9mVHlwZWRTdHJpbmcsIE5TVmlldyAqLCB2b2lkICheY29tcGxldGlvbkhh bmRsZXIpKE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRpZGF0ZSkpOworICAgIHZv aWQgc2hvd0NhbmRpZGF0ZXMoTlNBcnJheSAqY2FuZGlkYXRlcywgTlNTdHJpbmcgKiwgTlNSZWN0 IHJlY3RPZlR5cGVkU3RyaW5nLCBOU1JhbmdlIHNlbGVjdGVkUmFuZ2UsIE5TVmlldyAqLCB2b2lk ICheY29tcGxldGlvbkhhbmRsZXIpKE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRp ZGF0ZSkpOwogICAgIHZvaWQgd2ViVmlld0ltcGxBZGRpdGlvbnNXaWxsRGVzdHJveVZpZXcoKTsK IAogICAgIGJvb2wgd2luZG93SXNGcm9udFdpbmRvd1VuZGVyTW91c2UoTlNFdmVudCAqKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0JKHJl dmlzaW9uIDE5OTc4MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3 SW1wbC5tbQkod29ya2luZyBjb3B5KQpAQCAtOTEsNiArOTEsMTAgQEAKICNpbXBvcnQgPFdlYktp dFN5c3RlbUludGVyZmFjZS5oPgogI2ltcG9ydCA8c3lzL3N0YXQuaD4KIAorI2lmIFVTRShBUFBM RV9JTlRFUk5BTF9TREspCisjaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV2ViVmlld0ltcGxJbmNs dWRlcy5oPgorI2VuZGlmCisKIFNPRlRfTElOS19DT05TVEFOVF9NQVlfRkFJTChMb29rdXAsIExV Tm90aWZpY2F0aW9uUG9wb3ZlcldpbGxDbG9zZSwgTlNTdHJpbmcgKikKIAogQGludGVyZmFjZSBO U0FwcGxpY2F0aW9uICgpCkBAIC00MzUsNyArNDM5LDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6dXBk YXRlV2ViVmlld0ltcGxBZGRpdAogewogfQogCi12b2lkIFdlYlZpZXdJbXBsOjpzaG93Q2FuZGlk YXRlcyhOU0FycmF5ICpjYW5kaWRhdGVzLCBOU1N0cmluZyAqc3RyaW5nLCBOU1JlY3QgcmVjdE9m VHlwZWRTdHJpbmcsIE5TVmlldyAqdmlldywgdm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShOU1Rl eHRDaGVja2luZ1Jlc3VsdCAqYWNjZXB0ZWRDYW5kaWRhdGUpKQordm9pZCBXZWJWaWV3SW1wbDo6 c2hvd0NhbmRpZGF0ZXMoTlNBcnJheSAqY2FuZGlkYXRlcywgTlNTdHJpbmcgKnN0cmluZywgTlNS ZWN0IHJlY3RPZlR5cGVkU3RyaW5nLCBOU1JhbmdlIHNlbGVjdGVkUmFuZ2UsIE5TVmlldyAqdmll dywgdm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShOU1RleHRDaGVja2luZ1Jlc3VsdCAqYWNjZXB0 ZWRDYW5kaWRhdGUpKQogewogfQogCkBAIC0yMTU0LDEwICsyMTU4LDEwIEBAIHZvaWQgV2ViVmll d0ltcGw6OnJlcXVlc3RDYW5kaWRhdGVzRm9yU2UKICAgICBtX2xhc3RTdHJpbmdGb3JDYW5kaWRh dGVSZXF1ZXN0ID0gcG9zdExheW91dERhdGEuc3RyaW5nRm9yQ2FuZGlkYXRlUmVxdWVzdDsKIAog I2lmIEhBVkUoQURWQU5DRURfU1BFTExfQ0hFQ0tJTkcpCi0gICAgTlNSYW5nZSByYW5nZUZvckNh bmRpZGF0ZXMgPSBOU01ha2VSYW5nZShwb3N0TGF5b3V0RGF0YS5jYW5kaWRhdGVSZXF1ZXN0U3Rh cnRQb3NpdGlvbiwgcG9zdExheW91dERhdGEuc2VsZWN0ZWRUZXh0TGVuZ3RoKTsKKyAgICBOU1Jh bmdlIHNlbGVjdGVkUmFuZ2UgPSBOU01ha2VSYW5nZShwb3N0TGF5b3V0RGF0YS5jYW5kaWRhdGVS ZXF1ZXN0U3RhcnRQb3NpdGlvbiwgcG9zdExheW91dERhdGEuc2VsZWN0ZWRUZXh0TGVuZ3RoKTsK ICAgICBOU1RleHRDaGVja2luZ1R5cGVzIGNoZWNraW5nVHlwZXMgPSBOU1RleHRDaGVja2luZ1R5 cGVTcGVsbGluZyB8IE5TVGV4dENoZWNraW5nVHlwZVJlcGxhY2VtZW50IHwgTlNUZXh0Q2hlY2tp bmdUeXBlQ29ycmVjdGlvbjsKICAgICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cigpOwot ICAgIFtbTlNTcGVsbENoZWNrZXIgc2hhcmVkU3BlbGxDaGVja2VyXSByZXF1ZXN0Q2FuZGlkYXRl c0ZvclNlbGVjdGVkUmFuZ2U6cmFuZ2VGb3JDYW5kaWRhdGVzIGluU3RyaW5nOnBvc3RMYXlvdXRE YXRhLnBhcmFncmFwaENvbnRleHRGb3JDYW5kaWRhdGVSZXF1ZXN0IHR5cGVzOmNoZWNraW5nVHlw ZXMgb3B0aW9uczpuaWwgaW5TcGVsbERvY3VtZW50V2l0aFRhZzpzcGVsbENoZWNrZXJEb2N1bWVu dFRhZygpIGNvbXBsZXRpb25IYW5kbGVyOlt3ZWFrVGhpc10oTlNJbnRlZ2VyIHNlcXVlbmNlTnVt YmVyLCBOU0FycmF5PE5TVGV4dENoZWNraW5nUmVzdWx0ICo+ICpjYW5kaWRhdGVzKSB7CisgICAg W1tOU1NwZWxsQ2hlY2tlciBzaGFyZWRTcGVsbENoZWNrZXJdIHJlcXVlc3RDYW5kaWRhdGVzRm9y U2VsZWN0ZWRSYW5nZTpzZWxlY3RlZFJhbmdlIGluU3RyaW5nOnBvc3RMYXlvdXREYXRhLnBhcmFn cmFwaENvbnRleHRGb3JDYW5kaWRhdGVSZXF1ZXN0IHR5cGVzOmNoZWNraW5nVHlwZXMgb3B0aW9u czpuaWwgaW5TcGVsbERvY3VtZW50V2l0aFRhZzpzcGVsbENoZWNrZXJEb2N1bWVudFRhZygpIGNv bXBsZXRpb25IYW5kbGVyOlt3ZWFrVGhpc10oTlNJbnRlZ2VyIHNlcXVlbmNlTnVtYmVyLCBOU0Fy cmF5PE5TVGV4dENoZWNraW5nUmVzdWx0ICo+ICpjYW5kaWRhdGVzKSB7CiAgICAgICAgIGRpc3Bh dGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAgICBpZiAo IXdlYWtUaGlzKQogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTIxODIsOCArMjE4Niw5IEBA IHZvaWQgV2ViVmlld0ltcGw6OmhhbmRsZVJlcXVlc3RlZENhbmRpZGEKICAgICBpZiAobV9sYXN0 U3RyaW5nRm9yQ2FuZGlkYXRlUmVxdWVzdCAhPSBwb3N0TGF5b3V0RGF0YS5zdHJpbmdGb3JDYW5k aWRhdGVSZXF1ZXN0KQogICAgICAgICByZXR1cm47CiAKKyAgICBOU1JhbmdlIHNlbGVjdGVkUmFu Z2UgPSBOU01ha2VSYW5nZShwb3N0TGF5b3V0RGF0YS5jYW5kaWRhdGVSZXF1ZXN0U3RhcnRQb3Np dGlvbiwgcG9zdExheW91dERhdGEuc2VsZWN0ZWRUZXh0TGVuZ3RoKTsKICAgICBhdXRvIHdlYWtU aGlzID0gY3JlYXRlV2Vha1B0cigpOwotICAgIHNob3dDYW5kaWRhdGVzKGNhbmRpZGF0ZXMsIHBv c3RMYXlvdXREYXRhLnN0cmluZ0ZvckNhbmRpZGF0ZVJlcXVlc3QsIHBvc3RMYXlvdXREYXRhLnNl bGVjdGlvbkNsaXBSZWN0LCBtX3ZpZXcsIFt3ZWFrVGhpc10oTlNUZXh0Q2hlY2tpbmdSZXN1bHQg KmFjY2VwdGVkQ2FuZGlkYXRlKSB7CisgICAgc2hvd0NhbmRpZGF0ZXMoY2FuZGlkYXRlcywgcG9z dExheW91dERhdGEucGFyYWdyYXBoQ29udGV4dEZvckNhbmRpZGF0ZVJlcXVlc3QsIHBvc3RMYXlv dXREYXRhLnNlbGVjdGlvbkNsaXBSZWN0LCBzZWxlY3RlZFJhbmdlLCBtX3ZpZXcsIFt3ZWFrVGhp c10oTlNUZXh0Q2hlY2tpbmdSZXN1bHQgKmFjY2VwdGVkQ2FuZGlkYXRlKSB7CiAgICAgICAgIGRp c3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAgICBp ZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cJKHJldmlzaW9uIDE5OTc5MCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE2LTA0LTIwICBCZXRoIERha2luICA8YmRh a2luQGFwcGxlLmNvbT4KKworICAgICAgICBzaG93Q2FuZGlkYXRlcygpIHNob3VsZCB0YWtlIGEg cmFuZ2UgYW5kIHRoZSBzdHJpbmcgc2hvdWxkIGJlIHRoZSB3aG9sZSAKKyAgICAgICAgcGFyYWdy YXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTY4 MTMKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJvYmxlbS8y NTc2MDUzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENhY2hlIHRoZSByYW5nZSBhbmQgdGhlIHBhcmFncmFwaCBzaW5jZSB3ZSBjb21wdXRlIHRoZW0g aW4gCisgICAgICAgIHJlcXVlc3RDYW5kaWRhdGVzRm9yU2VsZWN0aW9uLCBhbmQgdGhlbiB3ZSBj YW4gdXNlIHRoZW0gYWdhaW4gaW4gCisgICAgICAgIGhhbmRsZVJlcXVlc3RlZENhbmRpZGF0ZXMu CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lmg6CisgICAgICAgICog V2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lm1tOgorICAgICAgICAoV2ViRWRpdG9yQ2xp ZW50OjpyZXF1ZXN0Q2FuZGlkYXRlc0ZvclNlbGVjdGlvbik6CisgICAgICAgIChXZWJFZGl0b3JD bGllbnQ6OmhhbmRsZVJlcXVlc3RlZENhbmRpZGF0ZXMpOgorICAgICAgICAqIFdlYlZpZXcvV2Vi Vmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyB1cGRhdGVXZWJWaWV3QWRkaXRpb25zXSk6Cisg ICAgICAgICgtW1dlYlZpZXcgc2hvd0NhbmRpZGF0ZXM6Zm9yU3RyaW5nOmluUmVjdDpmb3JTZWxl Y3RlZFJhbmdlOnZpZXc6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dlYlZpZXcg c2hvd0NhbmRpZGF0ZXM6Zm9yU3RyaW5nOmluUmVjdDp2aWV3OmNvbXBsZXRpb25IYW5kbGVyOl0p OiBEZWxldGVkLgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlld0ludGVybmFsLmg6CisKIDIwMTYt MDQtMjAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1vZGVy biBJREIgKFdvcmtlcnMpOiBFbmFibGUgSU5ERVhFRF9EQVRBQkFTRV9JTl9XT1JLRVJTIGNvbXBp bGUgdGltZSBmbGFnLCBidXQgZGlzYWJsZWQgaW4gUnVudGltZUVuYWJsZWRGZWF0dXJlcy4KSW5k ZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNs aWVudC5oCShyZXZpc2lvbiAxOTk3ODApCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJFZGl0b3JDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTg3LDYgKzE4NywxMCBA QCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBXZWJDb3JlOjpWaXNpYmxlU2VsZWN0aW9uIG1fbGFz dFNlbGVjdGlvbkZvclJlcXVlc3RlZENhbmRpZGF0ZXM7CisjaWYgUExBVEZPUk0oTUFDKSAmJiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTIwMAorICAgIFJldGFpblB0cjxO U1N0cmluZz4gbV9wYXJhZ3JhcGhDb250ZXh0Rm9yQ2FuZGlkYXRlUmVxdWVzdDsKKyAgICBOU1Jh bmdlIG1fcmFuZ2VGb3JDYW5kaWRhdGVzOworI2VuZGlmCiAKICAgICBXZWFrUHRyRmFjdG9yeTxX ZWJFZGl0b3JDbGllbnQ+IG1fd2Vha1B0ckZhY3Rvcnk7CiB9OwpJbmRleDogU291cmNlL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5tbQkocmV2aXNp b24gMTk5NzgwKQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9y Q2xpZW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUzLDEyICsxMTUzLDEyIEBAIHZvaWQgV2Vi RWRpdG9yQ2xpZW50OjpyZXF1ZXN0Q2FuZGlkYXRlc0YKIAogICAgIGludCBsZW5ndGhUb1NlbGVj dGlvblN0YXJ0ID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UocGFyYWdyYXBo U3RhcnQsIHNlbGVjdGlvblN0YXJ0KS5nZXQoKSk7CiAgICAgaW50IGxlbmd0aFRvU2VsZWN0aW9u RW5kID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UocGFyYWdyYXBoU3RhcnQs IHNlbGVjdGlvbkVuZCkuZ2V0KCkpOwotICAgIE5TUmFuZ2UgcmFuZ2VGb3JDYW5kaWRhdGVzID0g TlNNYWtlUmFuZ2UobGVuZ3RoVG9TZWxlY3Rpb25TdGFydCwgbGVuZ3RoVG9TZWxlY3Rpb25FbmQg LSBsZW5ndGhUb1NlbGVjdGlvblN0YXJ0KTsKLSAgICBTdHJpbmcgZnVsbFBsYWluVGV4dFN0cmlu Z09mUGFyYWdyYXBoID0gcGxhaW5UZXh0KG1ha2VSYW5nZShwYXJhZ3JhcGhTdGFydCwgcGFyYWdy YXBoRW5kKS5nZXQoKSk7CisgICAgTlNSYW5nZSBtX3JhbmdlRm9yQ2FuZGlkYXRlcyA9IE5TTWFr ZVJhbmdlKGxlbmd0aFRvU2VsZWN0aW9uU3RhcnQsIGxlbmd0aFRvU2VsZWN0aW9uRW5kIC0gbGVu Z3RoVG9TZWxlY3Rpb25TdGFydCk7CisgICAgbV9wYXJhZ3JhcGhDb250ZXh0Rm9yQ2FuZGlkYXRl UmVxdWVzdCA9IHBsYWluVGV4dChtYWtlUmFuZ2UocGFyYWdyYXBoU3RhcnQsIHBhcmFncmFwaEVu ZCkuZ2V0KCkpOwogCiAgICAgTlNUZXh0Q2hlY2tpbmdUeXBlcyBjaGVja2luZ1R5cGVzID0gTlNU ZXh0Q2hlY2tpbmdUeXBlU3BlbGxpbmcgfCBOU1RleHRDaGVja2luZ1R5cGVSZXBsYWNlbWVudCB8 IE5TVGV4dENoZWNraW5nVHlwZUNvcnJlY3Rpb247CiAgICAgYXV0byB3ZWFrRWRpdG9yID0gbV93 ZWFrUHRyRmFjdG9yeS5jcmVhdGVXZWFrUHRyKCk7Ci0gICAgW1tOU1NwZWxsQ2hlY2tlciBzaGFy ZWRTcGVsbENoZWNrZXJdIHJlcXVlc3RDYW5kaWRhdGVzRm9yU2VsZWN0ZWRSYW5nZTpyYW5nZUZv ckNhbmRpZGF0ZXMgaW5TdHJpbmc6ZnVsbFBsYWluVGV4dFN0cmluZ09mUGFyYWdyYXBoIHR5cGVz OmNoZWNraW5nVHlwZXMgb3B0aW9uczpuaWwgaW5TcGVsbERvY3VtZW50V2l0aFRhZzpzcGVsbENo ZWNrZXJEb2N1bWVudFRhZygpIGNvbXBsZXRpb25IYW5kbGVyOlt3ZWFrRWRpdG9yXShOU0ludGVn ZXIgc2VxdWVuY2VOdW1iZXIsIE5TQXJyYXk8TlNUZXh0Q2hlY2tpbmdSZXN1bHQgKj4gKmNhbmRp ZGF0ZXMpIHsKKyAgICBbW05TU3BlbGxDaGVja2VyIHNoYXJlZFNwZWxsQ2hlY2tlcl0gcmVxdWVz dENhbmRpZGF0ZXNGb3JTZWxlY3RlZFJhbmdlOm1fcmFuZ2VGb3JDYW5kaWRhdGVzIGluU3RyaW5n Om1fcGFyYWdyYXBoQ29udGV4dEZvckNhbmRpZGF0ZVJlcXVlc3QuZ2V0KCkgdHlwZXM6Y2hlY2tp bmdUeXBlcyBvcHRpb25zOm5pbCBpblNwZWxsRG9jdW1lbnRXaXRoVGFnOnNwZWxsQ2hlY2tlckRv Y3VtZW50VGFnKCkgY29tcGxldGlvbkhhbmRsZXI6W3dlYWtFZGl0b3JdKE5TSW50ZWdlciBzZXF1 ZW5jZU51bWJlciwgTlNBcnJheTxOU1RleHRDaGVja2luZ1Jlc3VsdCAqPiAqY2FuZGlkYXRlcykg ewogICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeewog ICAgICAgICAgICAgaWYgKCF3ZWFrRWRpdG9yKQogICAgICAgICAgICAgICAgIHJldHVybjsKQEAg LTExODksNyArMTE4OSw3IEBAIHZvaWQgV2ViRWRpdG9yQ2xpZW50OjpoYW5kbGVSZXF1ZXN0ZWRD YW4KICAgICAgICAgcmVjdEZvclNlbGVjdGlvbkNhbmRpZGF0ZXMgPSBmcmFtZS0+dmlldygpLT5j b250ZW50c1RvV2luZG93KHF1YWRzWzBdLmVuY2xvc2luZ0JvdW5kaW5nQm94KCkpOwogCiAgICAg YXV0byB3ZWFrRWRpdG9yID0gbV93ZWFrUHRyRmFjdG9yeS5jcmVhdGVXZWFrUHRyKCk7Ci0gICAg W21fd2ViVmlldyBzaG93Q2FuZGlkYXRlczpjYW5kaWRhdGVzIGZvclN0cmluZzpmcmFtZS0+ZWRp dG9yKCkuc3RyaW5nRm9yQ2FuZGlkYXRlUmVxdWVzdCgpIGluUmVjdDpyZWN0Rm9yU2VsZWN0aW9u Q2FuZGlkYXRlcyB2aWV3Om1fd2ViVmlldyBjb21wbGV0aW9uSGFuZGxlcjpbd2Vha0VkaXRvcl0o TlNUZXh0Q2hlY2tpbmdSZXN1bHQgKmFjY2VwdGVkQ2FuZGlkYXRlKSB7CisgICAgW21fd2ViVmll dyBzaG93Q2FuZGlkYXRlczpjYW5kaWRhdGVzIGZvclN0cmluZzptX3BhcmFncmFwaENvbnRleHRG b3JDYW5kaWRhdGVSZXF1ZXN0LmdldCgpIGluUmVjdDpyZWN0Rm9yU2VsZWN0aW9uQ2FuZGlkYXRl cyBmb3JTZWxlY3RlZFJhbmdlOm1fcmFuZ2VGb3JDYW5kaWRhdGVzIHZpZXc6bV93ZWJWaWV3IGNv bXBsZXRpb25IYW5kbGVyOlt3ZWFrRWRpdG9yXShOU1RleHRDaGVja2luZ1Jlc3VsdCAqYWNjZXB0 ZWRDYW5kaWRhdGUpIHsKICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5f cXVldWUoKSwgXnsKICAgICAgICAgICAgIGlmICghd2Vha0VkaXRvcikKICAgICAgICAgICAgICAg ICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lv biAxOTk3ODApCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtp bmcgY29weSkKQEAgLTY2OTIsNyArNjY5Miw3IEBAIC0gKHZvaWQpdXBkYXRlV2ViVmlld0FkZGl0 aW9ucwogewogfQogCi0tICh2b2lkKXNob3dDYW5kaWRhdGVzOihOU0FycmF5ICopY2FuZGlkYXRl cyBmb3JTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIGluUmVjdDooTlNSZWN0KXJlY3RPZlR5cGVk U3RyaW5nIHZpZXc6KE5TVmlldyAqKXZpZXcgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5T VGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRpZGF0ZSkpY29tcGxldGlvbkJsb2NrCist ICh2b2lkKXNob3dDYW5kaWRhdGVzOihOU0FycmF5ICopY2FuZGlkYXRlcyBmb3JTdHJpbmc6KE5T U3RyaW5nICopc3RyaW5nIGluUmVjdDooTlNSZWN0KXJlY3RPZlR5cGVkU3RyaW5nIGZvclNlbGVj dGVkUmFuZ2U6KE5TUmFuZ2UpcmFuZ2UgdmlldzooTlNWaWV3ICopdmlldyBjb21wbGV0aW9uSGFu ZGxlcjoodm9pZCAoXikoTlNUZXh0Q2hlY2tpbmdSZXN1bHQgKmFjY2VwdGVkQ2FuZGlkYXRlKSlj b21wbGV0aW9uQmxvY2sKIHsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJWaWV3SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlZpZXdJbnRlcm5hbC5oCShyZXZpc2lvbiAxOTk3ODApCisrKyBTb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTEsNSArMjkx LDUgQEAgQGludGVyZmFjZSBXZWJWaWV3IChXZWJWaWV3T3RoZXJJbnRlcm5hbAogCiBAaW50ZXJm YWNlIFdlYlZpZXcgKFdlYlVwZGF0ZVdlYlZpZXdBZGRpdGlvbnMpCiAtICh2b2lkKXVwZGF0ZVdl YlZpZXdBZGRpdGlvbnM7Ci0tICh2b2lkKXNob3dDYW5kaWRhdGVzOihOU0FycmF5ICopY2FuZGlk YXRlcyBmb3JTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIGluUmVjdDooTlNSZWN0KXJlY3RPZlR5 cGVkU3RyaW5nIHZpZXc6KE5TVmlldyAqKXZpZXcgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4p KE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRpZGF0ZSkpY29tcGxldGlvbkJsb2Nr OworLSAodm9pZClzaG93Q2FuZGlkYXRlczooTlNBcnJheSAqKWNhbmRpZGF0ZXMgZm9yU3RyaW5n OihOU1N0cmluZyAqKXN0cmluZyBpblJlY3Q6KE5TUmVjdClyZWN0T2ZUeXBlZFN0cmluZyBmb3JT ZWxlY3RlZFJhbmdlOihOU1JhbmdlKXJhbmdlIHZpZXc6KE5TVmlldyAqKXZpZXcgY29tcGxldGlv bkhhbmRsZXI6KHZvaWQgKF4pKE5TVGV4dENoZWNraW5nUmVzdWx0ICphY2NlcHRlZENhbmRpZGF0 ZSkpY29tcGxldGlvbkJsb2NrOwogQGVuZAo=