31516 2009-11-14 20:17:28 -0800 Need to implement ARIA role="directory" 2009-11-15 18:06:25 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach bdakin oldest_to_newest 163700 0 cfleizach 2009-11-14 20:17:28 -0800 The ARIA spec defines the directory role as "A list of references to members of a single group." 163702 1 43238 cfleizach 2009-11-14 20:30:40 -0800 Created attachment 43238 patch 163703 2 43238 cfleizach 2009-11-14 20:31:27 -0800 Comment on attachment 43238 patch some reason there was an xcodeproj change 163704 3 43239 cfleizach 2009-11-14 20:38:04 -0800 Created attachment 43239 patch 163812 4 43239 darin 2009-11-15 17:04:04 -0800 Comment on attachment 43239 patch > + * accessibility/AccessibilityObject.h: > + (WebCore::): > + * accessibility/mac/AccessibilityObjectWrapper.mm: > + (RoleEntry::): These change log entries are wrong. If the script makes a bad entry like this you should just delete it before posting the patch. I should fix prepare-ChangeLog so it never does that. A function name can never just end in "::" so I can work around the bug pretty easily. > TabPanelRole, > TreeRole, > TreeItemRole, > + DirectoryRole, Can we keep these in alphabetical order? > - return UI_STRING("tab panel", "An ARIA accessibility group that contenst the content of a tab."); > + return UI_STRING("tab panel", "An ARIA accessibility group that contains the content of a tab."); You need to regenerate the strings file after making a change like this one. 163823 5 cfleizach 2009-11-15 17:51:48 -0800 > > TabPanelRole, > > TreeRole, > > TreeItemRole, > > + DirectoryRole, > > Can we keep these in alphabetical order? > Re-ordering those items will be a rather big change. i filed https://bugs.webkit.org/show_bug.cgi?id=31524 to take care of that 163825 6 cfleizach 2009-11-15 18:06:25 -0800 http://trac.webkit.org/changeset/51007 43238 2009-11-14 20:30:40 -0800 2009-11-14 20:31:27 -0800 patch patch.txt text/plain 10496 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDk5OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDktMTEtMTQgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBOZWVkIHRvIGltcGxlbWVudCBBUklBIHJvbGU9ImRpcmVjdG9yeSIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNTE2CisKKyAgICAgICAgVGVzdDog cGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1kaXJlY3RvcnkuaHRtbAorCisgICAgICAg ICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIGFjY2Vzc2li aWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hl OjpnZXRPckNyZWF0ZSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TGlz dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5TGlzdDo6aXNPcmRlcmVkTGlz dCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisgICAg ICAgIChXZWJDb3JlOjopOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVBUklBUm9sZU1hcCk6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW06 CisgICAgICAgIChSb2xlRW50cnk6Oik6CisKIDIwMDktMTEtMTQgIEFkZWxlIFBldGVyc29uICA8 YWRlbGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCklu ZGV4OiBXZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24g NTA5OTMpCisrKyBXZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29y a2luZyBjb3B5KQpAQCAtNjUyMSw4ICs2NTIxLDggQEAKIAkJNzY5M0JBQ0YxMDZDMkRDQTAwN0Iw ODIzIC8qIFBsdWdpbkhhbHRlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBQbHVnaW5IYWx0ZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Njkz QkFEMDEwNkMyRENBMDA3QjA4MjMgLyogUGx1Z2luSGFsdGVyLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IFBsdWdpbkhhbHRlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQk3NjkzQkFEMTEwNkMyRENBMDA3QjA4MjMgLyogUGx1Z2luSGFsdGVyQ2xpZW50LmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdpbkhhbHRlckNsaWVudC5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk3OUFDOTIxNjEwOTk0NUM4MDAyMTI2NkUgLyogSlND b21wb3NpdGlvbkV2ZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9 IEpTQ29tcG9zaXRpb25FdmVudC5jcHA7IHBhdGggPSBKU0NvbXBvc2l0aW9uRXZlbnQuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk3OUFDOTIxNzEwOTk0NUM4MDAyMTI2NkUgLyog SlNDb21wb3NpdGlvbkV2ZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IEpT Q29tcG9zaXRpb25FdmVudC5oOyBwYXRoID0gSlNDb21wb3NpdGlvbkV2ZW50Lmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCTc5QUM5MjE2MTA5OTQ1QzgwMDIxMjY2RSAvKiBKU0NvbXBv c2l0aW9uRXZlbnQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlND b21wb3NpdGlvbkV2ZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNzlBQzky MTcxMDk5NDVDODAwMjEyNjZFIC8qIEpTQ29tcG9zaXRpb25FdmVudC5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jLmg7IHBhdGggPSBKU0NvbXBvc2l0aW9uRXZlbnQuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJNzlGMkY1OUUxMDkxOTM5QTAwMEQ4N0NCIC8qIENvbXBvc2l0aW9uRXZl bnQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQ29tcG9zaXRpb25F dmVudC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTc5RjJGNTlGMTA5MTkzOUEw MDBEODdDQiAvKiBDb21wb3NpdGlvbkV2ZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IENvbXBvc2l0aW9uRXZlbnQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ NzlGMkY1QTAxMDkxOTM5QTAwMEQ4N0NCIC8qIENvbXBvc2l0aW9uRXZlbnQuaWRsICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gdGV4dDsgcGF0aCA9IENvbXBvc2l0aW9uRXZlbnQuaWRsOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAkocmV2 aXNpb24gNTA5OTMpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE0Myw3ICsxNDMsNyBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBB WE9iamVjdENhY2hlOjpnZXRPCiAgICAgICAgICAgICBuZXdPYmogPSBBY2Nlc3NpYmlsaXR5TGlz dEJveDo6Y3JlYXRlKHJlbmRlcmVyKTsKIAogICAgICAgICAvLyBJZiB0aGUgbm9kZSBpcyBhcmlh IHJvbGU9Imxpc3QiIG9yIHRoZSBhcmlhIHJvbGUgaXMgZW1wdHkgYW5kIGl0cyBhIHVsL29sL2Rs IHR5cGUgKGl0IHNob3VsZG4ndCBiZSBhIGxpc3QgaWYgYXJpYSBzYXlzIG90aGVyd2lzZSkuIAot ICAgICAgICBlbHNlIGlmIChub2RlICYmIChub2RlSXNBcmlhVHlwZShub2RlLCAibGlzdCIpIAor ICAgICAgICBlbHNlIGlmIChub2RlICYmICgobm9kZUlzQXJpYVR5cGUobm9kZSwgImxpc3QiKSB8 fCBub2RlSXNBcmlhVHlwZShub2RlLCAiZGlyZWN0b3J5IikpCiAgICAgICAgICAgICAgICAgICAg ICAgICAgIHx8IChub2RlSXNBcmlhVHlwZShub2RlLCBudWxsQXRvbSkgJiYgKG5vZGUtPmhhc1Rh Z05hbWUodWxUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUob2xUYWcpIHx8IG5vZGUtPmhhc1RhZ05h bWUoZGxUYWcpKSkpKQogICAgICAgICAgICAgbmV3T2JqID0gQWNjZXNzaWJpbGl0eUxpc3Q6OmNy ZWF0ZShyZW5kZXJlcik7CiAgICAgICAgIApJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlMaXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eUxpc3QuY3BwCShyZXZpc2lvbiA1MDk5MykKKysrIFdlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5TGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3LDcgKzg3 LDExIEBAIGJvb2wgQWNjZXNzaWJpbGl0eUxpc3Q6OmlzT3JkZXJlZExpc3QoKSAKIHsKICAgICBp ZiAoIW1fcmVuZGVyZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKKworICAgIC8vIEFS SUEgc2F5cyBhIGRpcmVjdG9yeSBpcyBsaWtlIGEgc3RhdGljIHRhYmxlIG9mIGNvbnRlbnRzLCB3 aGljaCBzb3VuZHMgbGlrZSBhbiBvcmRlcmVkIGxpc3QuCisgICAgaWYgKGFyaWFSb2xlQXR0cmli dXRlKCkgPT0gRGlyZWN0b3J5Um9sZSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBOb2Rl KiBub2RlID0gbV9yZW5kZXJlci0+bm9kZSgpOwogICAgIHJldHVybiBub2RlICYmIG5vZGUtPmhh c1RhZ05hbWUob2xUYWcpOyAgICAKIH0KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlPYmplY3QuaAkocmV2aXNpb24gNTA5OTMpCisrKyBXZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsNiArMTY2 LDcgQEAgZW51bSBBY2Nlc3NpYmlsaXR5Um9sZSB7CiAgICAgVGFiUGFuZWxSb2xlLAogICAgIFRy ZWVSb2xlLAogICAgIFRyZWVJdGVtUm9sZSwKKyAgICBEaXJlY3RvcnlSb2xlLAogICAgIAogICAg IC8vIEFSSUEgR3JvdXBpbmcgcm9sZXMKICAgICBMYW5kbWFya0FwcGxpY2F0aW9uUm9sZSwKSW5k ZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdC5jcHAJKHJldmlzaW9uIDUwOTk0KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDQzLDYgKzI0NDMs NyBAQCBzdGF0aWMgY29uc3QgQVJJQVJvbGVNYXAmIGNyZWF0ZUFSSUFSb2xlCiAgICAgICAgIHsg ImNvbXBsZW1lbnRhcnkiLCBMYW5kbWFya0NvbXBsZW1lbnRhcnlSb2xlIH0sCiAgICAgICAgIHsg ImNvbnRlbnRpbmZvIiwgTGFuZG1hcmtDb250ZW50SW5mb1JvbGUgfSwKICAgICAgICAgeyAiZGlh bG9nIiwgQXBwbGljYXRpb25EaWFsb2dSb2xlIH0sCisgICAgICAgIHsgImRpcmVjdG9yeSIsIERp cmVjdG9yeVJvbGUgfSwKICAgICAgICAgeyAiZ3JpZCIsIFRhYmxlUm9sZSB9LAogICAgICAgICB7 ICJncmlkY2VsbCIsIENlbGxSb2xlIH0sCiAgICAgICAgIHsgImNvbHVtbmhlYWRlciIsIENvbHVt bkhlYWRlclJvbGUgfSwKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkocmV2aXNpb24gNTA5OTMpCisrKyBX ZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC05ODEsNiArOTgxLDcgQEAgc3RhdGljIGNvbnN0IEFjY2Vzc2liaWxp dHlSb2xlTWFwJiBjcmVhdAogICAgICAgICB7IEdyb3VwUm9sZSwgTlNBY2Nlc3NpYmlsaXR5R3Jv dXBSb2xlIH0sCiAgICAgICAgIHsgUmFkaW9Hcm91cFJvbGUsIE5TQWNjZXNzaWJpbGl0eVJhZGlv R3JvdXBSb2xlIH0sCiAgICAgICAgIHsgTGlzdFJvbGUsIE5TQWNjZXNzaWJpbGl0eUxpc3RSb2xl IH0sCisgICAgICAgIHsgRGlyZWN0b3J5Um9sZSwgTlNBY2Nlc3NpYmlsaXR5TGlzdFJvbGUgfSwK ICAgICAgICAgeyBTY3JvbGxCYXJSb2xlLCBOU0FjY2Vzc2liaWxpdHlTY3JvbGxCYXJSb2xlIH0s CiAgICAgICAgIHsgVmFsdWVJbmRpY2F0b3JSb2xlLCBOU0FjY2Vzc2liaWxpdHlWYWx1ZUluZGlj YXRvclJvbGUgfSwKICAgICAgICAgeyBJbWFnZVJvbGUsIE5TQWNjZXNzaWJpbGl0eUltYWdlUm9s ZSB9LApJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwOTk4KQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0xMS0xNCAgQ2hyaXMgRmxlaXphY2gg IDxjZmxlaXphY2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5lZWQgdG8gaW1wbGVtZW50IEFSSUEgcm9sZT0iZGlyZWN0b3J5Igor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE1MTYKKwor ICAgICAgICBGaXggYSBzcGVsbGluZyBlcnJvciBpbiB0aGUgY29tbWVudCBvZiBhIGxvY2FsaXpl ZCAoYWNjZXNzaWJpbGl0eSkgc3RyaW5nLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2Vi Vmlld0ZhY3RvcnkubW06CisgICAgICAgICgtW1dlYlZpZXdGYWN0b3J5IEFYQVJJQUNvbnRlbnRH cm91cFRleHQ6XSk6CisKIDIwMDktMTEtMTQgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBXZWJL aXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlZpZXdGYWN0b3J5Lm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViVmlld0ZhY3RvcnkubW0JKHJldmlzaW9uIDUwOTkz KQorKysgV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJWaWV3RmFjdG9yeS5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNTk0LDcgKzU5NCw3IEBACiAgICAgaWYgKFthcmlhVHlwZSBpc0VxdWFsVG9T dHJpbmc6QCJBUklBVXNlckludGVyZmFjZVRvb2x0aXAiXSkKICAgICAgICAgcmV0dXJuIFVJX1NU UklORygidG9vbHRpcCIsICJBbiBBUklBIGFjY2Vzc2liaWxpdHkgZ3JvdXAgdGhhdCBhY3RzIGFz IGEgdG9vbHRpcC4iKTsgICAgCiAgICAgaWYgKFthcmlhVHlwZSBpc0VxdWFsVG9TdHJpbmc6QCJB UklBVGFiUGFuZWwiXSkKLSAgICAgICAgcmV0dXJuIFVJX1NUUklORygidGFiIHBhbmVsIiwgIkFu IEFSSUEgYWNjZXNzaWJpbGl0eSBncm91cCB0aGF0IGNvbnRlbnN0IHRoZSBjb250ZW50IG9mIGEg dGFiLiIpOworICAgICAgICByZXR1cm4gVUlfU1RSSU5HKCJ0YWIgcGFuZWwiLCAiQW4gQVJJQSBh Y2Nlc3NpYmlsaXR5IGdyb3VwIHRoYXQgY29udGFpbnMgdGhlIGNvbnRlbnQgb2YgYSB0YWIuIik7 CiAgICAgcmV0dXJuIG5pbDsKIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNTA5OTgpCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0x MS0xNCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5lZWQgdG8gaW1wbGVtZW50IEFS SUEgcm9sZT0iZGlyZWN0b3J5IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzE1MTYKKworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5 L2FyaWEtZGlyZWN0b3J5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0v bWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1kaXJlY3RvcnkuaHRtbDogQWRkZWQuCisKIDIwMDktMTEt MTQgIEFkZWxlIFBldGVyc29uICA8YWRlbGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNz aWJpbGl0eS9hcmlhLWRpcmVjdG9yeS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1kaXJlY3RvcnktZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxp dHkvYXJpYS1kaXJlY3RvcnktZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE0 IEBACitJdGVtIDEKK0l0ZW0gMgorSXRlbSAzCitUaGlzIHRlc3RzIHRoYXQgQVJJQSBkaXJlY3Rv cnkgaXMgZXhwb3NlZCBjb3JyZWN0bHkuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNl cmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKwor CitQQVNTIGRpci5yb2xlIGlzICdBWFJvbGU6IEFYTGlzdCcKK1BBU1MgZGlyLnN1YnJvbGUgaXMg J0FYU3Vicm9sZTogQVhDb250ZW50TGlzdCcKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNj ZXNzaWJpbGl0eS9hcmlhLWRpcmVjdG9yeS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtZGlyZWN0b3J5Lmh0bWwJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWRpcmVj dG9yeS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM5IEBACis8IURPQ1RZUEUgSFRNTCBQ VUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVs PSJzdHlsZXNoZWV0IiBocmVmPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0 eWxlLmNzcyI+Cis8c2NyaXB0PgordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOworPC9z Y3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1w cmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorCis8ZGl2IHRhYmlu ZGV4PTAgaWQ9ImRpcmVjdG9yeSIgcm9sZT0iZGlyZWN0b3J5Ij4KKzxkaXY+SXRlbSAxPC9kaXY+ Cis8ZGl2Pkl0ZW0gMjwvZGl2PgorPGRpdj5JdGVtIDM8L2Rpdj4KKzwvZGl2PgorCis8cCBpZD0i ZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0Pgor CisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCBBUklBIGRpcmVjdG9yeSBpcyBleHBv c2VkIGNvcnJlY3RseS4iKTsKKworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIpIHsKKworICAgICAgICAgIHZhciBkaXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZGly ZWN0b3J5Iik7CisgICAgICAgICAgZGlyLmZvY3VzKCk7CisgICAgICAgICAgZGlyID0gYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7CisgICAgICAgICAgc2hvdWxkQmUoImRp ci5yb2xlIiwgIidBWFJvbGU6IEFYTGlzdCciKTsKKyAgICAgICAgICBzaG91bGRCZSgiZGlyLnN1 YnJvbGUiLCAiJ0FYU3Vicm9sZTogQVhDb250ZW50TGlzdCciKTsKKyAgICB9CisKKyAgICBzdWNj ZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi8uLi8u Li9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5Pgor PC9odG1sPgo= 43239 2009-11-14 20:38:04 -0800 2009-11-15 17:04:03 -0800 patch patch.txt text/plain 8217 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDk5OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMTEtMTQgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBOZWVkIHRvIGltcGxlbWVudCBBUklBIHJvbGU9ImRpcmVjdG9yeSIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNTE2CisKKyAgICAgICAgVGVzdDog cGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1kaXJlY3RvcnkuaHRtbAorCisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFY T2JqZWN0Q2FjaGU6OmdldE9yQ3JlYXRlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlMaXN0Ojpp c09yZGVyZWRMaXN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmpl Y3QuaDoKKyAgICAgICAgKFdlYkNvcmU6Oik6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUFSSUFS b2xlTWFwKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlci5tbToKKyAgICAgICAgKFJvbGVFbnRyeTo6KToKKwogMjAwOS0xMS0xNCAgQWRlbGUg UGV0ZXJzb24gIDxhZGVsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJl cm5zdGVpbi4KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAJKHJl dmlzaW9uIDUwOTk4KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xNDMsNyArMTQzLDcgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCog QVhPYmplY3RDYWNoZTo6Z2V0TwogICAgICAgICAgICAgbmV3T2JqID0gQWNjZXNzaWJpbGl0eUxp c3RCb3g6OmNyZWF0ZShyZW5kZXJlcik7CiAKICAgICAgICAgLy8gSWYgdGhlIG5vZGUgaXMgYXJp YSByb2xlPSJsaXN0IiBvciB0aGUgYXJpYSByb2xlIGlzIGVtcHR5IGFuZCBpdHMgYSB1bC9vbC9k bCB0eXBlIChpdCBzaG91bGRuJ3QgYmUgYSBsaXN0IGlmIGFyaWEgc2F5cyBvdGhlcndpc2UpLiAK LSAgICAgICAgZWxzZSBpZiAobm9kZSAmJiAobm9kZUlzQXJpYVR5cGUobm9kZSwgImxpc3QiKSAK KyAgICAgICAgZWxzZSBpZiAobm9kZSAmJiAoKG5vZGVJc0FyaWFUeXBlKG5vZGUsICJsaXN0Iikg fHwgbm9kZUlzQXJpYVR5cGUobm9kZSwgImRpcmVjdG9yeSIpKQogICAgICAgICAgICAgICAgICAg ICAgICAgICB8fCAobm9kZUlzQXJpYVR5cGUobm9kZSwgbnVsbEF0b20pICYmIChub2RlLT5oYXNU YWdOYW1lKHVsVGFnKSB8fCBub2RlLT5oYXNUYWdOYW1lKG9sVGFnKSB8fCBub2RlLT5oYXNUYWdO YW1lKGRsVGFnKSkpKSkKICAgICAgICAgICAgIG5ld09iaiA9IEFjY2Vzc2liaWxpdHlMaXN0Ojpj cmVhdGUocmVuZGVyZXIpOwogICAgICAgICAKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5TGlzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlMaXN0LmNwcAkocmV2aXNpb24gNTA5OTgpCisrKyBXZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Nyw3ICs4 NywxMSBAQCBib29sIEFjY2Vzc2liaWxpdHlMaXN0Ojppc09yZGVyZWRMaXN0KCkgCiB7CiAgICAg aWYgKCFtX3JlbmRlcmVyKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCisKKyAgICAvLyBB UklBIHNheXMgYSBkaXJlY3RvcnkgaXMgbGlrZSBhIHN0YXRpYyB0YWJsZSBvZiBjb250ZW50cywg d2hpY2ggc291bmRzIGxpa2UgYW4gb3JkZXJlZCBsaXN0LgorICAgIGlmIChhcmlhUm9sZUF0dHJp YnV0ZSgpID09IERpcmVjdG9yeVJvbGUpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgTm9k ZSogbm9kZSA9IG1fcmVuZGVyZXItPm5vZGUoKTsKICAgICByZXR1cm4gbm9kZSAmJiBub2RlLT5o YXNUYWdOYW1lKG9sVGFnKTsgICAgCiB9CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0LmgJKHJldmlzaW9uIDUwOTk4KQorKysgV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMTY2LDYgKzE2 Niw3IEBAIGVudW0gQWNjZXNzaWJpbGl0eVJvbGUgewogICAgIFRhYlBhbmVsUm9sZSwKICAgICBU cmVlUm9sZSwKICAgICBUcmVlSXRlbVJvbGUsCisgICAgRGlyZWN0b3J5Um9sZSwKICAgICAKICAg ICAvLyBBUklBIEdyb3VwaW5nIHJvbGVzCiAgICAgTGFuZG1hcmtBcHBsaWNhdGlvblJvbGUsCklu ZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwCShyZXZpc2lvbiA1MDk5OCkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ0Myw2ICsyNDQz LDcgQEAgc3RhdGljIGNvbnN0IEFSSUFSb2xlTWFwJiBjcmVhdGVBUklBUm9sZQogICAgICAgICB7 ICJjb21wbGVtZW50YXJ5IiwgTGFuZG1hcmtDb21wbGVtZW50YXJ5Um9sZSB9LAogICAgICAgICB7 ICJjb250ZW50aW5mbyIsIExhbmRtYXJrQ29udGVudEluZm9Sb2xlIH0sCiAgICAgICAgIHsgImRp YWxvZyIsIEFwcGxpY2F0aW9uRGlhbG9nUm9sZSB9LAorICAgICAgICB7ICJkaXJlY3RvcnkiLCBE aXJlY3RvcnlSb2xlIH0sCiAgICAgICAgIHsgImdyaWQiLCBUYWJsZVJvbGUgfSwKICAgICAgICAg eyAiZ3JpZGNlbGwiLCBDZWxsUm9sZSB9LAogICAgICAgICB7ICJjb2x1bW5oZWFkZXIiLCBDb2x1 bW5IZWFkZXJSb2xlIH0sCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0 eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0JKHJldmlzaW9uIDUwOTk4KQorKysg V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQko d29ya2luZyBjb3B5KQpAQCAtOTgxLDYgKzk4MSw3IEBAIHN0YXRpYyBjb25zdCBBY2Nlc3NpYmls aXR5Um9sZU1hcCYgY3JlYXQKICAgICAgICAgeyBHcm91cFJvbGUsIE5TQWNjZXNzaWJpbGl0eUdy b3VwUm9sZSB9LAogICAgICAgICB7IFJhZGlvR3JvdXBSb2xlLCBOU0FjY2Vzc2liaWxpdHlSYWRp b0dyb3VwUm9sZSB9LAogICAgICAgICB7IExpc3RSb2xlLCBOU0FjY2Vzc2liaWxpdHlMaXN0Um9s ZSB9LAorICAgICAgICB7IERpcmVjdG9yeVJvbGUsIE5TQWNjZXNzaWJpbGl0eUxpc3RSb2xlIH0s CiAgICAgICAgIHsgU2Nyb2xsQmFyUm9sZSwgTlNBY2Nlc3NpYmlsaXR5U2Nyb2xsQmFyUm9sZSB9 LAogICAgICAgICB7IFZhbHVlSW5kaWNhdG9yUm9sZSwgTlNBY2Nlc3NpYmlsaXR5VmFsdWVJbmRp Y2F0b3JSb2xlIH0sCiAgICAgICAgIHsgSW1hZ2VSb2xlLCBOU0FjY2Vzc2liaWxpdHlJbWFnZVJv bGUgfSwKSW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9t YWMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MDk5OCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTEtMTQgIENocmlzIEZsZWl6YWNo ICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBOZWVkIHRvIGltcGxlbWVudCBBUklBIHJvbGU9ImRpcmVjdG9yeSIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNTE2CisK KyAgICAgICAgRml4IGEgc3BlbGxpbmcgZXJyb3IgaW4gdGhlIGNvbW1lbnQgb2YgYSBsb2NhbGl6 ZWQgKGFjY2Vzc2liaWxpdHkpIHN0cmluZy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dl YlZpZXdGYWN0b3J5Lm1tOgorICAgICAgICAoLVtXZWJWaWV3RmFjdG9yeSBBWEFSSUFDb250ZW50 R3JvdXBUZXh0Ol0pOgorCiAyMDA5LTExLTE0ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25A YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJWaWV3RmFjdG9yeS5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlZpZXdGYWN0b3J5Lm1tCShyZXZpc2lvbiA1MDk5 OCkKKysrIFdlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViVmlld0ZhY3RvcnkubW0JKHdvcmtp bmcgY29weSkKQEAgLTU5NCw3ICs1OTQsNyBAQAogICAgIGlmIChbYXJpYVR5cGUgaXNFcXVhbFRv U3RyaW5nOkAiQVJJQVVzZXJJbnRlcmZhY2VUb29sdGlwIl0pCiAgICAgICAgIHJldHVybiBVSV9T VFJJTkcoInRvb2x0aXAiLCAiQW4gQVJJQSBhY2Nlc3NpYmlsaXR5IGdyb3VwIHRoYXQgYWN0cyBh cyBhIHRvb2x0aXAuIik7ICAgIAogICAgIGlmIChbYXJpYVR5cGUgaXNFcXVhbFRvU3RyaW5nOkAi QVJJQVRhYlBhbmVsIl0pCi0gICAgICAgIHJldHVybiBVSV9TVFJJTkcoInRhYiBwYW5lbCIsICJB biBBUklBIGFjY2Vzc2liaWxpdHkgZ3JvdXAgdGhhdCBjb250ZW5zdCB0aGUgY29udGVudCBvZiBh IHRhYi4iKTsKKyAgICAgICAgcmV0dXJuIFVJX1NUUklORygidGFiIHBhbmVsIiwgIkFuIEFSSUEg YWNjZXNzaWJpbGl0eSBncm91cCB0aGF0IGNvbnRhaW5zIHRoZSBjb250ZW50IG9mIGEgdGFiLiIp OwogICAgIHJldHVybiBuaWw7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwOTk4KQorKysgTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDkt MTEtMTQgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIHRvIGltcGxlbWVudCBB UklBIHJvbGU9ImRpcmVjdG9yeSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMxNTE2CisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0 eS9hcmlhLWRpcmVjdG9yeS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3Jt L21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtZGlyZWN0b3J5Lmh0bWw6IEFkZGVkLgorCiAyMDA5LTEx LTE0ICBBZGVsZSBQZXRlcnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vz c2liaWxpdHkvYXJpYS1kaXJlY3RvcnktZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtZGlyZWN0b3J5LWV4cGVjdGVk LnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmls aXR5L2FyaWEtZGlyZWN0b3J5LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwx NCBAQAorSXRlbSAxCitJdGVtIDIKK0l0ZW0gMworVGhpcyB0ZXN0cyB0aGF0IEFSSUEgZGlyZWN0 b3J5IGlzIGV4cG9zZWQgY29ycmVjdGx5LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBz ZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisK KworUEFTUyBkaXIucm9sZSBpcyAnQVhSb2xlOiBBWExpc3QnCitQQVNTIGRpci5zdWJyb2xlIGlz ICdBWFN1YnJvbGU6IEFYQ29udGVudExpc3QnCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Fj Y2Vzc2liaWxpdHkvYXJpYS1kaXJlY3RvcnkuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWRpcmVjdG9yeS5odG1sCShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1kaXJl Y3RvcnkuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzOSBAQAorPCFET0NUWVBFIEhUTUwg UFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJl bD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1z dHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsKKzwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qt cHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5Ij4KKworPGRpdiB0YWJp bmRleD0wIGlkPSJkaXJlY3RvcnkiIHJvbGU9ImRpcmVjdG9yeSI+Cis8ZGl2Pkl0ZW0gMTwvZGl2 PgorPGRpdj5JdGVtIDI8L2Rpdj4KKzxkaXY+SXRlbSAzPC9kaXY+Cis8L2Rpdj4KKworPHAgaWQ9 ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKworPHNjcmlwdD4K KworICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3RzIHRoYXQgQVJJQSBkaXJlY3RvcnkgaXMgZXhw b3NlZCBjb3JyZWN0bHkuIik7CisKKyAgICBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9s bGVyKSB7CisKKyAgICAgICAgICB2YXIgZGlyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImRp cmVjdG9yeSIpOworICAgICAgICAgIGRpci5mb2N1cygpOworICAgICAgICAgIGRpciA9IGFjY2Vz c2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OworICAgICAgICAgIHNob3VsZEJlKCJk aXIucm9sZSIsICInQVhSb2xlOiBBWExpc3QnIik7CisgICAgICAgICAgc2hvdWxkQmUoImRpci5z dWJyb2xlIiwgIidBWFN1YnJvbGU6IEFYQ29udGVudExpc3QnIik7CisgICAgfQorCisgICAgc3Vj Y2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0iLi4vLi4v Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4K