212093 2020-05-19 11:25:42 -0700 REGRESSION (r259930): Dictation marker at start of text is removed when added trailing whitespace is collapsed 2020-05-19 20:13:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=212097 InRadar, Regression P2 Normal --- 210246 1 dbates darin cdumez darin esprehn+autocc ews-watchlist kangil.han webkit-bug-importer oldest_to_newest 1654090 0 dbates 2020-05-19 11:25:42 -0700 See bug 210246, comment 17. 1654103 1 webkit-bug-importer 2020-05-19 11:40:16 -0700 <rdar://problem/63406502> 1654116 2 dbates 2020-05-19 11:59:32 -0700 Steps to reproduce using iOS Simulator build: 1 Add the following test case: [[ #include "config.h" #if PLATFORM(IOS_FAMILY) #import "PlatformUtilities.h" #import "TestInputDelegate.h" #import "TestWKWebView.h" #import "UIKitSPI.h" #import "WKWebViewConfigurationExtras.h" #import <WebKit/WKWebViewPrivate.h> #import <wtf/unicode/CharacterNames.h> namespace TestWebKitAPI { TEST(InsertTextAlternatives, InsertTrailingSpaceWhitespaceRebalance) { auto *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES]; auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration]); auto inputDelegate = adoptNS([[TestInputDelegate alloc] init]); [inputDelegate setFocusStartsInputSessionPolicyHandler:[] (WKWebView *, id <_WKFocusedElementInfo>) { return _WKFocusStartsInputSessionPolicyAllow; }]; [webView _setInputDelegate:inputDelegate.get()]; [webView synchronouslyLoadHTMLString:@"<body contenteditable='true'></body>"]; [webView evaluateJavaScriptAndWaitForInputSessionToChange:@"document.body.focus()"]; [[webView textInputContentView] insertText:@"hello" alternatives:@[@"yellow"] style:UITextAlternativeStyleNone]; [[webView textInputContentView] insertText:@" "]; [webView waitForNextPresentationUpdate]; EXPECT_TRUE([[webView objectByEvaluatingJavaScript:@"internals.hasDictationAlternativesMarker(0, 5)"] boolValue]); // hello } } // namespace TestWebKitAPI #endif // PLATFORM(IOS_FAMILY) ]] 2. Run it. Then it fails. 1654120 3 dbates 2020-05-19 12:05:03 -0700 Just FYI, I plan to add the test case ^^^ in the patch for bug 212097, flipping the EXPECT_TRUE() to FALSE to make the test pass for now. 1654121 4 darin 2020-05-19 12:06:45 -0700 (In reply to Daniel Bates from comment #3) > Just FYI, I plan to add the test case ^^^ in the patch for bug 212097, > flipping the EXPECT_TRUE() to FALSE to make the test pass for now. OK. But I don’t understand why. That will make it harder for me to land this fix. 1654138 5 darin 2020-05-19 12:57:40 -0700 I guess I can just wait for you to land your fix and then rebase afterward. 1654141 6 399761 darin 2020-05-19 13:01:14 -0700 Created attachment 399761 Patch 1654143 7 darin 2020-05-19 13:02:05 -0700 I put a fix here. Dan, feel free to grab the bug if you’d like to take it further. 1654152 8 dbates 2020-05-19 13:14:02 -0700 (In reply to Darin Adler from comment #4) > (In reply to Daniel Bates from comment #3) > > Just FYI, I plan to add the test case ^^^ in the patch for bug 212097, > > flipping the EXPECT_TRUE() to FALSE to make the test pass for now. > > OK. But I don’t understand why. That will make it harder for me to land this > fix. Yes, but it makes my workflow easier 🙂. More importantly I am saving you from any agony should that test depend on my work. I don't think it does as I'm typing this... 1654153 9 dbates 2020-05-19 13:14:11 -0700 (In reply to Darin Adler from comment #7) > I put a fix here. Dan, feel free to grab the bug if you’d like to take it > further. Thank you! 1654182 10 399771 dbates 2020-05-19 14:25:42 -0700 Created attachment 399771 Patch Alley-oop 1654185 11 399771 dbates 2020-05-19 14:29:39 -0700 Comment on attachment 399771 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399771&action=review Patch looks good. Needs change log for Tools change I did for you. > Source/WebCore/dom/DocumentMarkerController.cpp:598 > + unsigned targetStartOffset = clampTo<unsigned>(static_cast<int>(marker.startOffset()) + delta); OK as-is. No change needed. Optimal solution would use auto because types in template args <-- is that the right word? > Source/WebCore/dom/DocumentMarkerController.cpp:599 > + unsigned targetEndOffset = clampTo<unsigned>(static_cast<int>(marker.endOffset()) + delta); Ditto. 1654253 12 399787 darin 2020-05-19 17:32:25 -0700 Created attachment 399787 Patch 1654254 13 399787 darin 2020-05-19 17:32:47 -0700 Comment on attachment 399787 Patch I plan to set commit-queue+ once the EWS tests all pass. 1654298 14 ews-feeder 2020-05-19 20:13:53 -0700 Committed r261903: <https://trac.webkit.org/changeset/261903> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399787. 399761 2020-05-19 13:01:14 -0700 2020-05-19 14:25:40 -0700 Patch bug-212093-20200519130112.patch text/plain 2776 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODFmNDhlYjcxYmE0Mzc2 YzU1Mjc4MGE3ZjBjMGFlZDgyOGVjODBlNS4uYzNmNzcyYTAwZjQ3MDcxMmZlMDdmMTgxMDgxMTI2 MWExM2JkZTkzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA1LTE5ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjU5OTMw KTogRGljdGF0aW9uIG1hcmtlciBhdCBzdGFydCBvZiB0ZXh0IGlzIHJlbW92ZWQgd2hlbiBhZGRl ZCB0cmFpbGluZyB3aGl0ZXNwYWNlIGlzIGNvbGxhcHNlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMDkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCBjb21pbmcgaW4gYSBmdXR1cmUgdmVyc2lv biBvZiB0aGlzIHBhdGNoPworCisgICAgICAgICogZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnNoaWZ0 TWFya2Vycyk6IFVzZSBpbnQgdG8gZG8gdGhlIG1hdGggYmVmb3JlIGNsYW1waW5nIHRvCisgICAg ICAgIHVuc2lnbmVkLiBUaGlzIHByb3RlY3RzIGFnYWluc3QgdW5kZXJmbG93LgorCiAyMDIwLTA1 LTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFB1 c2ggYSBQbGF0Zm9ybURpc3BsYXlJRCB0byBzY3JvbGxpbmcgdHJlZXMsIGFuZCBhbGxvdyB0aGUg c2Nyb2xsaW5nIHRocmVhZCB0byBnZXQgZGlzcGxheURpZFJlZnJlc2ggbm90aWZpY2F0aW9ucwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcAppbmRl eCA4MmVhYjhjY2U2MGY1MGQ1NzY5NGVhMTg2NzA1MjdjOWM1YzY5MjI4Li5mN2M2MDhlNTAwMWM4 NjFlOTkxODk3YzdiNTZjNDQ2M2VkMDk3ODI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcApAQCAtNTk1LDkgKzU5NSw5IEBAIHZvaWQgRG9j dW1lbnRNYXJrZXJDb250cm9sbGVyOjpzaGlmdE1hcmtlcnMoTm9kZSYgbm9kZSwgdW5zaWduZWQg c3RhcnRPZmZzZXQsIGluCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICAgICAvLyBG SVhNRTogTm8gb2J2aW91cyByZWFzb24gdGhpcyBzaG91bGQgYmUgaU9TLXNwZWNpZmljLiBSZW1v dmUgdGhlICNpZiBhdCBzb21lIHBvaW50LgotICAgICAgICBpbnQgdGFyZ2V0U3RhcnRPZmZzZXQg PSBtYXJrZXIuc3RhcnRPZmZzZXQoKSArIGRlbHRhOwotICAgICAgICBpbnQgdGFyZ2V0RW5kT2Zm c2V0ID0gbWFya2VyLmVuZE9mZnNldCgpICsgZGVsdGE7Ci0gICAgICAgIGlmIChzdGF0aWNfY2Fz dDx1bnNpZ25lZD4odGFyZ2V0U3RhcnRPZmZzZXQpID49IG5vZGUubGVuZ3RoKCkgfHwgdGFyZ2V0 RW5kT2Zmc2V0IDw9IDApIHsKKyAgICAgICAgdW5zaWduZWQgdGFyZ2V0U3RhcnRPZmZzZXQgPSBj bGFtcFRvPHVuc2lnbmVkPihzdGF0aWNfY2FzdDxpbnQ+KG1hcmtlci5zdGFydE9mZnNldCgpKSAr IGRlbHRhKTsKKyAgICAgICAgdW5zaWduZWQgdGFyZ2V0RW5kT2Zmc2V0ID0gY2xhbXBUbzx1bnNp Z25lZD4oc3RhdGljX2Nhc3Q8aW50PihtYXJrZXIuZW5kT2Zmc2V0KCkpICsgZGVsdGEpOworICAg ICAgICBpZiAodGFyZ2V0U3RhcnRPZmZzZXQgPj0gbm9kZS5sZW5ndGgoKSB8fCB0YXJnZXRFbmRP ZmZzZXQgPD0gMCkgewogICAgICAgICAgICAgbGlzdC0+cmVtb3ZlKGkpOwogICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KQEAgLTYxMSwxMSArNjExLDExIEBAIHZvaWQgRG9jdW1lbnRN YXJrZXJDb250cm9sbGVyOjpzaGlmdE1hcmtlcnMoTm9kZSYgbm9kZSwgdW5zaWduZWQgc3RhcnRP ZmZzZXQsIGluCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgLy8gRklYTUU6IE5v IG9idmlvdXMgcmVhc29uIHRoaXMgc2hvdWxkIGJlIGlPUy1zcGVjaWZpYy4gUmVtb3ZlIHRoZSAj aWYgYXQgc29tZSBwb2ludC4KICAgICAgICAgZWxzZSBpZiAobWFya2VyLmVuZE9mZnNldCgpID4g c3RhcnRPZmZzZXQpIHsKLSAgICAgICAgICAgIGlmIChtYXJrZXIuZW5kT2Zmc2V0KCkgKyBkZWx0 YSA8PSBtYXJrZXIuc3RhcnRPZmZzZXQoKSkgeworICAgICAgICAgICAgaWYgKHRhcmdldEVuZE9m ZnNldCA8PSBtYXJrZXIuc3RhcnRPZmZzZXQoKSkgewogICAgICAgICAgICAgICAgIGxpc3QtPnJl bW92ZShpKTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIG1hcmtlci5zZXRFbmRPZmZzZXQoc3RkOjptaW48dW5zaWduZWQ+KHRhcmdldEVuZE9m ZnNldCwgbm9kZS5sZW5ndGgoKSkpOworICAgICAgICAgICAgbWFya2VyLnNldEVuZE9mZnNldChz dGQ6Om1pbih0YXJnZXRFbmRPZmZzZXQsIG5vZGUubGVuZ3RoKCkpKTsKICAgICAgICAgICAgIGRp ZFNoaWZ0TWFya2VyID0gdHJ1ZTsKICAgICAgICAgfQogI2VuZGlmCg== 399771 2020-05-19 14:25:42 -0700 2020-05-19 17:32:23 -0700 Patch bug-212093-20200519142541.patch text/plain 4332 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYyMDIwM2RiZmJmYjE4 ZjI1MzhkZDdlM2NhMDM3N2JiNTAxYzExMC4uYmU0YTRiMzZlNjJjNzRlNDIwM2I2MGY5NGMzMjk4 Y2YxMWUwYjczOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA1LTE5ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjU5OTMw KTogRGljdGF0aW9uIG1hcmtlciBhdCBzdGFydCBvZiB0ZXh0IGlzIHJlbW92ZWQgd2hlbiBhZGRl ZCB0cmFpbGluZyB3aGl0ZXNwYWNlIGlzIGNvbGxhcHNlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMDkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6c2hpZnRN YXJrZXJzKTogVXNlIGludCB0byBkbyB0aGUgbWF0aCBiZWZvcmUgY2xhbXBpbmcgdG8KKyAgICAg ICAgdW5zaWduZWQuIFRoaXMgcHJvdGVjdHMgYWdhaW5zdCB1bmRlcmZsb3cuCisKIDIwMjAtMDUt MTkgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIEJsdWUgZG90 dGVkIHVuZGVybGluZSB3aXRoIGFsdGVybmF0aXZlcyBvbmx5IHNob3duIGZvciBsYXN0IHdvcmQs IGdldHMgbG9zdCBmb3IgcHJldmlvdXMgaW5zZXJ0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcAppbmRleCA4MmVhYjhjY2U2MGY1MGQ1NzY5 NGVhMTg2NzA1MjdjOWM1YzY5MjI4Li5mN2M2MDhlNTAwMWM4NjFlOTkxODk3YzdiNTZjNDQ2M2Vk MDk3ODI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250 cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9s bGVyLmNwcApAQCAtNTk1LDkgKzU5NSw5IEBAIHZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVy OjpzaGlmdE1hcmtlcnMoTm9kZSYgbm9kZSwgdW5zaWduZWQgc3RhcnRPZmZzZXQsIGluCiAKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICAgICAvLyBGSVhNRTogTm8gb2J2aW91cyByZWFz b24gdGhpcyBzaG91bGQgYmUgaU9TLXNwZWNpZmljLiBSZW1vdmUgdGhlICNpZiBhdCBzb21lIHBv aW50LgotICAgICAgICBpbnQgdGFyZ2V0U3RhcnRPZmZzZXQgPSBtYXJrZXIuc3RhcnRPZmZzZXQo KSArIGRlbHRhOwotICAgICAgICBpbnQgdGFyZ2V0RW5kT2Zmc2V0ID0gbWFya2VyLmVuZE9mZnNl dCgpICsgZGVsdGE7Ci0gICAgICAgIGlmIChzdGF0aWNfY2FzdDx1bnNpZ25lZD4odGFyZ2V0U3Rh cnRPZmZzZXQpID49IG5vZGUubGVuZ3RoKCkgfHwgdGFyZ2V0RW5kT2Zmc2V0IDw9IDApIHsKKyAg ICAgICAgdW5zaWduZWQgdGFyZ2V0U3RhcnRPZmZzZXQgPSBjbGFtcFRvPHVuc2lnbmVkPihzdGF0 aWNfY2FzdDxpbnQ+KG1hcmtlci5zdGFydE9mZnNldCgpKSArIGRlbHRhKTsKKyAgICAgICAgdW5z aWduZWQgdGFyZ2V0RW5kT2Zmc2V0ID0gY2xhbXBUbzx1bnNpZ25lZD4oc3RhdGljX2Nhc3Q8aW50 PihtYXJrZXIuZW5kT2Zmc2V0KCkpICsgZGVsdGEpOworICAgICAgICBpZiAodGFyZ2V0U3RhcnRP ZmZzZXQgPj0gbm9kZS5sZW5ndGgoKSB8fCB0YXJnZXRFbmRPZmZzZXQgPD0gMCkgewogICAgICAg ICAgICAgbGlzdC0+cmVtb3ZlKGkpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0K QEAgLTYxMSwxMSArNjExLDExIEBAIHZvaWQgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpzaGlm dE1hcmtlcnMoTm9kZSYgbm9kZSwgdW5zaWduZWQgc3RhcnRPZmZzZXQsIGluCiAjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKICAgICAgICAgLy8gRklYTUU6IE5vIG9idmlvdXMgcmVhc29uIHRoaXMg c2hvdWxkIGJlIGlPUy1zcGVjaWZpYy4gUmVtb3ZlIHRoZSAjaWYgYXQgc29tZSBwb2ludC4KICAg ICAgICAgZWxzZSBpZiAobWFya2VyLmVuZE9mZnNldCgpID4gc3RhcnRPZmZzZXQpIHsKLSAgICAg ICAgICAgIGlmIChtYXJrZXIuZW5kT2Zmc2V0KCkgKyBkZWx0YSA8PSBtYXJrZXIuc3RhcnRPZmZz ZXQoKSkgeworICAgICAgICAgICAgaWYgKHRhcmdldEVuZE9mZnNldCA8PSBtYXJrZXIuc3RhcnRP ZmZzZXQoKSkgewogICAgICAgICAgICAgICAgIGxpc3QtPnJlbW92ZShpKTsKICAgICAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIG1hcmtlci5zZXRFbmRP ZmZzZXQoc3RkOjptaW48dW5zaWduZWQ+KHRhcmdldEVuZE9mZnNldCwgbm9kZS5sZW5ndGgoKSkp OworICAgICAgICAgICAgbWFya2VyLnNldEVuZE9mZnNldChzdGQ6Om1pbih0YXJnZXRFbmRPZmZz ZXQsIG5vZGUubGVuZ3RoKCkpKTsKICAgICAgICAgICAgIGRpZFNoaWZ0TWFya2VyID0gdHJ1ZTsK ICAgICAgICAgfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL0luc2VydFRleHRBbHRlcm5hdGl2ZXMubW0gYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL0luc2VydFRleHRBbHRlcm5hdGl2ZXMubW0KaW5kZXggMmRm MmJkYmY1ZTFjOTI1ZDA0ZDA2NTljN2YxMDMwYWFkMzA0NDliNy4uMjk1MzkzN2IwNjNhNjVkODkz NzMwNjc1OTVlZjc1MzUyMWVjYTcwNiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9JbnNlcnRUZXh0QWx0ZXJuYXRpdmVzLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW5zZXJ0VGV4dEFsdGVybmF0aXZlcy5tbQpA QCAtMTUzLDcgKzE1Myw3IEBAIFRFU1QoSW5zZXJ0VGV4dEFsdGVybmF0aXZlcywgSW5zZXJ0VHJh aWxpbmdTcGFjZSkKICAgICBFWFBFQ1RfRkFMU0UoW1t3ZWJWaWV3IG9iamVjdEJ5RXZhbHVhdGlu Z0phdmFTY3JpcHQ6QCJpbnRlcm5hbHMuaGFzRGljdGF0aW9uQWx0ZXJuYXRpdmVzTWFya2VyKDUs IDEpIl0gYm9vbFZhbHVlXSk7IC8vIDxzcGFjZT4KIH0KIAotVEVTVChJbnNlcnRUZXh0QWx0ZXJu YXRpdmVzLCBJbnNlcnRUcmFpbGluZ1NwYWNlV2hpdGVzcGFjZVJlYmFsYW5jZV9FeHBlY3RlZEZh aWx1cmUpCitURVNUKEluc2VydFRleHRBbHRlcm5hdGl2ZXMsIEluc2VydFRyYWlsaW5nU3BhY2VX aGl0ZXNwYWNlUmViYWxhbmNlKQogewogICAgIGF1dG8gKmNvbmZpZ3VyYXRpb24gPSBbV0tXZWJW aWV3Q29uZmlndXJhdGlvbiBfdGVzdF9jb25maWd1cmF0aW9uV2l0aFRlc3RQbHVnSW5DbGFzc05h bWU6QCJXZWJQcm9jZXNzUGx1Z0luV2l0aEludGVybmFscyIgY29uZmlndXJlSlNDRm9yVGVzdGlu ZzpZRVNdOwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9j XSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMzAwLCAzMDApIGNvbmZpZ3VyYXRpb246 Y29uZmlndXJhdGlvbl0pOwpAQCAtMTY3LDggKzE2Nyw3IEBAIFRFU1QoSW5zZXJ0VGV4dEFsdGVy bmF0aXZlcywgSW5zZXJ0VHJhaWxpbmdTcGFjZVdoaXRlc3BhY2VSZWJhbGFuY2VfRXhwZWN0ZWRG YWlsCiAgICAgW1t3ZWJWaWV3IHRleHRJbnB1dENvbnRlbnRWaWV3XSBpbnNlcnRUZXh0OkAiICJd OwogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKIAotICAgIC8v IEZJWE1FOiBDaGFuZ2UgdGhpcyB0byBFWFBFQ1RfVFJVRSgpIG9uY2UgPGh0dHBzOi8vd2Via2l0 Lm9yZy9iLzIxMjA5Mz4gaXMgZml4ZWQuCi0gICAgRVhQRUNUX0ZBTFNFKFtbd2ViVmlldyBvYmpl Y3RCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiaW50ZXJuYWxzLmhhc0RpY3RhdGlvbkFsdGVybmF0 aXZlc01hcmtlcigwLCA1KSJdIGJvb2xWYWx1ZV0pOyAvLyBoZWxsbworICAgIEVYUEVDVF9UUlVF KFtbd2ViVmlldyBvYmplY3RCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiaW50ZXJuYWxzLmhhc0Rp Y3RhdGlvbkFsdGVybmF0aXZlc01hcmtlcigwLCA1KSJdIGJvb2xWYWx1ZV0pOyAvLyBoZWxsbwog fQogCiBURVNUKEluc2VydFRleHRBbHRlcm5hdGl2ZXMsIEluc2VydFRyYWlsaW5nTmV3bGluZSkK 399787 2020-05-19 17:32:25 -0700 2020-05-19 20:13:53 -0700 Patch bug-212093-20200519173224.patch text/plain 5056 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxODk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGEzY2QyYzEyYmZhOGUw MDU5YTQ2NGVhNzhjOWY3YzQ4ODhlYWY5MC4uMWE3MWU3YWQ0NDg0NTI3MTg0YjE2NjI2M2JiN2Y5 YWE4MmNhOTI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA1LTE5ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjU5OTMw KTogRGljdGF0aW9uIG1hcmtlciBhdCBzdGFydCBvZiB0ZXh0IGlzIHJlbW92ZWQgd2hlbiBhZGRl ZCB0cmFpbGluZyB3aGl0ZXNwYWNlIGlzIGNvbGxhcHNlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMDkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFuaWVsIEJhdGVzLgorCisgICAgICAgICogZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnNoaWZ0TWFy a2Vycyk6IFVzZSBpbnQgdG8gZG8gdGhlIG1hdGggYmVmb3JlIGNsYW1waW5nIHRvCisgICAgICAg IHVuc2lnbmVkLiBUaGlzIHByb3RlY3RzIGFnYWluc3QgdW5kZXJmbG93LgorCiAyMDIwLTA1LTE5 ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBCbHVlIGRvdHRl ZCB1bmRlcmxpbmUgd2l0aCBhbHRlcm5hdGl2ZXMgb25seSBzaG93biBmb3IgbGFzdCB3b3JkLCBn ZXRzIGxvc3QgZm9yIHByZXZpb3VzIGluc2VydGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAKaW5kZXggODJlYWI4Y2NlNjBmNTBkNTc2OTRl YTE4NjcwNTI3YzljNWM2OTIyOC4uZGQ0MzUwYzgxOWU0NzM5NTA5YzQ0MTExYmIwOWNhZTZlMTJk MTUxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJv bGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxl ci5jcHAKQEAgLTU5NSw5ICs1OTUsOSBAQCB2b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6 c2hpZnRNYXJrZXJzKE5vZGUmIG5vZGUsIHVuc2lnbmVkIHN0YXJ0T2Zmc2V0LCBpbgogCiAjaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAgICAgLy8gRklYTUU6IE5vIG9idmlvdXMgcmVhc29u IHRoaXMgc2hvdWxkIGJlIGlPUy1zcGVjaWZpYy4gUmVtb3ZlIHRoZSAjaWYgYXQgc29tZSBwb2lu dC4KLSAgICAgICAgaW50IHRhcmdldFN0YXJ0T2Zmc2V0ID0gbWFya2VyLnN0YXJ0T2Zmc2V0KCkg KyBkZWx0YTsKLSAgICAgICAgaW50IHRhcmdldEVuZE9mZnNldCA9IG1hcmtlci5lbmRPZmZzZXQo KSArIGRlbHRhOwotICAgICAgICBpZiAoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHRhcmdldFN0YXJ0 T2Zmc2V0KSA+PSBub2RlLmxlbmd0aCgpIHx8IHRhcmdldEVuZE9mZnNldCA8PSAwKSB7CisgICAg ICAgIGF1dG8gdGFyZ2V0U3RhcnRPZmZzZXQgPSBjbGFtcFRvPHVuc2lnbmVkPihzdGF0aWNfY2Fz dDxpbnQ+KG1hcmtlci5zdGFydE9mZnNldCgpKSArIGRlbHRhKTsKKyAgICAgICAgYXV0byB0YXJn ZXRFbmRPZmZzZXQgPSBjbGFtcFRvPHVuc2lnbmVkPihzdGF0aWNfY2FzdDxpbnQ+KG1hcmtlci5l bmRPZmZzZXQoKSkgKyBkZWx0YSk7CisgICAgICAgIGlmICh0YXJnZXRTdGFydE9mZnNldCA+PSBu b2RlLmxlbmd0aCgpIHx8IHRhcmdldEVuZE9mZnNldCA8PSAwKSB7CiAgICAgICAgICAgICBsaXN0 LT5yZW1vdmUoaSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAtNjExLDEx ICs2MTEsMTEgQEAgdm9pZCBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OnNoaWZ0TWFya2VycyhO b2RlJiBub2RlLCB1bnNpZ25lZCBzdGFydE9mZnNldCwgaW4KICNpZiBQTEFURk9STShJT1NfRkFN SUxZKQogICAgICAgICAvLyBGSVhNRTogTm8gb2J2aW91cyByZWFzb24gdGhpcyBzaG91bGQgYmUg aU9TLXNwZWNpZmljLiBSZW1vdmUgdGhlICNpZiBhdCBzb21lIHBvaW50LgogICAgICAgICBlbHNl IGlmIChtYXJrZXIuZW5kT2Zmc2V0KCkgPiBzdGFydE9mZnNldCkgewotICAgICAgICAgICAgaWYg KG1hcmtlci5lbmRPZmZzZXQoKSArIGRlbHRhIDw9IG1hcmtlci5zdGFydE9mZnNldCgpKSB7Cisg ICAgICAgICAgICBpZiAodGFyZ2V0RW5kT2Zmc2V0IDw9IG1hcmtlci5zdGFydE9mZnNldCgpKSB7 CiAgICAgICAgICAgICAgICAgbGlzdC0+cmVtb3ZlKGkpOwogICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgbWFya2VyLnNldEVuZE9mZnNldChzdGQ6 Om1pbjx1bnNpZ25lZD4odGFyZ2V0RW5kT2Zmc2V0LCBub2RlLmxlbmd0aCgpKSk7CisgICAgICAg ICAgICBtYXJrZXIuc2V0RW5kT2Zmc2V0KHN0ZDo6bWluKHRhcmdldEVuZE9mZnNldCwgbm9kZS5s ZW5ndGgoKSkpOwogICAgICAgICAgICAgZGlkU2hpZnRNYXJrZXIgPSB0cnVlOwogICAgICAgICB9 CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCA4ZDVmMTdlZWIwZTEwMzU5YzQ0ZWI4Mzg5M2RjY2Y5ZjU1MjkxY2NhLi4xMzUwODY5MGU4 ODQxOTZmMDUxM2VkMTg5YTQyOWUzMjdkY2FhODVkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDUtMTkgIERh cmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyNTk5 MzApOiBEaWN0YXRpb24gbWFya2VyIGF0IHN0YXJ0IG9mIHRleHQgaXMgcmVtb3ZlZCB3aGVuIGFk ZGVkIHRyYWlsaW5nIHdoaXRlc3BhY2UgaXMgY29sbGFwc2VkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIwOTMKKworICAgICAgICBSZXZpZXdlZCBi eSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL0luc2VydFRleHRBbHRlcm5hdGl2ZXMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpU RVNUKTogRXhwZWN0IHN1Y2Nlc3MgcmF0aGVyIHRoYW4gZmFpbHVyZS4KKwogMjAyMC0wNS0xOSAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFk ZCBfV0tEb3dubG9hZERlbGVnYXRlIGNhbGxiYWNrIGluY2x1ZGluZyB0b3RhbEJ5dGVzV3JpdHRl bgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbnNl cnRUZXh0QWx0ZXJuYXRpdmVzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9JbnNlcnRUZXh0QWx0ZXJuYXRpdmVzLm1tCmluZGV4IDJkZjJiZGJmNWUxYzkyNWQwNGQw NjU5YzdmMTAzMGFhZDMwNDQ5YjcuLjI5NTM5MzdiMDYzYTY1ZDg5MzczMDY3NTk1ZWY3NTM1MjFl Y2E3MDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev SW5zZXJ0VGV4dEFsdGVybmF0aXZlcy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL0luc2VydFRleHRBbHRlcm5hdGl2ZXMubW0KQEAgLTE1Myw3ICsxNTMsNyBA QCBURVNUKEluc2VydFRleHRBbHRlcm5hdGl2ZXMsIEluc2VydFRyYWlsaW5nU3BhY2UpCiAgICAg RVhQRUNUX0ZBTFNFKFtbd2ViVmlldyBvYmplY3RCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiaW50 ZXJuYWxzLmhhc0RpY3RhdGlvbkFsdGVybmF0aXZlc01hcmtlcig1LCAxKSJdIGJvb2xWYWx1ZV0p OyAvLyA8c3BhY2U+CiB9CiAKLVRFU1QoSW5zZXJ0VGV4dEFsdGVybmF0aXZlcywgSW5zZXJ0VHJh aWxpbmdTcGFjZVdoaXRlc3BhY2VSZWJhbGFuY2VfRXhwZWN0ZWRGYWlsdXJlKQorVEVTVChJbnNl cnRUZXh0QWx0ZXJuYXRpdmVzLCBJbnNlcnRUcmFpbGluZ1NwYWNlV2hpdGVzcGFjZVJlYmFsYW5j ZSkKIHsKICAgICBhdXRvICpjb25maWd1cmF0aW9uID0gW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24g X3Rlc3RfY29uZmlndXJhdGlvbldpdGhUZXN0UGx1Z0luQ2xhc3NOYW1lOkAiV2ViUHJvY2Vzc1Bs dWdJbldpdGhJbnRlcm5hbHMiIGNvbmZpZ3VyZUpTQ0ZvclRlc3Rpbmc6WUVTXTsKICAgICBhdXRv IHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpO U01ha2VSZWN0KDAsIDAsIDMwMCwgMzAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb25dKTsK QEAgLTE2Nyw4ICsxNjcsNyBAQCBURVNUKEluc2VydFRleHRBbHRlcm5hdGl2ZXMsIEluc2VydFRy YWlsaW5nU3BhY2VXaGl0ZXNwYWNlUmViYWxhbmNlX0V4cGVjdGVkRmFpbAogICAgIFtbd2ViVmll dyB0ZXh0SW5wdXRDb250ZW50Vmlld10gaW5zZXJ0VGV4dDpAIiAiXTsKICAgICBbd2ViVmlldyB3 YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CiAKLSAgICAvLyBGSVhNRTogQ2hhbmdlIHRo aXMgdG8gRVhQRUNUX1RSVUUoKSBvbmNlIDxodHRwczovL3dlYmtpdC5vcmcvYi8yMTIwOTM+IGlz IGZpeGVkLgotICAgIEVYUEVDVF9GQUxTRShbW3dlYlZpZXcgb2JqZWN0QnlFdmFsdWF0aW5nSmF2 YVNjcmlwdDpAImludGVybmFscy5oYXNEaWN0YXRpb25BbHRlcm5hdGl2ZXNNYXJrZXIoMCwgNSki XSBib29sVmFsdWVdKTsgLy8gaGVsbG8KKyAgICBFWFBFQ1RfVFJVRShbW3dlYlZpZXcgb2JqZWN0 QnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImludGVybmFscy5oYXNEaWN0YXRpb25BbHRlcm5hdGl2 ZXNNYXJrZXIoMCwgNSkiXSBib29sVmFsdWVdKTsgLy8gaGVsbG8KIH0KIAogVEVTVChJbnNlcnRU ZXh0QWx0ZXJuYXRpdmVzLCBJbnNlcnRUcmFpbGluZ05ld2xpbmUpCg==