185536 2018-05-10 16:50:24 -0700 Cleanup canPerformActionForWebView in relation to the webSelectionAssistant being removed 2018-05-11 16:05:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner bdakin thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1422947 0 megan_gardner 2018-05-10 16:50:24 -0700 Cleanup canPerformActionForWebView in relation to the webSelectionAssistant being removed 1422948 1 340147 megan_gardner 2018-05-10 16:52:21 -0700 Created attachment 340147 Patch 1422949 2 webkit-bug-importer 2018-05-10 16:55:42 -0700 <rdar://problem/40147338> 1422953 3 340147 thorton 2018-05-10 17:02:32 -0700 Comment on attachment 340147 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340147&action=review > Source/WebKit/ChangeLog:8 > + The _webSelectionAssistant is now always nil, therefor many of these checks are unnecessary. therefore > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:-2322 > - // Don't attempt selectAll with general web content. I’m confused... did this behavior (where we enable selectAll) change with your earlier change to always use the modern selection path? > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:-2325 > - // FIXME: Only enable if the selection doesn't already span the entire document. Why’d this FIXME go away? 1422968 4 340147 wenson_hsieh 2018-05-10 17:32:15 -0700 Comment on attachment 340147 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340147&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2271 > + if (_page->editorState().isInPasswordField || _page->editorState().selectionIsRange) I think you're missing a ! here. 1423247 5 340147 megan_gardner 2018-05-11 13:51:39 -0700 Comment on attachment 340147 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340147&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2271 >> + if (_page->editorState().isInPasswordField || _page->editorState().selectionIsRange) > > I think you're missing a ! here. you're right, thanks! >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:-2322 >> - // Don't attempt selectAll with general web content. > > I’m confused... did this behavior (where we enable selectAll) change with your earlier change to always use the modern selection path? It didn't really change, as this logic was overly complicated and _page->editorState().selectionIsRange is basically equivalent to hasWebSelection, especially in the new paradigm. This is just overly complicated so I wanted to clean this up separately to removing _webSelectionAssistant. This new logic basically says if you have a selection, and it's not ranged, which basically means if you have a caret, then allow SelectAll. You cannot have a selection that is not ranged in nonEditable text, so we only allow selectAll in editable content where there is no selection. >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:-2325 >> - // FIXME: Only enable if the selection doesn't already span the entire document. > > Why’d this FIXME go away? Select All actually only appears when you have a caret selection, so you can only go from zero to everything, we don't even consider expanding via select all with a smaller selection. This mirrors Note's behavior. 1423249 6 340220 megan_gardner 2018-05-11 13:53:22 -0700 Created attachment 340220 Patch 1423299 7 megan_gardner 2018-05-11 16:05:19 -0700 https://trac.webkit.org/changeset/231726/webkit 340147 2018-05-10 16:52:21 -0700 2018-05-11 13:53:21 -0700 Patch bug-185536-20180510165220.patch text/plain 4065 megan_gardner SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzE2NzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA1LTEwICBNZWdhbiBHYXJk bmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBjYW5QZXJm b3JtQWN0aW9uRm9yV2ViVmlldyBpbiByZWxhdGlvbiB0byB0aGUgd2ViU2VsZWN0aW9uQXNzaXN0 YW50IGJlaW5nIHJlbW92ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NTUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor ICAgICAgICAKKyAgICAgICAgVGhlIF93ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgaXMgbm93IGFsd2F5 cyBuaWwsIHRoZXJlZm9yIG1hbnkgb2YgdGhlc2UgY2hlY2tzIGFyZSB1bm5lY2Vzc2FyeS4KKyAg ICAgICAgUmVtb3ZlIHRoZSBjaGVjayBmb3IgYSB3ZWJTZWxlY3Rpb24gYW5kIGNsZWFuIHVwIHRo ZSBsb2dpYyBzdXJyb3VuZGluZyB0aG9zZSBjaGVja3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBjYW5QZXJmb3JtQWN0aW9uRm9yV2ViVmlldzp3aXRoU2VuZGVyOl0pOgorCiAyMDE4LTA1LTEw ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gUmVsZWFz ZSBwYWdlIGxvYWQgcHJvY2VzcyBhc3NlcnRpb24gaWYgdGhlIHNjcmVlbiBpcyBsb2NrZWQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQkocmV2aXNpb24gMjMxNjY0KQorKysgU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAt MjIwOSw4ICsyMjA5LDYgQEAgLSAoQk9PTCljYW5QZXJmb3JtQWN0aW9uOihTRUwpYWN0aW9uIHdp dAogCiAtIChCT09MKWNhblBlcmZvcm1BY3Rpb25Gb3JXZWJWaWV3OihTRUwpYWN0aW9uIHdpdGhT ZW5kZXI6KGlkKXNlbmRlcgogewotICAgIEJPT0wgaGFzV2ViU2VsZWN0aW9uID0gX3dlYlNlbGVj dGlvbkFzc2lzdGFudCAmJiAhQ0dSZWN0SXNFbXB0eShfd2ViU2VsZWN0aW9uQXNzaXN0YW50Lmdl dCgpLnNlbGVjdGlvbkZyYW1lKTsKLQogICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKF9hcnJv d0tleTopKQogICAgICAgICByZXR1cm4gW3NlbGYgaXNGaXJzdFJlc3BvbmRlcl07CiAgICAgICAg IApAQCAtMjIzNSwxMSArMjIzMywxMSBAQCAtIChCT09MKWNhblBlcmZvcm1BY3Rpb25Gb3JXZWJW aWV3OihTRUwpCiAgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IoY29weTopKSB7CiAgICAgICAg IGlmIChfcGFnZS0+ZWRpdG9yU3RhdGUoKS5pc0luUGFzc3dvcmRGaWVsZCkKICAgICAgICAgICAg IHJldHVybiBOTzsKLSAgICAgICAgcmV0dXJuIGhhc1dlYlNlbGVjdGlvbiB8fCBfcGFnZS0+ZWRp dG9yU3RhdGUoKS5zZWxlY3Rpb25Jc1JhbmdlOworICAgICAgICByZXR1cm4gX3BhZ2UtPmVkaXRv clN0YXRlKCkuc2VsZWN0aW9uSXNSYW5nZTsKICAgICB9CiAKICAgICBpZiAoYWN0aW9uID09IEBz ZWxlY3RvcihfZGVmaW5lOikpIHsKLSAgICAgICAgaWYgKF9wYWdlLT5lZGl0b3JTdGF0ZSgpLmlz SW5QYXNzd29yZEZpZWxkIHx8ICEoaGFzV2ViU2VsZWN0aW9uIHx8IF9wYWdlLT5lZGl0b3JTdGF0 ZSgpLnNlbGVjdGlvbklzUmFuZ2UpKQorICAgICAgICBpZiAoX3BhZ2UtPmVkaXRvclN0YXRlKCku aXNJblBhc3N3b3JkRmllbGQgfHwgIV9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzUmFu Z2UpCiAgICAgICAgICAgICByZXR1cm4gTk87CiAKICAgICAgICAgTlNVSW50ZWdlciB0ZXh0TGVu Z3RoID0gX3BhZ2UtPmVkaXRvclN0YXRlKCkucG9zdExheW91dERhdGEoKS5zZWxlY3RlZFRleHRM ZW5ndGg7CkBAIC0yMjY2LDE4ICsyMjY0LDE4IEBAICAgICAgICAgLy8gYWNjZXB0YWJsZSwgYnV0 IHRoZSBpbnRlcmZhY2UKICAgICAgICAgICAgIHJldHVybiBOTzsKICNlbmRpZgogCi0gICAgICAg IHJldHVybiBoYXNXZWJTZWxlY3Rpb24gfHwgX3BhZ2UtPmVkaXRvclN0YXRlKCkuc2VsZWN0aW9u SXNSYW5nZTsKKyAgICAgICAgcmV0dXJuIF9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklz UmFuZ2U7CiAgICAgfQogCiAgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IoX3NoYXJlOikpIHsK LSAgICAgICAgaWYgKF9wYWdlLT5lZGl0b3JTdGF0ZSgpLmlzSW5QYXNzd29yZEZpZWxkIHx8ICEo aGFzV2ViU2VsZWN0aW9uIHx8IF9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzUmFuZ2Up KQorICAgICAgICBpZiAoX3BhZ2UtPmVkaXRvclN0YXRlKCkuaXNJblBhc3N3b3JkRmllbGQgfHwg X3BhZ2UtPmVkaXRvclN0YXRlKCkuc2VsZWN0aW9uSXNSYW5nZSkKICAgICAgICAgICAgIHJldHVy biBOTzsKIAogICAgICAgICByZXR1cm4gX3BhZ2UtPmVkaXRvclN0YXRlKCkucG9zdExheW91dERh dGEoKS5zZWxlY3RlZFRleHRMZW5ndGggPiAwOwogICAgIH0KIAogICAgIGlmIChhY3Rpb24gPT0g QHNlbGVjdG9yKF9hZGRTaG9ydGN1dDopKSB7Ci0gICAgICAgIGlmIChfcGFnZS0+ZWRpdG9yU3Rh dGUoKS5pc0luUGFzc3dvcmRGaWVsZCB8fCAhKGhhc1dlYlNlbGVjdGlvbiB8fCBfcGFnZS0+ZWRp dG9yU3RhdGUoKS5zZWxlY3Rpb25Jc1JhbmdlKSkKKyAgICAgICAgaWYgKF9wYWdlLT5lZGl0b3JT dGF0ZSgpLmlzSW5QYXNzd29yZEZpZWxkIHx8ICFfcGFnZS0+ZWRpdG9yU3RhdGUoKS5zZWxlY3Rp b25Jc1JhbmdlKQogICAgICAgICAgICAgcmV0dXJuIE5POwogCiAgICAgICAgIE5TU3RyaW5nICpz ZWxlY3RlZFRleHQgPSBbc2VsZiBzZWxlY3RlZFRleHRdOwpAQCAtMjMxMSwxOSArMjMwOSw5IEBA ICAgICAgICAgLy8gYWNjZXB0YWJsZSwgYnV0IHRoZSBpbnRlcmZhY2UKICAgICB9CiAKICAgICBp ZiAoYWN0aW9uID09IEBzZWxlY3RvcihzZWxlY3RBbGw6KSkgewotICAgICAgICBpZiAoX3BhZ2Ut PmVkaXRvclN0YXRlKCkuc2VsZWN0aW9uSXNOb25lIHx8ICFbc2VsZiBoYXNDb250ZW50XSkKLSAg ICAgICAgICAgIHJldHVybiBOTzsKLSAgICAgICAgaWYgKCFfcGFnZS0+ZWRpdG9yU3RhdGUoKS5z ZWxlY3Rpb25Jc1JhbmdlKQorICAgICAgICBpZiAoIV9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVj dGlvbklzTm9uZSAmJiAhX3BhZ2UtPmVkaXRvclN0YXRlKCkuc2VsZWN0aW9uSXNSYW5nZSkKICAg ICAgICAgICAgIHJldHVybiBZRVM7Ci0gICAgICAgIC8vIEVuYWJsZSBzZWxlY3RBbGwgZm9yIG5v bi1lZGl0YWJsZSB0ZXh0LCB3aGVyZSB0aGUgdXNlciBjYW4ndCBhY2Nlc3MKLSAgICAgICAgLy8g dGhpcyBjb21tYW5kIHZpYSBsb25nLXByZXNzIHRvIGdldCBhIGNhcmV0LgotICAgICAgICBpZiAo X3BhZ2UtPmVkaXRvclN0YXRlKCkuaXNDb250ZW50RWRpdGFibGUpCi0gICAgICAgICAgICByZXR1 cm4gTk87Ci0gICAgICAgIC8vIERvbid0IGF0dGVtcHQgc2VsZWN0QWxsIHdpdGggZ2VuZXJhbCB3 ZWIgY29udGVudC4KLSAgICAgICAgaWYgKGhhc1dlYlNlbGVjdGlvbikKLSAgICAgICAgICAgIHJl dHVybiBOTzsKLSAgICAgICAgLy8gRklYTUU6IE9ubHkgZW5hYmxlIGlmIHRoZSBzZWxlY3Rpb24g ZG9lc24ndCBhbHJlYWR5IHNwYW4gdGhlIGVudGlyZSBkb2N1bWVudC4KLSAgICAgICAgcmV0dXJu IFlFUzsKKyAgICAgICAgcmV0dXJuIE5POwogICAgIH0KIAogICAgIGlmIChhY3Rpb24gPT0gQHNl bGVjdG9yKHJlcGxhY2U6KSkK 340220 2018-05-11 13:53:22 -0700 2018-05-11 15:06:17 -0700 Patch bug-185536-20180511135321.patch text/plain 4066 megan_gardner SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzE2NzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA1LTEwICBNZWdhbiBHYXJk bmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBjYW5QZXJm b3JtQWN0aW9uRm9yV2ViVmlldyBpbiByZWxhdGlvbiB0byB0aGUgd2ViU2VsZWN0aW9uQXNzaXN0 YW50IGJlaW5nIHJlbW92ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NTUzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor ICAgICAgICAKKyAgICAgICAgVGhlIF93ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgaXMgbm93IGFsd2F5 cyBuaWwsIHRoZXJlZm9yIG1hbnkgb2YgdGhlc2UgY2hlY2tzIGFyZSB1bm5lY2Vzc2FyeS4KKyAg ICAgICAgUmVtb3ZlIHRoZSBjaGVjayBmb3IgYSB3ZWJTZWxlY3Rpb24gYW5kIGNsZWFuIHVwIHRo ZSBsb2dpYyBzdXJyb3VuZGluZyB0aG9zZSBjaGVja3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBjYW5QZXJmb3JtQWN0aW9uRm9yV2ViVmlldzp3aXRoU2VuZGVyOl0pOgorCiAyMDE4LTA1LTEw ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gUmVsZWFz ZSBwYWdlIGxvYWQgcHJvY2VzcyBhc3NlcnRpb24gaWYgdGhlIHNjcmVlbiBpcyBsb2NrZWQKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbQkocmV2aXNpb24gMjMxNjY0KQorKysgU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAt MjIwOSw4ICsyMjA5LDYgQEAgLSAoQk9PTCljYW5QZXJmb3JtQWN0aW9uOihTRUwpYWN0aW9uIHdp dAogCiAtIChCT09MKWNhblBlcmZvcm1BY3Rpb25Gb3JXZWJWaWV3OihTRUwpYWN0aW9uIHdpdGhT ZW5kZXI6KGlkKXNlbmRlcgogewotICAgIEJPT0wgaGFzV2ViU2VsZWN0aW9uID0gX3dlYlNlbGVj dGlvbkFzc2lzdGFudCAmJiAhQ0dSZWN0SXNFbXB0eShfd2ViU2VsZWN0aW9uQXNzaXN0YW50Lmdl dCgpLnNlbGVjdGlvbkZyYW1lKTsKLQogICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKF9hcnJv d0tleTopKQogICAgICAgICByZXR1cm4gW3NlbGYgaXNGaXJzdFJlc3BvbmRlcl07CiAgICAgICAg IApAQCAtMjIzNSwxMSArMjIzMywxMSBAQCAtIChCT09MKWNhblBlcmZvcm1BY3Rpb25Gb3JXZWJW aWV3OihTRUwpCiAgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IoY29weTopKSB7CiAgICAgICAg IGlmIChfcGFnZS0+ZWRpdG9yU3RhdGUoKS5pc0luUGFzc3dvcmRGaWVsZCkKICAgICAgICAgICAg IHJldHVybiBOTzsKLSAgICAgICAgcmV0dXJuIGhhc1dlYlNlbGVjdGlvbiB8fCBfcGFnZS0+ZWRp dG9yU3RhdGUoKS5zZWxlY3Rpb25Jc1JhbmdlOworICAgICAgICByZXR1cm4gX3BhZ2UtPmVkaXRv clN0YXRlKCkuc2VsZWN0aW9uSXNSYW5nZTsKICAgICB9CiAKICAgICBpZiAoYWN0aW9uID09IEBz ZWxlY3RvcihfZGVmaW5lOikpIHsKLSAgICAgICAgaWYgKF9wYWdlLT5lZGl0b3JTdGF0ZSgpLmlz SW5QYXNzd29yZEZpZWxkIHx8ICEoaGFzV2ViU2VsZWN0aW9uIHx8IF9wYWdlLT5lZGl0b3JTdGF0 ZSgpLnNlbGVjdGlvbklzUmFuZ2UpKQorICAgICAgICBpZiAoX3BhZ2UtPmVkaXRvclN0YXRlKCku aXNJblBhc3N3b3JkRmllbGQgfHwgIV9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzUmFu Z2UpCiAgICAgICAgICAgICByZXR1cm4gTk87CiAKICAgICAgICAgTlNVSW50ZWdlciB0ZXh0TGVu Z3RoID0gX3BhZ2UtPmVkaXRvclN0YXRlKCkucG9zdExheW91dERhdGEoKS5zZWxlY3RlZFRleHRM ZW5ndGg7CkBAIC0yMjY2LDE4ICsyMjY0LDE4IEBAICAgICAgICAgLy8gYWNjZXB0YWJsZSwgYnV0 IHRoZSBpbnRlcmZhY2UKICAgICAgICAgICAgIHJldHVybiBOTzsKICNlbmRpZgogCi0gICAgICAg IHJldHVybiBoYXNXZWJTZWxlY3Rpb24gfHwgX3BhZ2UtPmVkaXRvclN0YXRlKCkuc2VsZWN0aW9u SXNSYW5nZTsKKyAgICAgICAgcmV0dXJuIF9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklz UmFuZ2U7CiAgICAgfQogCiAgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IoX3NoYXJlOikpIHsK LSAgICAgICAgaWYgKF9wYWdlLT5lZGl0b3JTdGF0ZSgpLmlzSW5QYXNzd29yZEZpZWxkIHx8ICEo aGFzV2ViU2VsZWN0aW9uIHx8IF9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzUmFuZ2Up KQorICAgICAgICBpZiAoX3BhZ2UtPmVkaXRvclN0YXRlKCkuaXNJblBhc3N3b3JkRmllbGQgfHwg IV9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzUmFuZ2UpCiAgICAgICAgICAgICByZXR1 cm4gTk87CiAKICAgICAgICAgcmV0dXJuIF9wYWdlLT5lZGl0b3JTdGF0ZSgpLnBvc3RMYXlvdXRE YXRhKCkuc2VsZWN0ZWRUZXh0TGVuZ3RoID4gMDsKICAgICB9CiAKICAgICBpZiAoYWN0aW9uID09 IEBzZWxlY3RvcihfYWRkU2hvcnRjdXQ6KSkgewotICAgICAgICBpZiAoX3BhZ2UtPmVkaXRvclN0 YXRlKCkuaXNJblBhc3N3b3JkRmllbGQgfHwgIShoYXNXZWJTZWxlY3Rpb24gfHwgX3BhZ2UtPmVk aXRvclN0YXRlKCkuc2VsZWN0aW9uSXNSYW5nZSkpCisgICAgICAgIGlmIChfcGFnZS0+ZWRpdG9y U3RhdGUoKS5pc0luUGFzc3dvcmRGaWVsZCB8fCAhX3BhZ2UtPmVkaXRvclN0YXRlKCkuc2VsZWN0 aW9uSXNSYW5nZSkKICAgICAgICAgICAgIHJldHVybiBOTzsKIAogICAgICAgICBOU1N0cmluZyAq c2VsZWN0ZWRUZXh0ID0gW3NlbGYgc2VsZWN0ZWRUZXh0XTsKQEAgLTIzMTEsMTkgKzIzMDksOSBA QCAgICAgICAgIC8vIGFjY2VwdGFibGUsIGJ1dCB0aGUgaW50ZXJmYWNlCiAgICAgfQogCiAgICAg aWYgKGFjdGlvbiA9PSBAc2VsZWN0b3Ioc2VsZWN0QWxsOikpIHsKLSAgICAgICAgaWYgKF9wYWdl LT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzTm9uZSB8fCAhW3NlbGYgaGFzQ29udGVudF0pCi0g ICAgICAgICAgICByZXR1cm4gTk87Ci0gICAgICAgIGlmICghX3BhZ2UtPmVkaXRvclN0YXRlKCku c2VsZWN0aW9uSXNSYW5nZSkKKyAgICAgICAgaWYgKCFfcGFnZS0+ZWRpdG9yU3RhdGUoKS5zZWxl Y3Rpb25Jc05vbmUgJiYgIV9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzUmFuZ2UpCiAg ICAgICAgICAgICByZXR1cm4gWUVTOwotICAgICAgICAvLyBFbmFibGUgc2VsZWN0QWxsIGZvciBu b24tZWRpdGFibGUgdGV4dCwgd2hlcmUgdGhlIHVzZXIgY2FuJ3QgYWNjZXNzCi0gICAgICAgIC8v IHRoaXMgY29tbWFuZCB2aWEgbG9uZy1wcmVzcyB0byBnZXQgYSBjYXJldC4KLSAgICAgICAgaWYg KF9wYWdlLT5lZGl0b3JTdGF0ZSgpLmlzQ29udGVudEVkaXRhYmxlKQotICAgICAgICAgICAgcmV0 dXJuIE5POwotICAgICAgICAvLyBEb24ndCBhdHRlbXB0IHNlbGVjdEFsbCB3aXRoIGdlbmVyYWwg d2ViIGNvbnRlbnQuCi0gICAgICAgIGlmIChoYXNXZWJTZWxlY3Rpb24pCi0gICAgICAgICAgICBy ZXR1cm4gTk87Ci0gICAgICAgIC8vIEZJWE1FOiBPbmx5IGVuYWJsZSBpZiB0aGUgc2VsZWN0aW9u IGRvZXNuJ3QgYWxyZWFkeSBzcGFuIHRoZSBlbnRpcmUgZG9jdW1lbnQuCi0gICAgICAgIHJldHVy biBZRVM7CisgICAgICAgIHJldHVybiBOTzsKICAgICB9CiAKICAgICBpZiAoYWN0aW9uID09IEBz ZWxlY3RvcihyZXBsYWNlOikpCg==