197145 2019-04-20 23:41:57 -0700 Defer EditorState updates until the next layer tree flush in a few additional circumstances 2019-06-26 00:41:21 -0700 1 1 1 Unclassified WebKit HTML Editing Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=199196 https://bugs.webkit.org/show_bug.cgi?id=199213 InRadar P2 Normal --- 197188 1 wenson_hsieh wenson_hsieh aakash_jain ap bdakin commit-queue darin rniwa simon.fraser thorton tsavell webkit-bug-importer wenson_hsieh oldest_to_newest 1529131 0 wenson_hsieh 2019-04-20 23:41:57 -0700 Examples include after changing editability, showing the font manager on macOS, and after a selection change. 1529132 1 webkit-bug-importer 2019-04-20 23:42:26 -0700 <rdar://problem/50078170> 1529133 2 367904 wenson_hsieh 2019-04-20 23:46:33 -0700 Created attachment 367904 Patch 1529160 3 367904 wenson_hsieh 2019-04-21 13:43:13 -0700 Comment on attachment 367904 Patch Thanks for the review! 1529161 4 367904 commit-queue 2019-04-21 14:10:37 -0700 Comment on attachment 367904 Patch Clearing flags on attachment: 367904 Committed r244494: <https://trac.webkit.org/changeset/244494> 1529162 5 commit-queue 2019-04-21 14:10:38 -0700 All reviewed patches have been landed. Closing bug. 1531559 6 tsavell 2019-04-30 09:56:55 -0700 It looks like the changes in https://trac.webkit.org/changeset/244494/webkit has caused the test editing/pasteboard/5761530-1.html to become flakey. I was able to reproduce this using command: run-webkit-tests editing/pasteboard/5761530-1.html --iterations 20 --ios-simulator The test passes on 244493 and with fail on 244494 History: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=editing%2Fpasteboard%2F5761530-1.html Diff: --- /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test-results/editing/pasteboard/5761530-1-expected.txt +++ /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test-results/editing/pasteboard/5761530-1-actual.txt @@ -1,3 +1,3 @@ This tests to see that tabs are put into tab spans when they are copied individually. The pasted tab should be inside of a tab span, not a style span. To run the test manually, paste and then inspect the editable region, and ensure that there is a tab span at the beginning of the editable div. -<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space:pre;"> </span>xxx +<span class="Apple-tab-span" style="white-space: pre;"> </span><span class="Apple-tab-span" style="white-space:pre;"> </span>xxx 1531685 7 rniwa 2019-04-30 13:41:18 -0700 That's rather surprising. The test doesn't seem like it would depend anything related to EditorState. 1531687 8 rniwa 2019-04-30 13:42:44 -0700 Filed https://bugs.webkit.org/show_bug.cgi?id=197438 to track the test flakiness. 1531704 9 ap 2019-04-30 14:14:56 -0700 EWS did hit this failure, but since it is flaky, it wasn't reported. Perhaps we could eventually develop some logic for EWS to dig into flaky failures. 367904 2019-04-20 23:46:33 -0700 2019-04-21 14:10:37 -0700 Patch bug-197145-20190420234632.patch text/plain 14262 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxZGM4ZGFmMGU3YzQ1Zjg1 M2YxYTkwYTZjMWQyYTM4NjY3YmM2ZWYuLjcxNzcyODEzOTcyMzE0YzJlNDNjOGE4MTNhMjc0ZTVi NGFhOGZkZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDQtMjAgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgRGVmZXIgRWRpdG9yU3Rh dGUgdXBkYXRlcyB1bnRpbCB0aGUgbmV4dCBsYXllciB0cmVlIGZsdXNoIGluIGEgZmV3IGFkZGl0 aW9uYWwgY2lyY3Vtc3RhbmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTk3MTQ1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDA3ODE3MD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHZXRzIHJpZCBv ZiBzZW5kUGFydGlhbEVkaXRvclN0YXRlQW5kU2NoZWR1bGVQb3N0TGF5b3V0VXBkYXRlKCksIGlu IGZhdm9yIG9mIGFsd2F5cyBzY2hlZHVsaW5nIGEgZnVsbCBlZGl0b3IKKyAgICAgICAgc3RhdGUg dXBkYXRlIGFmdGVyIHRoZSBuZXh0IGNvbXBvc2l0aW5nIGZsdXNoLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1 cGRhdGVFZGl0b3JTdGF0ZUFmdGVyTGF5b3V0SWZFZGl0YWJpbGl0eUNoYW5nZWQpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpzZXROZWVkc0ZvbnRBdHRyaWJ1dGVzKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6ZGlkQ2hhbmdlT3ZlcmZsb3dTY3JvbGxQb3NpdGlvbik6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OmRpZENoYW5nZVNlbGVjdGlvbik6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2U6OmRpZENoYW5nZVNlbGVjdGlvbk9yT3ZlcmZsb3dTY3JvbGxQb3NpdGlvbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNlbmRQYXJ0aWFsRWRpdG9yU3RhdGVBbmRTY2hlZHVs ZVBvc3RMYXlvdXRVcGRhdGUpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9T Lm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwbGF0Zm9ybUVkaXRvclN0YXRlIGNvbnN0 KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyk6 CisKIDIwMTktMDQtMjAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCBmaXggaU9TIGJ1aWxkIHdpdGggcmVjZW50IFNES3MuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDE0MWRkNGE3MDAxODcw NTMwYjdhMDNmZDgzN2U1YWI3ZWQ1ODViNDcuLmYyYmU4MWVjN2U1YTFiOGZhMTdmNmNhZmZlZDAx NmM5Y2E1OTFmN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCkBAIC0xMTI1LDcgKzExMjUsNyBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZUVkaXRvclN0 YXRlQWZ0ZXJMYXlvdXRJZkVkaXRhYmlsaXR5Q2hhbmdlZCgpCiAgICAgRnJhbWUmIGZyYW1lID0g bV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKICAgICBFZGl0 b3JTdGF0ZUlzQ29udGVudEVkaXRhYmxlIGVkaXRvclN0YXRlSXNDb250ZW50RWRpdGFibGUgPSBm cmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5pc0NvbnRlbnRFZGl0YWJsZSgpID8gRWRpdG9y U3RhdGVJc0NvbnRlbnRFZGl0YWJsZTo6WWVzIDogRWRpdG9yU3RhdGVJc0NvbnRlbnRFZGl0YWJs ZTo6Tm87CiAgICAgaWYgKG1fbGFzdEVkaXRvclN0YXRlV2FzQ29udGVudEVkaXRhYmxlICE9IGVk aXRvclN0YXRlSXNDb250ZW50RWRpdGFibGUpCi0gICAgICAgIHNlbmRQYXJ0aWFsRWRpdG9yU3Rh dGVBbmRTY2hlZHVsZVBvc3RMYXlvdXRVcGRhdGUoKTsKKyAgICAgICAgc2NoZWR1bGVGdWxsRWRp dG9yU3RhdGVVcGRhdGUoKTsKIH0KIAogU3RyaW5nIFdlYlBhZ2U6OnJlbmRlclRyZWVFeHRlcm5h bFJlcHJlc2VudGF0aW9uKCkgY29uc3QKQEAgLTI3NjQsNyArMjc2NCw3IEBAIHZvaWQgV2ViUGFn ZTo6c2V0TmVlZHNGb250QXR0cmlidXRlcyhib29sIG5lZWRzRm9udEF0dHJpYnV0ZXMpCiAgICAg bV9uZWVkc0ZvbnRBdHRyaWJ1dGVzID0gbmVlZHNGb250QXR0cmlidXRlczsKIAogICAgIGlmICht X25lZWRzRm9udEF0dHJpYnV0ZXMpCi0gICAgICAgIHNlbmRQYXJ0aWFsRWRpdG9yU3RhdGVBbmRT Y2hlZHVsZVBvc3RMYXlvdXRVcGRhdGUoKTsKKyAgICAgICAgc2NoZWR1bGVGdWxsRWRpdG9yU3Rh dGVVcGRhdGUoKTsKIH0KIAogdm9pZCBXZWJQYWdlOjpyZXN0b3JlU2Vzc2lvbkludGVybmFsKGNv bnN0IFZlY3RvcjxCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU+JiBpdGVtU3RhdGVzLCBXYXNSZXN0 b3JlZEJ5QVBJUmVxdWVzdCByZXN0b3JlZEJ5QVBJUmVxdWVzdCwgV2ViQmFja0ZvcndhcmRMaXN0 UHJveHk6Ok92ZXJ3cml0ZUV4aXN0aW5nSXRlbSBvdmVyd3JpdGUpCkBAIC01Mjg3LDE1ICs1Mjg3 LDE1IEBAIHZvaWQgV2ViUGFnZTo6ZGlkQ2hhbmdlQ29udGVudHMoKQogCiB2b2lkIFdlYlBhZ2U6 OmRpZENoYW5nZU92ZXJmbG93U2Nyb2xsUG9zaXRpb24oKQogewotICAgIGRpZENoYW5nZVNlbGVj dGlvbk9yT3ZlcmZsb3dTY3JvbGxQb3NpdGlvbihFZGl0b3JTdGF0ZVVwZGF0ZVNjaGVkdWxpbmc6 OkRlZmVycmVkKTsKKyAgICBkaWRDaGFuZ2VTZWxlY3Rpb25Pck92ZXJmbG93U2Nyb2xsUG9zaXRp b24oKTsKIH0KIAogdm9pZCBXZWJQYWdlOjpkaWRDaGFuZ2VTZWxlY3Rpb24oKQogewotICAgIGRp ZENoYW5nZVNlbGVjdGlvbk9yT3ZlcmZsb3dTY3JvbGxQb3NpdGlvbihFZGl0b3JTdGF0ZVVwZGF0 ZVNjaGVkdWxpbmc6OkltbWVkaWF0ZSk7CisgICAgZGlkQ2hhbmdlU2VsZWN0aW9uT3JPdmVyZmxv d1Njcm9sbFBvc2l0aW9uKCk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6ZGlkQ2hhbmdlU2VsZWN0aW9u T3JPdmVyZmxvd1Njcm9sbFBvc2l0aW9uKEVkaXRvclN0YXRlVXBkYXRlU2NoZWR1bGluZyBlZGl0 b3JTdGF0ZVNjaGVkdWxpbmcpCit2b2lkIFdlYlBhZ2U6OmRpZENoYW5nZVNlbGVjdGlvbk9yT3Zl cmZsb3dTY3JvbGxQb3NpdGlvbigpCiB7CiAgICAgRnJhbWUmIGZyYW1lID0gbV9wYWdlLT5mb2N1 c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKICAgICAvLyBUaGUgYWN0IG9mIGdl dHRpbmcgRGljdGlvbmFyeSBQb3B1cCBpbmZvIGNhbiBtYWtlIHNlbGVjdGlvbiBjaGFuZ2VzIHRo YXQgd2Ugc2hvdWxkIG5vdCBwcm9wYWdhdGUgdG8gdGhlIFVJUHJvY2Vzcy4KQEAgLTUzMzgsMTAg KzUzMzgsNyBAQCB2b2lkIFdlYlBhZ2U6OmRpZENoYW5nZVNlbGVjdGlvbk9yT3ZlcmZsb3dTY3Jv bGxQb3NpdGlvbihFZGl0b3JTdGF0ZVVwZGF0ZVNjaGVkdQogICAgIH0KICNlbmRpZgogCi0gICAg aWYgKGVkaXRvclN0YXRlU2NoZWR1bGluZyA9PSBFZGl0b3JTdGF0ZVVwZGF0ZVNjaGVkdWxpbmc6 OkltbWVkaWF0ZSkKLSAgICAgICAgc2VuZFBhcnRpYWxFZGl0b3JTdGF0ZUFuZFNjaGVkdWxlUG9z dExheW91dFVwZGF0ZSgpOwotICAgIGVsc2UKLSAgICAgICAgc2NoZWR1bGVGdWxsRWRpdG9yU3Rh dGVVcGRhdGUoKTsKKyAgICBzY2hlZHVsZUZ1bGxFZGl0b3JTdGF0ZVVwZGF0ZSgpOwogfQogCiB2 b2lkIFdlYlBhZ2U6OnJlc2V0Rm9jdXNlZEVsZW1lbnRGb3JGcmFtZShXZWJGcmFtZSogZnJhbWUp CkBAIC02MDI0LDE2ICs2MDIxLDYgQEAgdm9pZCBXZWJQYWdlOjpzZW5kVG91Y2hCYXJNZW51SXRl bURhdGFSZW1vdmVkVXBkYXRlKEhUTUxNZW51SXRlbUVsZW1lbnQmIGVsZW1lbnQKIH0KICNlbmRp ZgogCi12b2lkIFdlYlBhZ2U6OnNlbmRQYXJ0aWFsRWRpdG9yU3RhdGVBbmRTY2hlZHVsZVBvc3RM YXlvdXRVcGRhdGUoKQotewotICAgIEZyYW1lJiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9s bGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7Ci0gICAgaWYgKGZyYW1lLmVkaXRvcigpLmlnbm9y ZVNlbGVjdGlvbkNoYW5nZXMoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgc2VuZChNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpFZGl0b3JTdGF0ZUNoYW5nZWQoZWRpdG9yU3RhdGUoSW5jbHVkZVBv c3RMYXlvdXREYXRhSGludDo6Tm8pKSwgcGFnZUlEKCkpOwotICAgIHNjaGVkdWxlRnVsbEVkaXRv clN0YXRlVXBkYXRlKCk7Ci19Ci0KIHZvaWQgV2ViUGFnZTo6Zmx1c2hQZW5kaW5nRWRpdG9yU3Rh dGVVcGRhdGUoKQogewogICAgIGlmICghbV9oYXNQZW5kaW5nRWRpdG9yU3RhdGVVcGRhdGUpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMmFjYzMyOGMz MDE1NmJhZjg0Y2Q4MjM1NzQ3MDkxNTlhMWI1MjA5Ny4uMjVhYjU0OGVjZjM5ZTQ4ZWUxZDg0NTVm NzMyZGQ2OTVkM2EzMjc3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaApAQCAtMTExMyw3ICsxMTEzLDYgQEAgcHVibGljOgogCiAgICAgc3RhdGljIFBsdWdp blZpZXcqIHBsdWdpblZpZXdGb3JGcmFtZShXZWJDb3JlOjpGcmFtZSopOwogCi0gICAgdm9pZCBz ZW5kUGFydGlhbEVkaXRvclN0YXRlQW5kU2NoZWR1bGVQb3N0TGF5b3V0VXBkYXRlKCk7CiAgICAg dm9pZCBmbHVzaFBlbmRpbmdFZGl0b3JTdGF0ZVVwZGF0ZSgpOwogCiAjaWYgRU5BQkxFKFJFU09V UkNFX0xPQURfU1RBVElTVElDUykKQEAgLTEyNzIsOCArMTI3MSw3IEBAIHByaXZhdGU6CiAgICAg dm9pZCBleGVjdXRlRWRpdENvbW1hbmQoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJik7CiAg ICAgdm9pZCBzZXRFZGl0YWJsZShib29sKTsKIAotICAgIGVudW0gY2xhc3MgRWRpdG9yU3RhdGVV cGRhdGVTY2hlZHVsaW5nIHsgRGVmZXJyZWQsIEltbWVkaWF0ZSB9OwotICAgIHZvaWQgZGlkQ2hh bmdlU2VsZWN0aW9uT3JPdmVyZmxvd1Njcm9sbFBvc2l0aW9uKEVkaXRvclN0YXRlVXBkYXRlU2No ZWR1bGluZyk7CisgICAgdm9pZCBkaWRDaGFuZ2VTZWxlY3Rpb25Pck92ZXJmbG93U2Nyb2xsUG9z aXRpb24oKTsKIAogICAgIHZvaWQgaW5jcmVhc2VMaXN0TGV2ZWwoKTsKICAgICB2b2lkIGRlY3Jl YXNlTGlzdExldmVsKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IDU1OGMzOGQxYTJlZGY0MmU2NzQ4YjU0MmUzMjUyOTJh ZjBmZTNhZGEuLmJiNzU0MDU0MGY2NGUxMjQyNzRlYWM0YTk3MGQwYThhYzc3NGJjMGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1t CkBAIC0yMTUsNyArMjE1LDcgQEAgdm9pZCBXZWJQYWdlOjpwbGF0Zm9ybUVkaXRvclN0YXRlKEZy YW1lJiBmcmFtZSwgRWRpdG9yU3RhdGUmIHJlc3VsdCwgSW5jbHVkZVBvc3QKICNpZiAhUExBVEZP Uk0oSU9TTUFDKQogICAgIHJlcXVpcmVzUG9zdExheW91dERhdGEgfD0gbV9rZXlib2FyZElzQXR0 YWNoZWQ7CiAjZW5kaWYKLSAgICBpZiAoc2hvdWxkSW5jbHVkZVBvc3RMYXlvdXREYXRhID09IElu Y2x1ZGVQb3N0TGF5b3V0RGF0YUhpbnQ6Ok5vICYmIG5lZWRzTGF5b3V0ICYmICFyZXF1aXJlc1Bv c3RMYXlvdXREYXRhKSB7CisgICAgaWYgKChzaG91bGRJbmNsdWRlUG9zdExheW91dERhdGEgPT0g SW5jbHVkZVBvc3RMYXlvdXREYXRhSGludDo6Tm8gfHwgbmVlZHNMYXlvdXQpICYmICFyZXF1aXJl c1Bvc3RMYXlvdXREYXRhKSB7CiAgICAgICAgIHJlc3VsdC5pc01pc3NpbmdQb3N0TGF5b3V0RGF0 YSA9IHRydWU7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0zMjU1LDcgKzMyNTUsNyBAQCB2 b2lkIFdlYlBhZ2U6OnVwZGF0ZVZpc2libGVDb250ZW50UmVjdHMoY29uc3QgVmlzaWJsZUNvbnRl bnRSZWN0VXBkYXRlSW5mbyYgdmlzaQogICAgICAgICBpZiAoc2VsZWN0aW9uSXNJbnNpZGVGaXhl ZFBvc2l0aW9uQ29udGFpbmVyKGZyYW1lKSkgewogICAgICAgICAgICAgLy8gRW5zdXJlIHRoYXQg dGhlIG5leHQgbGF5ZXIgdHJlZSBjb21taXQgY29udGFpbnMgdXAtdG8tZGF0ZSBjYXJldC9zZWxl Y3Rpb24gcmVjdHMuCiAgICAgICAgICAgICBmcmFtZVZpZXcuZnJhbWUoKS5zZWxlY3Rpb24oKS5z ZXRDYXJldFJlY3ROZWVkc1VwZGF0ZSgpOwotICAgICAgICAgICAgc2VuZFBhcnRpYWxFZGl0b3JT dGF0ZUFuZFNjaGVkdWxlUG9zdExheW91dFVwZGF0ZSgpOworICAgICAgICAgICAgc2NoZWR1bGVG dWxsRWRpdG9yU3RhdGVVcGRhdGUoKTsKICAgICAgICAgfQogCiAgICAgICAgIGZyYW1lVmlldy5k aWRVcGRhdGVWaWV3cG9ydE92ZXJyaWRlUmVjdHMoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkZjNjM2E2MmZhNjhhOTY2YmM1ZTliZWU5YWMw MmU3NjAxZmM2YmJlLi44M2MwMzJkZjY3NDI3YTdjYmQxNzEwNWQ0YTk5NDE0MmQwNWRiOWQ5IDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTktMDQtMjAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CisKKyAgICAgICAgRGVmZXIgRWRpdG9yU3RhdGUgdXBkYXRlcyB1bnRpbCB0aGUgbmV4dCBs YXllciB0cmVlIGZsdXNoIGluIGEgZmV3IGFkZGl0aW9uYWwgY2lyY3Vtc3RhbmNlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MTQ1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81MDA3ODE3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGp1c3RzIHNldmVyYWwgZWRpdGluZyBBUEkgdGVzdHMgdG8g d2FpdCBmb3IgYSBwcmVzZW50YXRpb24gdXBkYXRlIGZvbGxvd2luZyBhIHNlbGVjdGlvbiBjaGFu Z2UsIHByb2dyYW1tYXRpYworICAgICAgICBmb2N1cywgb3Igc2hvd2luZyB0aGUgZm9udCBtYW5h Z2VyLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9FZGl0b3JT dGF0ZVRlc3RzLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRWaWV3VGFyZ2V0Rm9yQWN0 aW9uLm1tOgorICAgICAgICAoVEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9t YWMvRm9udE1hbmFnZXJUZXN0cy5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgor CiAyMDE5LTA0LTIwICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CiAKICAg ICAgICAgW0NNYWtlXVtXaW5dIFVzZSB0YXJnZXQgb3JpZW50ZWQgZGVzaWduIGZvciBXZWJLaXRM ZWdhY3kKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev RWRpdG9yU3RhdGVUZXN0cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvRWRpdG9yU3RhdGVUZXN0cy5tbQppbmRleCAwNTFiZDM2ZTVmNTE5Y2QyN2Q2YmM2ZjFiZTk5 MjE5ODllNjU1MzFjLi4xODE4MjYyNmVhMzk1YzFkNzg3ZjI1YTJjMmI2MTRhMzNmZThkNGU4IDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0VkaXRvclN0 YXRlVGVzdHMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9F ZGl0b3JTdGF0ZVRlc3RzLm1tCkBAIC0zNDksNiArMzQ5LDcgQEAgVEVTVChFZGl0b3JTdGF0ZVRl c3RzLCBDYXJldENvbG9ySW5Db250ZW50RWRpdGFibGUpCiAgICAgYXV0byB3ZWJWaWV3ID0gYWRv cHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAw LCAzMjAsIDUwMCldKTsKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6 QCI8Ym9keSBzdHlsZT1cImNhcmV0LWNvbG9yOiByZWQ7XCIgY29udGVudGVkaXRhYmxlPVwidHJ1 ZVwiPjwvYm9keT4iXTsKICAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0 OkAiZG9jdW1lbnQuYm9keS5mb2N1cygpIl07CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVz ZW50YXRpb25VcGRhdGVdOwogICAgIFVJVmlldzxVSVRleHRJbnB1dFRyYWl0c19Qcml2YXRlPiAq dGV4dElucHV0ID0gKFVJVmlldzxVSVRleHRJbnB1dFRyYWl0c19Qcml2YXRlPiAqKSBbd2ViVmll dyB0ZXh0SW5wdXRDb250ZW50Vmlld107CiAgICAgVUlDb2xvciAqaW5zZXJ0aW9uUG9pbnRDb2xv ciA9IHRleHRJbnB1dC5pbnNlcnRpb25Qb2ludENvbG9yOwogICAgIFVJQ29sb3IgKnJlZENvbG9y ID0gW1VJQ29sb3IgcmVkQ29sb3JdOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRWaWV3VGFyZ2V0Rm9yQWN0aW9uLm1tIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRWaWV3VGFyZ2V0Rm9yQWN0 aW9uLm1tCmluZGV4IDRmY2Y0NjUxYjE1ZGNkNDBjYzc4NWIyZjQ5MjNhNjliYzZkYmMxYTcuLmQ0 ODZmOThlZjQ0NGU5ZmYyNDI1M2U4ZDgzNTRiNTVkNjk2Y2E2YjQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50Vmlld1RhcmdldEZvckFj dGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29u dGVudFZpZXdUYXJnZXRGb3JBY3Rpb24ubW0KQEAgLTUwLDYgKzUwLDcgQEAgVEVTVChXZWJLaXQs IFdLQ29udGVudFZpZXdUYXJnZXRGb3JBY3Rpb24pCiAgICAgW3dlYlZpZXcgc3luY2hyb25vdXNs eUxvYWRUZXN0UGFnZU5hbWVkOkAicmljaC1hbmQtcGxhaW4tdGV4dCJdOwogICAgIFt3ZWJWaWV3 IGJlY29tZUZpcnN0UmVzcG9uZGVyXTsKICAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdK YXZhU2NyaXB0OkAic2VsZWN0UGxhaW5UZXh0KCkiXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4 dFByZXNlbnRhdGlvblVwZGF0ZV07CiAKICAgICAvLyBGSVhNRTogT25jZSB0aGlzIHRlc3QgaXMg cnVubmluZyBpbiBhbiBhcHBsaWNhdGlvbiwgaXQgc2hvdWxkIGluc3RlYWQgdXNlCiAgICAgLy8g LVtVSUFwcGxpY2F0aW9uIHNlbmRBY3Rpb246dG86ZnJvbTpmb3JFdmVudDpdIGFuZCB2ZXJpZnkg dGhhdCB0aGUgYWN0aW9uIGlzIGRpc3BhdGNoZWQgdG8gdGhlCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9Gb250TWFuYWdlclRlc3RzLm1tIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9tYWMvRm9udE1hbmFnZXJUZXN0cy5tbQppbmRleCBkYmNmYjYyMmNmOWNj NDI4MjFhMDU0YzcxZDE0YzgwMmExYjg1OTU5Li43MjNkM2MwY2NkYTJmYTNlZmY1YWEzNGE5MmFl ZjAyNDhkZTE0M2JjIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9G b250TWFuYWdlclRlc3RzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0Zv bnRNYW5hZ2VyVGVzdHMubW0KQEAgLTEyMiw2ICsxMjIsNyBAQCBURVNUKEZvbnRNYW5hZ2VyVGVz dHMsIFRvZ2dsZUJvbGRBbmRJdGFsaWNXaXRoTWVudUl0ZW1zKQogICAgIGF1dG8gd2ViVmlldyA9 IHdlYlZpZXdGb3JGb250TWFuYWdlclRlc3RpbmcoZm9udE1hbmFnZXIpOwogCiAgICAgW3dlYlZp ZXcgc2VsZWN0V29yZDpuaWxdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9u VXBkYXRlXTsKICAgICBbZm9udE1hbmFnZXIgYWRkRm9udFRyYWl0Om1lbnVJdGVtQ2VsbEZvckZv bnRBY3Rpb24oTlNCb2xkRm9udE1hc2spLmF1dG9yZWxlYXNlKCldOwogICAgIEVYUEVDVF9XS19T VFJFUSgiYm9sZCIsIFt3ZWJWaWV3IHN0eWxlUHJvcGVydHlBdFNlbGVjdGlvblN0YXJ0OkAiZm9u dC13ZWlnaHQiXSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKCJib2xkIiwgW3dlYlZpZXcgc3R5bGVQ cm9wZXJ0eUF0U2VsZWN0aW9uRW5kOkAiZm9udC13ZWlnaHQiXSk7CkBAIC0xNTMsMTIgKzE1NCwx NCBAQCBURVNUKEZvbnRNYW5hZ2VyVGVzdHMsIENoYW5nZUZvbnRTaXplV2l0aE1lbnVJdGVtcykK IAogICAgIC8vIFNlbGVjdCAiZm9vIiBhbmQgaW5jcmVhc2UgZm9udCBzaXplLgogICAgIFt3ZWJW aWV3IHNlbGVjdFdvcmQ6bmlsXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlv blVwZGF0ZV07CiAgICAgW2ZvbnRNYW5hZ2VyIG1vZGlmeUZvbnQ6c2l6ZUluY3JlYXNlTWVudUl0 ZW1DZWxsLmdldCgpXTsKICAgICBbZm9udE1hbmFnZXIgbW9kaWZ5Rm9udDpzaXplSW5jcmVhc2VN ZW51SXRlbUNlbGwuZ2V0KCldOwogCiAgICAgLy8gTm93IHNlbGVjdCAiYmF6IiBhbmQgZGVjcmVh c2UgZm9udCBzaXplLgogICAgIFt3ZWJWaWV3IG1vdmVUb0VuZE9mUGFyYWdyYXBoOm5pbF07CiAg ICAgW3dlYlZpZXcgc2VsZWN0V29yZDpuaWxdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJl c2VudGF0aW9uVXBkYXRlXTsKICAgICBbZm9udE1hbmFnZXIgbW9kaWZ5Rm9udDpzaXplRGVjcmVh c2VNZW51SXRlbUNlbGwuZ2V0KCldOwogICAgIFtmb250TWFuYWdlciBtb2RpZnlGb250OnNpemVE ZWNyZWFzZU1lbnVJdGVtQ2VsbC5nZXQoKV07CiAKQEAgLTE2OCw2ICsxNzEsNyBAQCBURVNUKEZv bnRNYW5hZ2VyVGVzdHMsIENoYW5nZUZvbnRTaXplV2l0aE1lbnVJdGVtcykKIAogICAgIFt3ZWJW aWV3IG1vdmVUb0JlZ2lubmluZ09mUGFyYWdyYXBoOm5pbF07CiAgICAgW3dlYlZpZXcgc2VsZWN0 V29yZDpuaWxdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsK ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJmb28iLCBbd2ViVmlldyBzZWxlY3RlZFRleHRdKTsKICAg ICBFWFBFQ1RfV0tfU1RSRVEoQCIxOHB4IiwgW3dlYlZpZXcgc3R5bGVQcm9wZXJ0eUF0U2VsZWN0 aW9uU3RhcnQ6QCJmb250LXNpemUiXSk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKEAiMThweCIsIFt3 ZWJWaWV3IHN0eWxlUHJvcGVydHlBdFNlbGVjdGlvbkVuZDpAImZvbnQtc2l6ZSJdKTsKQEAgLTE5 MCw2ICsxOTQsNyBAQCBURVNUKEZvbnRNYW5hZ2VyVGVzdHMsIENoYW5nZUZvbnRXaXRoUGFuZWwp CiAKICAgICBOU0ZvbnRQYW5lbCAqZm9udFBhbmVsID0gW2ZvbnRNYW5hZ2VyIGZvbnRQYW5lbDpZ RVNdOwogICAgIFtmb250UGFuZWwgc2V0SXNWaXNpYmxlOllFU107CisgICAgW3dlYlZpZXcgd2Fp dEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOwogCiAgICAgTlNGb250ICpsYXJnZUhlbHZldGlj YUZvbnQgPSBbTlNGb250IGZvbnRXaXRoTmFtZTpAIkhlbHZldGljYSIgc2l6ZToyMF07CiAgICAg W2ZvbnRQYW5lbCBzZXRQYW5lbEZvbnQ6bGFyZ2VIZWx2ZXRpY2FGb250IGlzTXVsdGlwbGU6Tk9d OwpAQCAtMjM5LDYgKzI0NCw3IEBAIFRFU1QoRm9udE1hbmFnZXJUZXN0cywgQ2hhbmdlQXR0cmli dXRlc1dpdGhGb250RWZmZWN0c0JveCkKIAogICAgIE5TRm9udFBhbmVsICpmb250UGFuZWwgPSBb Zm9udE1hbmFnZXIgZm9udFBhbmVsOllFU107CiAgICAgW2ZvbnRQYW5lbCBzZXRJc1Zpc2libGU6 WUVTXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CiAKICAg ICBhdXRvIHRleHREZWNvcmF0aW9uc0Fyb3VuZFNlbGVjdGlvbiA9IFt3ZWJWaWV3XSB7CiAgICAg ICAgIE5TU3RyaW5nICpkZWNvcmF0aW9uc0F0U3RhcnQgPSBbd2ViVmlldyBzdHlsZVByb3BlcnR5 QXRTZWxlY3Rpb25TdGFydDpAIi13ZWJraXQtdGV4dC1kZWNvcmF0aW9ucy1pbi1lZmZlY3QiXTsK QEAgLTMzOSw2ICszNDUsNyBAQCBURVNUKEZvbnRNYW5hZ2VyVGVzdHMsIENoYW5nZUZvbnRDb2xv cldpdGhDb2xvclBhbmVsKQogICAgIC8vIDEuIFNlbGVjdCAiZm9vIiBhbmQgdHVybiBpdCByZWQ7 IHZlcmlmeSB0aGF0IHRoZSBmb250IGVsZW1lbnQgaXMgdXNlZCBmb3IgZnVsbHkgb3BhcXVlIGNv bG9ycy4KICAgICBjb2xvclBhbmVsLmNvbG9yID0gW05TQ29sb3IgY29sb3JXaXRoUmVkOjEgZ3Jl ZW46MCBibHVlOjAgYWxwaGE6MV07CiAgICAgW3dlYlZpZXcgc2VsZWN0V29yZDpuaWxdOworICAg IFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKICAgICBbd2ViVmlldyBj aGFuZ2VDb2xvcjpjb2xvclBhbmVsXTsKICAgICBjaGVja0ZvbnRDb2xvckF0U3RhcnRBbmRFbmRX aXRoSW5wdXRFdmVudHMoInJnYigyNTUsIDAsIDApIik7CiAgICAgRVhQRUNUX1RSVUUoW1t3ZWJW aWV3IG9iamVjdEJ5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCIhIWZvby5xdWVyeVNlbGVjdG9yKCdm b250JykiXSBib29sVmFsdWVdKTsKQEAgLTM0Niw2ICszNTMsNyBAQCBURVNUKEZvbnRNYW5hZ2Vy VGVzdHMsIENoYW5nZUZvbnRDb2xvcldpdGhDb2xvclBhbmVsKQogICAgIC8vIDIuIE5vdyBzZWxl Y3QgImJhciIgYW5kIHRyeSBhIGZldyBkaWZmZXJlbnQgY29sb3JzLCBzdGFydGluZyB3aXRoIGEg Y29sb3Igd2l0aCBhbHBoYS4KICAgICBjb2xvclBhbmVsLmNvbG9yID0gW05TQ29sb3IgY29sb3JX aXRoV2hpdGU6MSBhbHBoYTowLjJdOwogICAgIFt3ZWJWaWV3IHNlbGVjdE5leHRXb3JkXTsKKyAg ICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CiAgICAgW3dlYlZpZXcg Y2hhbmdlQ29sb3I6Y29sb3JQYW5lbF07CiAgICAgY2hlY2tGb250Q29sb3JBdFN0YXJ0QW5kRW5k V2l0aElucHV0RXZlbnRzKCJyZ2JhKDI1NSwgMjU1LCAyNTUsIDAuMikiKTsKICAgICBFWFBFQ1Rf RkFMU0UoW1t3ZWJWaWV3IG9iamVjdEJ5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCIhIWJhci5xdWVy eVNlbGVjdG9yKCdmb250JykiXSBib29sVmFsdWVdKTsKQEAgLTQ2MCw2ICs0NjgsNyBAQCBURVNU KEZvbnRNYW5hZ2VyVGVzdHMsIEFkZEZvbnRTaGFkb3dVc2luZ0ZvbnRPcHRpb25zKQogICAgIGF1 dG8gd2ViVmlldyA9IHdlYlZpZXdGb3JGb250TWFuYWdlclRlc3RpbmcoTlNGb250TWFuYWdlci5z aGFyZWRGb250TWFuYWdlcik7CiAKICAgICBbd2ViVmlldyBzZWxlY3RXb3JkOm5pbF07CisgICAg W3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOwogICAgIG9wdGlvbnMuc2hh ZG93V2lkdGggPSAzOwogICAgIG9wdGlvbnMuc2hhZG93SGVpZ2h0ID0gLTM7CiAgICAgb3B0aW9u cy5oYXNTaGFkb3cgPSBZRVM7CkBAIC00NzYsNiArNDg1LDcgQEAgVEVTVChGb250TWFuYWdlclRl c3RzLCBBZGRBbmRSZW1vdmVDb2xvcnNVc2luZ0ZvbnRPcHRpb25zKQogICAgIFRlc3RGb250T3B0 aW9ucyAqb3B0aW9ucyA9IFRlc3RGb250T3B0aW9ucy5zaGFyZWRJbnN0YW5jZTsKICAgICBhdXRv IHdlYlZpZXcgPSB3ZWJWaWV3Rm9yRm9udE1hbmFnZXJUZXN0aW5nKE5TRm9udE1hbmFnZXIuc2hh cmVkRm9udE1hbmFnZXIsIEAiPGJvZHkgY29udGVudGVkaXRhYmxlPmhlbGxvPC9ib2R5PiIpOwog ICAgIFt3ZWJWaWV3IHNlbGVjdFdvcmQ6bmlsXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFBy ZXNlbnRhdGlvblVwZGF0ZV07CiAKICAgICBvcHRpb25zLmJhY2tncm91bmRDb2xvciA9IFtOU0Nv bG9yIGNvbG9yV2l0aFJlZDoxIGdyZWVuOjAgYmx1ZTowIGFscGhhOjAuMl07CiAgICAgb3B0aW9u cy5mb3JlZ3JvdW5kQ29sb3IgPSBbTlNDb2xvciBjb2xvcldpdGhSZWQ6MCBncmVlbjowIGJsdWU6 MSBhbHBoYToxXTsK