99985 2012-10-22 05:44:00 -0700 [GTK] Don't use deprecated AccessibilityObject methods after r99502 2012-10-22 10:33:06 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 mario webkit-unassigned apinheiro cfleizach dmazzoni eric.carlson feature-media-reviews jdiggs webkit.review.bot oldest_to_newest 747463 0 mario 2012-10-22 05:44:00 -0700 After fixing bug 99502, the following functions from AccessibilityObject got deprecated: virtual String accessibilityDescription() const { return String(); } virtual String title() const { return String(); } virtual String helpText() const { return String(); } They should be replaced in the ATK wrapper with code using the new AccessibilityText based API. 747471 1 169888 mario 2012-10-22 05:57:27 -0700 Created attachment 169888 Patch proposal 747590 2 169888 cfleizach 2012-10-22 09:09:05 -0700 Comment on attachment 169888 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=169888&action=review just one inline question... I think changes look good for the first pass to ensure compatibility. Going forward GTK will probably want to adapt to provide better behavior and a way to expose aria-help, aria-describedby, summary and a few other types of text > Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp:102 > + return String(); this snippet is a Mac concept. Just want to make sure it also applies to GTK 747634 3 169888 dmazzoni 2012-10-22 09:50:25 -0700 Comment on attachment 169888 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=169888&action=review > Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp:125 > + // probably be in the description field since it's not "visible". This also sounds Mac-specific. Does ATK have the similar rule? On Mac, the basic rule seems to be: * Title = whatever's visible, unless overridden * Description = alternate text On Windows, the basic rule would be described as: * Name = primary title * Description = secondary title I thought ATK was more similar to Windows in this regard. The implementation I'm planning for Chromium (Win and hopefully ATK) is simpler - just take the first valid string for the name, second valid string for the description. Of course, that's likely to break some tests. That's why I'd like to see a test helper function that's cross-platform rather than testing title/description as if they were cross-platform when in reality they differ. 747664 4 mario 2012-10-22 10:28:22 -0700 Thanks both for the review and comments. (In reply to comment #2) > [...] > just one inline question... > I think changes look good for the first pass to ensure compatibility. > Going forward GTK will probably want to adapt to provide better behavior > and a way to expose aria-help, aria-describedby, summary and a few other > types of text Yes, that's the idea: to stop using that old API for the moment, to later on make the most of it to more accurately assign the accessible name and description for each element. > > Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp:102 > > + return String(); > > this snippet is a Mac concept. Just want to make sure it also applies to GTK Good point. Actually, I think we can safely remove that since in ATK an object with StaticTextRole won't ever be exposed on its own, but by means of its parent accessibility object, wrapped by an object implementing AtkText. Will remove that before landing (keeps passing tests). (In reply to comment #3) > (From update of attachment 169888 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=169888&action=review > > > Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp:125 > > + // probably be in the description field since it's not "visible". > > This also sounds Mac-specific. Does ATK have the similar rule? I think for the particular case of images the same rule apply here. Thus, I would leave it as is now, and we could always fix it later if we need it. > On Mac, the basic rule seems to be: > * Title = whatever's visible, unless overridden > * Description = alternate text > > On Windows, the basic rule would be described as: > * Name = primary title > * Description = secondary title > > I thought ATK was more similar to Windows in this regard. I also think ATK leans more towards Windows than to mac in this regard, still not being exactly the same thing. Joanie can probably drop some more light on this regard, as she surely will know better. > The implementation I'm planning for Chromium (Win and hopefully ATK) is > simpler - just take the first valid string for the name, second valid string > for the description. > > Of course, that's likely to break some tests. That's why I'd like to see > a test helper function that's cross-platform rather than testing > title/description as if they were cross-platform when in reality they differ. Makes sense, although I'm not completely sure that approach will always work anyway. Will probably need to keep some "special cases" for ATK, I'm afraid. 747668 5 mario 2012-10-22 10:33:06 -0700 Committed r132091: <http://trac.webkit.org/changeset/132091> 169888 2012-10-22 05:57:27 -0700 2012-10-22 09:50:25 -0700 Patch proposal 0001-2012-10-22-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 13113 mario RnJvbSBmYTU5ZTc4YzY3NzBiNjFjZWZiNmExZTFkZjE4OGYzOGZmYzUwOTVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBNb24sIDIyIE9jdCAyMDEyIDEyOjQ4OjM3ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMi0xMC0yMiAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFtHVEtdIERvbid0IHVzZSBkZXByZWNhdGVkIEFjY2Vzc2liaWxpdHlPYmplY3Qg bWV0aG9kcyBhZnRlciByOTk1MDIKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTk5ODUKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgog ICAgICAgIFVwZGF0ZSBjYWxsZXJzIGZvciBBY2Nlc3NpYmlsaXR5T2JqZWN0J3MgdGl0bGUoKSBh bmQKICAgICAgICBhY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKSBzbyB0aGV5IG5vdyB1c2UgQWNj ZXNzaWJpbGl0eVRleHQuCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNz aWJsZVV0aWwuY3BwOgogICAgICAgICh0aXRsZVRhZ1Nob3VsZEJlVXNlZEluRGVzY3JpcHRpb25G aWVsZCk6IEludGVybmFsIGhlbHBlciBmdW5jdGlvbi4KICAgICAgICAoYWNjZXNzaWJpbGl0eVRp dGxlKTogTmV3IGhlbHBlciBmdW5jdGlvbiwgcmV0dXJucyBhbiBTdHJpbmcgd2l0aAogICAgICAg IHRoZSB0aXRsZSBmb3IgYSBBY2Nlc3NpYmlsaXR5T2JqZWN0LCB1c2luZyBBY2Nlc3NpYmxlVGV4 dC4KICAgICAgICAoYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKTogTmV3IGhlbHBlciBmdW5jdGlv biwgcmV0dXJucyBhbiBTdHJpbmcgd2l0aAogICAgICAgIHRoZSBkZXNjcmlwdGlvbiBmb3IgYSBB Y2Nlc3NpYmlsaXR5T2JqZWN0LCB1c2luZyBBY2Nlc3NpYmxlVGV4dC4KICAgICAgICAqIGFjY2Vz c2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVVdGlsLmg6IEFkZGVkIHB1YmxpYwogICAgICAg IGRlY2xhcmF0aW9ucyBmb3IgYWNjZXNzaWJpbGl0eVRpdGxlIGFuZCBhY2Nlc3NpYmlsaXR5RGVz Y3JpcHRpb24uCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZVdy YXBwZXJBdGsuY3BwOgogICAgICAgICh3ZWJraXRBY2Nlc3NpYmxlR2V0TmFtZSk6IFVzZSBuZXcg aGVscGVycyBmb3IgcmV0cmlldmluZyB0aGUgdGl0bGUuCiAgICAgICAgKHdlYmtpdEFjY2Vzc2li bGVHZXREZXNjcmlwdGlvbik6IFVzZSBuZXcgaGVscGVycyBmb3IgcmV0cmlldmluZwogICAgICAg IHRoZSB0aXRsZSBhbmQgZGVzY3JpcHRpb24uCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsv V2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUltYWdlLmNwcDoKICAgICAgICAod2Via2l0QWNjZXNz aWJsZUltYWdlR2V0SW1hZ2VEZXNjcmlwdGlvbik6IFVzZSBuZXcgaGVscGVycyBmb3IKICAgICAg ICByZXRyaWV2aW5nIHRoZSB0aXRsZS4KCjIwMTItMTAtMjIgIE1hcmlvIFNhbmNoZXogUHJhZGEg IDxtc2FuY2hlekBpZ2FsaWEuY29tPgoKICAgICAgICBbR1RLXSBEb24ndCB1c2UgZGVwcmVjYXRl ZCBBY2Nlc3NpYmlsaXR5T2JqZWN0IG1ldGhvZHMgYWZ0ZXIgcjk5NTAyCiAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5OTg1CgogICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBVcGRhdGUgdGVzdCBhbmQgZXhwZWN0YXRpb25z IHRvIHJlZmxlY3QgdGhlIGNoYW5nZXMgaW4gdGhlCiAgICAgICAgYWNjZXNzaWJsZSB0aXRsZSAo bm93IGl0J3MgdGhlIGxvY2FsaXplZCBvbmUpIGJlaW5nIHJldHVybmVkLgoKICAgICAgICAqIHBs YXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L21lZGlhLWNvbnRyb2xzLXBhbmVsLXRpdGxlLWV4cGVj dGVkLnR4dDogVXBkYXRlZC4KICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L21l ZGlhLWNvbnRyb2xzLXBhbmVsLXRpdGxlLmh0bWw6IFVwZGF0ZWQuCi0tLQogTGF5b3V0VGVzdHMv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxMyArKysrKwogLi4uL21l ZGlhLWNvbnRyb2xzLXBhbmVsLXRpdGxlLWV4cGVjdGVkLnR4dCAgICAgICAgfCAgMiArLQogLi4u L2FjY2Vzc2liaWxpdHkvbWVkaWEtY29udHJvbHMtcGFuZWwtdGl0bGUuaHRtbCAgfCAgMiArLQog U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyOCAr KysrKysrKysKIC4uLi9ndGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUltYWdlLmNwcCAgICAg ICAgIHwgIDIgKy0KIC4uLi9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3NpYmxlVXRpbC5j cHAgICAgIHwgNjggKysrKysrKysrKysrKysrKysrKysrKwogLi4uL2FjY2Vzc2liaWxpdHkvZ3Rr L1dlYktpdEFjY2Vzc2libGVVdGlsLmggICAgICAgfCAgNCArKwogLi4uL2d0ay9XZWJLaXRBY2Nl c3NpYmxlV3JhcHBlckF0ay5jcHAgICAgICAgICAgICAgfCAgNiArLQogOCBmaWxlcyBjaGFuZ2Vk LCAxMTkgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWE0OGM4Ny4uMjY5 OGE5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTEwLTIyICBNYXJpbyBTYW5jaGV6IFBy YWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBEb24ndCB1c2UgZGVw cmVjYXRlZCBBY2Nlc3NpYmlsaXR5T2JqZWN0IG1ldGhvZHMgYWZ0ZXIgcjk5NTAyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTk4NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0ZXN0IGFuZCBl eHBlY3RhdGlvbnMgdG8gcmVmbGVjdCB0aGUgY2hhbmdlcyBpbiB0aGUKKyAgICAgICAgYWNjZXNz aWJsZSB0aXRsZSAobm93IGl0J3MgdGhlIGxvY2FsaXplZCBvbmUpIGJlaW5nIHJldHVybmVkLgor CisgICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbWVkaWEtY29udHJvbHMtcGFu ZWwtdGl0bGUtZXhwZWN0ZWQudHh0OiBVcGRhdGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9h Y2Nlc3NpYmlsaXR5L21lZGlhLWNvbnRyb2xzLXBhbmVsLXRpdGxlLmh0bWw6IFVwZGF0ZWQuCisK IDIwMTItMTAtMjEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgc3VwcHJlc3NpbmcgZmFpbHVyZSB1bnRpbCBJIGNhbiBmaWd1cmUgb3V0 IHdoYXQncyBnb2luZyBvbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9h Y2Nlc3NpYmlsaXR5L21lZGlhLWNvbnRyb2xzLXBhbmVsLXRpdGxlLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L21lZGlhLWNvbnRyb2xzLXBhbmVs LXRpdGxlLWV4cGVjdGVkLnR4dAppbmRleCBlM2UzY2VmLi41ZWNkMTZmIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9tZWRpYS1jb250cm9scy1wYW5l bC10aXRsZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vz c2liaWxpdHkvbWVkaWEtY29udHJvbHMtcGFuZWwtdGl0bGUtZXhwZWN0ZWQudHh0CkBAIC02LDcg KzYsNyBAQCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURQogUEFTUyBlbGVtZW50LnJvbGUgaXMgJ0FY Um9sZTogQVhHcm91cCcKIFBBU1MgZWxlbWVudC50aXRsZSBpcyAnQVhUaXRsZTogJwogUEFTUyBl bGVtZW50LnJvbGUgaXMgJ0FYUm9sZTogQVhUb29sYmFyJwotUEFTUyBlbGVtZW50LnRpdGxlIGlz ICdBWFRpdGxlOiBtZWRpYSBjb250cm9scycKK1BBU1MgZWxlbWVudC50aXRsZSBpcyAnQVhUaXRs ZTogdmlkZW8gZWxlbWVudCBjb250cm9sbGVyJwogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMg dHJ1ZQogCiBURVNUIENPTVBMRVRFCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvYWNjZXNzaWJpbGl0eS9tZWRpYS1jb250cm9scy1wYW5lbC10aXRsZS5odG1sIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbWVkaWEtY29udHJvbHMtcGFuZWwtdGl0 bGUuaHRtbAppbmRleCAxZjc3MTdhLi42OTM1NTIyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9tZWRpYS1jb250cm9scy1wYW5lbC10aXRsZS5odG1s CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L21lZGlhLWNvbnRy b2xzLXBhbmVsLXRpdGxlLmh0bWwKQEAgLTE3LDcgKzE3LDcgQEAgaWYgKHdpbmRvdy5hY2Nlc3Np YmlsaXR5Q29udHJvbGxlcikgewogICAgIHNob3VsZEJlKCJlbGVtZW50LnRpdGxlIiwgIidBWFRp dGxlOiAnIik7CiAgICAgZWxlbWVudCA9IGVsZW1lbnQuY2hpbGRBdEluZGV4KDApOwogICAgIHNo b3VsZEJlKCJlbGVtZW50LnJvbGUiLCAiJ0FYUm9sZTogQVhUb29sYmFyJyIpOwotICAgIHNob3Vs ZEJlKCJlbGVtZW50LnRpdGxlIiwgIidBWFRpdGxlOiBtZWRpYSBjb250cm9scyciKTsKKyAgICBz aG91bGRCZSgiZWxlbWVudC50aXRsZSIsICInQVhUaXRsZTogdmlkZW8gZWxlbWVudCBjb250cm9s bGVyJyIpOwogfQogCiA8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlZTQ5ODQ1Li41NDk4NmYwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTItMTAtMjIgIE1hcmlvIFNhbmNoZXogUHJh ZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSBkZXBy ZWNhdGVkIEFjY2Vzc2liaWxpdHlPYmplY3QgbWV0aG9kcyBhZnRlciByOTk1MDIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5OTg1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIGNhbGxlcnMgZm9y IEFjY2Vzc2liaWxpdHlPYmplY3QncyB0aXRsZSgpIGFuZAorICAgICAgICBhY2Nlc3NpYmlsaXR5 RGVzY3JpcHRpb24oKSBzbyB0aGV5IG5vdyB1c2UgQWNjZXNzaWJpbGl0eVRleHQuCisKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3NpYmxlVXRpbC5jcHA6CisgICAgICAg ICh0aXRsZVRhZ1Nob3VsZEJlVXNlZEluRGVzY3JpcHRpb25GaWVsZCk6IEludGVybmFsIGhlbHBl ciBmdW5jdGlvbi4KKyAgICAgICAgKGFjY2Vzc2liaWxpdHlUaXRsZSk6IE5ldyBoZWxwZXIgZnVu Y3Rpb24sIHJldHVybnMgYW4gU3RyaW5nIHdpdGgKKyAgICAgICAgdGhlIHRpdGxlIGZvciBhIEFj Y2Vzc2liaWxpdHlPYmplY3QsIHVzaW5nIEFjY2Vzc2libGVUZXh0LgorICAgICAgICAoYWNjZXNz aWJpbGl0eURlc2NyaXB0aW9uKTogTmV3IGhlbHBlciBmdW5jdGlvbiwgcmV0dXJucyBhbiBTdHJp bmcgd2l0aAorICAgICAgICB0aGUgZGVzY3JpcHRpb24gZm9yIGEgQWNjZXNzaWJpbGl0eU9iamVj dCwgdXNpbmcgQWNjZXNzaWJsZVRleHQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvV2Vi S2l0QWNjZXNzaWJsZVV0aWwuaDogQWRkZWQgcHVibGljCisgICAgICAgIGRlY2xhcmF0aW9ucyBm b3IgYWNjZXNzaWJpbGl0eVRpdGxlIGFuZCBhY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24uCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHA6 CisgICAgICAgICh3ZWJraXRBY2Nlc3NpYmxlR2V0TmFtZSk6IFVzZSBuZXcgaGVscGVycyBmb3Ig cmV0cmlldmluZyB0aGUgdGl0bGUuCisgICAgICAgICh3ZWJraXRBY2Nlc3NpYmxlR2V0RGVzY3Jp cHRpb24pOiBVc2UgbmV3IGhlbHBlcnMgZm9yIHJldHJpZXZpbmcKKyAgICAgICAgdGhlIHRpdGxl IGFuZCBkZXNjcmlwdGlvbi4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFj Y2Vzc2libGVJbnRlcmZhY2VJbWFnZS5jcHA6CisgICAgICAgICh3ZWJraXRBY2Nlc3NpYmxlSW1h Z2VHZXRJbWFnZURlc2NyaXB0aW9uKTogVXNlIG5ldyBoZWxwZXJzIGZvcgorICAgICAgICByZXRy aWV2aW5nIHRoZSB0aXRsZS4KKwogMjAxMi0xMC0yMSAgTU9SSVRBIEhhamltZSAgPG1vcnJpdGFA Z29vZ2xlLmNvbT4KIAogICAgICAgICBbVjhdIFY4RW5hYmxlUGVyQ29udGV4dCBzaG91bGRuJ3Qg cmVxdWlyZSBkb2N1bWVudCgpIGFjY2Vzc29yIHRvIHRoZSBuYXRpdmUgb2JqZWN0LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZUlu dGVyZmFjZUltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktp dEFjY2Vzc2libGVJbnRlcmZhY2VJbWFnZS5jcHAKaW5kZXggZjllNDJiOC4uM2VjYzk2NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJs ZUludGVyZmFjZUltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0 ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlSW1hZ2UuY3BwCkBAIC01NCw3ICs1NCw3IEBAIHN0 YXRpYyB2b2lkIHdlYmtpdEFjY2Vzc2libGVJbWFnZUdldEltYWdlUG9zaXRpb24oQXRrSW1hZ2Uq IGltYWdlLCBnaW50KiB4LCBnaW50CiAKIHN0YXRpYyBjb25zdCBnY2hhciogd2Via2l0QWNjZXNz aWJsZUltYWdlR2V0SW1hZ2VEZXNjcmlwdGlvbihBdGtJbWFnZSogaW1hZ2UpCiB7Ci0gICAgcmV0 dXJuIHJldHVyblN0cmluZyhjb3JlKGltYWdlKS0+YWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKCkp OworICAgIHJldHVybiByZXR1cm5TdHJpbmcoYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKGNvcmUo aW1hZ2UpKSk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdEFjY2Vzc2libGVJbWFnZUdldEltYWdl U2l6ZShBdGtJbWFnZSogaW1hZ2UsIGdpbnQqIHdpZHRoLCBnaW50KiBoZWlnaHQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3NpYmxlVXRp bC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3NpYmxl VXRpbC5jcHAKaW5kZXggNDNmNDEzZi4uOWVmZjJmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZVV0aWwuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVVdGlsLmNwcApAQCAt ODUsNiArODUsNzQgQEAgY29uc3QgY2hhciogcmV0dXJuU3RyaW5nKGNvbnN0IFN0cmluZyYgc3Ry KQogICAgIHJldHVybiByZXR1cm5lZFN0cmluZy5kYXRhKCk7CiB9CiAKKy8vIEZJWE1FOiBEaWZm ZXJlbnQga2luZHMgb2YgZWxlbWVudHMgYXJlIHB1dHRpbmcgdGhlIHRpdGxlIHRhZyB0byB1c2UK Ky8vIGluIGRpZmZlcmVudCBBWCBmaWVsZHMuIFRoaXMgbWlnaHQgbm90IGJlIDEwMCUgY29ycmVj dCBidXQgd2Ugd2lsbAorLy8ga2VlcCBpdCBub3cgaW4gb3JkZXIgdG8gYWNoaWV2ZSBjb25zaXN0 ZW5jeSB3aXRoIHByZXZpb3VzIGJlaGF2aW9yLgorc3RhdGljIGJvb2wgdGl0bGVUYWdTaG91bGRC ZVVzZWRJbkRlc2NyaXB0aW9uRmllbGQoQWNjZXNzaWJpbGl0eU9iamVjdCogY29yZU9iamVjdCkK K3sKKyAgICByZXR1cm4gKGNvcmVPYmplY3QtPmlzTGluaygpICYmICFjb3JlT2JqZWN0LT5pc0lt YWdlTWFwTGluaygpKSB8fCBjb3JlT2JqZWN0LT5pc0ltYWdlKCk7Cit9CisKKy8vIFRoaXMgc2hv dWxkIGJlIHRoZSAidmlzaWJsZSIgdGV4dCB0aGF0J3MgYWN0dWFsbHkgb24gdGhlIHNjcmVlbiBp ZiBwb3NzaWJsZS4KKy8vIElmIHRoZXJlJ3MgYWx0ZXJuYXRpdmUgdGV4dCwgdGhhdCBjYW4gb3Zl cnJpZGUgdGhlIHRpdGxlLgorU3RyaW5nIGFjY2Vzc2liaWxpdHlUaXRsZShBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBjb3JlT2JqZWN0KQoreworICAgIC8vIFN0YXRpYyB0ZXh0IG9iamVjdHMgc2hvdWxk IG5vdCBoYXZlIGEgdGl0bGUuIEl0cyBjb250ZW50IGlzIGNvbW11bmljYXRlZCBpbiBpdHMgQVhW YWx1ZS4KKyAgICBpZiAoY29yZU9iamVjdC0+cm9sZVZhbHVlKCkgPT0gU3RhdGljVGV4dFJvbGUp CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKworICAgIFZlY3RvcjxBY2Nlc3NpYmlsaXR5VGV4 dD4gdGV4dE9yZGVyOworICAgIGNvcmVPYmplY3QtPmFjY2Vzc2liaWxpdHlUZXh0KHRleHRPcmRl cik7CisKKyAgICB1bnNpZ25lZCBsZW5ndGggPSB0ZXh0T3JkZXIuc2l6ZSgpOworICAgIGZvciAo dW5zaWduZWQgayA9IDA7IGsgPCBsZW5ndGg7IGsrKykgeworICAgICAgICBjb25zdCBBY2Nlc3Np YmlsaXR5VGV4dCYgdGV4dCA9IHRleHRPcmRlcltrXTsKKworICAgICAgICAvLyBPbmNlIHdlIGVu Y291bnRlciB2aXNpYmxlIHRleHQsIG9yIHRoZSB0ZXh0IGZyb20gb3VyIGNoaWxkcmVuIHRoYXQg c2hvdWxkIGJlIHVzZWQgZm9yZW1vc3QuCisgICAgICAgIGlmICh0ZXh0LnRleHRTb3VyY2UgPT0g VmlzaWJsZVRleHQgfHwgdGV4dC50ZXh0U291cmNlID09IENoaWxkcmVuVGV4dCkKKyAgICAgICAg ICAgIHJldHVybiB0ZXh0LnRleHQ7CisKKyAgICAgICAgLy8gSWYgdGhlcmUncyBhbiBlbGVtZW50 IHRoYXQgbGFiZWxzIHRoaXMgb2JqZWN0IGFuZCBpdCdzIG5vdCBleHBvc2VkLCB0aGVuIHdlIHNo b3VsZCB1c2UKKyAgICAgICAgLy8gdGhhdCB0ZXh0IGFzIG91ciB0aXRsZS4KKyAgICAgICAgaWYg KHRleHQudGV4dFNvdXJjZSA9PSBMYWJlbEJ5RWxlbWVudFRleHQgJiYgIWNvcmVPYmplY3QtPmV4 cG9zZXNUaXRsZVVJRWxlbWVudCgpKQorICAgICAgICAgICAgcmV0dXJuIHRleHQudGV4dDsKKwor ICAgICAgICAvLyBFbGVtZW50cyBvZiByb2xlIFRvb2xiYXJSb2xlIHdpbGwgcmV0dXJuIGl0cyB0 aXRsZSBhcyBBbHRlcm5hdGl2ZVRleHQuCisgICAgICAgIGlmIChjb3JlT2JqZWN0LT5yb2xlVmFs dWUoKSA9PSBUb29sYmFyUm9sZSAmJiB0ZXh0LnRleHRTb3VyY2UgPT0gQWx0ZXJuYXRpdmVUZXh0 KQorICAgICAgICAgICAgcmV0dXJuIHRleHQudGV4dDsKKworICAgICAgICAvLyBGSVhNRTogVGhl IHRpdGxlIHRhZyBpcyB1c2VkIGluIGNlcnRhaW4gY2FzZXMgZm9yIHRoZSB0aXRsZS4gVGhpcyB1 c2FnZSBzaG91bGQKKyAgICAgICAgLy8gcHJvYmFibHkgYmUgaW4gdGhlIGRlc2NyaXB0aW9uIGZp ZWxkIHNpbmNlIGl0J3Mgbm90ICJ2aXNpYmxlIi4KKyAgICAgICAgaWYgKHRleHQudGV4dFNvdXJj ZSA9PSBUaXRsZVRhZ1RleHQgJiYgIXRpdGxlVGFnU2hvdWxkQmVVc2VkSW5EZXNjcmlwdGlvbkZp ZWxkKGNvcmVPYmplY3QpKQorICAgICAgICAgICAgcmV0dXJuIHRleHQudGV4dDsKKyAgICB9Cisg ICAgcmV0dXJuIFN0cmluZygpOworfQorCitTdHJpbmcgYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9u KEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3QpCit7CisgICAgLy8gU3RhdGljIHRleHQg b2JqZWN0cyBzaG91bGQgbm90IGhhdmUgYSBkZXNjcmlwdGlvbi4gSXRzIGNvbnRlbnQgaXMgY29t bXVuaWNhdGVkIGluIGl0cyBBWFZhbHVlLgorICAgIC8vIE9uZSBleGNlcHRpb24gaXMgdGhlIG1l ZGlhIGNvbnRyb2wgbGFiZWxzIHRoYXQgaGF2ZSBhIHZhbHVlIGFuZCBhIGRlc2NyaXB0aW9uLiBU aG9zZSBhcmUgc2V0IHByb2dyYW1hdGljYWxseS4KKyAgICBpZiAoY29yZU9iamVjdC0+cm9sZVZh bHVlKCkgPT0gU3RhdGljVGV4dFJvbGUgJiYgIWNvcmVPYmplY3QtPmlzTWVkaWFDb250cm9sTGFi ZWwoKSkKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOworCisgICAgVmVjdG9yPEFjY2Vzc2liaWxp dHlUZXh0PiB0ZXh0T3JkZXI7CisgICAgY29yZU9iamVjdC0+YWNjZXNzaWJpbGl0eVRleHQodGV4 dE9yZGVyKTsKKworICAgIHVuc2lnbmVkIGxlbmd0aCA9IHRleHRPcmRlci5zaXplKCk7CisgICAg Zm9yICh1bnNpZ25lZCBrID0gMDsgayA8IGxlbmd0aDsgaysrKSB7CisgICAgICAgIGNvbnN0IEFj Y2Vzc2liaWxpdHlUZXh0JiB0ZXh0ID0gdGV4dE9yZGVyW2tdOworCisgICAgICAgIGlmICh0ZXh0 LnRleHRTb3VyY2UgPT0gQWx0ZXJuYXRpdmVUZXh0KQorICAgICAgICAgICAgcmV0dXJuIHRleHQu dGV4dDsKKworICAgICAgICBpZiAodGV4dC50ZXh0U291cmNlID09IFRpdGxlVGFnVGV4dCAmJiB0 aXRsZVRhZ1Nob3VsZEJlVXNlZEluRGVzY3JpcHRpb25GaWVsZChjb3JlT2JqZWN0KSkKKyAgICAg ICAgICAgIHJldHVybiB0ZXh0LnRleHQ7CisgICAgfQorCisgICAgcmV0dXJuIFN0cmluZygpOwor fQorCiBib29sIHNlbGVjdGlvbkJlbG9uZ3NUb09iamVjdChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBj b3JlT2JqZWN0LCBWaXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24pCiB7CiAgICAgaWYgKCFjb3Jl T2JqZWN0IHx8ICFjb3JlT2JqZWN0LT5pc0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoKSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2li bGVVdGlsLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3Np YmxlVXRpbC5oCmluZGV4IGVjMWNkNTEuLmNkNjliMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVVdGlsLmgKKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZVV0aWwuaApAQCAtMzcs NiArMzcsMTAgQEAgdm9pZCBjb250ZW50c1JlbGF0aXZlVG9BdGtDb29yZGluYXRlVHlwZShXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0KiwgQXRrQ29vcmQKIAogY29uc3QgY2hhciogcmV0dXJu U3RyaW5nKGNvbnN0IFN0cmluZyYpOwogCitTdHJpbmcgYWNjZXNzaWJpbGl0eVRpdGxlKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlPYmplY3QqKTsKKworU3RyaW5nIGFjY2Vzc2liaWxpdHlEZXNjcmlw dGlvbihXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Kik7CisKIGJvb2wgc2VsZWN0aW9uQmVs b25nc1RvT2JqZWN0KFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3QqLCBXZWJDb3JlOjpWaXNp YmxlU2VsZWN0aW9uJik7CiAKICNlbmRpZiAvLyBXZWJLaXRBY2Nlc3NpYmxlVXRpbF9oCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3NpYmxl V3JhcHBlckF0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRB Y2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKaW5kZXggYjE5N2NiMjQuLmExZjY0N2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVXcmFw cGVyQXRrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRB Y2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKQEAgLTE0MSw3ICsxNDEsNyBAQCBzdGF0aWMgY29uc3Qg Z2NoYXIqIHdlYmtpdEFjY2Vzc2libGVHZXROYW1lKEF0a09iamVjdCogb2JqZWN0KQogCiAgICAg Ly8gTm90aGluZyB3b3JrZWQgc28gZmFyLCB0cnkgd2l0aCB0aGUgQWNjZXNzaWJpbGl0eU9iamVj dCdzCiAgICAgLy8gdGl0bGUoKSBiZWZvcmUgZ29pbmcgYWhlYWQgd2l0aCBzdHJpbmdWYWx1ZSgp LgotICAgIFN0cmluZyBheFRpdGxlID0gY29yZU9iamVjdC0+dGl0bGUoKTsKKyAgICBTdHJpbmcg YXhUaXRsZSA9IGFjY2Vzc2liaWxpdHlUaXRsZShjb3JlT2JqZWN0KTsKICAgICBpZiAoIWF4VGl0 bGUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gcmV0dXJuU3RyaW5nKGF4VGl0bGUpOwogCkBA IC0xNTUsNyArMTU1LDcgQEAgc3RhdGljIGNvbnN0IGdjaGFyKiB3ZWJraXRBY2Nlc3NpYmxlR2V0 RGVzY3JpcHRpb24oQXRrT2JqZWN0KiBvYmplY3QpCiAgICAgaWYgKGNvcmVPYmplY3QtPmlzQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdCgpKQogICAgICAgICBub2RlID0gY29yZU9iamVjdC0+bm9k ZSgpOwogICAgIGlmICghbm9kZSB8fCAhbm9kZS0+aXNIVE1MRWxlbWVudCgpIHx8IGNvcmVPYmpl Y3QtPmFyaWFSb2xlQXR0cmlidXRlKCkgIT0gVW5rbm93blJvbGUpCi0gICAgICAgIHJldHVybiBy ZXR1cm5TdHJpbmcoY29yZU9iamVjdC0+YWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKCkpOworICAg ICAgICByZXR1cm4gcmV0dXJuU3RyaW5nKGFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbihjb3JlT2Jq ZWN0KSk7CiAKICAgICAvLyBhdGtfdGFibGVfZ2V0X3N1bW1hcnkgcmV0dXJucyBhbiBBdGtPYmpl Y3QuIFdlIGhhdmUgbm8gc3VtbWFyeSBvYmplY3QsIHNvIGV4cG9zZSBzdW1tYXJ5IGhlcmUuCiAg ICAgaWYgKGNvcmVPYmplY3QtPnJvbGVWYWx1ZSgpID09IFRhYmxlUm9sZSkgewpAQCAtMTcwLDcg KzE3MCw3IEBAIHN0YXRpYyBjb25zdCBnY2hhciogd2Via2l0QWNjZXNzaWJsZUdldERlc2NyaXB0 aW9uKEF0a09iamVjdCogb2JqZWN0KQogICAgIGlmICghdGl0bGUuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm4gcmV0dXJuU3RyaW5nKHRpdGxlKTsKIAotICAgIHJldHVybiByZXR1cm5TdHJpbmco Y29yZU9iamVjdC0+YWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKCkpOworICAgIHJldHVybiByZXR1 cm5TdHJpbmcoYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKGNvcmVPYmplY3QpKTsKIH0KIAogc3Rh dGljIHZvaWQgc2V0QXRrUmVsYXRpb25TZXRGcm9tQ29yZU9iamVjdChBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBjb3JlT2JqZWN0LCBBdGtSZWxhdGlvblNldCogcmVsYXRpb25TZXQpCi0tIAoxLjcuMTEu NwoK