42474 2010-07-16 11:35:50 -0700 Spatial navigation: do not consider outline for focusable element boundaries 2011-04-19 05:15:29 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC All CLOSED FIXED P2 Normal --- 18662 1 tonikitoo tonikitoo hausmann simon.fraser oldest_to_newest 252630 0 tonikitoo 2010-07-16 11:35:50 -0700 Currently in WebCore::renderRectRelativeToRootDocument function , we are calling RenderObject::absoluteClippedOverflowRect to obtain the rect boundary of a given renderer/element. This method deals with outline, which is out of elements boundary. // Returns the rect that should be repainted whenever this object changes. The rect is in the view's // coordinate space. This method deals with outlines and overflow. IntRect absoluteClippedOverflowRect() { ... } It makes spatial navigation to fail on common sites like google.gom: "Web, Images, Map, etc" are inaccessible. Patch with a test coming ... 252635 1 61832 tonikitoo 2010-07-16 11:45:33 -0700 Created attachment 61832 patch - use getRect instead of absoluteClippedOverflowRect It fixes problem of zero-margin content (see layout test in the patch). 252637 2 61834 tonikitoo 2010-07-16 11:50:34 -0700 Created attachment 61834 (r63572, r=smfr) patch v2 - right patch Right patch this time. See comment #1 for description. 252638 3 61834 simon.fraser 2010-07-16 11:52:27 -0700 Comment on attachment 61834 (r63572, r=smfr) patch v2 - right patch r=me, but note that getRect() respects CSS transforms now, where absoluteClippedOverflowRect() did not, iirc. 252639 4 tonikitoo 2010-07-16 11:58:39 -0700 (In reply to comment #3) > (From update of attachment 61834 [details]) > r=me, Thank you! > but note that getRect() respects CSS transforms now, where absoluteClippedOverflowRect() did not, iirc. getRect is not currently transform-aware, although it could be. It calls RenderObject::absoluteBoundingBoxRect (which is transform-aware), but look at the call site and method signature. IntRect Node::getRect() const { // FIXME: broken with transforms if (renderer()) return renderer()->absoluteBoundingBoxRect(); .. // FIXME: useTransforms should go away eventually IntRect absoluteBoundingBoxRect(bool useTransforms = false); The caller 'd have to be absoluteBoundingBoxRect(true); Should I fix that in another bug? 252641 5 simon.fraser 2010-07-16 12:11:58 -0700 The patch in bug 41259 changes getRect(). 252658 6 61834 tonikitoo 2010-07-16 12:50:09 -0700 Comment on attachment 61834 (r63572, r=smfr) patch v2 - right patch Clearing flags on attachment: 61834 Committed r63572: <http://trac.webkit.org/changeset/63572> 255970 7 hausmann 2010-07-26 04:15:16 -0700 Revision r63572 cherry-picked into qtwebkit-2.0 with commit e70ca4c61a9dfc24875482c3184faaa34c08fb96 61832 2010-07-16 11:45:33 -0700 2010-07-16 11:50:34 -0700 patch - use getRect instead of absoluteClippedOverflowRect 0001-2010-07-15-Antonio-Gomes-tonikitoo-webkit.org.patch text/plain 2992 tonikitoo RnJvbSBhMzFiODk0Zjc5MDYxYWZhN2I3YjhmYjgwODFjZmNlZWU3MzU0Nzk0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVGh1LCAxNSBKdWwgMjAxMCAxODoyODo0NyAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIDIw MTAtMDctMTUgIEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KCiAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtRdF0gUmVtb3ZlIHVubmVjZXNz YXJ5IFdlYktpdCBoZWFkZXJzIGluY2x1c2lvbiBmcm9tIFdlYkNvcmUgZmlsZXMKICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI0MTYKCiAgICAgICAgVGhl cmUgYXJlIHNvbWUgcGxhY2VzIGluIFdlYkNvcmUgdW5uZWNlc3NhcmlseSBpbmNsdWRpbmcgV2Vi S2l0IGhlYWRlcnMuCgogICAgICAgIENsZWFuaW5nIHVwIG9ubHksIG5vIHRlc3RpbmcgbmVlZGVk LgoKICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvcXQvUmVzb3VyY2VIYW5kbGVRdC5jcHA6CiAg ICAgICAgKiBwbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmMKLS0tCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE1ICsrKysrKysrKysrKysrKwog V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1Jlc291cmNlSGFuZGxlUXQuY3BwIHwgICAgMSAt CiBXZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwICAgICAgICAgICAgfCAgICAy IC0tCiBXZWJDb3JlL3BsYXRmb3JtL3F0L1dpZGdldFF0LmNwcCAgICAgICAgICAgICAgICAgfCAg ICA1ICstLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCAzZTc4MjRjLi4yZTUzMTBjIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEwLTA3LTE1ICBBbnRvbmlv IEdvbWVzICA8dG9uaWtpdG9vQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBSZW1vdmUgdW5uZWNlc3NhcnkgV2ViS2l0IGhl YWRlcnMgaW5jbHVzaW9uIGZyb20gV2ViQ29yZSBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI0MTYKKworICAgICAgICBUaGVyZSBhcmUgc29t ZSBwbGFjZXMgaW4gV2ViQ29yZSB1bm5lY2Vzc2FyaWx5IGluY2x1ZGluZyBXZWJLaXQgaGVhZGVy cy4KKworICAgICAgICBDbGVhbmluZyB1cCBvbmx5LCBubyB0ZXN0aW5nIG5lZWRlZC4KKworICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvcXQvUmVzb3VyY2VIYW5kbGVRdC5jcHA6CisgICAgICAg ICogcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHA6CisgICAgICAgICogcGxhdGZvcm0vcXQv V2lkZ2V0UXQuY3BwOgorCiAyMDEwLTA3LTE1ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1Jlc291cmNlSGFuZGxlUXQuY3BwIGIvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3F0L1Jlc291cmNlSGFuZGxlUXQuY3BwCmluZGV4IDZkNGQzZDAuLmY5MWVl Y2IgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9SZXNvdXJjZUhhbmRs ZVF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUmVzb3VyY2VIYW5kbGVR dC5jcHAKQEAgLTQzLDcgKzQzLDYgQEAKIAogLy8gRklYTUU6IFdlYkNvcmUgaW5jbHVkaW5nIHRo ZXNlIGhlYWRlcnMgZnJvbSBXZWJLaXQgaXMgYSBtYXNzaXZlIGxheWVyaW5nIHZpb2xhdGlvbi4K ICNpbmNsdWRlICJxd2ViZnJhbWVfcC5oIgotI2luY2x1ZGUgInF3ZWJwYWdlX3AuaCIKIAogI2lu Y2x1ZGUgPFFBYnN0cmFjdE5ldHdvcmtDYWNoZT4KICNpbmNsdWRlIDxRQ29yZUFwcGxpY2F0aW9u PgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcCBiL1dl YkNvcmUvcGxhdGZvcm0vcXQvUmVuZGVyVGhlbWVRdC5jcHAKaW5kZXggZGViOTAzNy4uMjJkOTlh MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwCkBAIC01OCw4ICs1OCw2IEBA CiAjaW5jbHVkZSAiU2Nyb2xsYmFyVGhlbWVRdC5oIgogI2luY2x1ZGUgIlRpbWVSYW5nZXMuaCIK ICNpbmNsdWRlICJVc2VyQWdlbnRTdHlsZVNoZWV0cy5oIgotI2luY2x1ZGUgInF3ZWJwYWdlLmgi Ci0KIAogI2luY2x1ZGUgPFFBcHBsaWNhdGlvbj4KICNpbmNsdWRlIDxRQ29sb3I+CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL3F0L1dpZGdldFF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0v cXQvV2lkZ2V0UXQuY3BwCmluZGV4IDAwYTU4YTQuLjA5MDNiNmUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vcXQvV2lkZ2V0UXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvV2lk Z2V0UXQuY3BwCkBAIC00MSwxNCArNDEsMTEgQEAKICNpbmNsdWRlICJRV2ViUGFnZUNsaWVudC5o IgogI2luY2x1ZGUgIlNjcm9sbFZpZXcuaCIKIAotI2luY2x1ZGUgInF3ZWJmcmFtZS5oIgotI2lu Y2x1ZGUgInF3ZWJmcmFtZV9wLmgiCi0jaW5jbHVkZSAicXdlYnBhZ2UuaCIKLQogI2luY2x1ZGUg PFFDb3JlQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UURlYnVnPgogI2luY2x1ZGUgPFFQYWludEVu Z2luZT4KICNpbmNsdWRlIDxRUGFpbnRlcj4KKyNpbmNsdWRlIDxRV2lkZ2V0PgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKLS0gCjEuNy4wLjQKCg== 61834 2010-07-16 11:50:34 -0700 2010-07-16 12:50:09 -0700 (r63572, r=smfr) patch v2 - right patch 0001-Spatial-navigation-do-not-consider-outline-for-focus.patch text/plain 7501 tonikitoo RnJvbSBhM2MyNTg5YjE0YzYzNTZlZGIzNzU2ZDFmZmUxZmI0ZTVhY2M1NGFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogRnJpLCAxNiBKdWwgMjAxMCAxNDo0MDo0OCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFNw YXRpYWwgbmF2aWdhdGlvbjogZG8gbm90IGNvbnNpZGVyIG91dGxpbmUgZm9yIGZvY3VzYWJsZSBl bGVtZW50IGJvdW5kYXJpZXMKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MjQ3NAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpXZWJDb3JlOgoKVGVzdDogZmFz dC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtemVyby1tYXJnaW4tY29udGVudC5odG1s CgpDdXJyZW50bHkgaW4gV2ViQ29yZTo6cmVuZGVyUmVjdFJlbGF0aXZlVG9Sb290RG9jdW1lbnQg ZnVuY3Rpb24sIHdlIGFyZSBjYWxsaW5nClJlbmRlck9iamVjdDo6YWJzb2x1dGVDbGlwcGVkT3Zl cmZsb3dSZWN0IHRvIG9idGFpbiB0aGUgcmVjdCBib3VuZGFyeSBvZiBhIGdpdmVuCnJlbmRlcmVy L2VsZW1lbnQuIFRoaXMgbWV0aG9kIGRlYWxzIHdpdGggb3V0bGluZSwgd2hpY2ggaXMgb3V0IG9m IGVsZW1lbnRzIGJvdW5kYXJ5LgpJdCBtYWtlcyBzcGF0aWFsIG5hdmlnYXRpb24gdG8gZmFpbCBv biBjb21tb24gc2l0ZXMgbGlrZSBnb29nbGUuZ29tOiAiV2ViLCBJbWFnZXMsIE1hcCwgZXRjIgph cmUgaW5hY2Nlc3NpYmxlLgoKUGF0Y2ggcmVwbGFjZXMgUmVuZGVyT2JqZWN0OjphYnNvbHV0ZUNs aXBwZWRPdmVyZmxvd1JlY3QgYnkgTm9kZTo6Z2V0UmVjdCwKd2hpY2ggcmV0dXJucyBvbmx5IHRo ZSBhYnNvbHV0ZSBib3VuZGluZyBib3ggcmVjdCBvZiB0aGUgRWxlbWVudC4KCiogcGFnZS9TcGF0 aWFsTmF2aWdhdGlvbi5jcHA6CihXZWJDb3JlOjpyZW5kZXJSZWN0UmVsYXRpdmVUb1Jvb3REb2N1 bWVudCk6CihXZWJDb3JlOjpjaGVja05lZ2F0aXZlQ29vcmRzRm9yTm9kZSk6CgpMYXlvdXRUZXN0 czoKCiogZmFzdC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtemVyby1tYXJnaW4tY29u dGVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgoqIGZhc3QvZXZlbnRzL3NwYXRpYWwtbmF2aWdhdGlv bi9zbmF2LXplcm8tbWFyZ2luLWNvbnRlbnQuaHRtbDogQWRkZWQuCi0tLQogTGF5b3V0VGVzdHMv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEwICsrKwogLi4uL3Nu YXYtemVyby1tYXJnaW4tY29udGVudC1leHBlY3RlZC50eHQgICAgICAgICAgfCAgICAzICsKIC4u Li9zbmF2LXplcm8tbWFyZ2luLWNvbnRlbnQuaHRtbCAgICAgICAgICAgICAgICAgIHwgICA3MCAr KysrKysrKysrKysrKysrKysrKwogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDIyICsrKysrKwogV2ViQ29yZS9wYWdlL1NwYXRpYWxOYXZpZ2F0 aW9uLmNwcCAgICAgICAgICAgICAgICAgfCAgIDExICstLQogNSBmaWxlcyBjaGFuZ2VkLCAxMDgg aW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRU ZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi16ZXJvLW1hcmdpbi1jb250 ZW50LWV4cGVjdGVkLnR4dAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2Zhc3QvZXZl bnRzL3NwYXRpYWwtbmF2aWdhdGlvbi9zbmF2LXplcm8tbWFyZ2luLWNvbnRlbnQuaHRtbAoKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCBmMzJmMGEzLi43ODhlZmVjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDctMTYg IEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTcGF0aWFsIG5hdmlnYXRpb246IGRvIG5v dCBjb25zaWRlciBvdXRsaW5lIGZvciBmb2N1c2FibGUgZWxlbWVudCBib3VuZGFyaWVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjQ3NAorCisgICAg ICAgICogZmFzdC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtemVyby1tYXJnaW4tY29u dGVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZXZlbnRzL3NwYXRpYWwt bmF2aWdhdGlvbi9zbmF2LXplcm8tbWFyZ2luLWNvbnRlbnQuaHRtbDogQWRkZWQuCisKIDIwMTAt MDctMDcgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPiAsIEdyYWNlIEtsb2Jh ICA8a2xvYmFnQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NwYXRpYWwtbmF2aWdhdGlv bi9zbmF2LXplcm8tbWFyZ2luLWNvbnRlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvc3BhdGlhbC1uYXZpZ2F0aW9uL3NuYXYtemVyby1tYXJnaW4tY29udGVudC1leHBl Y3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGFiZjcwYgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NwYXRpYWwtbmF2aWdhdGlv bi9zbmF2LXplcm8tbWFyZ2luLWNvbnRlbnQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAor dGVzdDEgdGVzdDIKK1BBU1MgZ0ZvY3VzZWREb2N1bWVudC5hY3RpdmVFbGVtZW50LmdldEF0dHJp YnV0ZSgiaWQiKSBpcyAiZW5kIgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50 cy9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi16ZXJvLW1hcmdpbi1jb250ZW50Lmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2V2ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi16ZXJvLW1hcmdpbi1j b250ZW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTYyOTg5MAot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NwYXRpYWwtbmF2aWdh dGlvbi9zbmF2LXplcm8tbWFyZ2luLWNvbnRlbnQuaHRtbApAQCAtMCwwICsxLDcwIEBACis8aHRt bD4KKyAgPCEtLQorICAgIFRoaXMgdGVzdCBlbnN1cmVzIHRoZSB0cmF2ZXJzYWwgY29ycmVjdG5l c3Mgb2Ygc3BhdGlhbCBuYXZpZ2F0aW9uOgorICAgIGZvY3VzYWJsZSBlbGVtZW50cyBhY2Nlc3Np YmxlLCBpbmNsdWRpbmcgemVyby1tYXJnaW4gY29udGVudCwgc2hvdWxkIGJlCisgICAgYWNjZXNz aWJsZS4KKyAgLS0+CisgIDxoZWFkPgorICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAg ICBib2R5IHsKKyAgICAgICAgYmFja2dyb3VuZDpub25lIHJlcGVhdCBzY3JvbGwgMCAwICNGRkZG RkY7CisgICAgICAgIGNvbG9yOmJsYWNrOworICAgICAgICBtYXJnaW46MDsKKyAgICAgIH0KKwor ICAgICAgYm9keSwgYSwgeworICAgICAgICBmb250LWZhbWlseTphcmlhbCxzYW5zLXNlcmlmOwor ICAgICAgICBtYXJnaW4tcmlnaHQ6Mi41ZW07CisgICAgICAgIGZvbnQtc2l6ZToxM3B4OworICAg ICAgICB0ZXh0LWRlY29yYXRpb246dW5kZXJsaW5lOworICAgICAgICBjb2xvcjojMDAwMENDICFp bXBvcnRhbnQ7CisgICAgICB9CisgICAgPC9zdHlsZT4KKworICAgIDxzY3JpcHQgc3JjPSIuLi8u Li9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3Jj PSJyZXNvdXJjZXMvc3BhdGlhbC1uYXZpZ2F0aW9uLXV0aWxzLmpzIj48L3NjcmlwdD4KKyAgICA8 c2NyaXB0IHR5cGU9ImFwcGxpY2F0aW9uL2phdmFzY3JpcHQiPgorCisgICAgdmFyIHJlc3VsdE1h cCA9IFsKKyAgICAgIFsiUmlnaHQiLCAiZW5kIl0sCisgICAgICBbIkRPTkUiLCAiRE9ORSJdCisg ICAgXTsKKworICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgIGxheW91dFRlc3RDb250cm9s bGVyLnNldFNwYXRpYWxOYXZpZ2F0aW9uRW5hYmxlZCh0cnVlKTsKKyAgICAgIGxheW91dFRlc3RD b250cm9sbGVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0VGFiVG9MaW5rc1ByZWZlcmVuY2VL ZXkiLCAxKTsKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAg ICB9CisKKyAgICBmdW5jdGlvbiBydW5UZXN0KCkKKyAgICB7CisgICAgICAvLyBzdGFydGluZyB0 aGUgdGVzdCBpdHNlbGY6IGdldCB0byBhIGtub3duIHBsYWNlLgorICAgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoInN0YXJ0IikuZm9jdXMoKTsKKworICAgICAgaW5pdFRlc3QocmVzdWx0TWFw LCB0ZXN0Q29tcGxldGVkKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB0ZXN0Q29tcGxldGVkKCkK KyAgICB7CisgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgfQorCisgICAgd2luZG93Lm9u bG9hZCA9IHJ1blRlc3Q7CisKKyAgICA8L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vanMv cmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CisgIDwvaGVhZD4KKyAgPGJvZHkg aWQ9InNvbWUtY29udGVudCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgor ICAgIDxzcGFuPgorICAgICAgPGRpdj4KKyAgICAgICAgPG5vYnI+CisgICAgICAgICAgPGEgaHJl Zj0iIyIgaWQ9InN0YXJ0Ij4gdGVzdDEgPC9hPgorICAgICAgICAgIDxhIGhyZWY9IiMiIGlkPSJl bmQiPiB0ZXN0MiA8L2E+CisgICAgICAgIDwvbm9icj4KKyAgICAgIDwvZGl2PgorICAgIDwvc3Bh bj4KKyAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKyAgPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMzUz YTk1Li41NDRjZmRkIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEwLTA3LTE2ICBBbnRvbmlvIEdvbWVzICA8 dG9uaWtpdG9vQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3BhdGlhbCBuYXZpZ2F0aW9uOiBkbyBub3QgY29uc2lkZXIgb3V0bGlu ZSBmb3IgZm9jdXNhYmxlIGVsZW1lbnQgYm91bmRhcmllcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI0NzQKKworICAgICAgICBUZXN0OiBmYXN0L2V2 ZW50cy9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi16ZXJvLW1hcmdpbi1jb250ZW50Lmh0bWwKKwor ICAgICAgICBDdXJyZW50bHkgaW4gV2ViQ29yZTo6cmVuZGVyUmVjdFJlbGF0aXZlVG9Sb290RG9j dW1lbnQgZnVuY3Rpb24sIHdlIGFyZSBjYWxsaW5nCisgICAgICAgIFJlbmRlck9iamVjdDo6YWJz b2x1dGVDbGlwcGVkT3ZlcmZsb3dSZWN0IHRvIG9idGFpbiB0aGUgcmVjdCBib3VuZGFyeSBvZiBh IGdpdmVuCisgICAgICAgIHJlbmRlcmVyL2VsZW1lbnQuIFRoaXMgbWV0aG9kIGRlYWxzIHdpdGgg b3V0bGluZSwgd2hpY2ggaXMgb3V0IG9mIGVsZW1lbnRzIGJvdW5kYXJ5LgorICAgICAgICBJdCBt YWtlcyBzcGF0aWFsIG5hdmlnYXRpb24gdG8gZmFpbCBvbiBjb21tb24gc2l0ZXMgbGlrZSBnb29n bGUuZ29tOiAiV2ViLCBJbWFnZXMsIE1hcCwgZXRjIgorICAgICAgICBhcmUgaW5hY2Nlc3NpYmxl LgorCisgICAgICAgIFBhdGNoIHJlcGxhY2VzIFJlbmRlck9iamVjdDo6YWJzb2x1dGVDbGlwcGVk T3ZlcmZsb3dSZWN0IGJ5IE5vZGU6OmdldFJlY3QsCisgICAgICAgIHdoaWNoIHJldHVybnMgb25s eSB0aGUgYWJzb2x1dGUgYm91bmRpbmcgYm94IHJlY3Qgb2YgdGhlIEVsZW1lbnQuCisKKyAgICAg ICAgKiBwYWdlL1NwYXRpYWxOYXZpZ2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJlbmRl clJlY3RSZWxhdGl2ZVRvUm9vdERvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OmNoZWNrTmVn YXRpdmVDb29yZHNGb3JOb2RlKToKKwogMjAxMC0wNy0wNyBHcmFjZSBLbG9iYSAgPGtsb2JhZ0Bn bWFpbC5jb20+ICwgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdl L1NwYXRpYWxOYXZpZ2F0aW9uLmNwcCBiL1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5j cHAKaW5kZXggZTc0OGQxMi4uNDBhYTUyYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL1NwYXRp YWxOYXZpZ2F0aW9uLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvU3BhdGlhbE5hdmlnYXRpb24uY3Bw CkBAIC0xMDMsMTQgKzEwMyw5IEBAIHZvaWQgZGlzdGFuY2VEYXRhRm9yTm9kZShGb2N1c0RpcmVj dGlvbiBkaXJlY3Rpb24sIE5vZGUqIHN0YXJ0LCBGb2N1c0NhbmRpZGF0ZSYKIC8vIEZJWE1FOiBU aGlzIGZ1bmN0aW9uIGRvZXMgbm90IGJlaGF2ZSBjb3JyZWN0bHkgd2l0aCB0cmFuc2Zvcm1lZCBm cmFtZXMuCiBzdGF0aWMgSW50UmVjdCByZW5kZXJSZWN0UmVsYXRpdmVUb1Jvb3REb2N1bWVudChS ZW5kZXJPYmplY3QqIHJlbmRlcikKIHsKLSAgICBBU1NFUlQocmVuZGVyKTsKKyAgICBBU1NFUlQo cmVuZGVyICYmIHJlbmRlci0+bm9kZSgpKTsKIAotICAgIEludFJlY3QgcmVjdChyZW5kZXItPmFi c29sdXRlQ2xpcHBlZE92ZXJmbG93UmVjdCgpKTsKLQotICAgIGlmIChyZWN0LmlzRW1wdHkoKSkg ewotICAgICAgICBFbGVtZW50KiBlID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KHJlbmRlci0+bm9k ZSgpKTsKLSAgICAgICAgcmVjdCA9IGUtPmdldFJlY3QoKTsKLSAgICB9CisgICAgSW50UmVjdCBy ZWN0ID0gcmVuZGVyLT5ub2RlKCktPmdldFJlY3QoKTsKIAogICAgIC8vIEluIGNhc2VzIHdoZW4g dGhlIHxyZW5kZXJ8J3MgYXNzb2NpYXRlZCBub2RlIGlzIGluIGEgc2Nyb2xsYWJsZSBpbm5lcgog ICAgIC8vIGRvY3VtZW50LCB3ZSBvbmx5IGNvbnNpZGVyIGl0cyBzY3JvbGxPZmZzZXQgaWYgaXQg aXMgbm90IG9mZnNjcmVlbi4KQEAgLTUxNyw3ICs1MTIsNyBAQCBzdGF0aWMgYm9vbCBjaGVja05l Z2F0aXZlQ29vcmRzRm9yTm9kZShOb2RlKiBub2RlLCBjb25zdCBJbnRSZWN0JiBjdXJSZWN0KQog ewogICAgIEFTU0VSVChub2RlIHx8IG5vZGUtPnJlbmRlcmVyKCkpOwogCi0gICAgaWYgKGN1clJl Y3QueCgpID4gMCAmJiBjdXJSZWN0LnkoKSA+IDApCisgICAgaWYgKGN1clJlY3QueCgpID49IDAg JiYgY3VyUmVjdC55KCkgPj0gMCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBib29sIGNh bkJlU2Nyb2xsZWQgPSBmYWxzZTsKLS0gCjEuNy4wLjQKCg==