59737 2011-04-28 14:17:27 -0700 Focus and caret position should be updated when same-page links are followed 2013-07-26 05:38:59 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED DUPLICATE 17450 http://wikipedia.org P2 Normal --- 62008 25531 17450 0 jdiggs webkit-unassigned cfleizach cgarcia eric mario xan.lopez oldest_to_newest 394737 0 jdiggs 2011-04-28 14:17:27 -0700 Steps to reproduce: 1. Launch Epiphany and enable caret browsing by pressing F7 2. Navigate to the wikipedia page of your choice, e.g. http://en.wikipedia.org/wiki/Zombies 3. Move focus to a link under the 'Contents' heading (e.g. 'Zombie apocalypse') and press Return. At this point the window scrolls to display the chosen heading. 4. Press Down Arrow to move to the next line within the chosen section's contents. Expected results: The caret position would be updated to the next line of content under the chosen heading (e.g. 'Main article: Zombie apocalypse'). In addition, the appropriate accessible signals (focus:, object:state-changed:focused, and object:text-caret-moved) would be emitted. Actual results: The caret and focus are each moved to the next link in the contents (e.g. 'Philosophical Zombie'). Note: I'm guessing that this is not technically the 'Accessibility' component, but I'm not sure which component it is. It is, however, a significant accessibility issue for users who are blind. CCing Mario for triage. Thanks! 397807 1 mario 2011-05-04 04:37:44 -0700 Looks like we could make the most of the GTK-specific method we have in AXObjectCacheAtk.cpp, called handleScrolledToAnchor(), which seems to fit pretty well in this case. I'll try to come up with a patch for this soon. 397912 2 92239 mario 2011-05-04 07:31:27 -0700 Created attachment 92239 Patch proposal + Layout test Patch proposal + layout test. The implemented behaviour is specific to the GTK port. 405059 3 jdiggs 2011-05-17 08:09:57 -0700 Thanks Mario! I'll build and test it soon. In the meantime, bug 17450 was just pointed out to me. It sounds quite similar to what I reported here. (I really did search and browse prior to filing. Honest! :-) ) Anyhoo, if this is a cross-platform issue, is a single cross-platform solution possible? 405264 4 mario 2011-05-17 13:41:37 -0700 (In reply to comment #3) > Thanks Mario! I'll build and test it soon. In the meantime, bug 17450 was just pointed out to me. It sounds quite similar to what I reported here. (I really did search and browse prior to filing. Honest! :-) ) Anyhoo, if this is a cross-platform issue, is a single cross-platform solution possible? Sure! I just used that platform-specific method because it was exactly what I wanted to do for WebKitGTK, but I don't see much trouble in moving it to the general AXObjectCache code. I'll comment on bug 17450 414124 5 eric 2011-06-02 08:04:51 -0700 Seems like kinda an odd AX feature, but gtk should do whatever works for Gtk... 414149 6 92239 mrobinson 2011-06-02 08:36:08 -0700 Comment on attachment 92239 Patch proposal + Layout test View in context: https://bugs.webkit.org/attachment.cgi?id=92239&action=review Okay! Seems sane. > Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp:228 > + Position targetPosition = firstPositionInOrBeforeNode(const_cast<Node*>(node)); > + selection->moveTo(targetPosition, DOWNSTREAM); This seems simple enough to make into one line. Please change before landing. 414769 7 mario 2011-06-03 04:12:03 -0700 (In reply to comment #6) > (From update of attachment 92239 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=92239&action=review > > Okay! Seems sane. > > > Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp:228 > > + Position targetPosition = firstPositionInOrBeforeNode(const_cast<Node*>(node)); > > + selection->moveTo(targetPosition, DOWNSTREAM); > > This seems simple enough to make into one line. Please change before landing. Done. Committed r88004: <http://trac.webkit.org/changeset/88004> 414805 8 mario 2011-06-03 05:37:49 -0700 This patch caused some patches to start failing, so I've rolled it out: https://bugs.webkit.org/show_bug.cgi?id=62008 Btw, those patches only fail if running the accessibility layout tests before: run-webkit-tests --gtk --debug accessibility fast/block/float/float-in-float-hit-testing.html fast/css/target-fragment-match.html t/dynamic/anchor-lock.html fast/overflow/overflow_hidden.html svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html ...so it could be some interdependency issue among tests, triggered perhaps by the layout test in this bug. Hence, reopening... 414806 9 92239 mario 2011-06-03 05:38:16 -0700 Comment on attachment 92239 Patch proposal + Layout test Obsoleting bug and clearing flags 911948 10 mario 2013-07-26 05:38:59 -0700 This bug has been fixed in a more general way with the patch for bug 17450 *** This bug has been marked as a duplicate of bug 17450 *** 92239 2011-05-04 07:31:27 -0700 2011-06-03 05:38:16 -0700 Patch proposal + Layout test 0001-2011-05-04-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 8333 mario RnJvbSAxMmVkNzhlZjU1MjcyYTA0YWYxZjJmYmJkYzQ1Zjc0MWY1YzNkNzMwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBXZWQsIDQgTWF5IDIwMTEgMTY6MTA6NTMgKzAyMDAKU3ViamVjdDogW1BBVENI XSAyMDExLTA1LTA0ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4K CiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIEZvY3VzIGFuZCBj YXJldCBwb3NpdGlvbiBzaG91bGQgYmUgdXBkYXRlZCB3aGVuIHNhbWUtcGFnZSBsaW5rcyBhcmUg Zm9sbG93ZWQKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTk3MzcKCiAgICAgICAgVXBkYXRlIHRoZSBjYXJldCBwb3NpdGlvbiB0byB0aGUgYW5jaG9yJ3Mg cG9zaXRpb24gYWZ0ZXIgc2Nyb2xsaW5nLgoKICAgICAgICBUaGlzIGJlaGF2aW9yIGlzIHNwZWNp ZmljIHRvIHRoZSBHdGsgcG9ydCBhbmQgcmVxdWVzdGVkIGJlY2F1c2Ugb2YKICAgICAgICBhY2Nl c3NpYmlsaXR5IG5lZWRzLCB0aGF0J3Mgd2h5IGl0J3MgaW1wbGVtZW50ZWQgaW4gQVhPYmplY3RD YWNoZS4KCiAgICAgICAgVGVzdDogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvY2FyZXQtYnJv d3NpbmctYW5jaG9yLWZvbGxvd2VkLmh0bWwKCiAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9B WE9iamVjdENhY2hlQXRrLmNwcDoKICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6aGFu ZGxlU2Nyb2xsZWRUb0FuY2hvcik6IE1ha2Ugc3VyZSB0aGUKICAgICAgICBjYXJldCBpcyB1cGRh dGVkIHRvIGJlIGluIHRoZSBhbmNob3IncyBwb3NpdGlvbiBhZnRlciBzY3JvbGxpbmcuCgoyMDEx LTA1LTA0ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KCiAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIEZvY3VzIGFuZCBjYXJldCBw b3NpdGlvbiBzaG91bGQgYmUgdXBkYXRlZCB3aGVuIHNhbWUtcGFnZSBsaW5rcyBhcmUgZm9sbG93 ZWQKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk3MzcK CiAgICAgICAgTmV3IGxheW91dCB0ZXN0IGZvciB0ZXN0aW5nIHRoaXMgR1RLLXNwZWNpZmljIGZl YXR1cmUuCgogICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvY2FyZXQtYnJvd3Np bmctYW5jaG9yLWZvbGxvd2VkLWV4cGVjdGVkLnR4dDogQWRkZWQuCiAgICAgICAgKiBwbGF0Zm9y bS9ndGsvYWNjZXNzaWJpbGl0eS9jYXJldC1icm93c2luZy1hbmNob3ItZm9sbG93ZWQuaHRtbDog QWRkZWQuCi0tLQogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgIDEyICsrKysrCiAuLi4vY2FyZXQtYnJvd3NpbmctYW5jaG9yLWZvbGxvd2VkLWV4 cGVjdGVkLnR4dCAgICB8ICAgMjIgKysrKysrKysrCiAuLi4vY2FyZXQtYnJvd3NpbmctYW5jaG9y LWZvbGxvd2VkLmh0bWwgICAgICAgICAgICB8ICAgNTAgKysrKysrKysrKysrKysrKysrKysKIFNv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxOCAr KysrKysrCiAuLi4vV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BWE9iamVjdENhY2hlQXRrLmNw cCB8ICAgMjMgKysrKysrKysrLQogNSBmaWxlcyBjaGFuZ2VkLCAxMjQgaW5zZXJ0aW9ucygrKSwg MSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvYWNjZXNzaWJpbGl0eS9jYXJldC1icm93c2luZy1hbmNob3ItZm9sbG93ZWQtZXhwZWN0ZWQu dHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2li aWxpdHkvY2FyZXQtYnJvd3NpbmctYW5jaG9yLWZvbGxvd2VkLmh0bWwKCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZWUzNjc4 NC4uYjk0NjVlNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTA1LTA0ICBNYXJpbyBTYW5j aGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2N1cyBhbmQgY2FyZXQgcG9zaXRpb24gc2hvdWxk IGJlIHVwZGF0ZWQgd2hlbiBzYW1lLXBhZ2UgbGlua3MgYXJlIGZvbGxvd2VkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTczNworCisgICAgICAgIE5l dyBsYXlvdXQgdGVzdCBmb3IgdGVzdGluZyB0aGlzIEdUSy1zcGVjaWZpYyBmZWF0dXJlLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvY2FyZXQtYnJvd3NpbmctYW5jaG9y LWZvbGxvd2VkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Fj Y2Vzc2liaWxpdHkvY2FyZXQtYnJvd3NpbmctYW5jaG9yLWZvbGxvd2VkLmh0bWw6IEFkZGVkLgor CiAyMDExLTA1LTA0ICBTYXRpc2ggU2FtcGF0aCAgPHNhdGlzaEBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBHZW50aWxjb3JlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvY2FyZXQtYnJvd3NpbmctYW5jaG9yLWZvbGxv d2VkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5 L2NhcmV0LWJyb3dzaW5nLWFuY2hvci1mb2xsb3dlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzNkMGRlZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2NhcmV0LWJyb3dzaW5nLWFuY2hvci1m b2xsb3dlZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyMiBAQAorQSBsaW5rIHBvaW50aW5nIHRv IGFuIGFuY2hvciBhdCB0aGUgZW5kIG9mIHRoZSBkb2N1bWVudAorCitBIHBhcmFncmFwaCB3aXRo IGEgc29tZSB0ZXh0IGluIHRoZSBtaWRkbGUKKworVGhlIEFuY2hvcgorCitBIHBhcmFncmFwaCB3 aXRoIGEgc29tZSB0ZXh0IHJpZ2h0IGFmdGVyIHRoZSBhbmNob3IKKworVGhpcyB0ZXN0cyB0aGF0 IHRoZSBjYXJldCBwb3NpdGlvbiBpcyBwcm9wZXJseSB1cGRhdGVkIHdoZW4gZm9sbG93aW5nIGFu Y2hvciBsaW5rcy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNT IiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgYXhMaW5r LnJvbGUgaXMgJ0FYUm9sZTogbGluaycKK1BBU1MgYXhMaW5rLmlzRm9jdXNlZCBpcyB0cnVlCitQ QVNTIGF4TGluay5pc0ZvY3VzZWQgaXMgZmFsc2UKK1BBU1MgZ2V0U2VsZWN0aW9uKCkuYW5jaG9y Tm9kZS5ub2RlVmFsdWUgaXMgJ1RoZSBBbmNob3InCitQQVNTIGdldFNlbGVjdGlvbigpLmFuY2hv ck5vZGUubm9kZVZhbHVlIGlzICdBIHBhcmFncmFwaCB3aXRoIGEgc29tZSB0ZXh0IHJpZ2h0IGFm dGVyIHRoZSBhbmNob3InCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1Qg Q09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2li aWxpdHkvY2FyZXQtYnJvd3NpbmctYW5jaG9yLWZvbGxvd2VkLmh0bWwgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9jYXJldC1icm93c2luZy1hbmNob3ItZm9sbG93ZWQu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jOTBhYWRjCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvY2FyZXQt YnJvd3NpbmctYW5jaG9yLWZvbGxvd2VkLmh0bWwKQEAgLTAsMCArMSw1MCBAQAorPCFET0NUWVBF IEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxs aW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1z dHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsKKzwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qt cHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5Ij4KKzxwPjxhIGlkPSJs aW5rIiBocmVmPSIjYW5jaG9yIj5BIGxpbmsgcG9pbnRpbmcgdG8gYW4gYW5jaG9yIGF0IHRoZSBl bmQgb2YgdGhlIGRvY3VtZW50PC9hPjwvcD4KKzxwPkEgcGFyYWdyYXBoIHdpdGggYSBzb21lIHRl eHQgaW4gdGhlIG1pZGRsZTwvcD4KKzxwPjxhIGlkPSJhbmNob3IiIG5hbWU9ImFuY2hvciI+VGhl IEFuY2hvcjwvYT48L3A+Cis8cCBpZD0idGV4dCI+QSBwYXJhZ3JhcGggd2l0aCBhIHNvbWUgdGV4 dCByaWdodCBhZnRlciB0aGUgYW5jaG9yPC9wPgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8 ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbigiVGhpcyB0ZXN0 cyB0aGF0IHRoZSBjYXJldCBwb3NpdGlvbiBpcyBwcm9wZXJseSB1cGRhdGVkIHdoZW4gZm9sbG93 aW5nIGFuY2hvciBsaW5rcy4iKTsKKworaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikg eworICAgIGxheW91dFRlc3RDb250cm9sbGVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0RW5h YmxlQ2FyZXRCcm93c2luZyIsIHRydWUpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBB c1RleHQoKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAg ICAgICAgdmFyIGxpbmsgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGluayIpOworICAgICAg ICB2YXIgYW5jaG9yID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImFuY2hvciIpOworICAgICAg ICB2YXIgdGV4dEFmdGVyQW5jaG9yID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRleHQiKTsK KworICAgICAgICAvLyBGb2N1cyBvbiB0aGUgbGluayBhbmQgY2hlY2sgc3RhdGUKKyAgICAgICAg IGxpbmsuZm9jdXMoKTsKKyAgICAgICAgdmFyIGF4TGluayA9IGFjY2Vzc2liaWxpdHlDb250cm9s bGVyLmZvY3VzZWRFbGVtZW50OworICAgICAgICBzaG91bGRCZSgiYXhMaW5rLnJvbGUiLCAiJ0FY Um9sZTogbGluayciKTsKKyAgICAgICAgc2hvdWxkQmUoImF4TGluay5pc0ZvY3VzZWQiLCAidHJ1 ZSIpOworCisgICAgICAgIC8vIEV4ZWN1dGUgYWN0aW9uIGFuZCBjaGVjayBzdGF0ZS4KKyAgICAg ICAgYXhMaW5rLnByZXNzKCkKKyAgICAgICAgc2hvdWxkQmUoImF4TGluay5pc0ZvY3VzZWQiLCAi ZmFsc2UiKTsKKyAgICAgICAgc2hvdWxkQmUoImdldFNlbGVjdGlvbigpLmFuY2hvck5vZGUubm9k ZVZhbHVlIiwgIidUaGUgQW5jaG9yJyIpOworCisgICAgICAgIC8vIFByZXNzIGRvd24gYXJyb3Ig YW5kIGNoZWNrIHN0YXRlLgorICAgICAgICBldmVudFNlbmRlci5rZXlEb3duKCJkb3duQXJyb3ci KTsKKyAgICAgICAgc2hvdWxkQmUoImdldFNlbGVjdGlvbigpLmFuY2hvck5vZGUubm9kZVZhbHVl IiwgIidBIHBhcmFncmFwaCB3aXRoIGEgc29tZSB0ZXh0IHJpZ2h0IGFmdGVyIHRoZSBhbmNob3In Iik7CisgICAgfQorfQorCitzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+Cis8 c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48 L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYWRkMmJlLi40OGE1NWU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDUtMDQgIE1hcmlvIFNhbmNoZXog UHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZvY3VzIGFuZCBjYXJldCBwb3NpdGlvbiBzaG91bGQgYmUg dXBkYXRlZCB3aGVuIHNhbWUtcGFnZSBsaW5rcyBhcmUgZm9sbG93ZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NzM3CisKKyAgICAgICAgVXBkYXRl IHRoZSBjYXJldCBwb3NpdGlvbiB0byB0aGUgYW5jaG9yJ3MgcG9zaXRpb24gYWZ0ZXIgc2Nyb2xs aW5nLgorCisgICAgICAgIFRoaXMgYmVoYXZpb3IgaXMgc3BlY2lmaWMgdG8gdGhlIEd0ayBwb3J0 IGFuZCByZXF1ZXN0ZWQgYmVjYXVzZSBvZgorICAgICAgICBhY2Nlc3NpYmlsaXR5IG5lZWRzLCB0 aGF0J3Mgd2h5IGl0J3MgaW1wbGVtZW50ZWQgaW4gQVhPYmplY3RDYWNoZS4KKworICAgICAgICBU ZXN0OiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9jYXJldC1icm93c2luZy1hbmNob3ItZm9s bG93ZWQuaHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQVhPYmplY3RDYWNoZUF0 ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpoYW5kbGVTY3JvbGxlZFRv QW5jaG9yKTogTWFrZSBzdXJlIHRoZQorICAgICAgICBjYXJldCBpcyB1cGRhdGVkIHRvIGJlIGlu IHRoZSBhbmNob3IncyBwb3NpdGlvbiBhZnRlciBzY3JvbGxpbmcuCisKIDIwMTEtMDUtMDQgIFNh dGlzaCBTYW1wYXRoICA8c2F0aXNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBUb255IEdlbnRpbGNvcmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2d0ay9BWE9iamVjdENhY2hlQXRrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvZ3RrL0FYT2JqZWN0Q2FjaGVBdGsuY3BwCmluZGV4IDBlNzIwYzIuLjYyOGQ0OWIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FYT2JqZWN0Q2FjaGVBdGsu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FYT2JqZWN0Q2FjaGVB dGsuY3BwCkBAIC0yMiwxMCArMjIsMTUgQEAKIAogI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlPYmpl Y3QuaCIKICNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5oIgorI2luY2x1 ZGUgIkRvY3VtZW50LmgiCisjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJHT3duUHRyLmgi CiAjaW5jbHVkZSAiUmFuZ2UuaCIKKyNpbmNsdWRlICJTZWxlY3Rpb25Db250cm9sbGVyLmgiCiAj aW5jbHVkZSAiU2VsZWN0RWxlbWVudC5oIgorI2luY2x1ZGUgIlRleHRBZmZpbml0eS5oIgogI2lu Y2x1ZGUgIlRleHRJdGVyYXRvci5oIgorI2luY2x1ZGUgImh0bWxlZGl0aW5nLmgiCiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIApAQCAtMjAzLDggKzIwOCwyNCBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6 OmhhbmRsZUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkKFJlbmRlck9iamVjdCogb2xkRm9jdXNlZFJl bmRlcgogICAgIH0KIH0KIAotdm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVTY3JvbGxlZFRvQW5j aG9yKGNvbnN0IE5vZGUqKQordm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVTY3JvbGxlZFRvQW5j aG9yKGNvbnN0IE5vZGUqIG5vZGUpCiB7CisgICAgLy8gTWFrZSBzdXJlIHRoZSBjYXJldCBwb3Np dGlvbiBpcyBzZXQgdG8gdGhlIGFuY2hvciBwb3NpdGlvbiwgc28KKyAgICAvLyBmdXJ0aGVyIHVz ZSBvZiBhcnJvdyBrZXlzIHdvcmsgYXMgZXhwZWN0ZWQuCisgICAgRG9jdW1lbnQqIGRvY3VtZW50 ID0gbm9kZS0+ZG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvY3VtZW50KQorICAgICAgICByZXR1cm47 CisKKyAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1l KQorICAgICAgICByZXR1cm47CisKKyAgICBTZWxlY3Rpb25Db250cm9sbGVyKiBzZWxlY3Rpb24g PSBmcmFtZS0+c2VsZWN0aW9uKCk7CisgICAgaWYgKCFzZWxlY3Rpb24pCisgICAgICAgIHJldHVy bjsKKworICAgIFBvc2l0aW9uIHRhcmdldFBvc2l0aW9uID0gZmlyc3RQb3NpdGlvbkluT3JCZWZv cmVOb2RlKGNvbnN0X2Nhc3Q8Tm9kZSo+KG5vZGUpKTsKKyAgICBzZWxlY3Rpb24tPm1vdmVUbyh0 YXJnZXRQb3NpdGlvbiwgRE9XTlNUUkVBTSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK LS0gCjEuNy41Cgo=