25413 2009-04-26 16:41:51 -0700 [GTK] Please expose the level of headings. 2009-10-17 13:00:46 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 21546 25531 0 jdiggs webkit-unassigned apinheiro commit-queue walker.willie xan.lopez oldest_to_newest 118931 0 jdiggs 2009-04-26 16:41:51 -0700 Steps to reproduce: 1. View the (to be) attached document in WebKit Gtk. 2. Examine any of the headings using Accerciser's Interface Viewer. Expected results: There would be some way to identify the level of the heading. Actual results: (As best as I can tell) the level of the heading is not being exposed to assistive technologies. Comments: 1. The reason why it is helpful to have this information is because it enables the user to quickly scan through and/or navigate within a document in which headings have been properly applied. 2. FWIW, the way that Gecko exposes this information is via an object attribute (e.g. 'level:2'). That doesn't mean WebKit should follow suit if y'all have a better idea; merely pointing out this as an option. :-) Thanks! 118932 1 29806 jdiggs 2009-04-26 16:43:02 -0700 Created attachment 29806 aforementioned test case 155386 2 41355 jdiggs 2009-10-17 03:02:24 -0700 Created attachment 41355 proposed patch - take 1 I decided to take a stab at an easier one. :-) This works for me. Xan, please review and give pointers. Thanks in advance!! 155387 3 41355 xan.lopez 2009-10-17 03:22:37 -0700 Comment on attachment 41355 proposed patch - take 1 This patch is amazing, great job! A few small comments: > +static AtkAttributeSet* addAttributeToSet(AtkAttributeSet* attributeSet, const char* name, const char* value) > +{ > + AtkAttribute* attribute = (AtkAttribute*)g_malloc(sizeof(AtkAttribute)); WebKit style guide tells us to use C++ style castings, so you need to do something like: AtkAttribute* attribute = static_cast<AtkAttribute>(g_malloc(sizeof(AtkAttribute))); > + attribute->name = g_strdup(name); > + attribute->value = g_strdup(value); > + attributeSet = g_slist_prepend(attributeSet, attribute); > + > + return attributeSet; > +} > + > +static AtkAttributeSet* webkit_accessible_get_attributes(AtkObject* object) > +{ > + AtkAttributeSet* attributeSet = NULL; > + > + int headingLevel = core(object)->headingLevel(); > + if (headingLevel) { > + String value = String::number(headingLevel); > + attributeSet = addAttributeToSet(attributeSet, (const char*)"level", returnString(value)); - Is the (const char*) casting for "level" really needed? I think it should be const char* already. - Using returnString() here is a tiny hack, since the function was really intended for return values in public APIs implementations. Do thinks work if you pass value.utf8().data() to the function? I'm marking it as r- while we work on those final details. 155388 4 jdiggs 2009-10-17 03:56:23 -0700 Thanks for the feedback, Xan! Notes (mostly to myself so that I remember them after I get some sleep. :-) ) > WebKit style guide tells us to use C++ style castings, so you need to do > something like: > > AtkAttribute* attribute = > static_cast<AtkAttribute>(g_malloc(sizeof(AtkAttribute))); When I try that I get an error: ~~~~~~ WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: In function ‘AtkAttributeSet* addAttributeToSet(AtkAttributeSet*, const char*, const char*)’: WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:179: error: no matching function for call to ‘_AtkAttribute::_AtkAttribute(void*)’ ~~~~~~ But I'm new to C++. I bet if I research it and think about it, it'll all become clear. I'll do that "tomorrow." > - Is the (const char*) casting for "level" really needed? I think it should be > const char* already. You are correct. My bad. > - Using returnString() here is a tiny hack, since the function was really > intended for return values in public APIs implementations. Do thinks work if > you pass value.utf8().data() to the function? They do indeed. Cool. > I'm marking it as r- while we work on those final details. Thanks much for the review! I'll look into the first issue/error after some sleep. :-) 155404 5 xan.lopez 2009-10-17 10:47:59 -0700 (In reply to comment #4) > Thanks for the feedback, Xan! > > Notes (mostly to myself so that I remember them after I get some sleep. :-) ) > > > WebKit style guide tells us to use C++ style castings, so you need to do > > something like: > > > > AtkAttribute* attribute = > > static_cast<AtkAttribute>(g_malloc(sizeof(AtkAttribute))); > > When I try that I get an error: > > ~~~~~~ > WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: In function > ‘AtkAttributeSet* addAttributeToSet(AtkAttributeSet*, const char*, const > char*)’: > WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:179: error: no > matching function for call to ‘_AtkAttribute::_AtkAttribute(void*)’ > ~~~~~~ > > But I'm new to C++. I bet if I research it and think about it, it'll all become > clear. I'll do that "tomorrow." I'm sorry, there was a missing '*' in the static_cast, it should read static_cast<AtkAttribute*> :) 155411 6 41362 jdiggs 2009-10-17 12:34:21 -0700 Created attachment 41362 proposed patch - take 2 (In reply to comment #5) > I'm sorry, there was a missing '*' in the static_cast, it should read > static_cast<AtkAttribute*> :) Heheh. Even *I* see that NOW. :-) I really, really needed to sleep. But if I didn't see it, I would have been embarrassed when that turned out to be the "issue," so thanks for providing it. :-) This version makes that change along with the two others you pointed out. 155413 7 41362 xan.lopez 2009-10-17 12:48:17 -0700 Comment on attachment 41362 proposed patch - take 2 woot, r=me 155414 8 41362 commit-queue 2009-10-17 13:00:42 -0700 Comment on attachment 41362 proposed patch - take 2 Clearing flags on attachment: 41362 Committed r49743: <http://trac.webkit.org/changeset/49743> 155415 9 commit-queue 2009-10-17 13:00:46 -0700 All reviewed patches have been landed. Closing bug. 29806 2009-04-26 16:43:02 -0700 2009-04-26 16:43:02 -0700 aforementioned test case foo.html text/html 432 jdiggs PGh0bWw+CjxoZWFkPgo8dGl0bGU+U2ltcGxlIFRlc3Q8L3RpdGxlPgo8L2hlYWQ+Cjxib2R5Pgo8 aDE+SGVhZGluZyAxPC9oMT4KPGgyPkhlYWRpbmcgMjwvaDI+CjxwPkhlcmUgaXMgc29tZSA8Yj5i b2xkPC9iPiB0ZXh0IHdoaWNoIHdvdWxkIGludHJvZHVjZSB0aGUgbmV4dCBzZWN0aW9ucywgd2Vy ZSB0aGVyZSBhbnl0aGluZyB3b3J0aCBpbnRyb2R1Y2luZyB0aGVyZS48L3A+CjxoMz5TZWN0aW9u IDEgKEhlYWRpbmcgMyk8L2gzPgo8cD5GaXJzdCBwYXJhZ3JhcGg8L3A+CjxwPlNlY29uZCBwYXJh Z3JhcGg8L3A+CjxoMz5TZWN0aW9uIDIgKEhlYWRpbmcgMyk8L2gzPgo8cD5GaXJzdCBwYXJhZ3Jh cGg8L3A+CjxwPlNlY29uZCBwYXJhZ3JhcGg8L3A+CjxvbD4KPGxpPkl0ZW0gMTwvbGk+CjxsaT5J dGVtIDI8L2xpPgo8L29sPgo8L2JvZHk+CjwvaHRtbD4K 41355 2009-10-17 03:02:24 -0700 2009-10-17 12:34:21 -0700 proposed patch - take 1 25413.diffs text/plain 3035 jdiggs RnJvbSBmODc0MWQ4NTczM2UzOGNhOWExMDQ0MGFmNGIwZjdkZjBlMWYxZjU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpvYW5tYXJpZS5kaWdnc0BnbWFp bC5jb20+CkRhdGU6IFNhdCwgMTcgT2N0IDIwMDkgMDE6MTg6NDUgLTA0MDAKU3ViamVjdDogW1BB VENIXSBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCmh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNTQxMwpbR1RLXSBQbGVhc2UgZXhwb3NlIHRoZSBsZXZlbCBvZiBo ZWFkaW5ncwoKRXhwb3NlcyB0aGUgaGVhZGluZyBsZXZlbCBhcyBhbiBhdHRyaWJ1dGUgb2YgdGhl IEF0a09iamVjdC4KCiogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJBdGsuY3BwOgooYWRkQXR0cmlidXRlVG9TZXQpOgood2Via2l0X2FjY2Vzc2libGVfZ2V0X2F0 dHJpYnV0ZXMpOgood2Via2l0X2FjY2Vzc2libGVfY2xhc3NfaW5pdCk6Ci0tLQogV2ViQ29yZS9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE0ICsrKysrKysr KysrKwogLi4uL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgICAgICAgICAg fCAgIDIzICsrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlv bnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmODE1OWFjLi5kZWVmN2ZiIDEwMDY0NAotLS0gYS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy MDA5LTEwLTE3ICBKb2FubWFyaWUgRGlnZ3MgIDxqb2FubWFyaWUuZGlnZ3NAZ21haWwuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTQxMworICAgICAgICBbR1RLXSBQbGVh c2UgZXhwb3NlIHRoZSBsZXZlbCBvZiBoZWFkaW5ncworCisgICAgICAgIEV4cG9zZXMgdGhlIGhl YWRpbmcgbGV2ZWwgYXMgYW4gYXR0cmlidXRlIG9mIHRoZSBBdGtPYmplY3QuCisKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6Cisg ICAgICAgIChhZGRBdHRyaWJ1dGVUb1NldCk6CisgICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV9n ZXRfYXR0cmlidXRlcyk6CisgICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV9jbGFzc19pbml0KToK KwogMjAwOS0xMC0xNiAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1dHRAYXBwbGUuY29tPgogCiAg ICAgICAgIEFkZCBTUEkgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgYSBwbHVnLWluIGhhcyBldmVyIGJl ZW4gaGFsdGVkLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0Fj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcAppbmRleCA4MTE5MDNkLi45NTg3NDAwIDEw MDY0NAotLS0gYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyQXRrLmNwcAorKysgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyQXRrLmNwcApAQCAtMTc0LDYgKzE3NCwyOCBAQCBzdGF0aWMgZ2ludCB3 ZWJraXRfYWNjZXNzaWJsZV9nZXRfaW5kZXhfaW5fcGFyZW50KEF0a09iamVjdCogb2JqZWN0KQog ICAgIHJldHVybiAwOwogfQogCitzdGF0aWMgQXRrQXR0cmlidXRlU2V0KiBhZGRBdHRyaWJ1dGVU b1NldChBdGtBdHRyaWJ1dGVTZXQqIGF0dHJpYnV0ZVNldCwgY29uc3QgY2hhciogbmFtZSwgY29u c3QgY2hhciogdmFsdWUpCit7CisgICAgQXRrQXR0cmlidXRlKiBhdHRyaWJ1dGUgPSAoQXRrQXR0 cmlidXRlKilnX21hbGxvYyhzaXplb2YoQXRrQXR0cmlidXRlKSk7CisgICAgYXR0cmlidXRlLT5u YW1lID0gZ19zdHJkdXAobmFtZSk7CisgICAgYXR0cmlidXRlLT52YWx1ZSA9IGdfc3RyZHVwKHZh bHVlKTsKKyAgICBhdHRyaWJ1dGVTZXQgPSBnX3NsaXN0X3ByZXBlbmQoYXR0cmlidXRlU2V0LCBh dHRyaWJ1dGUpOworCisgICAgcmV0dXJuIGF0dHJpYnV0ZVNldDsKK30KKworc3RhdGljIEF0a0F0 dHJpYnV0ZVNldCogd2Via2l0X2FjY2Vzc2libGVfZ2V0X2F0dHJpYnV0ZXMoQXRrT2JqZWN0KiBv YmplY3QpCit7CisgICAgQXRrQXR0cmlidXRlU2V0KiBhdHRyaWJ1dGVTZXQgPSBOVUxMOworCisg ICAgaW50IGhlYWRpbmdMZXZlbCA9IGNvcmUob2JqZWN0KS0+aGVhZGluZ0xldmVsKCk7CisgICAg aWYgKGhlYWRpbmdMZXZlbCkgeworICAgICAgICBTdHJpbmcgdmFsdWUgPSBTdHJpbmc6Om51bWJl cihoZWFkaW5nTGV2ZWwpOworICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRBdHRyaWJ1dGVUb1Nl dChhdHRyaWJ1dGVTZXQsIChjb25zdCBjaGFyKikibGV2ZWwiLCByZXR1cm5TdHJpbmcodmFsdWUp KTsKKyAgICB9CisgICAgcmV0dXJuIGF0dHJpYnV0ZVNldDsKK30KKwogc3RhdGljIEF0a1JvbGUg YXRrUm9sZShBY2Nlc3NpYmlsaXR5Um9sZSByb2xlKQogewogICAgIHN3aXRjaCAocm9sZSkgewpA QCAtNDA4LDYgKzQzMCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9hY2Nlc3NpYmxlX2NsYXNzX2lu aXQoQXRrT2JqZWN0Q2xhc3MqIGtsYXNzKQogICAgIGtsYXNzLT5nZXRfcm9sZSA9IHdlYmtpdF9h Y2Nlc3NpYmxlX2dldF9yb2xlOwogICAgIGtsYXNzLT5yZWZfc3RhdGVfc2V0ID0gd2Via2l0X2Fj Y2Vzc2libGVfcmVmX3N0YXRlX3NldDsKICAgICBrbGFzcy0+Z2V0X2luZGV4X2luX3BhcmVudCA9 IHdlYmtpdF9hY2Nlc3NpYmxlX2dldF9pbmRleF9pbl9wYXJlbnQ7CisgICAga2xhc3MtPmdldF9h dHRyaWJ1dGVzID0gd2Via2l0X2FjY2Vzc2libGVfZ2V0X2F0dHJpYnV0ZXM7CiB9CiAKIEdUeXBl Ci0tIAoxLjYuMy4zCgo= 41362 2009-10-17 12:34:21 -0700 2009-10-17 13:00:42 -0700 proposed patch - take 2 25413-2.diffs text/plain 2993 jdiggs RnJvbSBkNmRkZDQwNmRkZjBmMjhjMmRiY2U0NzQ5ODQ4OWE3ZGUzMDg5OGQ1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpvYW5tYXJpZS5kaWdnc0BnbWFp bC5jb20+CkRhdGU6IFNhdCwgMTcgT2N0IDIwMDkgMTU6MjY6NTkgLTA0MDAKU3ViamVjdDogW1BB VENIXSBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCmh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNTQxMwpbR1RLXSBQbGVhc2UgZXhwb3NlIHRoZSBsZXZlbCBvZiBo ZWFkaW5ncwoKRXhwb3NlcyB0aGUgaGVhZGluZyBsZXZlbCBhcyBhbiBhdHRyaWJ1dGUgb2YgdGhl IEF0a09iamVjdC4KCiogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJBdGsuY3BwOgooYWRkQXR0cmlidXRlVG9TZXQpOgood2Via2l0X2FjY2Vzc2libGVfZ2V0X2F0 dHJpYnV0ZXMpOgood2Via2l0X2FjY2Vzc2libGVfY2xhc3NfaW5pdCk6Ci0tLQogV2ViQ29yZS9D aGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE0ICsrKysrKysr KysrKwogLi4uL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgICAgICAgICAg fCAgIDIzICsrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlv bnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhMTc5ODhhLi4zZDQzMjQ0IDEwMDY0NAotLS0gYS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy MDA5LTEwLTE3ICBKb2FubWFyaWUgRGlnZ3MgIDxqb2FubWFyaWUuZGlnZ3NAZ21haWwuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTQxMworICAgICAgICBbR1RLXSBQbGVh c2UgZXhwb3NlIHRoZSBsZXZlbCBvZiBoZWFkaW5ncworCisgICAgICAgIEV4cG9zZXMgdGhlIGhl YWRpbmcgbGV2ZWwgYXMgYW4gYXR0cmlidXRlIG9mIHRoZSBBdGtPYmplY3QuCisKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6Cisg ICAgICAgIChhZGRBdHRyaWJ1dGVUb1NldCk6CisgICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV9n ZXRfYXR0cmlidXRlcyk6CisgICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV9jbGFzc19pbml0KToK KwogMjAwOS0xMC0xNiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgYi9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcAppbmRleCA4MTE5 MDNkLi4wZWMwNzNiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcAorKysgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv Z3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcApAQCAtMTc0LDYgKzE3NCwyOCBA QCBzdGF0aWMgZ2ludCB3ZWJraXRfYWNjZXNzaWJsZV9nZXRfaW5kZXhfaW5fcGFyZW50KEF0a09i amVjdCogb2JqZWN0KQogICAgIHJldHVybiAwOwogfQogCitzdGF0aWMgQXRrQXR0cmlidXRlU2V0 KiBhZGRBdHRyaWJ1dGVUb1NldChBdGtBdHRyaWJ1dGVTZXQqIGF0dHJpYnV0ZVNldCwgY29uc3Qg Y2hhciogbmFtZSwgY29uc3QgY2hhciogdmFsdWUpCit7CisgICAgQXRrQXR0cmlidXRlKiBhdHRy aWJ1dGUgPSBzdGF0aWNfY2FzdDxBdGtBdHRyaWJ1dGUqPihnX21hbGxvYyhzaXplb2YoQXRrQXR0 cmlidXRlKSkpOworICAgIGF0dHJpYnV0ZS0+bmFtZSA9IGdfc3RyZHVwKG5hbWUpOworICAgIGF0 dHJpYnV0ZS0+dmFsdWUgPSBnX3N0cmR1cCh2YWx1ZSk7CisgICAgYXR0cmlidXRlU2V0ID0gZ19z bGlzdF9wcmVwZW5kKGF0dHJpYnV0ZVNldCwgYXR0cmlidXRlKTsKKworICAgIHJldHVybiBhdHRy aWJ1dGVTZXQ7Cit9CisKK3N0YXRpYyBBdGtBdHRyaWJ1dGVTZXQqIHdlYmtpdF9hY2Nlc3NpYmxl X2dldF9hdHRyaWJ1dGVzKEF0a09iamVjdCogb2JqZWN0KQoreworICAgIEF0a0F0dHJpYnV0ZVNl dCogYXR0cmlidXRlU2V0ID0gTlVMTDsKKworICAgIGludCBoZWFkaW5nTGV2ZWwgPSBjb3JlKG9i amVjdCktPmhlYWRpbmdMZXZlbCgpOworICAgIGlmIChoZWFkaW5nTGV2ZWwpIHsKKyAgICAgICAg U3RyaW5nIHZhbHVlID0gU3RyaW5nOjpudW1iZXIoaGVhZGluZ0xldmVsKTsKKyAgICAgICAgYXR0 cmlidXRlU2V0ID0gYWRkQXR0cmlidXRlVG9TZXQoYXR0cmlidXRlU2V0LCAibGV2ZWwiLCB2YWx1 ZS51dGY4KCkuZGF0YSgpKTsKKyAgICB9CisgICAgcmV0dXJuIGF0dHJpYnV0ZVNldDsKK30KKwog c3RhdGljIEF0a1JvbGUgYXRrUm9sZShBY2Nlc3NpYmlsaXR5Um9sZSByb2xlKQogewogICAgIHN3 aXRjaCAocm9sZSkgewpAQCAtNDA4LDYgKzQzMCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9hY2Nl c3NpYmxlX2NsYXNzX2luaXQoQXRrT2JqZWN0Q2xhc3MqIGtsYXNzKQogICAgIGtsYXNzLT5nZXRf cm9sZSA9IHdlYmtpdF9hY2Nlc3NpYmxlX2dldF9yb2xlOwogICAgIGtsYXNzLT5yZWZfc3RhdGVf c2V0ID0gd2Via2l0X2FjY2Vzc2libGVfcmVmX3N0YXRlX3NldDsKICAgICBrbGFzcy0+Z2V0X2lu ZGV4X2luX3BhcmVudCA9IHdlYmtpdF9hY2Nlc3NpYmxlX2dldF9pbmRleF9pbl9wYXJlbnQ7Cisg ICAga2xhc3MtPmdldF9hdHRyaWJ1dGVzID0gd2Via2l0X2FjY2Vzc2libGVfZ2V0X2F0dHJpYnV0 ZXM7CiB9CiAKIEdUeXBlCi0tIAoxLjYuMy4zCgo=