53033 2011-01-24 11:41:49 -0800 [GTK] Space characters in source document interfere with reported caret offset 2011-01-27 11:38:23 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 25531 0 jdiggs webkit-unassigned apinheiro mario oldest_to_newest 339143 0 79949 jdiggs 2011-01-24 11:41:49 -0800 Created attachment 79949 test case There are three paragraphs in the attached test case. Each paragraph's (displayed) text is the same length. Aside from the different word order in paragraph three, what distinguishes these paragraphs is whitespace in the source document: * p1 - no extraneous whitespace * p2 - one word per line (i.e. extraneous newline chars) * p3 - one word per line plus crazy use of space chars p1 and p2 seem to work as expected for all aspects of AtkText. p3 has problems with the reported caret offset (both during caret-moved events and when the caretOffset is requested). From Accerciser: In [1]: p1 = acc.queryText() In [2]: p1.getText(0, -1) Out[2]: 'Is this paragraph borked?' In [3]: p2 = acc.queryText() In [4]: p2.getText(0, -1) Out[4]: 'Is this paragraph borked?' In [5]: p3 = acc.queryText() In [6]: p3.getText(0, -1) Out[6]: 'This paragraph is borked!' In [7]: p1.characterCount Out[7]: 25 In [8]: p2.characterCount Out[8]: 25 In [9]: p3.characterCount Out[9]: 25 ^^^ Proof that most things are ok :-) ^^^ When moving by word, starting from the top of the file in Epiphany: object:text-caret-moved(2, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(7, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(17, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(24, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(2, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(7, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(17, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(24, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(4, 0, None) source: [paragraph | ] application: [application | epiphany-browser] ^^^ This is all fine too. :-) ^^^ But here's where the crazy whitespace begins in the source document: object:text-caret-moved(40, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(97, 0, None) source: [paragraph | ] application: [application | epiphany-browser] object:text-caret-moved(468, 0, None) source: [paragraph | ] application: [application | epiphany-browser] As a reminder: In [9]: p3.characterCount Out[9]: 25 ;-) ;-) Also at this point: In [10]: p3.caretOffset Out[10]: 468 In terms of WebKit Bugzilla, I cannot justify calling this a P1. BUT, in terms of other priorities, including Yelp 3 accessibility... If possible, please drop everything else and consider this a P1. The impact of this bug is Orca's going to get bogus caret-moved events and speak the wrong words any time there is extra space characters present. This will also interfere with Orca's ability to correctly report text selection. And we need sufficient time for the fixed WebKitGtk to get picked up downstream before GNOME 3. Sorry I just now noticed this and thanks in advance for prioritizing it!! 340939 1 80348 mario 2011-01-27 10:56:42 -0800 Created attachment 80348 Patch proposal + unit tests Attaching a patch proposal and the new unit test needed. 340946 2 80348 mrobinson 2011-01-27 11:01:18 -0800 Comment on attachment 80348 Patch proposal + unit tests Looks sane! 340971 3 mario 2011-01-27 11:38:23 -0800 Committed r76822: <http://trac.webkit.org/changeset/76822> 79949 2011-01-24 11:41:49 -0800 2011-01-24 11:41:49 -0800 test case test.html text/html 612 jdiggs PGh0bWw+CjxoZWFkPgogIDx0aXRsZT5UZXN0PC90aXRsZT4KPC9oZWFkPgo8Ym9keT4KPHA+SXMg dGhpcyBwYXJhZ3JhcGggYm9ya2VkPzwvcD4KPHA+SXMKdGhpcwpwYXJhZ3JhcGgKYm9ya2VkPwo8 L3A+CjxwPlRoaXMKICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJhZ3JhcGgKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaXMKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJvcmtlZCEKPC9wPgo8L2JvZHk+CjwvaHRtbD4K 80348 2011-01-27 10:56:42 -0800 2011-01-27 11:01:18 -0800 Patch proposal + unit tests 0001-2011-01-27-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 8604 mario RnJvbSBhYWRmNzVmMGY1MWFiOWVhOTE4MzhhMmUyZjU3YjYzNjRiYzcwMGQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBUaHUsIDI3IEphbiAyMDExIDE5OjQ5OjI4ICswMTAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMS0wMS0yNyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBTcGFj ZSBjaGFyYWN0ZXJzIGluIHNvdXJjZSBkb2N1bWVudCBpbnRlcmZlcmUgd2l0aCByZXBvcnRlZCBj YXJldCBvZmZzZXQKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTMwMzMKCiAgICAgICAgQ2FsY3VsYXRlIGNhcmV0IG9mZnNldCBmcm9tIHJlbmRlcmVkIHRl eHQgaW5zdGVhZCBvZiBmcm9tIG5vZGUgY29udGVudHMuCgogICAgICAgICogYWNjZXNzaWJpbGl0 eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgogICAgICAgIChvYmplY3RB bmRPZmZzZXRVbmlnbm9yZWQpOiBDYWxjdWxhdGUgdGhlIGNhcmV0IG9mZnNldCBiYXNlZCBvbmx5 CiAgICAgICAgb24gcG9zaXRpb25zIGFuZCByYW5nZXMsIGluc3RlYWQgb2YgdXNpbmcgdGhlIGNv bXB1dGVkIG9mZnNldCBpbgogICAgICAgIHRoZSBjb250YWluZXIgbm9kZS4KCjIwMTEtMDEtMjcg IE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgoKICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgW0dUS10gU3BhY2UgY2hhcmFjdGVycyBp biBzb3VyY2UgZG9jdW1lbnQgaW50ZXJmZXJlIHdpdGggcmVwb3J0ZWQgY2FyZXQgb2Zmc2V0CiAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMDMzCgogICAg ICAgIE5ldyB1bml0IHRlc3QgdG8gY2hlY2sgdGhlIGZpeCBmb3IgdGhpcyBidWcuCgogICAgICAg ICogdGVzdHMvdGVzdGF0ay5jOgogICAgICAgICh0ZXN0V2Via2l0QXRrQ2FyZXRPZmZzZXRzQW5k RXh0cmFub3VzV2hpdGVTcGFjZXMpOiBOZXcuCiAgICAgICAgKG1haW4pOiBBZGQgbmV3IHVuaXQg dGVzdC4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMTQgKysrKysrCiAuLi4vZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRr LmNwcCAgICAgICAgICB8ICAgMTQgKystLS0tCiBTb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysrCiBTb3VyY2UvV2ViS2l0L2d0ay90 ZXN0cy90ZXN0YXRrLmMgICAgICAgICAgICAgICAgICB8ICAgNDQgKysrKysrKysrKysrKysrKysr KysKIDQgZmlsZXMgY2hhbmdlZCwgNzUgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDZiNDEyYWIuLjZiMDc1NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBA QAorMjAxMS0wMS0yNyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10g U3BhY2UgY2hhcmFjdGVycyBpbiBzb3VyY2UgZG9jdW1lbnQgaW50ZXJmZXJlIHdpdGggcmVwb3J0 ZWQgY2FyZXQgb2Zmc2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01MzAzMworCisgICAgICAgIENhbGN1bGF0ZSBjYXJldCBvZmZzZXQgZnJvbSByZW5k ZXJlZCB0ZXh0IGluc3RlYWQgb2YgZnJvbSBub2RlIGNvbnRlbnRzLgorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgorICAgICAg ICAob2JqZWN0QW5kT2Zmc2V0VW5pZ25vcmVkKTogQ2FsY3VsYXRlIHRoZSBjYXJldCBvZmZzZXQg YmFzZWQgb25seQorICAgICAgICBvbiBwb3NpdGlvbnMgYW5kIHJhbmdlcywgaW5zdGVhZCBvZiB1 c2luZyB0aGUgY29tcHV0ZWQgb2Zmc2V0IGluCisgICAgICAgIHRoZSBjb250YWluZXIgbm9kZS4K KwogMjAxMS0wMS0yNCAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsu Y3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXJBdGsuY3BwCmluZGV4IDY5MmRlY2QuLmM3ZmUyOWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRr LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckF0ay5jcHAKQEAgLTI0NTcsOCArMjQ1Nyw2IEBAIEF0a09iamVjdCogd2Vi a2l0X2FjY2Vzc2libGVfZ2V0X2ZvY3VzZWRfZWxlbWVudChXZWJLaXRBY2Nlc3NpYmxlKiBhY2Nl c3NpYmxlKQogCiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmplY3RBbmRPZmZzZXRVbmlnbm9yZWQo QWNjZXNzaWJpbGl0eU9iamVjdCogY29yZU9iamVjdCwgaW50JiBvZmZzZXQsIGJvb2wgaWdub3Jl TGlua3MpCiB7Ci0gICAgTm9kZSogZW5kTm9kZSA9IHN0YXRpY19jYXN0PEFjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QqPihjb3JlT2JqZWN0KS0+cmVuZGVyZXIoKS0+bm9kZSgpOwotICAgIGludCBl bmRPZmZzZXQgPSBjb3JlT2JqZWN0LT5zZWxlY3Rpb24oKS5lbmQoKS5jb21wdXRlT2Zmc2V0SW5D b250YWluZXJOb2RlKCk7CiAgICAgLy8gSW5kaWNhdGlvbiB0aGF0IHNvbWV0aGluZyBib2d1cyBo YXMgdHJhbnNwaXJlZC4KICAgICBvZmZzZXQgPSAtMTsKIApAQCAtMjQ3MywxNiArMjQ3MSwxMiBA QCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmplY3RBbmRPZmZzZXRVbmlnbm9yZWQoQWNjZXNzaWJp bGl0eU9iamVjdCogY29yZU9iamVjdCwgaQogICAgIGlmICghcmVhbE9iamVjdCkKICAgICAgICAg cmV0dXJuIDA7CiAKLSAgICBOb2RlKiBub2RlID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdCo+KHJlYWxPYmplY3QpLT5yZW5kZXJlcigpLT5ub2RlKCk7CisgICAgTm9kZSog bm9kZSA9IHJlYWxPYmplY3QtPm5vZGUoKTsKICAgICBpZiAobm9kZSkgewotICAgICAgICBSZWZQ dHI8UmFuZ2U+IHJhbmdlID0gcmFuZ2VPZkNvbnRlbnRzKG5vZGUpOwotICAgICAgICBpZiAocmFu Z2UtPm93bmVyRG9jdW1lbnQoKSA9PSBub2RlLT5kb2N1bWVudCgpKSB7Ci0gICAgICAgICAgICBF eGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICAgICAgICAgIHJhbmdlLT5zZXRFbmRCZWZvcmUoZW5k Tm9kZSwgZWMpOwotICAgICAgICAgICAgaWYgKHJhbmdlLT5ib3VuZGFyeVBvaW50c1ZhbGlkKCkp Ci0gICAgICAgICAgICAgICAgb2Zmc2V0ID0gcmFuZ2UtPnRleHQoKS5sZW5ndGgoKSArIGVuZE9m ZnNldDsKLSAgICAgICAgfQorICAgICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gUmFuZ2U6OmNy ZWF0ZShub2RlLT5kb2N1bWVudCgpLCBmaXJzdFBvc2l0aW9uSW5Ob2RlKG5vZGUpLCByZWFsT2Jq ZWN0LT5zZWxlY3Rpb24oKS5lbmQoKSk7CisgICAgICAgIG9mZnNldCA9IFRleHRJdGVyYXRvcjo6 cmFuZ2VMZW5ndGgocmFuZ2UuZ2V0KCkpOwogICAgIH0KKwogICAgIHJldHVybiByZWFsT2JqZWN0 OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggOTEyYzk0OC4uNjRlNzExYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTAxLTI3ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8 bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbR1RLXSBTcGFjZSBjaGFyYWN0ZXJzIGluIHNvdXJjZSBkb2N1bWVudCBp bnRlcmZlcmUgd2l0aCByZXBvcnRlZCBjYXJldCBvZmZzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMDMzCisKKyAgICAgICAgTmV3IHVuaXQgdGVz dCB0byBjaGVjayB0aGUgZml4IGZvciB0aGlzIGJ1Zy4KKworICAgICAgICAqIHRlc3RzL3Rlc3Rh dGsuYzoKKyAgICAgICAgKHRlc3RXZWJraXRBdGtDYXJldE9mZnNldHNBbmRFeHRyYW5vdXNXaGl0 ZVNwYWNlcyk6IE5ldy4KKyAgICAgICAgKG1haW4pOiBBZGQgbmV3IHVuaXQgdGVzdC4KKwogMjAx MS0wMS0yMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jIGIvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGF0 ay5jCmluZGV4IDFlZTZjNTUuLjgwNDUzMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3Rr L3Rlc3RzL3Rlc3RhdGsuYworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMK QEAgLTQ0LDYgKzQ0LDggQEAgc3RhdGljIGNvbnN0IGNoYXIqIGNvbnRlbnRzSW5UYWJsZSA9ICI8 aHRtbD48Ym9keT48dGFibGU+PHRyPjx0ZD5mb288L3RkPjx0ZD5iYXIKIAogc3RhdGljIGNvbnN0 IGNoYXIqIGNvbnRlbnRzSW5UYWJsZVdpdGhIZWFkZXJzID0gIjxodG1sPjxib2R5Pjx0YWJsZT48 dHI+PHRoPmZvbzwvdGg+PHRoPmJhcjwvdGg+PHRoIGNvbHNwYW49JzInPmJhejwvdGg+PC90cj48 dHI+PHRoPnF1eDwvdGg+PHRkPjE8L3RkPjx0ZD4yPC90ZD48dGQ+MzwvdGQ+PC90cj48dHI+PHRo IHJvd3NwYW49JzInPnF1dXg8L3RoPjx0ZD40PC90ZD48dGQ+NTwvdGQ+PHRkPjY8L3RkPjwvdHI+ PHRyPjx0ZD42PC90ZD48dGQ+NzwvdGQ+PHRkPjg8L3RkPjwvdHI+PHRyPjx0aD5jb3JnZTwvdGg+ PHRkPjk8L3RkPjx0ZD4xMDwvdGQ+PHRkPjExPC90ZD48L3RyPjwvdGFibGU+PHRhYmxlPjx0cj48 dGQ+MTwvdGQ+PHRkPjI8L3RkPjwvdHI+PHRyPjx0ZD4zPC90ZD48dGQ+NDwvdGQ+PC90cj48L3Rh YmxlPjwvYm9keT48L2h0bWw+IjsKIAorc3RhdGljIGNvbnN0IGNoYXIqIGNvbnRlbnRzV2l0aEV4 dHJhbmVvdXNXaGl0ZVNwYWNlcyA9ICI8aHRtbD48aGVhZD48Ym9keT48cD5UaGlzXG4gICAgICAg ICAgICAgICAgICAgICAgICAgIHBhcmFncmFwaFxuICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaXNcbiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib3Jr ZWQhPC9wPjwvYm9keT48L2h0bWw+IjsKKwogc3RhdGljIGNvbnN0IGNoYXIqIGNvbWJvQm94U2Vs ZWN0b3IgPSAiPGh0bWw+PGJvZHk+PHNlbGVjdD48b3B0aW9uIHNlbGVjdGVkIHZhbHVlPSdmb28n PmZvbzwvb3B0aW9uPjxvcHRpb24gdmFsdWU9J2Jhcic+YmFyPC9vcHRpb24+PC9zZWxlY3Q+PC9i b2R5PjwvaHRtbD4iOwogCiBzdGF0aWMgY29uc3QgY2hhciogZm9ybVdpdGhUZXh0SW5wdXRzID0g IjxodG1sPjxib2R5Pjxmb3JtPjxpbnB1dCB0eXBlPSd0ZXh0JyBuYW1lPSdlbnRyeScgLz48L2Zv cm0+PC9ib2R5PjwvaHRtbD4iOwpAQCAtMjIzLDYgKzIyNSw0NyBAQCBzdGF0aWMgdm9pZCBydW5H ZXRUZXh0VGVzdHMoQXRrVGV4dCogdGV4dE9iamVjdCkKICAgICAgICAgICAgICAgICAgICAgICAg IDAsICJUaGlzIGlzIGEgdGVzdC4gVGhpcyBpcyB0aGUgc2Vjb25kIHNlbnRlbmNlLiBBbmQgdGhp cyB0aGUgdGhpcmQuIiwgMCwgNjQpOwogfQogCitzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrQ2Fy ZXRPZmZzZXRzQW5kRXh0cmFub3VzV2hpdGVTcGFjZXMoKQoreworICAgIFdlYktpdFdlYlZpZXcq IHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2Via2l0X3dlYl92aWV3X25ldygpKTsKKyAgICBn X29iamVjdF9yZWZfc2luayh3ZWJWaWV3KTsKKyAgICBHdGtBbGxvY2F0aW9uIGFsbG9jYXRpb24g PSB7IDAsIDAsIDgwMCwgNjAwIH07CisgICAgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlKEdUS19X SURHRVQod2ViVmlldyksICZhbGxvY2F0aW9uKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF9z dHJpbmcod2ViVmlldywgY29udGVudHNXaXRoRXh0cmFuZW91c1doaXRlU3BhY2VzLCAwLCAwLCAw KTsKKworICAgIC8qIFdhaXQgZm9yIHRoZSBhY2Nlc3NpYmxlIG9iamVjdHMgdG8gYmUgY3JlYXRl ZC4gKi8KKyAgICB3YWl0Rm9yQWNjZXNzaWJsZU9iamVjdHMoKTsKKworICAgIC8qIEVuYWJsZSBj YXJldCBicm93c2luZy4gKi8KKyAgICBXZWJLaXRXZWJTZXR0aW5ncyogc2V0dGluZ3MgPSB3ZWJr aXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzKHdlYlZpZXcpOworICAgIGdfb2JqZWN0X3NldChHX09C SkVDVChzZXR0aW5ncyksICJlbmFibGUtY2FyZXQtYnJvd3NpbmciLCBUUlVFLCBOVUxMKTsKKyAg ICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdzKHdlYlZpZXcsIHNldHRpbmdzKTsKKworICAg IC8qIEdldCB0byB0aGUgaW5uZXIgQXRrVGV4dCBvYmplY3QuICovCisgICAgQXRrT2JqZWN0KiBv YmplY3QgPSBndGtfd2lkZ2V0X2dldF9hY2Nlc3NpYmxlKEdUS19XSURHRVQod2ViVmlldykpOwor ICAgIGdfYXNzZXJ0KG9iamVjdCk7CisgICAgb2JqZWN0ID0gYXRrX29iamVjdF9yZWZfYWNjZXNz aWJsZV9jaGlsZChvYmplY3QsIDApOworICAgIGdfYXNzZXJ0KG9iamVjdCk7CisKKyAgICBBdGtU ZXh0KiB0ZXh0T2JqZWN0ID0gQVRLX1RFWFQob2JqZWN0KTsKKyAgICBnX2Fzc2VydChBVEtfSVNf VEVYVCh0ZXh0T2JqZWN0KSk7CisKKyAgICBnY2hhciogdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0 KHRleHRPYmplY3QsIDAsIC0xKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJUaGlz IHBhcmFncmFwaCBpcyBib3JrZWQhIik7CisgICAgZ19mcmVlKHRleHQpOworCisgICAgZ2ludCBj aGFyYWN0ZXJDb3VudCA9IGF0a190ZXh0X2dldF9jaGFyYWN0ZXJfY291bnQodGV4dE9iamVjdCk7 CisgICAgZ19hc3NlcnRfY21waW50KGNoYXJhY3RlckNvdW50LCA9PSwgMjUpOworCisgICAgZ2Jv b2xlYW4gcmVzdWx0ID0gYXRrX3RleHRfc2V0X2NhcmV0X29mZnNldCh0ZXh0T2JqZWN0LCBjaGFy YWN0ZXJDb3VudCAtIDEpOworICAgIGdfYXNzZXJ0X2NtcGludChyZXN1bHQsID09LCBUUlVFKTsK KworICAgIGdpbnQgY2FyZXRPZmZzZXQgPSBhdGtfdGV4dF9nZXRfY2FyZXRfb2Zmc2V0KHRleHRP YmplY3QpOworICAgIGdfYXNzZXJ0X2NtcGludChjYXJldE9mZnNldCwgPT0sIGNoYXJhY3RlckNv dW50IC0gMSk7CisKKyAgICBnX29iamVjdF91bnJlZih3ZWJWaWV3KTsKK30KKwogc3RhdGljIHZv aWQgdGVzdFdlYmtpdEF0a0NvbWJvQm94KCkKIHsKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 ID0gV0VCS0lUX1dFQl9WSUVXKHdlYmtpdF93ZWJfdmlld19uZXcoKSk7CkBAIC0xMzE0LDYgKzEz NTcsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAgICAgZ3RrX3Rlc3RfaW5p dCgmYXJnYywgJmFyZ3YsIDApOwogCiAgICAgZ190ZXN0X2J1Z19iYXNlKCJodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy8iKTsKKyAgICBnX3Rlc3RfYWRkX2Z1bmMoIi93ZWJraXQvYXRrL2NhcmV0T2Zm c2V0c0FuZEV4dHJhbm91c1doaXRlU3BhY2VzIiwgdGVzdFdlYmtpdEF0a0NhcmV0T2Zmc2V0c0Fu ZEV4dHJhbm91c1doaXRlU3BhY2VzKTsKICAgICBnX3Rlc3RfYWRkX2Z1bmMoIi93ZWJraXQvYXRr L2NvbWJvQm94IiwgdGVzdFdlYmtpdEF0a0NvbWJvQm94KTsKICAgICBnX3Rlc3RfYWRkX2Z1bmMo Ii93ZWJraXQvYXRrL2dldFRleHRBdE9mZnNldCIsIHRlc3RXZWJraXRBdGtHZXRUZXh0QXRPZmZz ZXQpOwogICAgIGdfdGVzdF9hZGRfZnVuYygiL3dlYmtpdC9hdGsvZ2V0VGV4dEF0T2Zmc2V0Rm9y bXMiLCB0ZXN0V2Via2l0QXRrR2V0VGV4dEF0T2Zmc2V0Rm9ybXMpOwotLSAKMS43LjMuNAoK