56659 2011-03-18 10:43:01 -0700 [GTK] Expose menu items and menus as children of a menu bar 2011-04-12 10:35:53 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 30796 1 mario webkit-unassigned jdiggs mrobinson oldest_to_newest 369719 0 mario 2011-03-18 10:43:01 -0700 In the following example: http://test.cita.illinois.edu/aria/menubar/menubar1.php Theres some WAI-ARIA compliant HTML exposing a menu bar with 4 menu items, where each of them pop out a menu when activated, showing some more menu items in those menus. That is, the typical menubar -> menuitems -> menu (for each menu item) -> menu item (for each menu) layout :-) Problem is that WebKitGTK should be exposing something like this (as for roles): Menubar |---> menu item | `---> menu | |---> menu item | |---> menu item | `---> menu item |---> menu item | `---> menu | |---> menu item | |---> menu item | `---> menu item |---> menu item | `---> menu | |---> menu item | |---> menu item | `---> menu item `---> menu item `---> menu |---> menu item |---> menu item `---> menu item However, what is currently exposing is the following: Menubar |---> panel |---> panel |---> panel `---> panel ...which is obviously wrong, preventing ATs from checking the contents of those menus 383215 1 89015 mario 2011-04-11 09:32:16 -0700 Created attachment 89015 Patch proposal + Layout test Attaching simple patch to fix this along with a cross platform test (needs adding new results for other platforms, say, Mac and Win) 384030 2 89015 cfleizach 2011-04-12 08:50:44 -0700 Comment on attachment 89015 Patch proposal + Layout test View in context: https://bugs.webkit.org/attachment.cgi?id=89015&action=review otherwise looks good. r=me > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:2968 > return MenuItemRole; It looks like we're calling parentObjectUnignored()->ariaRoleAttribute() potentially three times. I think that value should be stored local. parentObjectUnignored() can be little expensive. 384077 3 mario 2011-04-12 09:51:01 -0700 (In reply to comment #2) > (From update of attachment 89015 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=89015&action=review > > otherwise looks good. r=me > > > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:2968 > > return MenuItemRole; > > It looks like we're calling parentObjectUnignored()->ariaRoleAttribute() potentially three times. I think that value should be stored local. parentObjectUnignored() can be little expensive. I'll fix that right before committing. Thanks! 384120 4 mario 2011-04-12 10:35:53 -0700 Committed r83606: <http://trac.webkit.org/changeset/83606> 89015 2011-04-11 09:32:16 -0700 2011-04-12 08:50:43 -0700 Patch proposal + Layout test 0001-2011-04-11-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 8538 mario RnJvbSAzMjVkODE3YjIxOWNkY2ZiZjRhYzNmZTQ2ZDM1MGMxNjVhYTg3MjEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBNb24sIDExIEFwciAyMDExIDE4OjI5OjI5ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMS0wNC0xMSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBFeHBv c2UgbWVudSBpdGVtcyBhbmQgbWVudXMgYXMgY2hpbGRyZW4gb2YgYSBtZW51IGJhcgogICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjY1OQoKICAgICAgICBF bnN1cmUgbWVudSBpdGVtcyBnZXQgZXhwb3NlZCB3aGVuIHRoZXkncmUgY2hpbGRyZW4gb2YgbWVu dSBiYXJzLgoKICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHA6CiAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGVy bWluZUFyaWFSb2xlQXR0cmlidXRlKToKICAgICAgICBDb25zaWRlciBtZW51IGJhcnMgYXMgcG90 ZW50aWFsIHBhcmVudCBvYmplY3RzIGZvciBtZW51IGl0ZW1zLgoKMjAxMS0wNC0xMSAgTWFyaW8g U2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBFeHBvc2UgbWVudSBpdGVtcyBhbmQgbWVu dXMgYXMgY2hpbGRyZW4gb2YgYSBtZW51IGJhcgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01NjY1OQoKICAgICAgICBOZXcgY3Jvc3MtcGxhdGZvcm0gdGVz dC4gU2tpcHBlZCBpbiBwbGF0Zm9ybXMgd2l0aCBubyByZXN1bHRzIHlldC4KCiAgICAgICAgKiBh Y2Nlc3NpYmlsaXR5L2FyaWEtbWVudWJhci1tZW51aXRlbXMuaHRtbDogQWRkZWQuCiAgICAgICAg KiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9hcmlhLW1lbnViYXItbWVudWl0ZW1zLWV4cGVj dGVkLnR4dDogQWRkZWQuCiAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2tpcHBlZDogU2tpcHBlZCB0 aGUgbmV3IHRlc3QuCiAgICAgICAgKiBwbGF0Zm9ybS93aW4vU2tpcHBlZDogRGl0dG8uCi0tLQog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE0 ICsrKysKIC4uLi9hY2Nlc3NpYmlsaXR5L2FyaWEtbWVudWJhci1tZW51aXRlbXMuaHRtbCAgICAg IHwgICA3MiArKysrKysrKysrKysrKysrKysrKwogLi4uL2FyaWEtbWVudWJhci1tZW51aXRlbXMt ZXhwZWN0ZWQudHh0ICAgICAgICAgICAgfCAgIDI0ICsrKysrKysKIExheW91dFRlc3RzL3BsYXRm b3JtL21hYy9Ta2lwcGVkICAgICAgICAgICAgICAgICAgIHwgICAgMSArCiBMYXlvdXRUZXN0cy9w bGF0Zm9ybS93aW4vU2tpcHBlZCAgICAgICAgICAgICAgICAgICB8ICAgIDEgKwogU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEzICsrKysKIC4u Li9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwICAgIHwgICAgMyAr LQogNyBmaWxlcyBjaGFuZ2VkLCAxMjcgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbWVudWJhci1t ZW51aXRlbXMuaHRtbAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9hY2Nlc3NpYmlsaXR5L2FyaWEtbWVudWJhci1tZW51aXRlbXMtZXhwZWN0ZWQudHh0CgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDdmMGZlNTcuLjhmOTcyMmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wNC0xMSAg TWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRXhwb3NlIG1lbnUgaXRl bXMgYW5kIG1lbnVzIGFzIGNoaWxkcmVuIG9mIGEgbWVudSBiYXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NjU5CisKKyAgICAgICAgTmV3IGNyb3Nz LXBsYXRmb3JtIHRlc3QuIFNraXBwZWQgaW4gcGxhdGZvcm1zIHdpdGggbm8gcmVzdWx0cyB5ZXQu CisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbWVudWJhci1tZW51aXRlbXMuaHRtbDog QWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1tZW51YmFy LW1lbnVpdGVtcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9T a2lwcGVkOiBTa2lwcGVkIHRoZSBuZXcgdGVzdC4KKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vU2tp cHBlZDogRGl0dG8uCisKIDIwMTEtMDQtMTEgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGln YWxpYS5jb20+CiAKICAgICAgICAgU2tpcHBlZCBhbm90aGVyIHRlc3QgdGhhdCByZXF1aXJlcyBk dW1wUmVzb3VyY2VSZXNwb25zZU1JTUVUeXBlcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvYXJpYS1tZW51YmFyLW1lbnVpdGVtcy5odG1sIGIvTGF5b3V0VGVzdHMvYWNj ZXNzaWJpbGl0eS9hcmlhLW1lbnViYXItbWVudWl0ZW1zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uN2QxZjkyNwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvYXJpYS1tZW51YmFyLW1lbnVpdGVtcy5odG1sCkBAIC0wLDAgKzEsNzIg QEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1s PgorPGhlYWQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2Zhc3QvanMvcmVzb3Vy Y2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQ+Cit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2Vk ID0gZmFsc2U7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9q cy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0iYm9keSI+CisKKzx1 bCBpZD0ibWVudWJhciIgcm9sZT0ibWVudWJhciIgYXJpYS1vd25zPSJtZW51aXRlbTEgbWVudWl0 ZW0yIj4KKyAgPGxpIGlkPSJtZW51aXRlbTEiIHJvbGU9Im1lbnVpdGVtIiB0YWJpbmRleD0iMCIg YXJpYS1vd25zPSJzdWJtZW51MSI+CisgICAgTWVudSAxCisgICAgPHVsIGlkPSJzdWJtZW51MSIg cm9sZT0ibWVudSI+CisgICAgICA8bGkgaWQ9Im1lbnVpdGVtMTEiIHJvbGU9Im1lbnVpdGVtcmFk aW8iIHRhYmluZGV4PSItMSI+CisgICAgICAgIE1lbnUgaXRlbSAxLjEKKyAgICAgIDwvbGk+Cisg ICAgPC91bD4KKyAgPC9saT4KKyAgPGxpIGlkPSJtZW51aXRlbTIiIHJvbGU9Im1lbnVpdGVtIiB0 YWJpbmRleD0iMCIgYXJpYS1vd25zPSJzdWJtZW51MiI+CisgICAgTWVudSAyCisgICAgPHVsIGlk PSJzdWJtZW51MiIgcm9sZT0ibWVudSI+CisgICAgICA8bGkgaWQ9Im1lbnVpdGVtMjEiIHJvbGU9 Im1lbnVpdGVtcmFkaW8iIHRhYmluZGV4PSItMSI+CisgICAgICAgIE1lbnUgaXRlbSAyLjEKKyAg ICAgIDwvbGk+CisgICAgICA8bGkgaWQ9Im1lbnVpdGVtMjIiIHJvbGU9Im1lbnVpdGVtcmFkaW8i IHRhYmluZGV4PSItMSI+CisgICAgICAgIE1lbnUgaXRlbSAyLjIKKyAgICAgIDwvbGk+CisgICAg PC91bD4KKyAgPC9saT4KKzwvdWw+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBp ZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhh dCBBUklBIG1lbnUgaXRlbXMgYXJlIHByb3Blcmx5IGV4cG9zZWQgYXMgY2hpbGRyZW4gZm9yIG1l bnUgYmFycyIpOworCitpZiAod2luZG93LmxheW91dENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Cit9CisKK2lmICh3aW5kb3cuYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIpIHsKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYm9keSIpLmZvY3Vz KCk7CisgICAgdmFyIHdlYkFyZWEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxl bWVudDsKKworICAgIHZhciBtZW51QmFyID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMCk7CisgICAg ZGVidWcobWVudUJhci5yb2xlKTsKKyAgICBzaG91bGRCZSgibWVudUJhci5jaGlsZHJlbkNvdW50 IiwgIjIiKTsKKworICAgIHZhciBtZW51SXRlbSA9IG1lbnVCYXIuY2hpbGRBdEluZGV4KDApOwor ICAgIGRlYnVnKG1lbnVJdGVtLnJvbGUpOworICAgIHNob3VsZEJlKCJtZW51SXRlbS5jaGlsZHJl bkNvdW50IiwgIjIiKTsKKworICAgIHZhciBtZW51U3ViSXRlbTEgPSBtZW51SXRlbS5jaGlsZEF0 SW5kZXgoMCk7CisgICAgZGVidWcobWVudVN1Ykl0ZW0xLnJvbGUpOworICAgIHNob3VsZEJlKCJt ZW51U3ViSXRlbTEuY2hpbGRyZW5Db3VudCIsICIwIik7CisKKyAgICB2YXIgbWVudVN1Ykl0ZW0y ID0gbWVudUl0ZW0uY2hpbGRBdEluZGV4KDEpOworICAgIGRlYnVnKG1lbnVTdWJJdGVtMi5yb2xl KTsKKyAgICBzaG91bGRCZSgibWVudVN1Ykl0ZW0yLmNoaWxkcmVuQ291bnQiLCAiMSIpOworCisg ICAgdmFyIHN1Yk1lbnVTdWJJdGVtID0gbWVudVN1Ykl0ZW0yLmNoaWxkQXRJbmRleCgwKTsKKyAg ICBkZWJ1ZyhzdWJNZW51U3ViSXRlbS5yb2xlKTsKKyAgICBzaG91bGRCZSgic3ViTWVudVN1Ykl0 ZW0uY2hpbGRyZW5Db3VudCIsICIwIik7Cit9CisKK3N1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7 Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBv c3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1tZW51YmFyLW1lbnVpdGVtcy1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9hcmlhLW1l bnViYXItbWVudWl0ZW1zLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi43OTkwYzgxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1tZW51YmFyLW1lbnVpdGVtcy1leHBlY3RlZC50eHQKQEAg LTAsMCArMSwyNCBAQAorTWVudSAxCitNZW51IGl0ZW0gMS4xCitNZW51IDIKK01lbnUgaXRlbSAy LjEKK01lbnUgaXRlbSAyLjIKK1RoaXMgdGVzdHMgdGhhdCBBUklBIG1lbnUgaXRlbXMgYXJlIHBy b3Blcmx5IGV4cG9zZWQgYXMgY2hpbGRyZW4gZm9yIG1lbnUgYmFycworCitPbiBzdWNjZXNzLCB5 b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVT VCBDT01QTEVURSIuCisKKworQVhSb2xlOiBtZW51IGJhcgorUEFTUyBtZW51QmFyLmNoaWxkcmVu Q291bnQgaXMgMgorQVhSb2xlOiBtZW51IGl0ZW0KK1BBU1MgbWVudUl0ZW0uY2hpbGRyZW5Db3Vu dCBpcyAyCitBWFJvbGU6IHBhbmVsCitQQVNTIG1lbnVTdWJJdGVtMS5jaGlsZHJlbkNvdW50IGlz IDAKK0FYUm9sZTogbWVudQorUEFTUyBtZW51U3ViSXRlbTIuY2hpbGRyZW5Db3VudCBpcyAxCitB WFJvbGU6IG1lbnUgaXRlbQorUEFTUyBzdWJNZW51U3ViSXRlbS5jaGlsZHJlbkNvdW50IGlzIDAK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZCBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9Ta2lwcGVkCmluZGV4IDliOGY2NzUuLmJhNzEwYzQgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYy9Ta2lwcGVkCkBAIC02OCw2ICs2OCw3IEBAIG1lZGlhL3ZpZGVvLWVtcHR5LXNvdXJjZS5o dG1sCiAKICMgQWNjZXNzaWJpbGl0eSB0ZXN0cyB3aXRob3V0IHJlc3VsdHMKIGFjY2Vzc2liaWxp dHkvZG9jdW1lbnQtYXR0cmlidXRlcy5odG1sCithY2Nlc3NpYmlsaXR5L2FyaWEtbWVudWJhci1t ZW51aXRlbXMuaHRtbAogCiAjIEFjY2Vzc2liaWxpdHkgdGVzdHMgd2l0aCBtaXNzaW5nIEFjY2Vz c2liaWxpdHlDb250cm9sbGVyIGZ1bmN0aW9uYWxpdHkuCiBhY2Nlc3NpYmlsaXR5L3NlbGVjdGlv bi1zdGF0ZXMuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBw ZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAppbmRleCA4YmYyYjcxLi41ZDEx MjNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAorKysgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZApAQCAtNTA4LDYgKzUwOCw3IEBAIGFjY2Vz c2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW9uLWlucHV0Lmh0bWwKIGFjY2Vzc2liaWxpdHkvYXJp YS1sYWJlbGxlZGJ5LXN0YXktd2l0aGluLmh0bWwKIGFjY2Vzc2liaWxpdHkvYXJpYS1saW5rLXN1 cHBvcnRzLXByZXNzLmh0bWwKIGFjY2Vzc2liaWxpdHkvYXJpYS1saXN0LWFuZC1saXN0aXRlbS5o dG1sCithY2Nlc3NpYmlsaXR5L2FyaWEtbWVudWJhci1tZW51aXRlbXMuaHRtbAogYWNjZXNzaWJp bGl0eS9hcmlhLXByZXNlbnRhdGlvbmFsLXJvbGUuaHRtbAogYWNjZXNzaWJpbGl0eS9hcmlhLXJl YWRvbmx5Lmh0bWwKIGFjY2Vzc2liaWxpdHkvYXJpYS1yb2xlcy5odG1sCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTJmY2E1Yy4uMWZlY2E4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTA0LTEx ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBFeHBvc2UgbWVudSBp dGVtcyBhbmQgbWVudXMgYXMgY2hpbGRyZW4gb2YgYSBtZW51IGJhcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY2NTkKKworICAgICAgICBFbnN1cmUg bWVudSBpdGVtcyBnZXQgZXhwb3NlZCB3aGVuIHRoZXkncmUgY2hpbGRyZW4gb2YgbWVudSBiYXJz LgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGVybWlu ZUFyaWFSb2xlQXR0cmlidXRlKToKKyAgICAgICAgQ29uc2lkZXIgbWVudSBiYXJzIGFzIHBvdGVu dGlhbCBwYXJlbnQgb2JqZWN0cyBmb3IgbWVudSBpdGVtcy4KKwogMjAxMS0wNC0xMCAgQ2hhbmdT ZW9rIE9oICA8c2hpdmFtaWRvd0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJp YyBTZWlkZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCBjMzc5NDJmLi4wYmVkZTM5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5jcHAKQEAgLTI5NjMsNyArMjk2Myw4IEBAIEFjY2Vzc2liaWxpdHlSb2xl IEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGVybWluZUFyaWFSb2xlQXR0cmlidXRlKCkg Y29uc3QKICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoYXJpYVJvbGUsICJtZW51aXRlbSIpKSB7 CiAgICAgICAgIGlmIChwYXJlbnRPYmplY3RVbmlnbm9yZWQoKS0+YXJpYVJvbGVBdHRyaWJ1dGUo KSA9PSBHcm91cFJvbGUpCiAgICAgICAgICAgICByZXR1cm4gTWVudUJ1dHRvblJvbGU7Ci0gICAg ICAgIGlmIChwYXJlbnRPYmplY3RVbmlnbm9yZWQoKS0+YXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBN ZW51Um9sZSkKKyAgICAgICAgaWYgKHBhcmVudE9iamVjdFVuaWdub3JlZCgpLT5hcmlhUm9sZUF0 dHJpYnV0ZSgpID09IE1lbnVSb2xlCisgICAgICAgICAgICB8fCBwYXJlbnRPYmplY3RVbmlnbm9y ZWQoKS0+YXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBNZW51QmFyUm9sZSkKICAgICAgICAgICAgIHJl dHVybiBNZW51SXRlbVJvbGU7CiAgICAgfQogICAgIAotLSAKMS43LjQuMgoK