70247 2011-10-17 10:06:27 -0700 AX: The scrollArea is not correctly returning the scrollbars 2011-11-17 13:49:09 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach bdakin oldest_to_newest 485236 0 cfleizach 2011-10-17 10:06:27 -0700 The AXScroll area is not returning the right elements for horizontal and vertical scrollbars. It looks like this is because on WK2 there is an if block that is causing problems 504157 1 cfleizach 2011-11-16 12:51:17 -0800 Problem is that we're getting caught in a if/else block when there's no render object 504416 2 115488 cfleizach 2011-11-16 17:08:26 -0800 Created attachment 115488 patch 504419 3 115488 cfleizach 2011-11-16 17:09:29 -0800 Comment on attachment 115488 patch View in context: https://bugs.webkit.org/attachment.cgi?id=115488&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm:2232 > + this block looks big, but all it does is make sure that we only do AXStartMarker and EndMarker when the m_object has a renderer() 504479 4 115501 cfleizach 2011-11-16 18:10:09 -0800 Created attachment 115501 patch 505170 5 cfleizach 2011-11-17 13:49:09 -0800 http://trac.webkit.org/changeset/100666 115488 2011-11-16 17:08:26 -0800 2011-11-16 18:10:09 -0800 patch patch.txt text/plain 8908 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDUzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTE2ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFRoZSBzY3JvbGxB cmVhIGlzIG5vdCBjb3JyZWN0bHkgcmV0dXJuaW5nIHRoZSBzY3JvbGxiYXJzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDI0NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgZmV3IGJ1Z3MgdGhhdCB3ZXJl IHByZXZlbnRpbmcgdGhpcyBmcm9tIHdvcmtpbmcuCisgICAgICAgICAgIDEpIGluIGFjY2Vzc2li aWxpdHlBdHRyaWJ1dGVWYWx1ZTogd2hlbiBhbiBlbGVtZW50IGRpZCBub3QgaGF2ZSBhIHJlbmRl cmVyKCkgd2Ugd2VyZSByZXR1cm5pbmcgZWFybGllciB0aGFuIHdlIHNob3VsZCBoYXZlCisgICAg ICAgICAgIDIpIFdlIHdlcmUgbm90IHVwZGF0aW5nIGFuZCBjbGVhcmluZyB0aGUgc2Nyb2xsYmFy cyBjb3JyZWN0bHkgd2hlbiBjaGlsZHJlbiB3ZXJlIGNsZWFyZWQgb3Igd2hlbiBhc2tlZCBmb3Iu CisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2Nyb2xsYmFycy5o dG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3OjpzY3JvbGxCYXIp OgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc6OmNsZWFyQ2hpbGRy ZW4pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaDoK KyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ci5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJp bGl0eUF0dHJpYnV0ZVZhbHVlOl0pOgorCiAyMDExLTExLTE2ICBTaGF3biBTaW5naCAgPHNoYXdu c2luZ2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gVHJhY2sgcHJvcGVydHkg Y2hhbmdlcyBmb3IgcmVuZGVyIHN1cmZhY2VzLgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAkocmV2aXNpb24g MTAwNDkwKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Ny b2xsVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2ICs1Miw3IEBACiAgICAgCiAgICAgdmly dHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBzY3JvbGxCYXIoQWNjZXNzaWJpbGl0eU9yaWVudGF0 aW9uKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRyZW4oKTsKKyAgICB2aXJ0dWFs IHZvaWQgY2xlYXJDaGlsZHJlbigpOwogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCog YWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKICAgICB2aXJ0 dWFsIHZvaWQgdXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgpOwogICAgIHZpcnR1YWwgdm9pZCBz ZXROZWVkc1RvVXBkYXRlQ2hpbGRyZW4oKSB7IG1fY2hpbGRyZW5EaXJ0eSA9IHRydWU7IH0KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCShyZXZpc2lvbiAxMDA0OTApCisr KyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjIxOCwzMSArMjIxOCwxOCBAQAogICAgIGlm IChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhTZWxlY3RlZFRleHRNYXJrZXJS YW5nZSJdKQogICAgICAgICByZXR1cm4gW3NlbGYgdGV4dE1hcmtlclJhbmdlRm9yU2VsZWN0aW9u XTsKICAgICAKLSAgICBpZiAobV9vYmplY3QtPmlzQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCgp KSB7Ci0gICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBzdGF0aWNfY2FzdDxBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0Kj4obV9vYmplY3QpLT5yZW5kZXJlcigpOwotICAgICAgICBpZiAo IXJlbmRlcmVyKQotICAgICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAgICAgCisgICAgaWYgKG1f b2JqZWN0LT5yZW5kZXJlcigpKSB7CiAgICAgICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFs VG9TdHJpbmc6IEAiQVhTdGFydFRleHRNYXJrZXIiXSkKLSAgICAgICAgICAgIHJldHVybiBbc2Vs ZiB0ZXh0TWFya2VyRm9yVmlzaWJsZVBvc2l0aW9uOnN0YXJ0T2ZEb2N1bWVudChyZW5kZXJlci0+ ZG9jdW1lbnQoKSldOworICAgICAgICAgICAgcmV0dXJuIFtzZWxmIHRleHRNYXJrZXJGb3JWaXNp YmxlUG9zaXRpb246c3RhcnRPZkRvY3VtZW50KG1fb2JqZWN0LT5yZW5kZXJlcigpLT5kb2N1bWVu dCgpKV07CiAgICAgICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhF bmRUZXh0TWFya2VyIl0pCi0gICAgICAgICAgICByZXR1cm4gW3NlbGYgdGV4dE1hcmtlckZvclZp c2libGVQb3NpdGlvbjplbmRPZkRvY3VtZW50KHJlbmRlcmVyLT5kb2N1bWVudCgpKV07Ci0KLSAg ICAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlC bG9ja1F1b3RlTGV2ZWxBdHRyaWJ1dGVdKQotICAgICAgICAgICAgcmV0dXJuIFtOU051bWJlciBu dW1iZXJXaXRoSW50Om1fb2JqZWN0LT5ibG9ja3F1b3RlTGV2ZWwoKV07Ci0gICAgICAgIGlmIChb YXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6QCJBWFRhYmxlTGV2ZWwiXSkKLSAgICAgICAg ICAgIHJldHVybiBbTlNOdW1iZXIgbnVtYmVyV2l0aEludDptX29iamVjdC0+dGFibGVMZXZlbCgp XTsKLSAgICB9IGVsc2UgewotICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBwYXJlbnQgPSBt X29iamVjdC0+cGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7Ci0gICAgICAgIGlmICghcGFyZW50KQot ICAgICAgICAgICAgcmV0dXJuIFtOU051bWJlciBudW1iZXJXaXRoSW50OjBdOwotICAgICAgICAK LSAgICAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxp dHlCbG9ja1F1b3RlTGV2ZWxBdHRyaWJ1dGVdKQotICAgICAgICAgICAgcmV0dXJuIFtwYXJlbnQt PndyYXBwZXIoKSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6TlNBY2Nlc3NpYmlsaXR5Qmxv Y2tRdW90ZUxldmVsQXR0cmlidXRlXTsKLSAgICAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1 YWxUb1N0cmluZzpAIkFYVGFibGVMZXZlbCJdKQotICAgICAgICAgICAgcmV0dXJuIFtwYXJlbnQt PndyYXBwZXIoKSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6QCJBWFRhYmxlTGV2ZWwiXTsK KyAgICAgICAgICAgIHJldHVybiBbc2VsZiB0ZXh0TWFya2VyRm9yVmlzaWJsZVBvc2l0aW9uOmVu ZE9mRG9jdW1lbnQobV9vYmplY3QtPnJlbmRlcmVyKCktPmRvY3VtZW50KCkpXTsKICAgICB9CiAg ICAgCisgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxp dHlCbG9ja1F1b3RlTGV2ZWxBdHRyaWJ1dGVdKQorICAgICAgICByZXR1cm4gW05TTnVtYmVyIG51 bWJlcldpdGhJbnQ6bV9vYmplY3QtPmJsb2NrcXVvdGVMZXZlbCgpXTsKKyAgICBpZiAoW2F0dHJp YnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOkAiQVhUYWJsZUxldmVsIl0pCisgICAgICAgIHJldHVy biBbTlNOdW1iZXIgbnVtYmVyV2l0aEludDptX29iamVjdC0+dGFibGVMZXZlbCgpXTsKKyAgICAK ICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOiBOU0FjY2Vzc2liaWxpdHlM aW5rZWRVSUVsZW1lbnRzQXR0cmlidXRlXSkgewogICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgbGlua2VkVUlFbGVtZW50czsKICAgICAgICAg bV9vYmplY3QtPmxpbmtlZFVJRWxlbWVudHMobGlua2VkVUlFbGVtZW50cyk7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3Jv bGxWaWV3LmNwcAkocmV2aXNpb24gMTAwNDkwKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwLDYg KzUwLDggQEAKICAgICAKIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlTY3JvbGxW aWV3OjpzY3JvbGxCYXIoQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9uIG9yaWVudGF0aW9uKSBjb25z dAogeworICAgIHVwZGF0ZVNjcm9sbGJhcnMoKTsKKyAgICAKICAgICBzd2l0Y2ggKG9yaWVudGF0 aW9uKSB7CiAgICAgY2FzZSBBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb25WZXJ0aWNhbDoKICAgICAg ICAgcmV0dXJuIG1fdmVydGljYWxTY3JvbGxiYXIgPyBtX3ZlcnRpY2FsU2Nyb2xsYmFyLmdldCgp IDogMDsKQEAgLTEyMSw2ICsxMjMsMTMgQEAKICAgICByZXR1cm4gc2Nyb2xsQmFyT2JqZWN0Owog fQogICAgICAgICAKK3ZvaWQgQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc6OmNsZWFyQ2hpbGRyZW4o KQoreworICAgIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmNsZWFyQ2hpbGRyZW4oKTsKKyAgICBtX3Zl cnRpY2FsU2Nyb2xsYmFyID0gMDsKKyAgICBtX2hvcml6b250YWxTY3JvbGxiYXIgPSAwOworfQor ICAgIAogdm9pZCBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldzo6YWRkQ2hpbGRyZW4oKQogewogICAg IEFTU0VSVCghbV9oYXZlQ2hpbGRyZW4pOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTAwNTMxKQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTEtMTEtMTYgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAg ICBBWDogVGhlIHNjcm9sbEFyZWEgaXMgbm90IGNvcnJlY3RseSByZXR1cm5pbmcgdGhlIHNjcm9s bGJhcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcw MjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zY3JvbGxiYXJzLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2Nyb2xsYmFycy5odG1sOiBB ZGRlZC4KKwogMjAxMS0xMS0xNiAgQmVuIFdlbGxzICA8YmVud2VsbHNAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFNlYW1pbmcgb24gYm9yZGVyIGNvcm5lcnMgd2l0aCBtaXhlZCBjb2xvdXIgYWxw aGEgYm9yZGVycwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv c2Nyb2xsYmFycy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL2FjY2Vzc2liaWxpdHkvc2Nyb2xsYmFycy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDAp CisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zY3JvbGxiYXJzLWV4 cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzMTAgQEAKK1RoaXMgdGVzdHMgdGhh dCBhIHNjcm9sbCBhcmVhIHdpbGwgcmV0dXJuIHNjcm9sbCBiYXJzIHdoZW4gYXNrZWQuCisKK09u IHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxv d2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworUEFTUyBzY3JvbGxBcmVhLnJvbGUgaXMgJ0FYUm9s ZTogQVhTY3JvbGxBcmVhJworUEFTUyBzY3JvbGxBcmVhLnZlcnRpY2FsU2Nyb2xsYmFyLnJvbGUg aXMgJ0FYUm9sZTogQVhTY3JvbGxCYXInCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwpJbmRleDog TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2Nyb2xsYmFycy5odG1sCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3Njcm9s bGJhcnMuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nl c3NpYmlsaXR5L3Njcm9sbGJhcnMuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0NSBAQAor PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8 aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vLi4vZmFzdC9qcy9yZXNv dXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQYXJz ZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMvcmVz b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5 IiB0YWJpbmRleD0iMCI+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29u c29sZSI+PC9kaXY+CisKKzxkaXYgcm9sZT0idGV4dGJveCIgaWQ9ImlmcmFtZUdyb3VwIj48L2Rp dj4KKworPHNjcmlwdD4KKworICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3RzIHRoYXQgYSBzY3Jv bGwgYXJlYSB3aWxsIHJldHVybiBzY3JvbGwgYmFycyB3aGVuIGFza2VkLiIpOworCisgICBpZiAo d2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJib2R5IikuZm9jdXMoKTsKKyAgICAgICAgdmFyIGJvZHkgPSBhY2Nlc3NpYmls aXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsKKyAgICB9CisKKyAgICAvLyBDYXVzZSB0aGUg d2ViIHBhZ2UgdG8gZ2FpbiBzY3JvbGxiYXJzLgorICAgIGZvciAodmFyIGsgPSAwOyBrIDwgMTAw OyBrKyspIHsKKyAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYm9keSIpLmlubmVySFRN TCArPSAiPGJyPjxicj48YnI+IjsKKyAgICB9CisKKyAgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmls aXR5Q29udHJvbGxlcikgeworICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib2R5 IikuZm9jdXMoKTsKKyAgICAgICAgICB2YXIgYm9keSA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVy LmZvY3VzZWRFbGVtZW50OworCisgICAgICAgICAgdmFyIHNjcm9sbEFyZWEgPSBib2R5LnBhcmVu dEVsZW1lbnQoKTsKKyAgICAgICAgICBzaG91bGRCZSgic2Nyb2xsQXJlYS5yb2xlIiwgIidBWFJv bGU6IEFYU2Nyb2xsQXJlYSciKTsKKyAgICAgICAgICBzaG91bGRCZSgic2Nyb2xsQXJlYS52ZXJ0 aWNhbFNjcm9sbGJhci5yb2xlIiwgIidBWFJvbGU6IEFYU2Nyb2xsQmFyJyIpOworICAgIH0KKwor ICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9 Ii4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8 L2JvZHk+Cis8L2h0bWw+Cg== 115501 2011-11-16 18:10:09 -0800 2011-11-17 13:41:47 -0800 patch patch.txt text/plain 10104 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDUzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTE2ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFRoZSBzY3JvbGxB cmVhIGlzIG5vdCBjb3JyZWN0bHkgcmV0dXJuaW5nIHRoZSBzY3JvbGxiYXJzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDI0NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEgZmV3IGJ1Z3MgdGhhdCB3ZXJl IHByZXZlbnRpbmcgdGhpcyBmcm9tIHdvcmtpbmcuCisgICAgICAgICAgIDEpIGluIGFjY2Vzc2li aWxpdHlBdHRyaWJ1dGVWYWx1ZTogd2hlbiBhbiBlbGVtZW50IGRpZCBub3QgaGF2ZSBhIHJlbmRl cmVyKCkgd2Ugd2VyZSByZXR1cm5pbmcgZWFybGllciB0aGFuIHdlIHNob3VsZCBoYXZlCisgICAg ICAgICAgIDIpIFdlIHdlcmUgbm90IHVwZGF0aW5nIGFuZCBjbGVhcmluZyB0aGUgc2Nyb2xsYmFy cyBjb3JyZWN0bHkgd2hlbiBjaGlsZHJlbiB3ZXJlIGNsZWFyZWQgb3Igd2hlbiBhc2tlZCBmb3Iu CisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2Nyb2xsYmFycy5o dG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3OjpzY3JvbGxCYXIp OgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc6OmNsZWFyQ2hpbGRy ZW4pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaDoK KyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ci5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJp bGl0eUF0dHJpYnV0ZVZhbHVlOl0pOgorCiAyMDExLTExLTE2ICBTaGF3biBTaW5naCAgPHNoYXdu c2luZ2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gVHJhY2sgcHJvcGVydHkg Y2hhbmdlcyBmb3IgcmVuZGVyIHN1cmZhY2VzLgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAkocmV2aXNpb24g MTAwNDkwKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Ny b2xsVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC01MCw4ICs1MCw5IEBACiAgICAgdmlydHVhbCBi b29sIGlzQXR0YWNobWVudCgpIGNvbnN0OwogICAgIHZpcnR1YWwgV2lkZ2V0KiB3aWRnZXRGb3JB dHRhY2htZW50VmlldygpIGNvbnN0OwogICAgIAotICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9i amVjdCogc2Nyb2xsQmFyKEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvbikgY29uc3Q7CisgICAgdmly dHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBzY3JvbGxCYXIoQWNjZXNzaWJpbGl0eU9yaWVudGF0 aW9uKTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRyZW4oKTsKKyAgICB2aXJ0dWFsIHZvaWQg Y2xlYXJDaGlsZHJlbigpOwogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogYWNjZXNz aWJpbGl0eUhpdFRlc3QoY29uc3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKICAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXROZWVk c1RvVXBkYXRlQ2hpbGRyZW4oKSB7IG1fY2hpbGRyZW5EaXJ0eSA9IHRydWU7IH0KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCShyZXZpc2lvbiAxMDA0OTApCisrKyBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjIxOCwzMSArMjIxOCwxOCBAQAogICAgIGlmIChbYXR0 cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhTZWxlY3RlZFRleHRNYXJrZXJSYW5nZSJd KQogICAgICAgICByZXR1cm4gW3NlbGYgdGV4dE1hcmtlclJhbmdlRm9yU2VsZWN0aW9uXTsKICAg ICAKLSAgICBpZiAobV9vYmplY3QtPmlzQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCgpKSB7Ci0g ICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0Kj4obV9vYmplY3QpLT5yZW5kZXJlcigpOwotICAgICAgICBpZiAoIXJlbmRl cmVyKQotICAgICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICAgICAgCisgICAgaWYgKG1fb2JqZWN0 LT5yZW5kZXJlcigpKSB7CiAgICAgICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJp bmc6IEAiQVhTdGFydFRleHRNYXJrZXIiXSkKLSAgICAgICAgICAgIHJldHVybiBbc2VsZiB0ZXh0 TWFya2VyRm9yVmlzaWJsZVBvc2l0aW9uOnN0YXJ0T2ZEb2N1bWVudChyZW5kZXJlci0+ZG9jdW1l bnQoKSldOworICAgICAgICAgICAgcmV0dXJuIFtzZWxmIHRleHRNYXJrZXJGb3JWaXNpYmxlUG9z aXRpb246c3RhcnRPZkRvY3VtZW50KG1fb2JqZWN0LT5yZW5kZXJlcigpLT5kb2N1bWVudCgpKV07 CiAgICAgICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhFbmRUZXh0 TWFya2VyIl0pCi0gICAgICAgICAgICByZXR1cm4gW3NlbGYgdGV4dE1hcmtlckZvclZpc2libGVQ b3NpdGlvbjplbmRPZkRvY3VtZW50KHJlbmRlcmVyLT5kb2N1bWVudCgpKV07Ci0KLSAgICAgICAg aWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlCbG9ja1F1 b3RlTGV2ZWxBdHRyaWJ1dGVdKQotICAgICAgICAgICAgcmV0dXJuIFtOU051bWJlciBudW1iZXJX aXRoSW50Om1fb2JqZWN0LT5ibG9ja3F1b3RlTGV2ZWwoKV07Ci0gICAgICAgIGlmIChbYXR0cmli dXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6QCJBWFRhYmxlTGV2ZWwiXSkKLSAgICAgICAgICAgIHJl dHVybiBbTlNOdW1iZXIgbnVtYmVyV2l0aEludDptX29iamVjdC0+dGFibGVMZXZlbCgpXTsKLSAg ICB9IGVsc2UgewotICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBwYXJlbnQgPSBtX29iamVj dC0+cGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7Ci0gICAgICAgIGlmICghcGFyZW50KQotICAgICAg ICAgICAgcmV0dXJuIFtOU051bWJlciBudW1iZXJXaXRoSW50OjBdOwotICAgICAgICAKLSAgICAg ICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlCbG9j a1F1b3RlTGV2ZWxBdHRyaWJ1dGVdKQotICAgICAgICAgICAgcmV0dXJuIFtwYXJlbnQtPndyYXBw ZXIoKSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6TlNBY2Nlc3NpYmlsaXR5QmxvY2tRdW90 ZUxldmVsQXR0cmlidXRlXTsKLSAgICAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0 cmluZzpAIkFYVGFibGVMZXZlbCJdKQotICAgICAgICAgICAgcmV0dXJuIFtwYXJlbnQtPndyYXBw ZXIoKSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6QCJBWFRhYmxlTGV2ZWwiXTsKKyAgICAg ICAgICAgIHJldHVybiBbc2VsZiB0ZXh0TWFya2VyRm9yVmlzaWJsZVBvc2l0aW9uOmVuZE9mRG9j dW1lbnQobV9vYmplY3QtPnJlbmRlcmVyKCktPmRvY3VtZW50KCkpXTsKICAgICB9CiAgICAgCisg ICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlCbG9j a1F1b3RlTGV2ZWxBdHRyaWJ1dGVdKQorICAgICAgICByZXR1cm4gW05TTnVtYmVyIG51bWJlcldp dGhJbnQ6bV9vYmplY3QtPmJsb2NrcXVvdGVMZXZlbCgpXTsKKyAgICBpZiAoW2F0dHJpYnV0ZU5h bWUgaXNFcXVhbFRvU3RyaW5nOkAiQVhUYWJsZUxldmVsIl0pCisgICAgICAgIHJldHVybiBbTlNO dW1iZXIgbnVtYmVyV2l0aEludDptX29iamVjdC0+dGFibGVMZXZlbCgpXTsKKyAgICAKICAgICBp ZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOiBOU0FjY2Vzc2liaWxpdHlMaW5rZWRV SUVsZW1lbnRzQXR0cmlidXRlXSkgewogICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpBY2Nl c3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgbGlua2VkVUlFbGVtZW50czsKICAgICAgICAgbV9vYmpl Y3QtPmxpbmtlZFVJRWxlbWVudHMobGlua2VkVUlFbGVtZW50cyk7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkocmV2aXNp b24gMTAwNDkwKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5MSw3ICs0OTEsNyBAQAogICAgIHZpcnR1YWwg Ym9vbCBleHBvc2VzVGl0bGVVSUVsZW1lbnQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAgICAg dmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JyZXNwb25kaW5nTGFiZWxGb3JDb250cm9s RWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlP YmplY3QqIGNvcnJlc3BvbmRpbmdDb250cm9sRm9yTGFiZWxFbGVtZW50KCkgY29uc3QgeyByZXR1 cm4gMDsgfQotICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogc2Nyb2xsQmFyKEFjY2Vz c2liaWxpdHlPcmllbnRhdGlvbikgY29uc3QgeyByZXR1cm4gMDsgfQorICAgIHZpcnR1YWwgQWNj ZXNzaWJpbGl0eU9iamVjdCogc2Nyb2xsQmFyKEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvbikgeyBy ZXR1cm4gMDsgfQogICAgIAogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eVJvbGUgYXJpYVJvbGVB dHRyaWJ1dGUoKSBjb25zdCB7IHJldHVybiBVbmtub3duUm9sZTsgfQogICAgIHZpcnR1YWwgYm9v bCBpc1ByZXNlbnRhdGlvbmFsQ2hpbGRPZkFyaWFSb2xlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9s bFZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCShyZXZpc2lvbiAxMDA0OTApCisrKyBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDgsOCArNDgsMTAgQEAKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEFjY2Vzc2li aWxpdHlTY3JvbGxWaWV3KHZpZXcpKTsKIH0KICAgICAKLUFjY2Vzc2liaWxpdHlPYmplY3QqIEFj Y2Vzc2liaWxpdHlTY3JvbGxWaWV3OjpzY3JvbGxCYXIoQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9u IG9yaWVudGF0aW9uKSBjb25zdAorQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVNj cm9sbFZpZXc6OnNjcm9sbEJhcihBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb24gb3JpZW50YXRpb24p CiB7CisgICAgdXBkYXRlU2Nyb2xsYmFycygpOworICAgIAogICAgIHN3aXRjaCAob3JpZW50YXRp b24pIHsKICAgICBjYXNlIEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvblZlcnRpY2FsOgogICAgICAg ICByZXR1cm4gbV92ZXJ0aWNhbFNjcm9sbGJhciA/IG1fdmVydGljYWxTY3JvbGxiYXIuZ2V0KCkg OiAwOwpAQCAtMTIxLDYgKzEyMywxMyBAQAogICAgIHJldHVybiBzY3JvbGxCYXJPYmplY3Q7CiB9 CiAgICAgICAgIAordm9pZCBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldzo6Y2xlYXJDaGlsZHJlbigp Cit7CisgICAgQWNjZXNzaWJpbGl0eU9iamVjdDo6Y2xlYXJDaGlsZHJlbigpOworICAgIG1fdmVy dGljYWxTY3JvbGxiYXIgPSAwOworICAgIG1faG9yaXpvbnRhbFNjcm9sbGJhciA9IDA7Cit9Cisg ICAgCiB2b2lkIEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3OjphZGRDaGlsZHJlbigpCiB7CiAgICAg QVNTRVJUKCFtX2hhdmVDaGlsZHJlbik7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDA1MzEpCisrKyBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAx MS0xMS0xNiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgorCisgICAgICAg IEFYOiBUaGUgc2Nyb2xsQXJlYSBpcyBub3QgY29ycmVjdGx5IHJldHVybmluZyB0aGUgc2Nyb2xs YmFycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzAy NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3Njcm9sbGJhcnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zY3JvbGxiYXJzLmh0bWw6IEFk ZGVkLgorCiAyMDExLTExLTE2ICBCZW4gV2VsbHMgIDxiZW53ZWxsc0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgU2VhbWluZyBvbiBib3JkZXIgY29ybmVycyB3aXRoIG1peGVkIGNvbG91ciBhbHBo YSBib3JkZXJzCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9z Y3JvbGxiYXJzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvYWNjZXNzaWJpbGl0eS9zY3JvbGxiYXJzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3Njcm9sbGJhcnMtZXhw ZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDMxMCBAQAorVGhpcyB0ZXN0cyB0aGF0 IGEgc2Nyb2xsIGFyZWEgd2lsbCByZXR1cm4gc2Nyb2xsIGJhcnMgd2hlbiBhc2tlZC4KKworT24g c3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93 ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCitQQVNTIHNjcm9sbEFyZWEucm9sZSBpcyAnQVhSb2xl OiBBWFNjcm9sbEFyZWEnCitQQVNTIHNjcm9sbEFyZWEudmVydGljYWxTY3JvbGxiYXIucm9sZSBp cyAnQVhSb2xlOiBBWFNjcm9sbEJhcicKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUK KworVEVTVCBDT01QTEVURQorCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisK KworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKwor CisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCisKKworCkluZGV4OiBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zY3JvbGxiYXJzLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2Nyb2xs YmFycy5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vz c2liaWxpdHkvc2Nyb2xsYmFycy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQ1IEBACis8 IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxo ZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291 cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0PgordmFyIHN1Y2Nlc3NmdWxseVBhcnNl ZCA9IGZhbHNlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHki IHRhYmluZGV4PSIwIj4KKworPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25z b2xlIj48L2Rpdj4KKworPGRpdiByb2xlPSJ0ZXh0Ym94IiBpZD0iaWZyYW1lR3JvdXAiPjwvZGl2 PgorCis8c2NyaXB0PgorCisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCBhIHNjcm9s bCBhcmVhIHdpbGwgcmV0dXJuIHNjcm9sbCBiYXJzIHdoZW4gYXNrZWQuIik7CisKKyAgIGlmICh3 aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoImJvZHkiKS5mb2N1cygpOworICAgICAgICB2YXIgYm9keSA9IGFjY2Vzc2liaWxp dHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OworICAgIH0KKworICAgIC8vIENhdXNlIHRoZSB3 ZWIgcGFnZSB0byBnYWluIHNjcm9sbGJhcnMuCisgICAgZm9yICh2YXIgayA9IDA7IGsgPCAxMDA7 IGsrKykgeworICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib2R5IikuaW5uZXJIVE1M ICs9ICI8YnI+PGJyPjxicj4iOworICAgIH0KKworICAgICBpZiAod2luZG93LmFjY2Vzc2liaWxp dHlDb250cm9sbGVyKSB7CisgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJvZHki KS5mb2N1cygpOworICAgICAgICAgIHZhciBib2R5ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIu Zm9jdXNlZEVsZW1lbnQ7CisKKyAgICAgICAgICB2YXIgc2Nyb2xsQXJlYSA9IGJvZHkucGFyZW50 RWxlbWVudCgpOworICAgICAgICAgIHNob3VsZEJlKCJzY3JvbGxBcmVhLnJvbGUiLCAiJ0FYUm9s ZTogQVhTY3JvbGxBcmVhJyIpOworICAgICAgICAgIHNob3VsZEJlKCJzY3JvbGxBcmVhLnZlcnRp Y2FsU2Nyb2xsYmFyLnJvbGUiLCAiJ0FYUm9sZTogQVhTY3JvbGxCYXInIik7CisgICAgfQorCisg ICAgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0i Li4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4K