184806 2018-04-19 20:31:49 -0700 Fixes for timing out tests associated with switching Text Selection Assistants 2018-04-20 13:41:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner bdakin ryanhaddad thorton wenson_hsieh oldest_to_newest 1416165 0 megan_gardner 2018-04-19 20:31:49 -0700 Fixes for failing tests associated with switching Text Selection Assistants 1416168 1 338392 megan_gardner 2018-04-19 20:37:28 -0700 Created attachment 338392 Patch 1416169 2 megan_gardner 2018-04-19 20:38:05 -0700 <rdar://problem/39367905> 1416314 3 338392 bdakin 2018-04-20 10:46:09 -0700 Comment on attachment 338392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338392&action=review I don't think this should block committing this change since this change will fix some tests, but is there any way to write a test to explicitly test that we are allowing double tap at the right times? We should add a mechanism for that kind of test if we don't have one already. > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1661 > + if (gesture == UIWKGestureDoubleTap && !(self.isAssistingNode)) Do you need !(self.isAssistingNode) here? There is the early return just about when self.isAssistingNode is true, so I wouldn't think you need it. 1416317 4 338392 wenson_hsieh 2018-04-20 10:52:46 -0700 Comment on attachment 338392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338392&action=review > Source/WebKit/ChangeLog:8 > + The major fix is the disabling the double tap gesture. The other fixes are small I think "…disabling the double tap non-editable text selection gesture." would be more accurate. We still want the double tap gesture in general! > Source/WebKit/ChangeLog:15 > + We should not be allowing a double tap text gestures in non-editable web content. s/allowing a/allowing/ > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1660 > + // Don't allow double tap text gestures in Noneditable content Nit - comments should end with a period (https://webkit.org/code-style-guidelines/#comments-sentences). Also, probably s/Noneditable/noneditable/ > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1661 > + if (gesture == UIWKGestureDoubleTap && !(self.isAssistingNode)) Nit - s/(self.isAssistingNode)/self.isAssistingNode > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:2253 > + return hasWebSelection || _page->editorState().selectionIsRange; Note that this would also disable lookup when you have a caret selection when editing text, which isn't what we do now. That being said, pressing "Look up" when you have a caret selection when editing text does nothing in shipping iOS 11.3, so it seems not allowing the lookup action in this case is somewhat of a progression. Not necessarily for this patch, but it would be interesting to know if "Look up" with a caret in editable content ever worked (it would've expected it to look up the word near the current selection). > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3152 > + // UIKit does not expect caret selections in noneditable content Period at the end! (https://webkit.org/code-style-guidelines/#comments-sentences) 1416324 5 338392 wenson_hsieh 2018-04-20 10:56:20 -0700 Comment on attachment 338392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338392&action=review >>> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1661 >>> + if (gesture == UIWKGestureDoubleTap && !(self.isAssistingNode)) >> >> Do you need !(self.isAssistingNode) here? There is the early return just about when self.isAssistingNode is true, so I wouldn't think you need it. > > Nit - s/(self.isAssistingNode)/self.isAssistingNode ^ Actually, what Beth said :) I think this can be simplified to something like: if (gesture == UIWKGestureDoubleTap) return self.isAssistingNode && _positionInformation.nodeAtPositionIsAssistedNode; 1416340 6 bdakin 2018-04-20 11:39:46 -0700 Oh you should make your patch update the test expectations for the tests that are fixed now too!!! 1416352 7 megan_gardner 2018-04-20 12:02:57 -0700 Added a test and addressed comments. The tests were marked as skip in internal, so that will have to be a different patch. 1416353 8 338447 megan_gardner 2018-04-20 12:03:20 -0700 Created attachment 338447 Patch 1416357 9 megan_gardner 2018-04-20 12:04:08 -0700 Oh, and I checked, lookup did/does nothing on older builds, so we should not be showing it on caret selections. 1416359 10 wenson_hsieh 2018-04-20 12:05:12 -0700 (In reply to Megan Gardner from comment #9) > Oh, and I checked, lookup did/does nothing on older builds, so we should not > be showing it on caret selections. 👍 Sounds good! 1416360 11 338447 bdakin 2018-04-20 12:06:44 -0700 Comment on attachment 338447 Patch A test!! That is awesome! 1416397 12 megan_gardner 2018-04-20 13:41:48 -0700 https://trac.webkit.org/r230850 338392 2018-04-19 20:37:28 -0700 2018-04-20 12:03:19 -0700 Patch bug-184806-20180419203727.patch text/plain 3414 megan_gardner SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzA4MzMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA0LTE5ICBNZWdhbiBHYXJk bmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRml4ZXMgZm9yIGZhaWxp bmcgdGVzdHMgYXNzb2NpYXRlZCB3aXRoIHN3aXRjaGluZyBUZXh0IFNlbGVjdGlvbiBBc3Npc3Rh bnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ4 MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAg ICAgIFRoZSBtYWpvciBmaXggaXMgdGhlIGRpc2FibGluZyB0aGUgZG91YmxlIHRhcCBnZXN0dXJl LiBUaGUgb3RoZXIgZml4ZXMgYXJlIHNtYWxsCisgICAgICAgIHR3ZWFrcyB0aGF0IHNob3VsZG4n dCBldmVuIGJlIHJ1biBpbnRvIHdpdGggdGhlIGZpeCB0byB0aGUgZG91YmxlIHRhcCBnZXN0dXJl LAorICAgICAgICBidXQgdGhleSBhcmUgaW5jb3JyZWN0LCBzbyBJIGFtIHRha2luZyB0aGUgb3Bw b3J0dW5pdHkgdG8gZml4IHRoZW0gbm93LCBpbiBjYXNlCisgICAgICAgIHdlIHJ1biBpbnRvIHRo ZW0gYWdhaW4uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyB0ZXh0SW50ZXJhY3Rpb25HZXN0dXJl OnNob3VsZEJlZ2luQXRQb2ludDpdKToKKyAgICAgICAgV2Ugc2hvdWxkIG5vdCBiZSBhbGxvd2lu ZyBhIGRvdWJsZSB0YXAgdGV4dCBnZXN0dXJlcyBpbiBub24tZWRpdGFibGUgd2ViIGNvbnRlbnQu CisgICAgICAgIFdlIGRpZG4ndCBoYXZlIG9uZSB3aXRoIHRoZSBvbGQgYXNzaXN0YW50LiBGb3J0 dW5hdGVseSwgdGhpcyBpcyBlYXNpbHkgZGlzYWJsZWQuCisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgY2FuUGVyZm9ybUFjdGlvbkZvcldlYlZpZXc6d2l0aFNlbmRlcjpdKToKKyAgICAgICAgV2Ug c2hvdWxkIG5vdCBhbGxvdyB0aGUgbG9va3VwIGFjdGlvbiBpZiB3ZSBkbyBub3QgYWN0dWFsbHkg aGF2ZSBhIHNlbGVjdGlvbi4KKyAgICAgICAgSXQgaXMgbWVhbmluZ2xlc3Mgd2l0aG91dCBvbmUu CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgc2VsZWN0ZWRUZXh0UmFuZ2VdKToKKyAgICAgICAg V2Ugc2hvdWxkIG5vdCByZXR1cm4gYSBzZWxlY3Rpb24gdG8gVUlLaXQgaWYgYWxsIHdlIGhhdmUg aXMgY2FyZXQgc2VsZWN0aW9uCisgICAgICAgIGluIG5vbi1lZGl0YWJsZSBjb250ZW50LiBXZSBo YXZlIHRoaXMgZm9yIHNlbGVjdGlvbnMgb24gTWFjLCBidXQgVUlLaXQgZG9lcworICAgICAgICBu b3Qga25vdyBob3cgdG8gcHJvcGVybHkgaGFuZGxlIHRoaXMsIGFuZCB3aWxsIGhhdmUgaW5jb3Jy ZWN0IGJlaGF2aW9yIGlmIHdlIAorICAgICAgICByZXR1cm4gYSB2YWxpZCBzZWxlY3Rpb24uCisK IDIwMTgtMDQtMTkgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEF1dG9tYXRpb246IGFkZCBzdXBwb3J0IGZvciBtb3VzZS9rZXlib2FyZCBpbnRlcmFjdGlvbiBz ZXF1ZW5jZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkocmV2aXNpb24gMjMwNzczKQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMTY1Niw2ICsxNjU2LDEwIEBAIC0gKEJPT0wpdGV4dEludGVyYWN0aW9uR2Vz dHVyZTooVUlXS0dlc3QKICAgICAvLyBJZiB3ZSdyZSBjdXJyZW50bHkgZWRpdGluZyBhbiBhc3Np c3RlZCBub2RlLCBvbmx5IGFsbG93IHRoZSBzZWxlY3Rpb24gdG8gbW92ZSB3aXRoaW4gdGhhdCBh c3Npc3RlZCBub2RlLgogICAgIGlmIChzZWxmLmlzQXNzaXN0aW5nTm9kZSkKICAgICAgICAgcmV0 dXJuIF9wb3NpdGlvbkluZm9ybWF0aW9uLm5vZGVBdFBvc2l0aW9uSXNBc3Npc3RlZE5vZGU7Cisg ICAgCisgICAgLy8gRG9uJ3QgYWxsb3cgZG91YmxlIHRhcCB0ZXh0IGdlc3R1cmVzIGluIE5vbmVk aXRhYmxlIGNvbnRlbnQKKyAgICBpZiAoZ2VzdHVyZSA9PSBVSVdLR2VzdHVyZURvdWJsZVRhcCAm JiAhKHNlbGYuaXNBc3Npc3RpbmdOb2RlKSkKKyAgICAgICAgcmV0dXJuIE5POwogCiAgICAgLy8g SWYgd2UncmUgc2VsZWN0aW5nIHNvbWV0aGluZywgZG9uJ3QgYWN0aXZhdGUgaGlnaGxpZ2h0Lgog ICAgIGlmIChnZXN0dXJlID09IFVJV0tHZXN0dXJlTG91cGUgJiYgW3NlbGYgaGFzU2VsZWN0YWJs ZVBvc2l0aW9uQXRQb2ludDpwb2ludF0pCkBAIC0yMjQ2LDcgKzIyNTAsNyBAQCAgICAgICAgIC8v IGFjY2VwdGFibGUsIGJ1dCB0aGUgaW50ZXJmYWNlCiAgICAgICAgICAgICByZXR1cm4gTk87CiAj ZW5kaWYKIAotICAgICAgICByZXR1cm4gWUVTOworICAgICAgICByZXR1cm4gaGFzV2ViU2VsZWN0 aW9uIHx8IF9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzUmFuZ2U7CiAgICAgfQogCiAg ICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IoX3NoYXJlOikpIHsKQEAgLTMxNDUsNiArMzE0OSwx MCBAQCAtIChVSVRleHRSYW5nZSAqKXNlbGVjdGVkVGV4dFJhbmdlCiB7CiAgICAgaWYgKF9wYWdl LT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzTm9uZSB8fCBfcGFnZS0+ZWRpdG9yU3RhdGUoKS5p c01pc3NpbmdQb3N0TGF5b3V0RGF0YSkKICAgICAgICAgcmV0dXJuIG5pbDsKKyAgICAvLyBVSUtp dCBkb2VzIG5vdCBleHBlY3QgY2FyZXQgc2VsZWN0aW9ucyBpbiBub25lZGl0YWJsZSBjb250ZW50 CisgICAgaWYgKCFfcGFnZS0+ZWRpdG9yU3RhdGUoKS5pc0NvbnRlbnRFZGl0YWJsZSAmJiAhX3Bh Z2UtPmVkaXRvclN0YXRlKCkuc2VsZWN0aW9uSXNSYW5nZSkKKyAgICAgICAgcmV0dXJuIG5pbDsK KyAgICAKICAgICBhdXRvJiBwb3N0TGF5b3V0RWRpdG9yU3RhdGVEYXRhID0gX3BhZ2UtPmVkaXRv clN0YXRlKCkucG9zdExheW91dERhdGEoKTsKICAgICBGbG9hdFJlY3Qgc3RhcnRSZWN0ID0gcG9z dExheW91dEVkaXRvclN0YXRlRGF0YS5jYXJldFJlY3RBdFN0YXJ0OwogICAgIEZsb2F0UmVjdCBl bmRSZWN0ID0gcG9zdExheW91dEVkaXRvclN0YXRlRGF0YS5jYXJldFJlY3RBdEVuZDsK 338447 2018-04-20 12:03:20 -0700 2018-04-20 12:06:44 -0700 Patch bug-184806-20180420120319.patch text/plain 8587 megan_gardner SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzA4NDUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA0LTIwICBNZWdhbiBHYXJk bmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRml4ZXMgZm9yIGZhaWxp bmcgdGVzdHMgYXNzb2NpYXRlZCB3aXRoIHN3aXRjaGluZyBUZXh0IFNlbGVjdGlvbiBBc3Npc3Rh bnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ4 MDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM5MzY3OTA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IEJldGggRGFraW4gYW5kIFdlbnNvbiBIc2llaC4KKyAgICAgICAgCisgICAgICAgIFRoZSBt YWpvciBmaXggaXMgdGhlIGRpc2FibGluZyB0aGUgZG91YmxlIHRhcCBub25lZGl0YWJsZSB0ZXh0 IHNlbGVjdGlvbiBnZXN0dXJlLgorICAgICAgICBUaGUgb3RoZXIgZml4ZXMgYXJlIHNtYWxsIHR3 ZWFrcyB0aGF0IHNob3VsZG4ndCBldmVuIGJlIHJ1biBpbnRvIHdpdGggdGhlIGZpeCB0byAKKyAg ICAgICAgdGhlIGRvdWJsZSB0YXAgZ2VzdHVyZSwgYnV0IHRoZXkgYXJlIGluY29ycmVjdCwgc28g SSBhbSB0YWtpbmcgdGhlIG9wcG9ydHVuaXR5IHRvIAorICAgICAgICBmaXggdGhlbSBub3csIGlu IGNhc2Ugd2UgcnVuIGludG8gdGhlbSBhZ2Fpbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHRl eHRJbnRlcmFjdGlvbkdlc3R1cmU6c2hvdWxkQmVnaW5BdFBvaW50Ol0pOgorICAgICAgICBXZSBz aG91bGQgbm90IGJlIGFsbG93aW5nIGEgZG91YmxlIHRhcCB0ZXh0IGdlc3R1cmVzIGluIG5vbi1l ZGl0YWJsZSB3ZWIgY29udGVudC4KKyAgICAgICAgV2UgZGlkbid0IGhhdmUgb25lIHdpdGggdGhl IG9sZCBhc3Npc3RhbnQuIEZvcnR1bmF0ZWx5LCB0aGlzIGlzIGVhc2lseSBkaXNhYmxlZC4KKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBjYW5QZXJmb3JtQWN0aW9uRm9yV2ViVmlldzp3aXRoU2Vu ZGVyOl0pOgorICAgICAgICBXZSBzaG91bGQgbm90IGFsbG93IHRoZSBsb29rdXAgYWN0aW9uIGlm IHdlIGRvIG5vdCBhY3R1YWxseSBoYXZlIGEgc2VsZWN0aW9uLgorICAgICAgICBJdCBpcyBtZWFu aW5nbGVzcyB3aXRob3V0IG9uZS4KKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBzZWxlY3RlZFRl eHRSYW5nZV0pOgorICAgICAgICBXZSBzaG91bGQgbm90IHJldHVybiBhIHNlbGVjdGlvbiB0byBV SUtpdCBpZiBhbGwgd2UgaGF2ZSBpcyBjYXJldCBzZWxlY3Rpb24KKyAgICAgICAgaW4gbm9uLWVk aXRhYmxlIGNvbnRlbnQuIFdlIGhhdmUgdGhpcyBmb3Igc2VsZWN0aW9ucyBvbiBNYWMsIGJ1dCBV SUtpdCBkb2VzCisgICAgICAgIG5vdCBrbm93IGhvdyB0byBwcm9wZXJseSBoYW5kbGUgdGhpcywg YW5kIHdpbGwgaGF2ZSBpbmNvcnJlY3QgYmVoYXZpb3IgaWYgd2UgCisgICAgICAgIHJldHVybiBh IHZhbGlkIHNlbGVjdGlvbi4KKwogMjAxOC0wNC0yMCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0 YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IC1XZm9ybWF0IHdh cm5pbmcKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkocmV2aXNpb24gMjMwODQ1KQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2luZyBj b3B5KQpAQCAtMTY1Niw2ICsxNjU2LDEwIEBAIC0gKEJPT0wpdGV4dEludGVyYWN0aW9uR2VzdHVy ZTooVUlXS0dlc3QKICAgICAvLyBJZiB3ZSdyZSBjdXJyZW50bHkgZWRpdGluZyBhbiBhc3Npc3Rl ZCBub2RlLCBvbmx5IGFsbG93IHRoZSBzZWxlY3Rpb24gdG8gbW92ZSB3aXRoaW4gdGhhdCBhc3Np c3RlZCBub2RlLgogICAgIGlmIChzZWxmLmlzQXNzaXN0aW5nTm9kZSkKICAgICAgICAgcmV0dXJu IF9wb3NpdGlvbkluZm9ybWF0aW9uLm5vZGVBdFBvc2l0aW9uSXNBc3Npc3RlZE5vZGU7CisgICAg CisgICAgLy8gRG9uJ3QgYWxsb3cgZG91YmxlIHRhcCB0ZXh0IGdlc3R1cmVzIGluIG5vbmVkaXRh YmxlIGNvbnRlbnQuCisgICAgaWYgKGdlc3R1cmUgPT0gVUlXS0dlc3R1cmVEb3VibGVUYXApCisg ICAgICAgIHJldHVybiBOTzsKIAogICAgIC8vIElmIHdlJ3JlIHNlbGVjdGluZyBzb21ldGhpbmcs IGRvbid0IGFjdGl2YXRlIGhpZ2hsaWdodC4KICAgICBpZiAoZ2VzdHVyZSA9PSBVSVdLR2VzdHVy ZUxvdXBlICYmIFtzZWxmIGhhc1NlbGVjdGFibGVQb3NpdGlvbkF0UG9pbnQ6cG9pbnRdKQpAQCAt MjI0Niw3ICsyMjUwLDcgQEAgICAgICAgICAvLyBhY2NlcHRhYmxlLCBidXQgdGhlIGludGVyZmFj ZQogICAgICAgICAgICAgcmV0dXJuIE5POwogI2VuZGlmCiAKLSAgICAgICAgcmV0dXJuIFlFUzsK KyAgICAgICAgcmV0dXJuIGhhc1dlYlNlbGVjdGlvbiB8fCBfcGFnZS0+ZWRpdG9yU3RhdGUoKS5z ZWxlY3Rpb25Jc1JhbmdlOwogICAgIH0KIAogICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKF9z aGFyZTopKSB7CkBAIC0zMTQ1LDYgKzMxNDksMTAgQEAgLSAoVUlUZXh0UmFuZ2UgKilzZWxlY3Rl ZFRleHRSYW5nZQogewogICAgIGlmIChfcGFnZS0+ZWRpdG9yU3RhdGUoKS5zZWxlY3Rpb25Jc05v bmUgfHwgX3BhZ2UtPmVkaXRvclN0YXRlKCkuaXNNaXNzaW5nUG9zdExheW91dERhdGEpCiAgICAg ICAgIHJldHVybiBuaWw7CisgICAgLy8gVUlLaXQgZG9lcyBub3QgZXhwZWN0IGNhcmV0IHNlbGVj dGlvbnMgaW4gbm9uZWRpdGFibGUgY29udGVudC4KKyAgICBpZiAoIV9wYWdlLT5lZGl0b3JTdGF0 ZSgpLmlzQ29udGVudEVkaXRhYmxlICYmICFfcGFnZS0+ZWRpdG9yU3RhdGUoKS5zZWxlY3Rpb25J c1JhbmdlKQorICAgICAgICByZXR1cm4gbmlsOworICAgIAogICAgIGF1dG8mIHBvc3RMYXlvdXRF ZGl0b3JTdGF0ZURhdGEgPSBfcGFnZS0+ZWRpdG9yU3RhdGUoKS5wb3N0TGF5b3V0RGF0YSgpOwog ICAgIEZsb2F0UmVjdCBzdGFydFJlY3QgPSBwb3N0TGF5b3V0RWRpdG9yU3RhdGVEYXRhLmNhcmV0 UmVjdEF0U3RhcnQ7CiAgICAgRmxvYXRSZWN0IGVuZFJlY3QgPSBwb3N0TGF5b3V0RWRpdG9yU3Rh dGVEYXRhLmNhcmV0UmVjdEF0RW5kOwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91 Y2gvaW9zL2RvdWJsZS10YXAtb24tZWRpdGFibGUtYW5kLW5vbmVkaXRhYmxlLWV4cGVjdGVkLnR4 dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9pb3MvZG91Ymxl LXRhcC1vbi1lZGl0YWJsZS1hbmQtbm9uZWRpdGFibGUtZXhwZWN0ZWQudHh0CShub25leGlzdGVu dCkKKysrIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL2lvcy9kb3VibGUtdGFwLW9uLWVk aXRhYmxlLWFuZC1ub25lZGl0YWJsZS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAs MCArMSwzIEBACitQQVNTOiBObyBTZWxlY3Rpb24KK1BBU1M6IEhhcyBTZWxlY3Rpb24KKwpJbmRl eDogTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL2RvdWJsZS10YXAtb24tZWRpdGFi bGUtYW5kLW5vbmVkaXRhYmxlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9l dmVudHMvdG91Y2gvaW9zL2RvdWJsZS10YXAtb24tZWRpdGFibGUtYW5kLW5vbmVkaXRhYmxlLmh0 bWwJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL2Rv dWJsZS10YXAtb24tZWRpdGFibGUtYW5kLW5vbmVkaXRhYmxlLmh0bWwJKHdvcmtpbmcgY29weSkK QEAgLTAsMCArMSw4OSBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorPGhlYWQ+CisgICAg PHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uL3Jlc291cmNlcy9iYXNpYy1nZXN0dXJlcy5qcyI+PC9z Y3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7Cisg ICAgICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIHRlc3RSdW5u ZXIud2FpdFVudGlsRG9uZSgpOworICAgICAgICB9CisgICAgCisgICAgICAgIGFzeW5jIGZ1bmN0 aW9uIHJ1blRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXRlc3RSdW5uZXIucnVu VUlTY3JpcHQpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICB2YXIgb3V0 cHV0ID0gJyc7CisgICAgICAgICAgICB2YXIgbm9uZWRpdGFibGVUYXJnZXRSZWN0ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ25vbmVkaXRhYmxlVGFwUG9pbnQnKS5nZXRCb3VuZGluZ0NsaWVu dFJlY3QoKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgdmFyIG5vbmVkaXRhYmxlVGFwUG9p bnRYID0gbm9uZWRpdGFibGVUYXJnZXRSZWN0LnggKyBub25lZGl0YWJsZVRhcmdldFJlY3Qud2lk dGggLyAyOworICAgICAgICAgICAgdmFyIG5vbmVkaXRhYmxlVGFwUG9pbnRZID0gbm9uZWRpdGFi bGVUYXJnZXRSZWN0LnkgKyBub25lZGl0YWJsZVRhcmdldFJlY3QuaGVpZ2h0IC8gMjsKKyAgICAg ICAgICAgIAorICAgICAgICAgICAgYXdhaXQgZG91YmxlVGFwQXRQb2ludChub25lZGl0YWJsZVRh cFBvaW50WCwgbm9uZWRpdGFibGVUYXBQb2ludFkpOworICAgICAgICAgICAgaWYgKGRvY3VtZW50 LmdldFNlbGVjdGlvbigpLnR5cGUgPT0gIk5vbmUiKQorICAgICAgICAgICAgICAgIG91dHB1dCAr PSAnUEFTUzogTm8gU2VsZWN0aW9uJzsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICBvdXRwdXQgKz0gJ0ZBSUw6IEhhcyBzZWxlY3Rpb24gZXZlbiB0aG91Z2ggd2Ugc2hvdWxkIG5v dC4gSW5jb3JyZWN0IFNlbGVjdGlvbjogJyArIGRvY3VtZW50LmdldFNlbGVjdGlvbigpLnRvU3Ry aW5nKCk7CisgICAgICAgICAgICBvdXRwdXQgKz0gJzxicj4nOworCisgICAgICAgICAgICB2YXIg ZWRpdGFibGVUYXJnZXRSZWN0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ25vbmVkaXRhYmxl VGFwUG9pbnQnKS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKworICAgICAgICAgICAgdmFyIGVk aXRhYmxlVGFwUG9pbnRYID0gZWRpdGFibGVUYXJnZXRSZWN0LnggKyBlZGl0YWJsZVRhcmdldFJl Y3Qud2lkdGggLyAyOworICAgICAgICAgICAgdmFyIGVkaXRhYmxlVGFwUG9pbnRZID0gZWRpdGFi bGVUYXJnZXRSZWN0LnkgKyBlZGl0YWJsZVRhcmdldFJlY3QuaGVpZ2h0IC8gMjsKKworICAgICAg ICAgICAgYXdhaXQgZG91YmxlVGFwQXRQb2ludChub25lZGl0YWJsZVRhcFBvaW50WCwgbm9uZWRp dGFibGVUYXBQb2ludFkpOworICAgICAgICAgICAgaWYgKGRvY3VtZW50LmdldFNlbGVjdGlvbigp LnR5cGUgPT0gIk5vbmUiKQorICAgICAgICAgICAgICAgIG91dHB1dCArPSAnUEFTUzogSGFzIFNl bGVjdGlvbic7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgb3V0cHV0ICs9ICdG QUlMOiBObyBzZWxlY3Rpb24gZXZlbiB0aG91Z2ggd2Ugc2hvdWxkIGhhdmUgb25lLic7CisgICAg ICAgICAgICBvdXRwdXQgKz0gJzxicj4nOworCisgICAgICAgICAgICB2YXIgbm9uZWRpdGFibGVF bGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ25vbmVkaXRhYmxlJyk7CisgICAgICAg ICAgICBub25lZGl0YWJsZUVsZW1lbnQucGFyZW50Tm9kZS5yZW1vdmVDaGlsZChub25lZGl0YWJs ZUVsZW1lbnQpOworICAgICAgICAgICAgdmFyIGVkaXRhYmxlRWxlbWVudCA9ZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ2VkaXRhYmxlJyk7CisgICAgICAgICAgICBlZGl0YWJsZUVsZW1lbnQucGFy ZW50Tm9kZS5yZW1vdmVDaGlsZChlZGl0YWJsZUVsZW1lbnQpOworICAgICAgICAgICAgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldCcpLmlubmVySFRNTCA9IG91dHB1dDsKKyAgICAgICAg ICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICB9CisKKyAgICAgICAgd2luZG93 LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBydW5UZXN0LCBmYWxzZSk7CisgICAgPC9zY3JpcHQ+ CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAgI25vbmVkaXRhYmxlIHsKKyAgICAgICAgICAgIGhl aWdodDogMjAwcHg7CisgICAgICAgICAgICB3aWR0aDogMzAwcHg7CisgICAgICAgICAgICBiYWNr Z3JvdW5kLWNvbG9yOiBzaWx2ZXI7CisgICAgICAgICAgICBmb250LWZhbWlseTogbW9ub3NwYWNl OworICAgICAgICAgICAgZm9udC1zaXplOiAxOHB4OworICAgICAgICB9CisgICAgICAgICNlZGl0 YWJsZSB7CisgICAgICAgICAgICBoZWlnaHQ6IDIwMHB4OworICAgICAgICAgICAgd2lkdGg6IDMw MHB4OworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgICAgICAgICAg Zm9udC1mYW1pbHk6IG1vbm9zcGFjZTsKKyAgICAgICAgICAgIGZvbnQtc2l6ZTogMThweDsKKyAg ICAgICAgfQorICAgICAgICAjdGFyZ2V0IHsKKyAgICAgICAgICAgIGhlaWdodDogNTBweDsKKyAg ICAgICAgICAgIHdpZHRoOiAzMDBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHNp bHZlcjsKKyAgICAgICAgICAgIGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7CisgICAgICAgICAgICBm b250LXNpemU6IDE4cHg7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorICAgIDxtZXRhIG5hbWU9 InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MSI+ Cis8L2hlYWQ+Cis8Ym9keT4KKworICAgIDxkaXYgaWQ9Im5vbmVkaXRhYmxlIj4KKyAgICAgICAg PHA+TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIDxzcGFuIGlkPSJub25lZGl0YWJsZVRhcFBv aW50Ij5jb25zZWN0ZXR1cjwvc3Bhbj4gYWRpcGlzY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0 ZW1wb3IgaW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gVXQgZW5p bSBhZCBtaW5pbSB2ZW5pYW0sIHF1aXMgbm9zdHJ1ZCBleGVyY2l0YXRpb24gdWxsYW1jbyBsYWJv cmlzIG5pc2kgdXQgYWxpcXVpcCBleCBlYSBjb21tb2RvIGNvbnNlcXVhdC48L3A+CisgICAgPC9k aXY+CisgICAgPGRpdiBpZD0iZWRpdGFibGUiIGNvbnRlbnRlZGl0YWJsZT4KKyAgICAgICAgPHA+ TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdCwg c2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWdu YSBhbGlxdWEuIFV0IGVuaW0gYWQgbWluaW0gdmVuaWFtLCBxdWlzIG5vc3RydWQgZXhlcmNpdGF0 aW9uIHVsbGFtY28gbGFib3JpcyBuaXNpIHV0IGFsaXF1aXAgZXggZWEgY29tbW9kbyBjb25zZXF1 YXQuPC9wPgorICAgIDwvZGl2PiAKKyAgICA8ZGl2IGlkPSJ0YXJnZXQiPgorICAgICAgICBUaGlz IHRlc3QgcmVxdWlyZXMgVUlTY3JpcHRDb250cm9sbGVyIHRvIHJ1bi4KKyAgICA8L2Rpdj4KKzwv Ym9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL3Jlc291cmNlcy9iYXNpYy1nZXN0dXJl cy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9yZXNvdXJjZXMvYmFzaWMtZ2VzdHVyZXMu anMJKHJldmlzaW9uIDIzMDg0NSkKKysrIExheW91dFRlc3RzL3Jlc291cmNlcy9iYXNpYy1nZXN0 dXJlcy5qcwkod29ya2luZyBjb3B5KQpAQCAtMjIsNiArMjIsMTggQEAgZnVuY3Rpb24gZG91Ymxl VGFwVG9ab29tQXRQb2ludCh4LCB5KQogICAgIH0pOwogfQogCitmdW5jdGlvbiBkb3VibGVUYXBB dFBvaW50KHgsIHkpCit7CisgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJlc29sdmUgPT4geworICAg ICAgICB0ZXN0UnVubmVyLnJ1blVJU2NyaXB0KGAKKyAgICAgICAgICAgIChmdW5jdGlvbigpIHsK KyAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIuZG91YmxlVGFwQXRQb2ludCgke3h9LCAke3l9 LCBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLnVpU2NyaXB0 Q29tcGxldGUoKTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pKCk7YCwgcmVz b2x2ZSk7CisgICAgfSk7Cit9CisKIGZ1bmN0aW9uIGxvbmdQcmVzc0F0UG9pbnQoeCwgeSkKIHsK ICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7Cg==