138786 2014-11-16 17:06:08 -0800 Whitespace action menus should focus the HitTestResult and create an insertion point 2014-11-17 12:10:11 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned andersca bdakin thorton oldest_to_newest 1049089 0 bdakin 2014-11-16 17:06:08 -0800 Whitespace action menus should focus the HitTestResult and create an insertion point rdar://problem/18944893 1049090 1 241685 bdakin 2014-11-16 17:10:43 -0800 Created attachment 241685 Patch 1049093 2 241685 thorton 2014-11-16 17:28:40 -0800 Comment on attachment 241685 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241685&action=review > Source/WebKit/mac/WebView/WebActionMenuController.mm:176 > + frame->page()->focusController().setFocusedElement(element, element->document().frame()); > + VisiblePosition position = renderer->positionForPoint(_hitTestResult.localPoint(), nullptr); > + element->document().frame()->selection().setSelection(position); There's a bunch of things that might need null checks here? (but I don't know). 1049271 3 bdakin 2014-11-17 12:10:11 -0800 (In reply to comment #2) > Comment on attachment 241685 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241685&action=review > > > Source/WebKit/mac/WebView/WebActionMenuController.mm:176 > > + frame->page()->focusController().setFocusedElement(element, element->document().frame()); > > + VisiblePosition position = renderer->positionForPoint(_hitTestResult.localPoint(), nullptr); > > + element->document().frame()->selection().setSelection(position); > > There's a bunch of things that might need null checks here? (but I don't > know). I fixed this up. Thank you! http://trac.webkit.org/changeset/176220 241685 2014-11-16 17:10:43 -0800 2014-11-16 17:28:40 -0800 Patch for-review.txt text/plain 10191 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjE2NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTExLTE2ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXaGl0ZXNwYWNlIGFjdGlvbiBtZW51 cyBzaG91bGQgZm9jdXMgdGhlIEhpdFRlc3RSZXN1bHQgYW5kIGNyZWF0ZSBhbiBpbnNlcnRpb24g CisgICAgICAgIHBvaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzg3ODYKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFy Oi8vcHJvYmxlbS8xODk0NDg5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdoaXRlc3BhY2UgbWVudXMgc2hvdWxkIGNhdXNlIHRoZSBIaXRUZXN0UmVz dWx0IHRvIGJlIGZvY3VzZWQsIGFuZCB0aGV5IHNob3VsZCBzZXQgCisgICAgICAgIHRoZSBzZWxl Y3Rpb24gYmFzZWQgb24gdGhlIEhpdFRlc3QgbG9jYXRpb24uCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Zm9jdXNB bmRTZWxlY3RMYXN0QWN0aW9uTWVudUhpdFRlc3RSZXN1bHQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNv bnRyb2xsZXIubW06CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgaXNNZW51Rm9y VGV4dENvbnRlbnRdKToKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxlciB3aWxsT3Bl bk1lbnU6d2l0aEV2ZW50Ol0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpwZXJmb3JtQWN0aW9uTWVudUhpdFRlc3RBdExvY2F0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Zm9jdXNBbmRTZWxlY3RMYXN0QWN0aW9uTWVudUhpdFRl c3RSZXN1bHQpOgorCiAyMDE0LTExLTE2ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBw bGUuY29tPgogCiAgICAgICAgIFVzZSBUZXh0SW5kaWNhdG9yIGluc3RlYWQgb2YgdGhlIGJ1aWx0 IGluIExvb2t1cCBoaWdobGlnaHQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCShyZXZpc2lvbiAxNzYxNjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTMyMyw2ICs1MzIzLDExIEBA IHZvaWQgV2ViUGFnZVByb3h5OjpzZWxlY3RMYXN0QWN0aW9uTWVudVIKICAgICBtX3Byb2Nlc3Mt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNlbGVjdExhc3RBY3Rpb25NZW51UmFuZ2UoKSwgbV9w YWdlSUQpOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6Zm9jdXNBbmRTZWxlY3RMYXN0QWN0aW9u TWVudUhpdFRlc3RSZXN1bHQoKQoreworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZTo6Rm9jdXNBbmRTZWxlY3RMYXN0QWN0aW9uTWVudUhpdFRlc3RSZXN1bHQoKSwgbV9wYWdl SUQpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0 KGNvbnN0IEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0JiByZXN1bHQsIElQQzo6TWVzc2FnZURlY29k ZXImIGRlY29kZXIpCiB7CiAgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiB1c2VyRGF0YTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDE3NjE2NCkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5 KQpAQCAtOTMyLDYgKzkzMiw3IEBAIHB1YmxpYzoKICAgICBXZWJIaXRUZXN0UmVzdWx0KiBsYXN0 TW91c2VNb3ZlSGl0VGVzdFJlc3VsdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdE1vdXNlTW92ZUhp dFRlc3RSZXN1bHQuZ2V0KCk7IH0KICAgICB2b2lkIHBlcmZvcm1BY3Rpb25NZW51SGl0VGVzdEF0 TG9jYXRpb24oV2ViQ29yZTo6RmxvYXRQb2ludCk7CiAgICAgdm9pZCBzZWxlY3RMYXN0QWN0aW9u TWVudVJhbmdlKCk7CisgICAgdm9pZCBmb2N1c0FuZFNlbGVjdExhc3RBY3Rpb25NZW51SGl0VGVz dFJlc3VsdCgpOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShFRkwpICYmIEhBVkUoQUNDRVNTSUJJ TElUWSkgJiYgZGVmaW5lZChIQVZFX0VDT1JFX1gpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCShyZXZpc2lv biAxNzYxNjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNv bnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTE4NCw3ICsxODQsNyBAQCAtICh2b2lkKXBy ZXBhcmVGb3JNZW51OihOU01lbnUgKiltZW51IHdpCiAKIC0gKEJPT0wpaXNNZW51Rm9yVGV4dENv bnRlbnQKIHsKLSAgICByZXR1cm4gX3R5cGUgPT0ga1dLQWN0aW9uTWVudVJlYWRPbmx5VGV4dCB8 fCBfdHlwZSA9PSBrV0tBY3Rpb25NZW51RWRpdGFibGVUZXh0IHx8IF90eXBlID09IGtXS0FjdGlv bk1lbnVFZGl0YWJsZVRleHRXaXRoU3VnZ2VzdGlvbnMgfHwgX3R5cGUgPT0ga1dLQWN0aW9uTWVu dVdoaXRlc3BhY2VJbkVkaXRhYmxlQXJlYTsKKyAgICByZXR1cm4gX3R5cGUgPT0ga1dLQWN0aW9u TWVudVJlYWRPbmx5VGV4dCB8fCBfdHlwZSA9PSBrV0tBY3Rpb25NZW51RWRpdGFibGVUZXh0IHx8 IF90eXBlID09IGtXS0FjdGlvbk1lbnVFZGl0YWJsZVRleHRXaXRoU3VnZ2VzdGlvbnM7CiB9CiAK IC0gKHZvaWQpd2lsbE9wZW5NZW51OihOU01lbnUgKiltZW51IHdpdGhFdmVudDooTlNFdmVudCAq KWV2ZW50CkBAIC0yMDQsNiArMjA0LDExIEBAIC0gKHZvaWQpd2lsbE9wZW5NZW51OihOU01lbnUg KiltZW51IHdpdGgKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIGlmIChfdHlwZSA9PSBr V0tBY3Rpb25NZW51V2hpdGVzcGFjZUluRWRpdGFibGVBcmVhKSB7CisgICAgICAgIF9wYWdlLT5m b2N1c0FuZFNlbGVjdExhc3RBY3Rpb25NZW51SGl0VGVzdFJlc3VsdCgpOworICAgICAgICByZXR1 cm47CisgICAgfQorCiAgICAgaWYgKCFbc2VsZiBpc01lbnVGb3JUZXh0Q29udGVudF0pIHsKICAg ICAgICAgX3BhZ2UtPmNsZWFyU2VsZWN0aW9uKCk7CiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gMTc2 MTY0KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29y a2luZyBjb3B5KQpAQCAtNDksNiArNDksNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvRHJhZ0RhdGEu aD4KICNpbmNsdWRlIDxXZWJDb3JlL0VkaXRvci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVM b2FkZXJUeXBlcy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvSGl0VGVzdFJlc3VsdC5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSW50U2l6ZUhhc2guaD4K ICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KQEAgLTEwNTcsNiArMTA1OCw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBwZXJmb3JtQWN0aW9uTWVudUhpdFRlc3RBdExvY2F0aW9uKFdlYkNvcmU6OkZs b2F0UG9pbnQpOwogICAgIFBhc3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IGxvb2t1cFRleHRBdExv Y2F0aW9uKFdlYkNvcmU6OkZsb2F0UG9pbnQpOwogICAgIHZvaWQgc2VsZWN0TGFzdEFjdGlvbk1l bnVSYW5nZSgpOworICAgIHZvaWQgZm9jdXNBbmRTZWxlY3RMYXN0QWN0aW9uTWVudUhpdFRlc3RS ZXN1bHQoKTsKIAogICAgIHZvaWQgZGF0YURldGVjdG9yc0RpZFByZXNlbnRVSSgpOwogICAgIHZv aWQgZGF0YURldGVjdG9yc0RpZENoYW5nZVVJKCk7CkBAIC0xMjkyLDYgKzEyOTQsNyBAQCBwcml2 YXRlOgogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFJlZlB0cjxXZWJDb3JlOjpSYW5nZT4gbV9s YXN0QWN0aW9uTWVudVJhbmdlRm9yU2VsZWN0aW9uOworICAgIFdlYkNvcmU6OkhpdFRlc3RSZXN1 bHQgbV9sYXN0QWN0aW9uTWVudUhpdFRlc3RSZXN1bHQ7CiAgICAgUmVmUHRyPFdlYlBhZ2VPdmVy bGF5PiBtX2xhc3RBY3Rpb25NZW51SGl0UGFnZU92ZXJsYXk7CiAjZW5kaWYKIH07CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNz YWdlcy5pbgkocmV2aXNpb24gMTc2MTY0KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTQwMCw2ICs0MDAs NyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICNpZiBQTEFURk9STShN QUMpCiAgICAgUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0QXRMb2NhdGlvbihXZWJDb3JlOjpGbG9h dFBvaW50IGxvY2F0aW9uKQogICAgIFNlbGVjdExhc3RBY3Rpb25NZW51UmFuZ2UoKQorICAgIEZv Y3VzQW5kU2VsZWN0TGFzdEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0KCkKICAgICBEYXRhRGV0ZWN0 b3JzRGlkUHJlc2VudFVJKCkKICAgICBEYXRhRGV0ZWN0b3JzRGlkQ2hhbmdlVUkoKQogICAgIERh dGFEZXRlY3RvcnNEaWRIaWRlVUkoKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQkocmV2aXNpb24gMTc2MTY0KQorKysg U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDA4LDYgKzEwMDgsNyBAQCB2b2lkIFdlYlBhZ2U6OnBlcmZvcm1BY3Rp b25NZW51SGl0VGVzdEF0CiAgICAgUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiBsb29rdXBSYW5nZSA9 IGxvb2t1cFRleHRBdExvY2F0aW9uKGxvY2F0aW9uSW5WaWV3Q29vb3JkaW5hdGVzKTsKICAgICBh Y3Rpb25NZW51UmVzdWx0Lmxvb2t1cFRleHQgPSBsb29rdXBSYW5nZSA/IGxvb2t1cFJhbmdlLT50 ZXh0KCkgOiBTdHJpbmcoKTsKICAgICBtX2xhc3RBY3Rpb25NZW51UmFuZ2VGb3JTZWxlY3Rpb24g PSBsb29rdXBSYW5nZTsKKyAgICBtX2xhc3RBY3Rpb25NZW51SGl0VGVzdFJlc3VsdCA9IGhpdFRl c3RSZXN1bHQ7CiAKICAgICBpZiAoSW1hZ2UqIGltYWdlID0gaGl0VGVzdFJlc3VsdC5pbWFnZSgp KSB7CiAgICAgICAgIGFjdGlvbk1lbnVSZXN1bHQuaW1hZ2UgPSBTaGFyZWFibGVCaXRtYXA6OmNy ZWF0ZVNoYXJlYWJsZShJbnRTaXplKGltYWdlLT5zaXplKCkpLCBTaGFyZWFibGVCaXRtYXA6OlN1 cHBvcnRzQWxwaGEpOwpAQCAtMTA4MSw2ICsxMDgyLDI0IEBAIHZvaWQgV2ViUGFnZTo6c2VsZWN0 TGFzdEFjdGlvbk1lbnVSYW5nZSgKICAgICAgICAgY29yZVBhZ2UoKS0+bWFpbkZyYW1lKCkuc2Vs ZWN0aW9uKCkuc2V0U2VsZWN0ZWRSYW5nZShtX2xhc3RBY3Rpb25NZW51UmFuZ2VGb3JTZWxlY3Rp b24uZ2V0KCksIERPV05TVFJFQU0sIHRydWUpOwogfQogCit2b2lkIFdlYlBhZ2U6OmZvY3VzQW5k U2VsZWN0TGFzdEFjdGlvbk1lbnVIaXRUZXN0UmVzdWx0KCkKK3sKKyAgICBpZiAoIW1fbGFzdEFj dGlvbk1lbnVIaXRUZXN0UmVzdWx0LmlzQ29udGVudEVkaXRhYmxlKCkpCisgICAgICAgIHJldHVy bjsKKworICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBtX2xhc3RBY3Rpb25NZW51SGl0VGVzdFJlc3Vs dC5pbm5lckVsZW1lbnQoKTsKKyAgICBpZiAoIWVsZW1lbnQpCisgICAgICAgIHJldHVybjsKKwor ICAgIGF1dG8gcmVuZGVyZXIgPSBlbGVtZW50LT5yZW5kZXJlcigpOworICAgIGlmICghcmVuZGVy ZXIpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuc2V0 Rm9jdXNlZEVsZW1lbnQoZWxlbWVudCwgZWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgpKTsKKyAg ICBWaXNpYmxlUG9zaXRpb24gcG9zaXRpb24gPSByZW5kZXJlci0+cG9zaXRpb25Gb3JQb2ludCht X2xhc3RBY3Rpb25NZW51SGl0VGVzdFJlc3VsdC5sb2NhbFBvaW50KCksIG51bGxwdHIpOworICAg IGVsZW1lbnQtPmRvY3VtZW50KCkuZnJhbWUoKS0+c2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9uKHBv c2l0aW9uKTsKK30KKwogdm9pZCBXZWJQYWdlOjpkYXRhRGV0ZWN0b3JzRGlkUHJlc2VudFVJKCkK IHsKICAgICBpZiAobV9sYXN0QWN0aW9uTWVudUhpdFBhZ2VPdmVybGF5KQpJbmRleDogU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwkocmV2aXNpb24gMTc2MTY0KQorKysgU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTQtMTEtMTYgIEJldGggRGFraW4g IDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIFdoaXRlc3BhY2UgYWN0aW9uIG1lbnVzIHNo b3VsZCBmb2N1cyB0aGUgSGl0VGVzdFJlc3VsdCBhbmQgY3JlYXRlIGFuIGluc2VydGlvbiAKKyAg ICAgICAgcG9pbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzODc4NgorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIHJkYXI6Ly9w cm9ibGVtLzE4OTQ0ODkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hpdGVzcGFjZSBtZW51cyBzaG91bGQgY2F1c2UgdGhlIEhpdFRlc3RSZXN1bHQg dG8gYmUgZm9jdXNlZCwgYW5kIHRoZXkgc2hvdWxkIHNldCAKKyAgICAgICAgdGhlIHNlbGVjdGlv biBiYXNlZCBvbiB0aGUgSGl0VGVzdCBsb2NhdGlvbi4KKworICAgICAgICAqIFdlYlZpZXcvV2Vi QWN0aW9uTWVudUNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250cm9s bGVyIGlzTWVudUZvclRleHRDb250ZW50XSk6CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250 cm9sbGVyIGZvY3VzQW5kU2VsZWN0SGl0VGVzdFJlc3VsdF0pOgorICAgICAgICAoLVtXZWJBY3Rp b25NZW51Q29udHJvbGxlciB3aWxsT3Blbk1lbnU6d2l0aEV2ZW50Ol0pOgorCiAyMDE0LTExLTE2 ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBU ZXh0SW5kaWNhdG9yIGluc3RlYWQgb2YgdGhlIGJ1aWx0IGluIExvb2t1cCBoaWdobGlnaHQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25NZW51Q29u dHJvbGxlci5tbQkocmV2aXNpb24gMTc2MTY0KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJBY3Rpb25NZW51Q29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQs NyBAQAogI2ltcG9ydCA8V2ViQ29yZS9FZGl0b3IuaD4KICNpbXBvcnQgPFdlYkNvcmUvRWxlbWVu dC5oPgogI2ltcG9ydCA8V2ViQ29yZS9FdmVudEhhbmRsZXIuaD4KKyNpbXBvcnQgPFdlYkNvcmUv Rm9jdXNDb250cm9sbGVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+CiAjaW1wb3J0IDxX ZWJDb3JlL0ZyYW1lVmlldy5oPgogI2ltcG9ydCA8V2ViQ29yZS9IVE1MQ29udmVydGVyLmg+CkBA IC0xNTAsNyArMTUxLDI5IEBAIC0gKHZvaWQpcHJlcGFyZUZvck1lbnU6KE5TTWVudSAqKW1lbnUg d2kKIAogLSAoQk9PTClpc01lbnVGb3JUZXh0Q29udGVudAogewotICAgIHJldHVybiBfdHlwZSA9 PSBXZWJBY3Rpb25NZW51UmVhZE9ubHlUZXh0IHx8IF90eXBlID09IFdlYkFjdGlvbk1lbnVFZGl0 YWJsZVRleHQgfHwgX3R5cGUgPT0gV2ViQWN0aW9uTWVudUVkaXRhYmxlVGV4dFdpdGhTdWdnZXN0 aW9ucyB8fCBfdHlwZSA9PSBXZWJBY3Rpb25NZW51V2hpdGVzcGFjZUluRWRpdGFibGVBcmVhOwor ICAgIHJldHVybiBfdHlwZSA9PSBXZWJBY3Rpb25NZW51UmVhZE9ubHlUZXh0IHx8IF90eXBlID09 IFdlYkFjdGlvbk1lbnVFZGl0YWJsZVRleHQgfHwgX3R5cGUgPT0gV2ViQWN0aW9uTWVudUVkaXRh YmxlVGV4dFdpdGhTdWdnZXN0aW9uczsKK30KKworLSAodm9pZClmb2N1c0FuZFNlbGVjdEhpdFRl c3RSZXN1bHQKK3sKKyAgICBpZiAoIV9oaXRUZXN0UmVzdWx0LmlzQ29udGVudEVkaXRhYmxlKCkp CisgICAgICAgIHJldHVybjsKKworICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBfaGl0VGVzdFJlc3Vs dC5pbm5lckVsZW1lbnQoKTsKKyAgICBpZiAoIWVsZW1lbnQpCisgICAgICAgIHJldHVybjsKKwor ICAgIGF1dG8gcmVuZGVyZXIgPSBlbGVtZW50LT5yZW5kZXJlcigpOworICAgIGlmICghcmVuZGVy ZXIpCisgICAgICAgIHJldHVybjsKKworICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoW193ZWJWaWV3 IF9zZWxlY3RlZE9yTWFpbkZyYW1lXSk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJu OworCisgICAgZnJhbWUtPnBhZ2UoKS0+Zm9jdXNDb250cm9sbGVyKCkuc2V0Rm9jdXNlZEVsZW1l bnQoZWxlbWVudCwgZWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgpKTsKKyAgICBWaXNpYmxlUG9z aXRpb24gcG9zaXRpb24gPSByZW5kZXJlci0+cG9zaXRpb25Gb3JQb2ludChfaGl0VGVzdFJlc3Vs dC5sb2NhbFBvaW50KCksIG51bGxwdHIpOworICAgIGVsZW1lbnQtPmRvY3VtZW50KCkuZnJhbWUo KS0+c2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9uKHBvc2l0aW9uKTsKIH0KIAogLSAodm9pZCl3aWxs T3Blbk1lbnU6KE5TTWVudSAqKW1lbnUgd2l0aEV2ZW50OihOU0V2ZW50ICopZXZlbnQKQEAgLTE3 MSw2ICsxOTQsMTEgQEAgLSAodm9pZCl3aWxsT3Blbk1lbnU6KE5TTWVudSAqKW1lbnUgd2l0aAog ICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKF90eXBlID09IFdlYkFjdGlvbk1lbnVX aGl0ZXNwYWNlSW5FZGl0YWJsZUFyZWEpIHsKKyAgICAgICAgW3NlbGYgZm9jdXNBbmRTZWxlY3RI aXRUZXN0UmVzdWx0XTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmICghW3NlbGYg aXNNZW51Rm9yVGV4dENvbnRlbnRdKSB7CiAgICAgICAgIFtbX3dlYlZpZXcgX3NlbGVjdGVkT3JN YWluRnJhbWVdIF9jbGVhclNlbGVjdGlvbl07CiAgICAgICAgIHJldHVybjsK