53389 2011-01-29 17:40:04 -0800 [Gtk] atk_text_set_caret_offset returns True even when it is unsuccessful 2011-01-31 09:58:15 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 25531 53388 0 jdiggs webkit-unassigned apinheiro mario oldest_to_newest 342175 0 jdiggs 2011-01-29 17:40:04 -0800 +++ This bug was initially created as a clone of Bug #53388 +++ Created an attachment (id=80582) test case Steps to reproduce: 1. Open the attached test case in Epiphany. 2. Using Accerciser, attempt to set the caret position within the paragraph and within the first list item, by: A. Selecting the corresponding object in Accerciser's tree of accessible objects B. Typing 'acc.queryText().setCaretOffset(n)' - where 'n' is the desired offset. Expected results: You'd be able to set the caret offset for both objects. **Non-cloned stuff: AND if you could not, False would be returned.** Actual results: You can set the caret offset for only the paragraph; not the list item. **Non-cloned stuff: BUT True is always returned.** 342176 1 jdiggs 2011-01-29 17:45:22 -0800 Mario, related aside and/or good test: Ignoring Orca and just using the native caret navigation in Epiphany, I cannot arrow to the list item's number. And that's OK. If there's someplace we cannot place the caret, so be it. BUT, if you return False in those cases, an AT like Orca can see that it's a list item and reattempt positioning the caret at the first part of the text which is *not* the list item. (Make sense?) 342559 2 mario 2011-01-31 07:19:05 -0800 Blocking 53388, as we need to fix this bug first so set_caret_offset returns FALSE when trying to set the caret in the marker for a list item. 342605 3 80646 mario 2011-01-31 09:17:24 -0800 Created attachment 80646 Patch proposal + unit tests Attaching a patch to fix this issue. Notice that I included the needed code to consider list item markers (so we return FALSE in case you try to set the caret in the middle of them), as it's part of the solution for this bug, even if bug 53388 is not fixed yet and hence set_caret_offset will return FALSE always regardless of the offset being in the item's marker or in the item's text :-) Asking for review now... 342618 4 80646 mrobinson 2011-01-31 09:36:57 -0800 Comment on attachment 80646 Patch proposal + unit tests View in context: https://bugs.webkit.org/attachment.cgi?id=80646&action=review > Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:1714 > + RenderObject* renderer = toAccessibilityRenderObject(coreObject)->renderer(); > + if (renderer && renderer->isListItem()) { > + String markerText = toRenderListItem(renderer)->markerTextWithSuffix(); > + int markerLength = g_utf8_strlen(markerText.utf8().data(), -1); > + if (offset < markerLength) > + return FALSE; > + > + // We need to adjust the offset for list items. > + offset -= markerLength; > + } Please mention this change in the ChangeLog as well. 342631 5 mario 2011-01-31 09:58:15 -0800 Committed r77137: <http://trac.webkit.org/changeset/77137> 80646 2011-01-31 09:17:24 -0800 2011-01-31 09:36:56 -0800 Patch proposal + unit tests 0001-2011-01-31-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 10883 mario RnJvbSAxODM0NWEyMjg4OGE0OGI1NGU3ODI2OWUwYTRkZmU3ODc4ZTIxZWY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBNb24sIDMxIEphbiAyMDExIDE4OjE0OjIwICswMTAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMS0wMS0zMSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR3RrXSBhdGtf dGV4dF9zZXRfY2FyZXRfb2Zmc2V0IHJldHVybnMgVHJ1ZSBldmVuIHdoZW4gaXQgaXMgdW5zdWNj ZXNzZnVsCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUz Mzg5CgogICAgICAgIFJldHVybiBGQUxTRSB3aGVuIG5vdCBhYmxlIHRvIHNldCB0aGUgY2FyZXQg YXQgdGhlIHNwZWNpZmllZCBvZmZzZXQuCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgogICAgICAgICh3ZWJraXRfYWNjZXNzaWJs ZV90ZXh0X3NldF9jYXJldF9vZmZzZXQpOiBSZXR1cm4gRkFMU0Ugd2hlbiB0aGUKICAgICAgICBy YW5nZSBjcmVhdGVkIGlzIE5VTEwgYW5kIGNvbnNpZGVyIG1hcmtlcnMgZm9yIGxpc3QgaXRlbXMu CgoyMDExLTAxLTMxICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4K CiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtHdGtdIGF0a190 ZXh0X3NldF9jYXJldF9vZmZzZXQgcmV0dXJucyBUcnVlIGV2ZW4gd2hlbiBpdCBpcyB1bnN1Y2Nl c3NmdWwKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMz ODkKCiAgICAgICAgTmV3IHVuaXQgdGVzdCB0byBjaGVjayB0aGUgZml4IGZvciB0aGlzIGJ1Zy4K CiAgICAgICAgKiB0ZXN0cy90ZXN0YXRrLmM6CiAgICAgICAgKHRlc3RXZWJraXRBdGtDYXJldE9m ZnNldHMpOiBOZXcuCiAgICAgICAgKG1haW4pOiBBZGQgbmV3IHRlc3QuCi0tLQogU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEzICsrKwogLi4u L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgICAgICAgICAgfCAgIDE4ICsr Ky0KIFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgIHwg ICAxMyArKysKIFNvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYyAgICAgICAgICAgICAg ICAgIHwgIDEwNCArKysrKysrKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAxNDcgaW5z ZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA4NDE1MS4uNGNmM2I4 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTAxLTMxICBNYXJpbyBTYW5jaGV6 IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBhdGtfdGV4dF9zZXRfY2FyZXRfb2Zmc2V0IHJl dHVybnMgVHJ1ZSBldmVuIHdoZW4gaXQgaXMgdW5zdWNjZXNzZnVsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzM4OQorCisgICAgICAgIFJldHVybiBG QUxTRSB3aGVuIG5vdCBhYmxlIHRvIHNldCB0aGUgY2FyZXQgYXQgdGhlIHNwZWNpZmllZCBvZmZz ZXQuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlckF0ay5jcHA6CisgICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV90ZXh0X3NldF9jYXJldF9v ZmZzZXQpOiBSZXR1cm4gRkFMU0Ugd2hlbiB0aGUKKyAgICAgICAgcmFuZ2UgY3JlYXRlZCBpcyBO VUxMIGFuZCBjb25zaWRlciBtYXJrZXJzIGZvciBsaXN0IGl0ZW1zLgorCiAyMDExLTAxLTI4ICBT aGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByNzY4OTMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0 ay5jcHAKaW5kZXggOTlkYTA3Yi4uZGY3OThjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyQXRrLmNwcApAQCAtMTY5OSwxMCArMTY5OSwyNiBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0 X2FjY2Vzc2libGVfdGV4dF9zZXRfY2FyZXRfb2Zmc2V0KEF0a1RleHQqIHRleHQsIGdpbnQgb2Zm cwogewogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3QgPSBjb3JlKHRleHQpOwog CisgICAgaWYgKCFjb3JlT2JqZWN0LT5pc0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoKSkKKyAg ICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IHRvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdChjb3JlT2JqZWN0KS0+cmVuZGVyZXIoKTsKKyAgICBpZiAo cmVuZGVyZXIgJiYgcmVuZGVyZXItPmlzTGlzdEl0ZW0oKSkgeworICAgICAgICBTdHJpbmcgbWFy a2VyVGV4dCA9IHRvUmVuZGVyTGlzdEl0ZW0ocmVuZGVyZXIpLT5tYXJrZXJUZXh0V2l0aFN1ZmZp eCgpOworICAgICAgICBpbnQgbWFya2VyTGVuZ3RoID0gZ191dGY4X3N0cmxlbihtYXJrZXJUZXh0 LnV0ZjgoKS5kYXRhKCksIC0xKTsKKyAgICAgICAgaWYgKG9mZnNldCA8IG1hcmtlckxlbmd0aCkK KyAgICAgICAgICAgIHJldHVybiBGQUxTRTsKKworICAgICAgICAvLyBXZSBuZWVkIHRvIGFkanVz dCB0aGUgb2Zmc2V0IGZvciBsaXN0IGl0ZW1zLgorICAgICAgICBvZmZzZXQgLT0gbWFya2VyTGVu Z3RoOworICAgIH0KKwogICAgIFBsYWluVGV4dFJhbmdlIHRleHRSYW5nZShvZmZzZXQsIDApOwog ICAgIFZpc2libGVQb3NpdGlvblJhbmdlIHJhbmdlID0gY29yZU9iamVjdC0+dmlzaWJsZVBvc2l0 aW9uUmFuZ2VGb3JSYW5nZSh0ZXh0UmFuZ2UpOwotICAgIGNvcmVPYmplY3QtPnNldFNlbGVjdGVk VmlzaWJsZVBvc2l0aW9uUmFuZ2UocmFuZ2UpOworICAgIGlmIChyYW5nZS5pc051bGwoKSkKKyAg ICAgICAgcmV0dXJuIEZBTFNFOwogCisgICAgY29yZU9iamVjdC0+c2V0U2VsZWN0ZWRWaXNpYmxl UG9zaXRpb25SYW5nZShyYW5nZSk7CiAgICAgcmV0dXJuIFRSVUU7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxv ZwppbmRleCBhZmRjMzc1Li5hZWJhYTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDEtMzEgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtd IGF0a190ZXh0X3NldF9jYXJldF9vZmZzZXQgcmV0dXJucyBUcnVlIGV2ZW4gd2hlbiBpdCBpcyB1 bnN1Y2Nlc3NmdWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUzMzg5CisKKyAgICAgICAgTmV3IHVuaXQgdGVzdCB0byBjaGVjayB0aGUgZml4IGZvciB0 aGlzIGJ1Zy4KKworICAgICAgICAqIHRlc3RzL3Rlc3RhdGsuYzoKKyAgICAgICAgKHRlc3RXZWJr aXRBdGtDYXJldE9mZnNldHMpOiBOZXcuCisgICAgICAgIChtYWluKTogQWRkIG5ldyB0ZXN0Lgor CiAyMDExLTAxLTI3ICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3Rr L3Rlc3RzL3Rlc3RhdGsuYyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYwppbmRl eCBmN2E1YzU5Li5iNmE0YzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90 ZXN0YXRrLmMKKysrIGIvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jCkBAIC02MCw2 ICs2MCw4IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBsaW5rc1dpdGhJbmxpbmVJbWFnZXMgPSAiPGh0 bWw+PGhlYWQ+PHN0eWxlPmEuaHR0cDpiZWZvcmUge2NvCiAKIHN0YXRpYyBjb25zdCBjaGFyKiBs aXN0c09mSXRlbXMgPSAiPGh0bWw+PGJvZHk+PHVsPjxsaT50ZXh0IG9ubHk8L2xpPjxsaT48YSBo cmVmPSdmb28nPmxpbmsgb25seTwvYT48L2xpPjxsaT50ZXh0IGFuZCBhIDxhIGhyZWY9J2Jhcic+ bGluazwvYT48L2xpPjwvdWw+PG9sPjxsaT50ZXh0IG9ubHk8L2xpPjxsaT48YSBocmVmPSdmb28n Pmxpbmsgb25seTwvYT48L2xpPjxsaT50ZXh0IGFuZCBhIDxhIGhyZWY9J2Jhcic+bGluazwvYT48 L2xpPjwvb2w+PC9ib2R5PjwvaHRtbD4iOwogCitzdGF0aWMgY29uc3QgY2hhciogdGV4dEZvckNh cmV0QnJvd3NpbmcgPSAiPGh0bWw+PGJvZHk+PGgxPkEgdGV4dCBoZWFkZXI8L2gxPjxwPkEgcGFy YWdyYXBoIDxhIGhyZWY9J2h0dHA6Ly9mb28uYmFyLmJhei8nPndpdGggYSBsaW5rPC9hPiBpbiB0 aGUgbWlkZGxlPC9wPjxvbD48bGk+QSBsaXN0IGl0ZW08L2xpPjwvb2w+PHNlbGVjdD48b3B0aW9u IHNlbGVjdGVkIHZhbHVlPSdmb28nPkFuIG9wdGlvbiBpbiBhIGNvbWJvIGJveDwvb3B0aW9uPjwv c2VsZWN0PjwvYm9keT48L2h0bWw+IjsKKwogc3RhdGljIGNvbnN0IGNoYXIqIHRleHRGb3JTZWxl Y3Rpb25zID0gIjxodG1sPjxib2R5PjxwPkEgcGFyYWdyYXBoIHdpdGggcGxhaW4gdGV4dDwvcD48 cD5BIHBhcmFncmFwaCB3aXRoIDxhIGhyZWY9J2h0dHA6Ly93ZWJraXQub3JnJz5hIGxpbms8L2E+ IGluIHRoZSBtaWRkbGU8L3A+PC9ib2R5PjwvaHRtbD4iOwogCiBzdGF0aWMgY29uc3QgY2hhciog dGV4dFdpdGhBdHRyaWJ1dGVzID0gIjxodG1sPjxoZWFkPjxzdHlsZT4uc3QxIHtmb250LWZhbWls eTogbW9ub3NwYWNlOyBjb2xvcjpyZ2IoMTIwLDEyMSwxMjIpO30gLnN0MiB7dGV4dC1kZWNvcmF0 aW9uOnVuZGVybGluZTsgYmFja2dyb3VuZC1jb2xvcjpyZ2IoODAsODEsODIpO308L3N0eWxlPjwv aGVhZD48Ym9keT48cCBzdHlsZT1cImZvbnQtc2l6ZToxNDsgdGV4dC1hbGlnbjpyaWdodDtcIj5U aGlzIGlzIHRoZSA8aT5maXJzdDwvaT48Yj4gc2VudGVuY2Ugb2YgdGhpcyB0ZXh0LjwvYj48L3A+ PHAgY2xhc3M9XCJzdDFcIj5UaGlzIHNlbnRlbmNlIHNob3VsZCBoYXZlIGFuIHN0eWxlIGFwcGxp ZWQgPHNwYW4gY2xhc3M9XCJzdDJcIj5hbmQgdGhpcyBwYXJ0IHNob3VsZCBoYXZlIGFub3RoZXIg b25lPC9zcGFuPi48L3A+PHA+eDxzdWI+MTwvc3ViPjxzdXA+Mjwvc3VwPj14PHN1Yj4yPC9zdWI+ PHN1cD4zPC9zdXA+PC9wPjxwIHN0eWxlPVwidGV4dC1hbGlnbjpjZW50ZXI7XCI+VGhpcyBzZW50 ZW5jZSBpcyB0aGUgPHN0cmlrZT5sYXN0PC9zdHJpa2U+IG9uZS48L3A+PC9ib2R5PjwvaHRtbD4i OwpAQCAtMjI3LDYgKzIyOSwxMDcgQEAgc3RhdGljIHZvaWQgcnVuR2V0VGV4dFRlc3RzKEF0a1Rl eHQqIHRleHRPYmplY3QpCiAgICAgICAgICAgICAgICAgICAgICAgICAwLCAiVGhpcyBpcyBhIHRl c3QuIFRoaXMgaXMgdGhlIHNlY29uZCBzZW50ZW5jZS4gQW5kIHRoaXMgdGhlIHRoaXJkLiIsIDAs IDY0KTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a0NhcmV0T2Zmc2V0cygpCit7Cisg ICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3Zp ZXdfbmV3KCkpOworICAgIGdfb2JqZWN0X3JlZl9zaW5rKHdlYlZpZXcpOworICAgIEd0a0FsbG9j YXRpb24gYWxsb2NhdGlvbiA9IHsgMCwgMCwgODAwLCA2MDAgfTsKKyAgICBndGtfd2lkZ2V0X3Np emVfYWxsb2NhdGUoR1RLX1dJREdFVCh3ZWJWaWV3KSwgJmFsbG9jYXRpb24pOworICAgIHdlYmtp dF93ZWJfdmlld19sb2FkX3N0cmluZyh3ZWJWaWV3LCB0ZXh0Rm9yQ2FyZXRCcm93c2luZywgMCwg MCwgMCk7CisKKyAgICAvKiBXYWl0IGZvciB0aGUgYWNjZXNzaWJsZSBvYmplY3RzIHRvIGJlIGNy ZWF0ZWQuICovCisgICAgd2FpdEZvckFjY2Vzc2libGVPYmplY3RzKCk7CisKKyAgICBBdGtPYmpl Y3QqIG9iamVjdCA9IGd0a193aWRnZXRfZ2V0X2FjY2Vzc2libGUoR1RLX1dJREdFVCh3ZWJWaWV3 KSk7CisgICAgZ19hc3NlcnQob2JqZWN0KTsKKworICAgIEF0a09iamVjdCogaGVhZGVyID0gYXRr X29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChvYmplY3QsIDApOworICAgIGdfYXNzZXJ0KEFU S19JU19URVhUKGhlYWRlcikpOworICAgIGdjaGFyKiB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQo QVRLX1RFWFQoaGVhZGVyKSwgMCwgLTEpOworICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0LCA9PSwg IkEgdGV4dCBoZWFkZXIiKTsKKyAgICBnX2ZyZWUgKHRleHQpOworCisgICAgLyogSXQgc2hvdWxk IGJlIHBvc3NpYmxlIHRvIHBsYWNlIHRoZSBjYXJldCBpbnNpZGUgYSBoZWFkZXIuICovCisgICAg Z2Jvb2xlYW4gcmVzdWx0ID0gYXRrX3RleHRfc2V0X2NhcmV0X29mZnNldChBVEtfVEVYVChoZWFk ZXIpLCA1KTsKKyAgICBnX2Fzc2VydF9jbXBpbnQocmVzdWx0LCA9PSwgVFJVRSk7CisgICAgZ2lu dCBvZmZzZXQgPSBhdGtfdGV4dF9nZXRfY2FyZXRfb2Zmc2V0KEFUS19URVhUKGhlYWRlcikpOwor ICAgIGdfYXNzZXJ0X2NtcGludChvZmZzZXQsID09LCA1KTsKKworICAgIEF0a09iamVjdCogcGFy YWdyYXBoID0gYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChvYmplY3QsIDEpOworICAg IGdfYXNzZXJ0KEFUS19JU19URVhUKHBhcmFncmFwaCkpOworICAgIHRleHQgPSBhdGtfdGV4dF9n ZXRfdGV4dChBVEtfVEVYVChwYXJhZ3JhcGgpLCAwLCAtMSk7CisgICAgZ19hc3NlcnRfY21wc3Ry KHRleHQsID09LCAiQSBwYXJhZ3JhcGggd2l0aCBhIGxpbmsgaW4gdGhlIG1pZGRsZSIpOworICAg IGdfZnJlZSAodGV4dCk7CisKKyAgICAvKiBJdCBzaG91bGQgYmUgcG9zc2libGUgdG8gcGxhY2Ug dGhlIGNhcmV0IGluc2lkZSBhIHBhcmFncmFwaCBhbmQgYSBsaW5rLiAqLworICAgIHJlc3VsdCA9 IGF0a190ZXh0X3NldF9jYXJldF9vZmZzZXQoQVRLX1RFWFQocGFyYWdyYXBoKSwgNSk7CisgICAg Z19hc3NlcnRfY21waW50KHJlc3VsdCwgPT0sIFRSVUUpOworICAgIG9mZnNldCA9IGF0a190ZXh0 X2dldF9jYXJldF9vZmZzZXQoQVRLX1RFWFQocGFyYWdyYXBoKSk7CisgICAgZ19hc3NlcnRfY21w aW50KG9mZnNldCwgPT0sIDUpOworCisgICAgcmVzdWx0ID0gYXRrX3RleHRfc2V0X2NhcmV0X29m ZnNldChBVEtfVEVYVChwYXJhZ3JhcGgpLCAyMCk7CisgICAgZ19hc3NlcnRfY21waW50KHJlc3Vs dCwgPT0sIFRSVUUpOworICAgIG9mZnNldCA9IGF0a190ZXh0X2dldF9jYXJldF9vZmZzZXQoQVRL X1RFWFQocGFyYWdyYXBoKSk7CisgICAgZ19hc3NlcnRfY21waW50KG9mZnNldCwgPT0sIDIwKTsK KworICAgIHJlc3VsdCA9IGF0a190ZXh0X3NldF9jYXJldF9vZmZzZXQoQVRLX1RFWFQocGFyYWdy YXBoKSwgMzApOworICAgIGdfYXNzZXJ0X2NtcGludChyZXN1bHQsID09LCBUUlVFKTsKKyAgICBv ZmZzZXQgPSBhdGtfdGV4dF9nZXRfY2FyZXRfb2Zmc2V0KEFUS19URVhUKHBhcmFncmFwaCkpOwor ICAgIGdfYXNzZXJ0X2NtcGludChvZmZzZXQsID09LCAzMCk7CisKKyAgICBBdGtPYmplY3QqIGxp c3QgPSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKG9iamVjdCwgMik7CisgICAgZ19h c3NlcnQoQVRLX09CSkVDVChsaXN0KSk7CisgICAgZ19hc3NlcnQoYXRrX29iamVjdF9nZXRfcm9s ZShsaXN0KSA9PSBBVEtfUk9MRV9MSVNUKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoYXRrX29iamVj dF9nZXRfbl9hY2Nlc3NpYmxlX2NoaWxkcmVuKGxpc3QpLCA9PSwgMSk7CisKKyAgICBBdGtPYmpl Y3QqIGxpc3RJdGVtID0gYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChsaXN0LCAwKTsK KyAgICBnX2Fzc2VydChBVEtfSVNfVEVYVChsaXN0SXRlbSkpOworICAgIHRleHQgPSBhdGtfdGV4 dF9nZXRfdGV4dChBVEtfVEVYVChsaXN0SXRlbSksIDAsIC0xKTsKKyAgICBnX2Fzc2VydF9jbXBz dHIodGV4dCwgPT0sICIxLiBBIGxpc3QgaXRlbSIpOworICAgIGdfZnJlZSAodGV4dCk7CisKKyAg ICAvKiBJdCdzIG5vdCBwb3NzaWJsZSB0byBwbGFjZSB0aGUgY2FyZXQgaW5zaWRlIGFuIGl0ZW0n cyBtYXJrZXIuICovCisgICAgcmVzdWx0ID0gYXRrX3RleHRfc2V0X2NhcmV0X29mZnNldChBVEtf VEVYVChsaXN0SXRlbSksIDEpOworICAgIGdfYXNzZXJ0X2NtcGludChyZXN1bHQsID09LCBGQUxT RSk7CisKKyAgICAvKiBUT0RPOiBDaGVjayBoZXJlIHRoYXQgaXQncyBwb3NzaWJsZSB0byBzZXQg dGhlIGNhcmV0IGluIHRoZQorICAgICAgIG1pZGRsZSBvZiB0aGUgdGV4dCBmb3IgYSBsaXN0IGl0 ZW0gd2hlbiBmaXhpbmcgYnVnIDUzMzg4LgorICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MzM4OCAqLworCisgICAgQXRrT2JqZWN0KiBwYW5lbCA9IGF0a19v YmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqZWN0LCAzKTsKKyAgICBnX2Fzc2VydChBVEtf SVNfT0JKRUNUKHBhbmVsKSk7CisgICAgZ19hc3NlcnQoYXRrX29iamVjdF9nZXRfcm9sZShwYW5l bCkgPT0gQVRLX1JPTEVfUEFORUwpOworCisgICAgQXRrT2JqZWN0KiBjb21ib0JveCA9IGF0a19v YmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQocGFuZWwsIDApOworICAgIGdfYXNzZXJ0KEFUS19J U19PQkpFQ1QoY29tYm9Cb3gpKTsKKyAgICBnX2Fzc2VydChhdGtfb2JqZWN0X2dldF9yb2xlKGNv bWJvQm94KSA9PSBBVEtfUk9MRV9DT01CT19CT1gpOworCisgICAgQXRrT2JqZWN0KiBtZW51UG9w dXAgPSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKGNvbWJvQm94LCAwKTsKKyAgICBn X2Fzc2VydChBVEtfSVNfT0JKRUNUKG1lbnVQb3B1cCkpOworICAgIGdfYXNzZXJ0KGF0a19vYmpl Y3RfZ2V0X3JvbGUobWVudVBvcHVwKSA9PSBBVEtfUk9MRV9NRU5VKTsKKworICAgIEF0a09iamVj dCogY29tYm9Cb3hPcHRpb24gPSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKG1lbnVQ b3B1cCwgMCk7CisgICAgZ19hc3NlcnQoQVRLX0lTX09CSkVDVChjb21ib0JveE9wdGlvbikpOwor ICAgIGdfYXNzZXJ0KGF0a19vYmplY3RfZ2V0X3JvbGUoY29tYm9Cb3hPcHRpb24pID09IEFUS19S T0xFX01FTlVfSVRFTSk7CisgICAgZ19hc3NlcnQoQVRLX0lTX1RFWFQoY29tYm9Cb3hPcHRpb24p KTsKKyAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQoQVRLX1RFWFQoY29tYm9Cb3hPcHRpb24p LCAwLCAtMSk7CisgICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiQW4gb3B0aW9uIGluIGEg Y29tYm8gYm94Iik7CisKKyAgICAvKiBJdCdzIG5vdCBwb3NzaWJsZSB0byBwbGFjZSB0aGUgY2Fy ZXQgaW5zaWRlIGFuIG9wdGlvbiBmb3IgYSBjb21ib2JveC4gKi8KKyAgICByZXN1bHQgPSBhdGtf dGV4dF9zZXRfY2FyZXRfb2Zmc2V0KEFUS19URVhUKGNvbWJvQm94T3B0aW9uKSwgMSk7CisgICAg Z19hc3NlcnRfY21waW50KHJlc3VsdCwgPT0sIEZBTFNFKTsKKworICAgIGdfb2JqZWN0X3VucmVm KGhlYWRlcik7CisgICAgZ19vYmplY3RfdW5yZWYocGFyYWdyYXBoKTsKKyAgICBnX29iamVjdF91 bnJlZihsaXN0KTsKKyAgICBnX29iamVjdF91bnJlZihsaXN0SXRlbSk7CisgICAgZ19vYmplY3Rf dW5yZWYocGFuZWwpOworICAgIGdfb2JqZWN0X3VucmVmKGNvbWJvQm94KTsKKyAgICBnX29iamVj dF91bnJlZihtZW51UG9wdXApOworICAgIGdfb2JqZWN0X3VucmVmKGNvbWJvQm94T3B0aW9uKTsK KyAgICBnX29iamVjdF91bnJlZih3ZWJWaWV3KTsKK30KKwogc3RhdGljIHZvaWQgdGVzdFdlYmtp dEF0a0NhcmV0T2Zmc2V0c0FuZEV4dHJhbm91c1doaXRlU3BhY2VzKCkKIHsKICAgICBXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdlYmtpdF93ZWJfdmlld19uZXcoKSk7 CkBAIC0xMzkzLDYgKzE0OTYsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAg ICAgZ3RrX3Rlc3RfaW5pdCgmYXJnYywgJmFyZ3YsIDApOwogCiAgICAgZ190ZXN0X2J1Z19iYXNl KCJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy8iKTsKKyAgICBnX3Rlc3RfYWRkX2Z1bmMoIi93ZWJr aXQvYXRrL2NhcmV0T2Zmc2V0cyIsIHRlc3RXZWJraXRBdGtDYXJldE9mZnNldHMpOwogICAgIGdf dGVzdF9hZGRfZnVuYygiL3dlYmtpdC9hdGsvY2FyZXRPZmZzZXRzQW5kRXh0cmFub3VzV2hpdGVT cGFjZXMiLCB0ZXN0V2Via2l0QXRrQ2FyZXRPZmZzZXRzQW5kRXh0cmFub3VzV2hpdGVTcGFjZXMp OwogICAgIGdfdGVzdF9hZGRfZnVuYygiL3dlYmtpdC9hdGsvY29tYm9Cb3giLCB0ZXN0V2Via2l0 QXRrQ29tYm9Cb3gpOwogICAgIGdfdGVzdF9hZGRfZnVuYygiL3dlYmtpdC9hdGsvZ2V0VGV4dEF0 T2Zmc2V0IiwgdGVzdFdlYmtpdEF0a0dldFRleHRBdE9mZnNldCk7Ci0tIAoxLjcuMy41Cgo=