56655 2011-03-18 10:29:40 -0700 [GTK] Expose the AtkValue interface for WAI-ARIA sliders 2011-03-28 03:16:53 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 56953 30796 1 mario webkit-unassigned jdiggs mrobinson oldest_to_newest 369709 0 mario 2011-03-18 10:29:40 -0700 HTML/CSS/JavaScript Sliders created using the WAI-ARIA specification should be exposed in WebKitGTK implementing the AtkValue interface, which is not happening right now. In more detail, the following functions should be implemented: atk_value_get_current_value atk_value_get_maximum_value atk_value_get_minimum_value atk_value_set_current_value atk_value_get_minimum_increment Use this example as reference: http://test.cita.illinois.edu/aria/slider/slider1.php 372477 1 86703 mario 2011-03-23 15:16:33 -0700 Created attachment 86703 Patch proposal + Layout test Patch proposal + Layout test for this 373558 2 86703 mrobinson 2011-03-25 09:34:08 -0700 Comment on attachment 86703 Patch proposal + Layout test View in context: https://bugs.webkit.org/attachment.cgi?id=86703&action=review > Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp:156 > + GValue gValue = { 0 }; > + atk_value_get_current_value(ATK_VALUE(axObject), &gValue); > + > + AtkPropertyValues propertyValues; > + propertyValues.property_name = "accessible-value"; > + propertyValues.new_value = gValue; > + Would it make sense to simply do: atk_value_get_current_value(ATK_VALUE(axObject), &propertyValues.new_value); 374377 3 mario 2011-03-28 03:15:54 -0700 (In reply to comment #2) > (From update of attachment 86703 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=86703&action=review > > > Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp:156 > > + GValue gValue = { 0 }; > > + atk_value_get_current_value(ATK_VALUE(axObject), &gValue); > > + > > + AtkPropertyValues propertyValues; > > + propertyValues.property_name = "accessible-value"; > > + propertyValues.new_value = gValue; > > + > > Would it make sense to simply do: > > atk_value_get_current_value(ATK_VALUE(axObject), &propertyValues.new_value); Yes, I'll change that. Thanks 374378 4 mario 2011-03-28 03:16:53 -0700 Committed r82095: <http://trac.webkit.org/changeset/82095> 86703 2011-03-23 15:16:33 -0700 2011-03-25 09:34:08 -0700 Patch proposal + Layout test 0001-2011-03-23-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 12931 mario RnJvbSBmYmQ5Mjk2MTZjZWFkZDBlY2IzYjhmNjM3NWRkYjVlZDkyNGFkZDZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBNb24sIDIxIE1hciAyMDExIDE4OjM5OjI1ICswMTAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMS0wMy0yMyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBFeHBv c2UgdGhlIEF0a1ZhbHVlIGludGVyZmFjZSBmb3IgV0FJLUFSSUEgc2xpZGVycwogICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjY1NQoKICAgICAgICBJbXBs ZW1lbnQgQXRrVmFsdWUgaW50ZXJmYWNlIGZvciBXQUktQVJJQSBzbGlkZXJzLgoKICAgICAgICBU ZXN0OiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9hcmlhLXNsaWRlci1yZXF1aXJlZC1hdHRy aWJ1dGVzLmh0bWwKCiAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BWE9iamVjdENhY2hlQXRr LmNwcDoKICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZp Y2F0aW9uKTogRW1pdCB0aGUKICAgICAgICAncHJvcGVydHktY2hhbmdlOjphY2Nlc3NpYmxlLXZh bHVlJyBzaWduYWwgd2hlbiBuZWVkZWQuCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgogICAgICAgIChjb3JlKTogTmV3LCByZXR1 cm5zIGEgY29yZSBvYmplY3QgZnJvbSBhbiBBdGtWYWx1ZS4KICAgICAgICAod2Via2l0QWNjZXNz aWJsZVZhbHVlR2V0Q3VycmVudFZhbHVlKTogTmV3LCBpbXBsZW1lbnRzIEF0a1ZhbHVlLgogICAg ICAgICh3ZWJraXRBY2Nlc3NpYmxlVmFsdWVHZXRNYXhpbXVtVmFsdWUpOiBEaXR0by4KICAgICAg ICAod2Via2l0QWNjZXNzaWJsZVZhbHVlR2V0TWluaW11bVZhbHVlKTogRGl0dG8uCiAgICAgICAg KHdlYmtpdEFjY2Vzc2libGVWYWx1ZVNldEN1cnJlbnRWYWx1ZSk6IERpdHRvLgogICAgICAgICh3 ZWJraXRBY2Nlc3NpYmxlVmFsdWVHZXRNaW5pbXVtSW5jcmVtZW50KTogRGl0dG8uCiAgICAgICAg KGF0a1ZhbHVlSW50ZXJmYWNlSW5pdCk6IERpdHRvLgogICAgICAgIChHZXRBdGtJbnRlcmZhY2VU eXBlRnJvbVdBSVR5cGUpOiBBZGQgQVRLX1RZUEVfVkFMVUUuCiAgICAgICAgKGdldEludGVyZmFj ZU1hc2tGcm9tT2JqZWN0KTogU2V0IHRoZSBXQUlfVkFMVUUgYml0IGZvciBzbGlkZXJzLgoKMjAx MS0wMy0yMyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CgogICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBFeHBvc2UgdGhl IEF0a1ZhbHVlIGludGVyZmFjZSBmb3IgV0FJLUFSSUEgc2xpZGVycwogICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjY1NQoKICAgICAgICBOZXcgdGVzdCB0 byBjaGVjayBXQUktQVJJQSBzbGlkZXJzIHJlcXVpcmVkIGF0dHJpYnV0ZXMuCgogICAgICAgICog cGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1zbGlkZXItcmVxdWlyZWQtYXR0cmlidXRl cy1leHBlY3RlZC50eHQ6IEFkZGVkLgogICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxp dHkvYXJpYS1zbGlkZXItcmVxdWlyZWQtYXR0cmlidXRlcy5odG1sOiBBZGRlZC4KLS0tCiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTIgKysr CiAuLi4vYXJpYS1zbGlkZXItcmVxdWlyZWQtYXR0cmlidXRlcy1leHBlY3RlZC50eHQgICB8ICAg MjEgKysrKysrCiAuLi4vYXJpYS1zbGlkZXItcmVxdWlyZWQtYXR0cmlidXRlcy5odG1sICAgICAg ICAgICB8ICAgNTggKysrKysrKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI2ICsrKysrKysKIC4uLi9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvZ3RrL0FYT2JqZWN0Q2FjaGVBdGsuY3BwIHwgICAxMiArKysKIC4uLi9ndGsvQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwICAgICAgICAgIHwgICA3MyArKysrKysrKysr KysrKysrKysrLQogNiBmaWxlcyBjaGFuZ2VkLCAyMDEgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlv bnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS9hcmlhLXNsaWRlci1yZXF1aXJlZC1hdHRyaWJ1dGVzLWV4cGVjdGVkLnR4dAogY3Jl YXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2Fy aWEtc2xpZGVyLXJlcXVpcmVkLWF0dHJpYnV0ZXMuaHRtbAoKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZGI3ZWZjLi40ZDM2 M2RmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMjMgIE1hcmlvIFNhbmNoZXogUHJh ZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtHVEtdIEV4cG9zZSB0aGUgQXRrVmFsdWUgaW50ZXJmYWNlIGZv ciBXQUktQVJJQSBzbGlkZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NjY1NQorCisgICAgICAgIE5ldyB0ZXN0IHRvIGNoZWNrIFdBSS1BUklBIHNs aWRlcnMgcmVxdWlyZWQgYXR0cmlidXRlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nl c3NpYmlsaXR5L2FyaWEtc2xpZGVyLXJlcXVpcmVkLWF0dHJpYnV0ZXMtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9hcmlhLXNsaWRlci1y ZXF1aXJlZC1hdHRyaWJ1dGVzLmh0bWw6IEFkZGVkLgorCiAyMDExLTAzLTIzICBYaWFvbWVpIEpp ICA8eGppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgZmFzdC9jc3MvYmlkaS1vdmVycmlk ZS1pbi1hbm9ueW1vdXMtYmxvY2suaHRtbCBhcyBleHBlY3RlZCB0byBmYWlsIGFmdGVyIHI4MTgw Ny4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2Fy aWEtc2xpZGVyLXJlcXVpcmVkLWF0dHJpYnV0ZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1zbGlkZXItcmVxdWlyZWQtYXR0cmlidXRl cy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTVlYzA2 YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmls aXR5L2FyaWEtc2xpZGVyLXJlcXVpcmVkLWF0dHJpYnV0ZXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEsMjEgQEAKK0FjY2Vzc2liaWxpdHkgb2JqZWN0IGVtaXR0ZWQgImZvY3VzLWV2ZW50ID0gMSIg LyBOYW1lOiAiKE5vIG5hbWUpIiAvIFJvbGU6IDUwCitBY2Nlc3NpYmlsaXR5IG9iamVjdCBlbWl0 dGVkICJzdGF0ZS1jaGFuZ2U6Zm9jdXNlZCA9IDEiIC8gTmFtZTogIihObyBuYW1lKSIgLyBSb2xl OiA1MAorQWNjZXNzaWJpbGl0eSBvYmplY3QgZW1pdHRlZCAibG9hZC1jb21wbGV0ZSIgLyBOYW1l OiAiKE5vIG5hbWUpIiAvIFJvbGU6IDgwCitBY2Nlc3NpYmlsaXR5IG9iamVjdCBlbWl0dGVkICJz dGF0ZS1jaGFuZ2U6YnVzeSA9IDAiIC8gTmFtZTogIihObyBuYW1lKSIgLyBSb2xlOiA4MAorQWNj ZXNzaWJpbGl0eSBvYmplY3QgZW1pdHRlZCAicHJvcGVydHktY2hhbmdlOmFjY2Vzc2libGUtdmFs dWUiIC8gTmFtZTogIihObyBuYW1lKSIgLyBSb2xlOiA1MAorQWNjZXNzaWJpbGl0eSBvYmplY3Qg ZW1pdHRlZCAicHJvcGVydHktY2hhbmdlOmFjY2Vzc2libGUtdmFsdWUiIC8gTmFtZTogIihObyBu YW1lKSIgLyBSb2xlOiA1MAorVGhpcyB0ZXN0cyB0aGUgZXhwb3N1cmUgb2YgYXR0cmlidXRlcyBm b3IgYW4gQVJJQSBzbGlkZXIuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBv ZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKK1BBU1MgYXhTbGlk ZXIucm9sZSBpcyAnQVhSb2xlOiBzbGlkZXInCitQQVNTIGF4U2xpZGVyLmludFZhbHVlIGlzIDUw CitQQVNTIGF4U2xpZGVyLm1pblZhbHVlIGlzIDAKK1BBU1MgYXhTbGlkZXIubWF4VmFsdWUgaXMg MTAwCitQQVNTIGF4U2xpZGVyLmludFZhbHVlIGlzIDc1CitQQVNTIGF4U2xpZGVyLmludFZhbHVl IGlzIDM1CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmls aXR5L2FyaWEtc2xpZGVyLXJlcXVpcmVkLWF0dHJpYnV0ZXMuaHRtbCBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2FyaWEtc2xpZGVyLXJlcXVpcmVkLWF0dHJpYnV0ZXMu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43Y2RlNzVkCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1z bGlkZXItcmVxdWlyZWQtYXR0cmlidXRlcy5odG1sCkBAIC0wLDAgKzEsNTggQEAKKzwhRE9DVFlQ RSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8 bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qt c3R5bGUuY3NzIj4KKzxzY3JpcHQ+Cit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gZmFsc2U7CisK K2Z1bmN0aW9uIGZpbmlzaFRlc3QoKQoreworICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlm eURvbmUoKTsKK30KKworZnVuY3Rpb24gcnVuVGVzdCgpCit7CisgICAgc2xpZGVyID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoInNsaWRlciIpOworICAgIHNsaWRlci5mb2N1cygpOworCisgICAg YXhTbGlkZXIgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsKKworICAg IHNob3VsZEJlKCJheFNsaWRlci5yb2xlIiwgIidBWFJvbGU6IHNsaWRlciciKTsKKyAgICBzaG91 bGRCZSgiYXhTbGlkZXIuaW50VmFsdWUiLCAiNTAiKTsKKyAgICBzaG91bGRCZSgiYXhTbGlkZXIu bWluVmFsdWUiLCAiMCIpOworICAgIHNob3VsZEJlKCJheFNsaWRlci5tYXhWYWx1ZSIsICIxMDAi KTsKKworICAgIHNsaWRlci5zZXRBdHRyaWJ1dGUoImFyaWEtdmFsdWVub3ciLCAiNzUiKTsKKyAg ICBzaG91bGRCZSgiYXhTbGlkZXIuaW50VmFsdWUiLCAiNzUiKTsKKworICAgIHNsaWRlci5zZXRB dHRyaWJ1dGUoImFyaWEtdmFsdWVub3ciLCAiMzUiKTsKKyAgICBzaG91bGRCZSgiYXhTbGlkZXIu aW50VmFsdWUiLCAiMzUiKTsKKworICAgIHdpbmRvdy5zZXRUaW1lb3V0KCJmaW5pc2hUZXN0KCk7 IiwgMCk7Cit9Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291 cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0iYm9keSIg b25sb2FkPSJydW5UZXN0KCk7Ij4KKzxkaXYgcm9sZT0iYXBwbGljYXRpb24iPgorICA8c3BhbiBp ZD0ic2xpZGVyIiB0YWJpbmRleD0iMCIgcm9sZT0ic2xpZGVyIiBhcmlhLXZhbHVlbWluPSIwIiBh cmlhLXZhbHVlbWF4PSIxMDAiIGFyaWEtdmFsdWVub3c9IjUwIj48L3NwYW4+Cis8L2Rpdj4KKzxw IGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0 PgorZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhlIGV4cG9zdXJlIG9mIGF0dHJpYnV0ZXMgZm9y IGFuIEFSSUEgc2xpZGVyLiIpOworCitpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVy KSB7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRl c3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKK30KKworaWYgKHdpbmRvdy5hY2Nlc3NpYmls aXR5Q29udHJvbGxlcikgeworICAgIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmxvZ0FjY2Vzc2li aWxpdHlFdmVudHMoKTsKK30KKworc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKKzwvc2NyaXB0 PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5q cyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDUwMzY1Zi4uY2Fl Mzk5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDExLTAzLTIzICBNYXJpbyBTYW5j aGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBFeHBvc2UgdGhlIEF0a1ZhbHVlIGludGVy ZmFjZSBmb3IgV0FJLUFSSUEgc2xpZGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTY2NTUKKworICAgICAgICBJbXBsZW1lbnQgQXRrVmFsdWUgaW50 ZXJmYWNlIGZvciBXQUktQVJJQSBzbGlkZXJzLgorCisgICAgICAgIFRlc3Q6IHBsYXRmb3JtL2d0 ay9hY2Nlc3NpYmlsaXR5L2FyaWEtc2xpZGVyLXJlcXVpcmVkLWF0dHJpYnV0ZXMuaHRtbAorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQVhPYmplY3RDYWNoZUF0ay5jcHA6CisgICAgICAg IChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24pOiBFbWl0 IHRoZQorICAgICAgICAncHJvcGVydHktY2hhbmdlOjphY2Nlc3NpYmxlLXZhbHVlJyBzaWduYWwg d2hlbiBuZWVkZWQuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckF0ay5jcHA6CisgICAgICAgIChjb3JlKTogTmV3LCByZXR1cm5zIGEgY29y ZSBvYmplY3QgZnJvbSBhbiBBdGtWYWx1ZS4KKyAgICAgICAgKHdlYmtpdEFjY2Vzc2libGVWYWx1 ZUdldEN1cnJlbnRWYWx1ZSk6IE5ldywgaW1wbGVtZW50cyBBdGtWYWx1ZS4KKyAgICAgICAgKHdl YmtpdEFjY2Vzc2libGVWYWx1ZUdldE1heGltdW1WYWx1ZSk6IERpdHRvLgorICAgICAgICAod2Vi a2l0QWNjZXNzaWJsZVZhbHVlR2V0TWluaW11bVZhbHVlKTogRGl0dG8uCisgICAgICAgICh3ZWJr aXRBY2Nlc3NpYmxlVmFsdWVTZXRDdXJyZW50VmFsdWUpOiBEaXR0by4KKyAgICAgICAgKHdlYmtp dEFjY2Vzc2libGVWYWx1ZUdldE1pbmltdW1JbmNyZW1lbnQpOiBEaXR0by4KKyAgICAgICAgKGF0 a1ZhbHVlSW50ZXJmYWNlSW5pdCk6IERpdHRvLgorICAgICAgICAoR2V0QXRrSW50ZXJmYWNlVHlw ZUZyb21XQUlUeXBlKTogQWRkIEFUS19UWVBFX1ZBTFVFLgorICAgICAgICAoZ2V0SW50ZXJmYWNl TWFza0Zyb21PYmplY3QpOiBTZXQgdGhlIFdBSV9WQUxVRSBiaXQgZm9yIHNsaWRlcnMuCisKIDIw MTEtMDMtMjMgIFhpYW9tZWkgSmkgIDx4amlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhdmlkIEh5YXR0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9ndGsvQVhPYmplY3RDYWNoZUF0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2d0ay9BWE9iamVjdENhY2hlQXRrLmNwcAppbmRleCAwNzAxZWNlLi43N2FjN2Q3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BWE9iamVjdENhY2hlQXRr LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BWE9iamVjdENhY2hl QXRrLmNwcApAQCAtMTQzLDYgKzE0MywxOCBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0 Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0LCBBWAogICAg ICAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKGF4T2JqZWN0LCAic3RhdGUtY2hhbmdlIiwg ImZvY3VzZWQiLCB0cnVlKTsKICAgICAgICAgfQogICAgICAgICBub3RpZnlDaGlsZHJlblNlbGVj dGlvbkNoYW5nZShjb3JlT2JqZWN0KTsKKyAgICB9IGVsc2UgaWYgKG5vdGlmaWNhdGlvbiA9PSBB WFZhbHVlQ2hhbmdlZCkgeworICAgICAgICBpZiAoIUFUS19JU19WQUxVRShheE9iamVjdCkpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgR1ZhbHVlIGdWYWx1ZSA9IHsgMCB9OworICAg ICAgICBhdGtfdmFsdWVfZ2V0X2N1cnJlbnRfdmFsdWUoQVRLX1ZBTFVFKGF4T2JqZWN0KSwgJmdW YWx1ZSk7CisKKyAgICAgICAgQXRrUHJvcGVydHlWYWx1ZXMgcHJvcGVydHlWYWx1ZXM7CisgICAg ICAgIHByb3BlcnR5VmFsdWVzLnByb3BlcnR5X25hbWUgPSAiYWNjZXNzaWJsZS12YWx1ZSI7Cisg ICAgICAgIHByb3BlcnR5VmFsdWVzLm5ld192YWx1ZSA9IGdWYWx1ZTsKKworICAgICAgICBnX3Np Z25hbF9lbWl0X2J5X25hbWUoQVRLX09CSkVDVChheE9iamVjdCksICJwcm9wZXJ0eS1jaGFuZ2U6 OmFjY2Vzc2libGUtdmFsdWUiLCAmcHJvcGVydHlWYWx1ZXMsIE5VTEwpOwogICAgIH0KIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXJBdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsv QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwCmluZGV4IDFkMjM2MTIuLmU2YzI3ZTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyQXRrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKQEAgLTE1OCw2ICsxNTgsMTEg QEAgc3RhdGljIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmUoQXRrRG9jdW1lbnQqIGRvY3VtZW50 KQogICAgIHJldHVybiBjb3JlKEFUS19PQkpFQ1QoZG9jdW1lbnQpKTsKIH0KIAorc3RhdGljIEFj Y2Vzc2liaWxpdHlPYmplY3QqIGNvcmUoQXRrVmFsdWUqIHZhbHVlKQoreworICAgIHJldHVybiBj b3JlKEFUS19PQkpFQ1QodmFsdWUpKTsKK30KKwogc3RhdGljIGdjaGFyKiB3ZWJraXRfYWNjZXNz aWJsZV90ZXh0X2dldF90ZXh0KEF0a1RleHQqIHRleHQsIGdpbnQgc3RhcnRPZmZzZXQsIGdpbnQg ZW5kT2Zmc2V0KTsKIAogc3RhdGljIGNvbnN0IGdjaGFyKiB3ZWJraXRfYWNjZXNzaWJsZV9nZXRf bmFtZShBdGtPYmplY3QqIG9iamVjdCkKQEAgLTIzMDEsNiArMjMwNiw2MyBAQCBzdGF0aWMgdm9p ZCBhdGtfZG9jdW1lbnRfaW50ZXJmYWNlX2luaXQoQXRrRG9jdW1lbnRJZmFjZSogaWZhY2UpCiAg ICAgaWZhY2UtPmdldF9kb2N1bWVudF9sb2NhbGUgPSB3ZWJraXRfYWNjZXNzaWJsZV9kb2N1bWVu dF9nZXRfbG9jYWxlOwogfQogCisKK3N0YXRpYyB2b2lkIHdlYmtpdEFjY2Vzc2libGVWYWx1ZUdl dEN1cnJlbnRWYWx1ZShBdGtWYWx1ZSogdmFsdWUsIEdWYWx1ZSogZ1ZhbHVlKQoreworICAgIG1l bXNldChnVmFsdWUsICAwLCBzaXplb2YoR1ZhbHVlKSk7CisgICAgZ192YWx1ZV9pbml0KGdWYWx1 ZSwgR19UWVBFX0RPVUJMRSk7CisgICAgZ192YWx1ZV9zZXRfZG91YmxlKGdWYWx1ZSwgY29yZSh2 YWx1ZSktPnZhbHVlRm9yUmFuZ2UoKSk7Cit9CisKK3N0YXRpYyB2b2lkIHdlYmtpdEFjY2Vzc2li bGVWYWx1ZUdldE1heGltdW1WYWx1ZShBdGtWYWx1ZSogdmFsdWUsIEdWYWx1ZSogZ1ZhbHVlKQor eworICAgIG1lbXNldChnVmFsdWUsICAwLCBzaXplb2YoR1ZhbHVlKSk7CisgICAgZ192YWx1ZV9p bml0KGdWYWx1ZSwgR19UWVBFX0RPVUJMRSk7CisgICAgZ192YWx1ZV9zZXRfZG91YmxlKGdWYWx1 ZSwgY29yZSh2YWx1ZSktPm1heFZhbHVlRm9yUmFuZ2UoKSk7Cit9CisKK3N0YXRpYyB2b2lkIHdl YmtpdEFjY2Vzc2libGVWYWx1ZUdldE1pbmltdW1WYWx1ZShBdGtWYWx1ZSogdmFsdWUsIEdWYWx1 ZSogZ1ZhbHVlKQoreworICAgIG1lbXNldChnVmFsdWUsICAwLCBzaXplb2YoR1ZhbHVlKSk7Cisg ICAgZ192YWx1ZV9pbml0KGdWYWx1ZSwgR19UWVBFX0RPVUJMRSk7CisgICAgZ192YWx1ZV9zZXRf ZG91YmxlKGdWYWx1ZSwgY29yZSh2YWx1ZSktPm1pblZhbHVlRm9yUmFuZ2UoKSk7Cit9CisKK3N0 YXRpYyBnYm9vbGVhbiB3ZWJraXRBY2Nlc3NpYmxlVmFsdWVTZXRDdXJyZW50VmFsdWUoQXRrVmFs dWUqIHZhbHVlLCBjb25zdCBHVmFsdWUqIGdWYWx1ZSkKK3sKKyAgICBpZiAoIUdfVkFMVUVfSE9M RFNfRE9VQkxFKGdWYWx1ZSkgJiYgIUdfVkFMVUVfSE9MRFNfSU5UKGdWYWx1ZSkpCisgICAgICAg IHJldHVybiBGQUxTRTsKKworICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3QgPSBj b3JlKHZhbHVlKTsKKyAgICBpZiAoIWNvcmVPYmplY3QtPmNhblNldFZhbHVlQXR0cmlidXRlKCkp CisgICAgICAgIHJldHVybiBGQUxTRTsKKworICAgIGlmIChHX1ZBTFVFX0hPTERTX0RPVUJMRShn VmFsdWUpKQorICAgICAgICBjb3JlT2JqZWN0LT5zZXRWYWx1ZShTdHJpbmc6Om51bWJlcihnX3Zh bHVlX2dldF9kb3VibGUoZ1ZhbHVlKSkpOworICAgIGVsc2UKKyAgICAgICAgY29yZU9iamVjdC0+ c2V0VmFsdWUoU3RyaW5nOjpudW1iZXIoZ192YWx1ZV9nZXRfaW50KGdWYWx1ZSkpKTsKKworICAg IHJldHVybiBUUlVFOworfQorCitzdGF0aWMgdm9pZCB3ZWJraXRBY2Nlc3NpYmxlVmFsdWVHZXRN aW5pbXVtSW5jcmVtZW50KEF0a1ZhbHVlKiB2YWx1ZSwgR1ZhbHVlKiBnVmFsdWUpCit7CisgICAg bWVtc2V0KGdWYWx1ZSwgIDAsIHNpemVvZihHVmFsdWUpKTsKKyAgICBnX3ZhbHVlX2luaXQoZ1Zh bHVlLCBHX1RZUEVfRE9VQkxFKTsKKworICAgIC8vIFRoZXJlJ3Mgbm90IHN1Y2ggYSB0aGluZyBp biB0aGUgV0FJLUFSSUEgc3BlY2lmaWNhdGlvbiwgdGh1cyByZXR1cm4gemVyby4KKyAgICBnX3Zh bHVlX3NldF9kb3VibGUoZ1ZhbHVlLCAwLjApOworfQorCitzdGF0aWMgdm9pZCBhdGtWYWx1ZUlu dGVyZmFjZUluaXQoQXRrVmFsdWVJZmFjZSogaWZhY2UpCit7CisgICAgaWZhY2UtPmdldF9jdXJy ZW50X3ZhbHVlID0gd2Via2l0QWNjZXNzaWJsZVZhbHVlR2V0Q3VycmVudFZhbHVlOworICAgIGlm YWNlLT5nZXRfbWF4aW11bV92YWx1ZSA9IHdlYmtpdEFjY2Vzc2libGVWYWx1ZUdldE1heGltdW1W YWx1ZTsKKyAgICBpZmFjZS0+Z2V0X21pbmltdW1fdmFsdWUgPSB3ZWJraXRBY2Nlc3NpYmxlVmFs dWVHZXRNaW5pbXVtVmFsdWU7CisgICAgaWZhY2UtPnNldF9jdXJyZW50X3ZhbHVlID0gd2Via2l0 QWNjZXNzaWJsZVZhbHVlU2V0Q3VycmVudFZhbHVlOworICAgIGlmYWNlLT5nZXRfbWluaW11bV9p bmNyZW1lbnQgPSB3ZWJraXRBY2Nlc3NpYmxlVmFsdWVHZXRNaW5pbXVtSW5jcmVtZW50OworfQor CiBzdGF0aWMgY29uc3QgR0ludGVyZmFjZUluZm8gQXRrSW50ZXJmYWNlc0luaXRGdW5jdGlvbnNb XSA9IHsKICAgICB7KEdJbnRlcmZhY2VJbml0RnVuYylhdGtfYWN0aW9uX2ludGVyZmFjZV9pbml0 LAogICAgICAoR0ludGVyZmFjZUZpbmFsaXplRnVuYykgMCwgMH0sCkBAIC0yMzIxLDYgKzIzODMs OCBAQCBzdGF0aWMgY29uc3QgR0ludGVyZmFjZUluZm8gQXRrSW50ZXJmYWNlc0luaXRGdW5jdGlv bnNbXSA9IHsKICAgICB7KEdJbnRlcmZhY2VJbml0RnVuYylhdGtIeXBlcmxpbmtJbXBsSW50ZXJm YWNlSW5pdCwKICAgICAgKEdJbnRlcmZhY2VGaW5hbGl6ZUZ1bmMpIDAsIDB9LAogICAgIHsoR0lu dGVyZmFjZUluaXRGdW5jKWF0a19kb2N1bWVudF9pbnRlcmZhY2VfaW5pdCwKKyAgICAgKEdJbnRl cmZhY2VGaW5hbGl6ZUZ1bmMpIDAsIDB9LAorICAgIHsoR0ludGVyZmFjZUluaXRGdW5jKWF0a1Zh bHVlSW50ZXJmYWNlSW5pdCwKICAgICAgKEdJbnRlcmZhY2VGaW5hbGl6ZUZ1bmMpIDAsIDB9CiB9 OwogCkBAIC0yMzM0LDcgKzIzOTgsOCBAQCBlbnVtIFdBSVR5cGUgewogICAgIFdBSV9UQUJMRSwK ICAgICBXQUlfSFlQRVJURVhULAogICAgIFdBSV9IWVBFUkxJTkssCi0gICAgV0FJX0RPQ1VNRU5U CisgICAgV0FJX0RPQ1VNRU5ULAorICAgIFdBSV9WQUxVRSwKIH07CiAKIHN0YXRpYyBHVHlwZSBH ZXRBdGtJbnRlcmZhY2VUeXBlRnJvbVdBSVR5cGUoV0FJVHlwZSB0eXBlKQpAQCAtMjM2MCw2ICsy NDI1LDggQEAgc3RhdGljIEdUeXBlIEdldEF0a0ludGVyZmFjZVR5cGVGcm9tV0FJVHlwZShXQUlU eXBlIHR5cGUpCiAgICAgICAgIHJldHVybiBBVEtfVFlQRV9IWVBFUkxJTktfSU1QTDsKICAgICBj YXNlIFdBSV9ET0NVTUVOVDoKICAgICAgICAgcmV0dXJuIEFUS19UWVBFX0RPQ1VNRU5UOworICAg IGNhc2UgV0FJX1ZBTFVFOgorICAgICAgICByZXR1cm4gQVRLX1RZUEVfVkFMVUU7CiAgICAgfQog CiAgICAgcmV0dXJuIEdfVFlQRV9JTlZBTElEOwpAQCAtMjQzMSw2ICsyNDk4LDEwIEBAIHN0YXRp YyBndWludDE2IGdldEludGVyZmFjZU1hc2tGcm9tT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmplY3Qq IGNvcmVPYmplY3QpCiAgICAgaWYgKHJvbGUgPT0gV2ViQXJlYVJvbGUpCiAgICAgICAgIGludGVy ZmFjZU1hc2sgfD0gMSA8PCBXQUlfRE9DVU1FTlQ7CiAKKyAgICAvLyBWYWx1ZQorICAgIGlmIChy b2xlID09IFNsaWRlclJvbGUpCisgICAgICAgIGludGVyZmFjZU1hc2sgfD0gMSA8PCBXQUlfVkFM VUU7CisKICAgICByZXR1cm4gaW50ZXJmYWNlTWFzazsKIH0KIAotLSAKMS43LjQKCg==