27523 2009-07-21 15:44:06 -0700 Don't convert soft hyphens in selections into spaces 2010-11-10 17:32:39 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC All RESOLVED INVALID P2 Normal --- 1 agl webkit-unassigned ap eric mitz peter.arrenbrecht+webkit simon oldest_to_newest 133628 0 agl 2009-07-21 15:44:06 -0700 Soft hyphens are code points which suggest optimal line-breaking points in words. Because they aren't usually part of a TextBox, we are currently converting all of them into spaces when getting the text of a selection. With this patch, soft-hypens which aren't rendered are omitted in the selection. 133632 1 33222 agl 2009-07-21 15:47:23 -0700 Created attachment 33222 patch 133648 2 33222 eric 2009-07-21 16:32:55 -0700 Comment on attachment 33222 patch Need expected results for the layout test. + var e = window.eventSender; + e.mouseMoveTo(3, 5); + e.mouseDown(); + for (var x = 4; x < 300; x += 20) { + e.mouseMoveTo(x, 5); + } + e.mouseUp(); can probably be replaced by something like this: var sel = window.getSelection() var p = document.getElementsByTagName("p")[0]; // an id lookup would be cleaner. sel.selectAllChildren(p); WebKit only way for selecting part of a node: sel.setBaseAndExtent(p, 0, p, 10); You can also create ranges and add them to the selection with sel.addRange(). In FF the only way to manipulate the selection is through Ranges: var range = document.createRange(); range.setStart(p, 0); range.setEnd(p, 10); sel.removeAllRanges(); sel.addRange(range); http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html Yes, the Range API is insane. No need to do all the style stuff if you use Range/Selection APIs to create the selection. I'm not really sure about the code change. I would probably have put it into some sort of inline: atRunEndOrSoftHyphen(str, nextRunStart, runEnd) I'm not actually sure what the change is doing though, so difficult for me to name said inline. ;) r- for lack of expected results. 133680 3 33234 agl 2009-07-21 19:02:58 -0700 Created attachment 33234 patch 133744 4 peter.arrenbrecht+webkit 2009-07-22 05:02:35 -0700 I just realized that Firefox copies the soft-hyphens as 0xad, which in gedit serves as a soft word-break location. Furthermore, it does _not_ copy shown hyphens, as you suggest doing in the webkit patch. And I don't think one should, because the paste target should handle wrapping, I think. 133785 5 33234 ap 2009-07-22 09:36:18 -0700 Comment on attachment 33234 patch This looks like a duplicate of bug 11154 and/or 26774 to me. Please search for existing Bugzilla bugs when submitting new ones. We usually check whether the test is running under DRT to avoid console spew if it's not. Also, it's slightly better to call dumpAsText as early as possible, to ease investigation in case something in the test suddenly starts raising exceptions. if (window.layoutTestController) layoutTestController.dumpAsText(); The ChangeLog doesn't explain changes to charset-xuser-defined-expected.txt. Why are these safe? r- for the reasons given by Peter Arrenbrecht above. 133789 6 agl 2009-07-22 09:48:52 -0700 Peter: > Furthermore, it does _not_ copy shown hyphens, as you suggest doing in the webkit patch. Substituting spaces for &shy; is clearly wrong, which is why I got rid of it. If people think that we should keep the &shy;'s, then I can make that change. However, there's no way that we should keep the &shy;'s when not rendered and omit them when rendered as you suggest. Also, I can't replicate this behaviour in Firefox - it copies &shy;'s, rendered or not, for me. 134043 7 peter.arrenbrecht+webkit 2009-07-22 23:47:54 -0700 Adam, > Substituting spaces for &shy; is clearly wrong, which is why I got rid of it. Agreed. > However, there's no way that we should keep the &shy;'s when not rendered and > omit them when rendered as you suggest. That is not what I meant to suggest. I suggest keeping _all_ &shy;'s as 0xad, as Firefox does, irrespective of whether they are rendered or not. > Also, I can't replicate this behaviour > in Firefox - it copies &shy;'s, rendered or not, for me. I'm on Ubuntu Jaunty. When I copy in Firefox and then do $ xclip -o -selection clipboard | hexdump -C I get the all the &shy; chars as 0xad. If I paste into gedit and turn line wrapping on there, when I resize the width of gedit, it clearly breaks the long words at the 0xad locations (although without adding a hyphen). Referring again to http://recoveringphysicist.com/11/soft-hyphens, if I copy the last two words of the demo paragraph in Firefox and hexdump, I get: 00000000 75 6e ad 70 72 65 ad 6d 65 64 69 ad 74 61 74 65 |un.pre.medi.tate| 00000010 64 20 75 6e 69 ad 6c 61 74 65 72 ad 61 6c |d uni.later.al| Although if I paste this into a terminal, the 0xad's are rendered as spaces. Also if I paste into vim. So it's not entirely clear to me that what Firefox does really is desirable. 307655 8 mitz 2010-11-10 17:32:39 -0800 As of r71787, soft hyphens aren’t converted into spaces when converting to plain text. They are left as-is. This makes sense for copy and paste, and was also made to work with find. 33222 2009-07-21 15:47:23 -0700 2009-07-21 19:02:58 -0700 patch patch text/plain 3712 agl ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5ZDNhMjFhLi4xZmJjZmE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDct MjEgIEFkYW0gTGFuZ2xleSAgPGFnbEBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IGNvbnZlcnQgc29mdCBoeXBoZW5zIGlu IHNlbGVjdGlvbnMgaW50byBzcGFjZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTI3NTIzCisgICAgICAgIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20v cC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lkPTE3MzUyCisKKyAgICAgICAgU29mdCBoeXBoZW5z IGFyZSBjb2RlIHBvaW50cyB3aGljaCBzdWdnZXN0IG9wdGltYWwgbGluZS1icmVha2luZworICAg ICAgICBwb2ludHMgaW4gd29yZHMuIEJlY2F1c2UgdGhleSBhcmVuJ3QgdXN1YWxseSBwYXJ0IG9m IGEgVGV4dEJveCwgd2UgYXJlCisgICAgICAgIGN1cnJlbnRseSBjb252ZXJ0aW5nIGFsbCBvZiB0 aGVtIGludG8gc3BhY2VzIHdoZW4gZ2V0dGluZyB0aGUgdGV4dCBvZgorICAgICAgICBhIHNlbGVj dGlvbi4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2gsIHNvZnQtaHlwZW5zIHdoaWNoIGFyZW4n dCByZW5kZXJlZCBhcmUgb21pdHRlZCBpbiB0aGUKKyAgICAgICAgc2VsZWN0aW9uLgorCisgICAg ICAgICogZmFzdC90ZXh0L3NvZnQtaHlwaGVuLTQuaHRtbDogQWRkZWQuCisKIDIwMDktMDctMjEg IFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFRvciBBcm5lIFZlc3Riw7guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L3RleHQvc29mdC1oeXBoZW4tNC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NvZnQtaHlw aGVuLTQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40NjBhODVkCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NvZnQtaHlwaGVuLTQuaHRt bApAQCAtMCwwICsxLDM1IEBACis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHNjcmlwdD4KKyAgICAg IGZ1bmN0aW9uIGdvKCkgeworICAgICAgICB2YXIgZSA9IHdpbmRvdy5ldmVudFNlbmRlcjsKKyAg ICAgICAgZS5tb3VzZU1vdmVUbygzLCA1KTsKKyAgICAgICAgZS5tb3VzZURvd24oKTsKKyAgICAg ICAgZm9yICh2YXIgeCA9IDQ7IHggPCAzMDA7IHggKz0gMjApIHsKKyAgICAgICAgICBlLm1vdXNl TW92ZVRvKHgsIDUpOworICAgICAgICB9CisgICAgICAgIGUubW91c2VVcCgpOworCisgICAgICAg IHZhciBwYXN0ZVRhcmdldCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJwYXN0ZS10YXJnZXQi KTsKKyAgICAgICAgcGFzdGVUYXJnZXQuaW5uZXJIVE1MID0gd2luZG93LmdldFNlbGVjdGlvbigp LmdldFJhbmdlQXQoMCkudG9TdHJpbmcoKTsKKworICAgICAgICB3aW5kb3cubGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgfQorICAgIDwvc2NyaXB0PgorCisgICAgPHN0 eWxlPgorICAgICAgYm9keSB7CisgICAgICAgIGJvcmRlcjogMHB4OworICAgICAgICBwYWRkaW5n OiAwcHg7CisgICAgICAgIG1hcmdpbjogMHB4OworICAgICAgfQorICAgIDwvc3R5bGU+CisgIDwv aGVhZD4KKworICA8Ym9keSBvbmxvYWQ9ImdvKCk7Ij4KKyAgICA8cD5ObyBzcCZzaHk7YWNlcyBp biBzZWwmc2h5O2VjJnNoeTt0aW9uLjwvcD4KKworICAgIDxwPlRoaXMgdGVzdCBwYXNzZXMgaWYg dGhlIGZvbGxvd2luZyBjb250YWlucyB0aGUgYWJvdmUsIHNlbGVjdGVkLCB0ZXh0IHdpdGggbm8g c3BhY2VzLjwvcD4KKyAgICA8cCBpZD0icGFzdGUtdGFyZ2V0Ij48L3A+CisgIDwvYm9keT4KKzwv aHRtbD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggOTAzOGExYy4uYWFlYmVhZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAwOS0wNy0yMSAgQWRhbSBM YW5nbGV5ICA8YWdsQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRG9uJ3QgY29udmVydCBzb2Z0IGh5cGhlbnMgaW4gc2VsZWN0aW9u cyBpbnRvIHNwYWNlcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Mjc1MjMKKyAgICAgICAgaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVt L2lzc3Vlcy9kZXRhaWw/aWQ9MTczNTIKKworICAgICAgICBTb2Z0IGh5cGhlbnMgYXJlIGNvZGUg cG9pbnRzIHdoaWNoIHN1Z2dlc3Qgb3B0aW1hbCBsaW5lLWJyZWFraW5nCisgICAgICAgIHBvaW50 cyBpbiB3b3Jkcy4gQmVjYXVzZSB0aGV5IGFyZW4ndCB1c3VhbGx5IHBhcnQgb2YgYSBUZXh0Qm94 LCB3ZSBhcmUKKyAgICAgICAgY3VycmVudGx5IGNvbnZlcnRpbmcgYWxsIG9mIHRoZW0gaW50byBz cGFjZXMgd2hlbiBnZXR0aW5nIHRoZSB0ZXh0IG9mCisgICAgICAgIGEgc2VsZWN0aW9uLgorCisg ICAgICAgIFdpdGggdGhpcyBwYXRjaCwgc29mdC1oeXBlbnMgd2hpY2ggYXJlbid0IHJlbmRlcmVk IGFyZSBvbWl0dGVkIGluIHRoZQorICAgICAgICBzZWxlY3Rpb24uCisKKyAgICAgICAgVGVzdDog ZmFzdC90ZXh0L3NvZnQtaHlwaGVuLTQuaHRtbAorCisgICAgICAgICogZWRpdGluZy9UZXh0SXRl cmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEl0ZXJhdG9yOjpoYW5kbGVUZXh0Qm94 KToKKwogMjAwOS0wNy0yMSAgSmFtZXMgSGF3a2lucyAgPGpoYXdraW5zQGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Vk aXRpbmcvVGV4dEl0ZXJhdG9yLmNwcCBiL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3Bw CmluZGV4IGY4MmE5NzIuLjU4ZDZkODUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZWRpdGluZy9UZXh0 SXRlcmF0b3IuY3BwCisrKyBiL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCkBAIC01 MzAsNyArNTMwLDcgQEAgdm9pZCBUZXh0SXRlcmF0b3I6OmhhbmRsZVRleHRCb3goKQogCiAgICAg ICAgICAgICAvLyBBZHZhbmNlIGFuZCByZXR1cm4KICAgICAgICAgICAgIGludCBuZXh0UnVuU3Rh cnQgPSBuZXh0VGV4dEJveCA/IG5leHRUZXh0Qm94LT5zdGFydCgpIDogc3RyLmxlbmd0aCgpOwot ICAgICAgICAgICAgaWYgKG5leHRSdW5TdGFydCA+IHJ1bkVuZCkKKyAgICAgICAgICAgIGlmIChu ZXh0UnVuU3RhcnQgPiBydW5FbmQgJiYgIShuZXh0UnVuU3RhcnQgLSBydW5FbmQgPT0gMSAmJiBz dHJbbmV4dFJ1blN0YXJ0IC0gMV0gPT0gc29mdEh5cGhlbikpCiAgICAgICAgICAgICAgICAgbV9s YXN0VGV4dE5vZGVFbmRlZFdpdGhDb2xsYXBzZWRTcGFjZSA9IHRydWU7IC8vIGNvbGxhcHNlZCBz cGFjZSBiZXR3ZWVuIHJ1bnMgb3IgYXQgdGhlIGVuZAogICAgICAgICAgICAgbV90ZXh0Qm94ID0g bmV4dFRleHRCb3g7CiAgICAgICAgICAgICBpZiAocmVuZGVyZXItPmNvbnRhaW5zUmV2ZXJzZWRU ZXh0KCkpCg== 33234 2009-07-21 19:02:58 -0700 2010-06-15 11:26:12 -0700 patch patch text/plain 5626 agl ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5ZDNhMjFhLi5jNGJiOWU4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMDktMDct MjEgIEFkYW0gTGFuZ2xleSAgPGFnbEBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IGNvbnZlcnQgc29mdCBoeXBoZW5zIGlu IHNlbGVjdGlvbnMgaW50byBzcGFjZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTI3NTIzCisgICAgICAgIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20v cC9jaHJvbWl1bS9pc3N1ZXMvZGV0YWlsP2lkPTE3MzUyCisKKyAgICAgICAgU29mdCBoeXBoZW5z IGFyZSBjb2RlIHBvaW50cyB3aGljaCBzdWdnZXN0IG9wdGltYWwgbGluZS1icmVha2luZworICAg ICAgICBwb2ludHMgaW4gd29yZHMuIEJlY2F1c2UgdGhleSBhcmVuJ3QgdXN1YWxseSBwYXJ0IG9m IGEgVGV4dEJveCwgd2UgYXJlCisgICAgICAgIGN1cnJlbnRseSBjb252ZXJ0aW5nIGFsbCBvZiB0 aGVtIGludG8gc3BhY2VzIHdoZW4gZ2V0dGluZyB0aGUgdGV4dCBvZgorICAgICAgICBhIHNlbGVj dGlvbi4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2gsIHNvZnQtaHlwZW5zIHdoaWNoIGFyZW4n dCByZW5kZXJlZCBhcmUgb21pdHRlZCBpbiB0aGUKKyAgICAgICAgc2VsZWN0aW9uLgorCisgICAg ICAgICogZmFzdC9lbmNvZGluZy9jaGFyc2V0LXh1c2VyLWRlZmluZWQtZXhwZWN0ZWQudHh0OiBV cGRhdGVkCisgICAgICAgICogZmFzdC90ZXh0L3NvZnQtaHlwaGVuLTQtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvc29mdC1oeXBoZW4tNC5odG1sOiBBZGRlZC4KKwog MjAwOS0wNy0yMSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvZW5jb2RpbmcvY2hhcnNldC14dXNlci1kZWZpbmVkLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2Zhc3QvZW5jb2RpbmcvY2hhcnNldC14dXNlci1kZWZpbmVkLWV4cGVjdGVk LnR4dAppbmRleCBiNWZmMjBiLi40NzAxNDY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0 L2VuY29kaW5nL2NoYXJzZXQteHVzZXItZGVmaW5lZC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9lbmNvZGluZy9jaGFyc2V0LXh1c2VyLWRlZmluZWQtZXhwZWN0ZWQudHh0CkBA IC0xLDQgKzEsNCBAQAogVGVzdCBidWd6aWxsYSBidWcgMTgyNzAgKEludGVycHJldGluZyB4LXVz ZXItZGVmaW5lZCBhcyB3aW5kb3dzLTEyNTIgd2hlbiBkZWNsYXJlZCBpbiBtZXRhIHRhZykuIFR3 byBsaW5lcyBiZWxvdyBzaG91bGQgYmUgaWRlbnRpY2FsLgogCi3igqwg4oCaxpLigJ7igKbigKDi gKHLhuKAsMWg4oC5xZIgxb0g4oCY4oCZ4oCc4oCd4oCi4oCT4oCUy5zihKLFoeKAusWTIMW+xbjC oMKhwqLCo8KkwqXCpsKnwqjCqcKqwqvCrCDCrsKvwrDCscKywrPCtMK1wrbCt8K4wrnCusK7wrzC vcK+wr/DgMOBw4LDg8OEw4XDhsOHw4jDicOKw4vDjMONw47Dj8OQw5HDksOTw5TDlcOWw5fDmMOZ w5rDm8Ocw53DnsOfw6DDocOiw6PDpMOlw6bDp8Oow6nDqsOrw6zDrcOuw6/DsMOxw7LDs8O0w7XD tsO3w7jDucO6w7vDvMO9w77Dvwot4oKsIOKAmsaS4oCe4oCm4oCg4oChy4bigLDFoOKAucWSIMW9 IOKAmOKAmeKAnOKAneKAouKAk+KAlMuc4oSixaHigLrFkyDFvsW4wqDCocKiwqPCpMKlwqbCp8Ko wqnCqsKrwqwgwq7Cr8KwwrHCssKzwrTCtcK2wrfCuMK5wrrCu8K8wr3CvsK/w4DDgcOCw4PDhMOF w4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlsOXw5jDmcOaw5vDnMOdw57Dn8Ogw6HD osOjw6TDpcOmw6fDqMOpw6rDq8Osw63DrsOvw7DDscOyw7PDtMO1w7bDt8O4w7nDusO7w7zDvcO+ w78KK+KCrCDigJrGkuKAnuKApuKAoOKAocuG4oCwxaDigLnFkiDFvSDigJjigJnigJzigJ3igKLi gJPigJTLnOKEosWh4oC6xZMgxb7FuMKgwqHCosKjwqTCpcKmwqfCqMKpwqrCq8Kswq7Cr8KwwrHC ssKzwrTCtcK2wrfCuMK5wrrCu8K8wr3CvsK/w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOO w4/DkMORw5LDk8OUw5XDlsOXw5jDmcOaw5vDnMOdw57Dn8Ogw6HDosOjw6TDpcOmw6fDqMOpw6rD q8Osw63DrsOvw7DDscOyw7PDtMO1w7bDt8O4w7nDusO7w7zDvcO+w78KK+KCrCDigJrGkuKAnuKA puKAoOKAocuG4oCwxaDigLnFkiDFvSDigJjigJnigJzigJ3igKLigJPigJTLnOKEosWh4oC6xZMg xb7FuMKgwqHCosKjwqTCpcKmwqfCqMKpwqrCq8Kswq7Cr8KwwrHCssKzwrTCtcK2wrfCuMK5wrrC u8K8wr3CvsK/w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlsOX w5jDmcOaw5vDnMOdw57Dn8Ogw6HDosOjw6TDpcOmw6fDqMOpw6rDq8Osw63DrsOvw7DDscOyw7PD tMO1w7bDt8O4w7nDusO7w7zDvcO+w78KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4 dC9zb2Z0LWh5cGhlbi00LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9zb2Z0 LWh5cGhlbi00LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li5hZDJhOTg1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NvZnQt aHlwaGVuLTQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAorTm8gc3BhY2VzIGluIHNlbGVj dGlvbi4KKworVGhpcyB0ZXN0IHBhc3NlcyBpZiB0aGUgZm9sbG93aW5nIGNvbnRhaW5zIHRoZSBh Ym92ZSwgc2VsZWN0ZWQsIHRleHQgd2l0aCBubyBzcGFjZXMuCisKK05vIHNwYWNlcyBpbiBzZWxl Y3Rpb24uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvc29mdC1oeXBoZW4tNC5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3NvZnQtaHlwaGVuLTQuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45NzY2OTM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L3NvZnQtaHlwaGVuLTQuaHRtbApAQCAtMCwwICsxLDI0IEBACis8 aHRtbD4KKyAgPGhlYWQ+CisgICAgPHNjcmlwdD4KKyAgICAgIGZ1bmN0aW9uIGdvKCkgeworICAg ICAgICB2YXIgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgICAgICB2YXIg c2VsZWN0aW9uU291cmNlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNlbGVjdGlvbi1zb3Vy Y2UiKTsKKyAgICAgICAgc2VsZWN0aW9uLnNlbGVjdEFsbENoaWxkcmVuKHNlbGVjdGlvblNvdXJj ZSk7CisKKyAgICAgICAgdmFyIHBhc3RlVGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InBhc3RlLXRhcmdldCIpOworICAgICAgICBwYXN0ZVRhcmdldC5pbm5lckhUTUwgPSB3aW5kb3cu Z2V0U2VsZWN0aW9uKCkuZ2V0UmFuZ2VBdCgwKS50b1N0cmluZygpOworCisgICAgICAgIHdpbmRv dy5sYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICB9CisgICAgPC9zY3Jp cHQ+CisgIDwvaGVhZD4KKworICA8Ym9keSBvbmxvYWQ9ImdvKCk7Ij4KKyAgICA8cCBpZD0ic2Vs ZWN0aW9uLXNvdXJjZSI+Tm8gc3Amc2h5O2FjZXMgaW4gc2VsJnNoeTtlYyZzaHk7dGlvbi48L3A+ CisKKyAgICA8cD5UaGlzIHRlc3QgcGFzc2VzIGlmIHRoZSBmb2xsb3dpbmcgY29udGFpbnMgdGhl IGFib3ZlLCBzZWxlY3RlZCwgdGV4dCB3aXRoIG5vIHNwYWNlcy48L3A+CisKKyAgICA8cCBpZD0i cGFzdGUtdGFyZ2V0Ij48L3A+CisgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTAzOGExYy4uYWFlYmVhZCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyNSBAQAorMjAwOS0wNy0yMSAgQWRhbSBMYW5nbGV5ICA8YWdsQGdvb2dsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qg Y29udmVydCBzb2Z0IGh5cGhlbnMgaW4gc2VsZWN0aW9ucyBpbnRvIHNwYWNlcy4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1MjMKKyAgICAgICAg aHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2Nocm9taXVtL2lzc3Vlcy9kZXRhaWw/aWQ9MTczNTIK KworICAgICAgICBTb2Z0IGh5cGhlbnMgYXJlIGNvZGUgcG9pbnRzIHdoaWNoIHN1Z2dlc3Qgb3B0 aW1hbCBsaW5lLWJyZWFraW5nCisgICAgICAgIHBvaW50cyBpbiB3b3Jkcy4gQmVjYXVzZSB0aGV5 IGFyZW4ndCB1c3VhbGx5IHBhcnQgb2YgYSBUZXh0Qm94LCB3ZSBhcmUKKyAgICAgICAgY3VycmVu dGx5IGNvbnZlcnRpbmcgYWxsIG9mIHRoZW0gaW50byBzcGFjZXMgd2hlbiBnZXR0aW5nIHRoZSB0 ZXh0IG9mCisgICAgICAgIGEgc2VsZWN0aW9uLgorCisgICAgICAgIFdpdGggdGhpcyBwYXRjaCwg c29mdC1oeXBlbnMgd2hpY2ggYXJlbid0IHJlbmRlcmVkIGFyZSBvbWl0dGVkIGluIHRoZQorICAg ICAgICBzZWxlY3Rpb24uCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L3NvZnQtaHlwaGVuLTQu aHRtbAorCisgICAgICAgICogZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VGV4dEl0ZXJhdG9yOjpoYW5kbGVUZXh0Qm94KToKKwogMjAwOS0wNy0yMSAgSmFtZXMg SGF3a2lucyAgPGpoYXdraW5zQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2 aWQgSHlhdHQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcCBi L1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCmluZGV4IGY4MmE5NzIuLjU4ZDZkODUg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCisrKyBiL1dlYkNv cmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCkBAIC01MzAsNyArNTMwLDcgQEAgdm9pZCBUZXh0 SXRlcmF0b3I6OmhhbmRsZVRleHRCb3goKQogCiAgICAgICAgICAgICAvLyBBZHZhbmNlIGFuZCBy ZXR1cm4KICAgICAgICAgICAgIGludCBuZXh0UnVuU3RhcnQgPSBuZXh0VGV4dEJveCA/IG5leHRU ZXh0Qm94LT5zdGFydCgpIDogc3RyLmxlbmd0aCgpOwotICAgICAgICAgICAgaWYgKG5leHRSdW5T dGFydCA+IHJ1bkVuZCkKKyAgICAgICAgICAgIGlmIChuZXh0UnVuU3RhcnQgPiBydW5FbmQgJiYg IShuZXh0UnVuU3RhcnQgLSBydW5FbmQgPT0gMSAmJiBzdHJbbmV4dFJ1blN0YXJ0IC0gMV0gPT0g c29mdEh5cGhlbikpCiAgICAgICAgICAgICAgICAgbV9sYXN0VGV4dE5vZGVFbmRlZFdpdGhDb2xs YXBzZWRTcGFjZSA9IHRydWU7IC8vIGNvbGxhcHNlZCBzcGFjZSBiZXR3ZWVuIHJ1bnMgb3IgYXQg dGhlIGVuZAogICAgICAgICAgICAgbV90ZXh0Qm94ID0gbmV4dFRleHRCb3g7CiAgICAgICAgICAg ICBpZiAocmVuZGVyZXItPmNvbnRhaW5zUmV2ZXJzZWRUZXh0KCkpCg==