106756 2013-01-13 22:40:44 -0800 AX: Need to implement ColorWellRole 2013-01-14 14:22:31 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dmazzoni dmazzoni abarth aboxhall apinheiro cfleizach dglazkov fishd jamesr jdiggs jochen mifenton ojan.autocc tkent tkent+wkapi webkit.review.bot oldest_to_newest 806092 0 dmazzoni 2013-01-13 22:40:44 -0800 Chromium implements <input type="color"> using a native Mac color well, so it's important to support this role. 806094 1 182509 dmazzoni 2013-01-13 22:43:43 -0800 Created attachment 182509 Patch 806097 2 182509 cfleizach 2013-01-13 22:53:45 -0800 Comment on attachment 182509 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182509&action=review the AXValue for a color well should return something like AXValue rgb 0.76448 1 0.280308 1, so VO can speak the color > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:2466 > + const AtomicString& type = input->getAttribute(typeAttr); What case will this not be handled by the same code in AXNodeObject? 806452 3 182599 dmazzoni 2013-01-14 10:31:48 -0800 Created attachment 182599 Patch 806453 4 dmazzoni 2013-01-14 10:33:19 -0800 (In reply to comment #2) > (From update of attachment 182509 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182509&action=review > > the AXValue for a color well should return something like > > AXValue rgb 0.76448 1 0.280308 1, so VO can speak the color OK. I implemented the Mac version but the code won't be used until Safari has color well support. I implemented something similar in Chromium DRT. > > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:2466 > > + const AtomicString& type = input->getAttribute(typeAttr); > > What case will this not be handled by the same code in AXNodeObject? Right now, AccessibilityRenderObject::determineAccessibilityRole doesn't call the inherited method. We need to refactor it some more to remove more duplication. 806455 5 webkit.review.bot 2013-01-14 10:35:13 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 806473 6 cfleizach 2013-01-14 11:00:57 -0800 (In reply to comment #4) > (In reply to comment #2) > > (From update of attachment 182509 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=182509&action=review > > > > the AXValue for a color well should return something like > > > > AXValue rgb 0.76448 1 0.280308 1, so VO can speak the color > > OK. I implemented the Mac version but the code won't be used until Safari has color well support. I implemented something similar in Chromium DRT. > > > > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:2466 > > > + const AtomicString& type = input->getAttribute(typeAttr); > > > > What case will this not be handled by the same code in AXNodeObject? > > Right now, AccessibilityRenderObject::determineAccessibilityRole doesn't call the inherited method. We need to refactor it some more to remove more duplication. Is there a need to duplicate this logic in AXNodeObject currently then? 806569 7 dmazzoni 2013-01-14 13:36:01 -0800 (In reply to comment #6) > Is there a need to duplicate this logic in AXNodeObject currently then? I think there are now two relatively obscure places in the code where AXNodeObject is used without AXRenderObject: 1. In canvas fallback content 2. In a subtree with display:none but aria-hidden=false These are admittedly rare, but I still think it's right to implement this code in AXNodeObject and try to refactor it over time to put most of the logic there and use AXRenderObject only where the information we get from the render tree differs. 806621 8 182599 webkit.review.bot 2013-01-14 14:22:26 -0800 Comment on attachment 182599 Patch Clearing flags on attachment: 182599 Committed r139663: <http://trac.webkit.org/changeset/139663> 806622 9 webkit.review.bot 2013-01-14 14:22:31 -0800 All reviewed patches have been landed. Closing bug. 182509 2013-01-13 22:43:43 -0800 2013-01-14 10:31:46 -0800 Patch bug-106756-20130113224044.patch text/plain 5722 dmazzoni U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM5NDRkYTFiNWI5ZDY2 YmVhN2Q4ZWVkODM1YjBkNDIyYmQ5MDM1My4uYzZmYzBkZTQ4YjRjYTMxNzU2ZTk3ODUyZDkzMGFk Yjg3NWQ0N2Q0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTEzICBEb21p bmljIE1henpvbmkgIDxkbWF6em9uaUBnb29nbGUuY29tPgorCisgICAgICAgIEFYOiBOZWVkIHRv IGltcGxlbWVudCBDb2xvcldlbGxSb2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDY3NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNYXBzIGlucHV0IHR5cGU9Y29sb3IgdG8gQ29sb3JXZWxsUm9sZSB3 aGVuIGNvbXBpbGVkIGluLgorCisgICAgICAgIFRlc3Q6IGFjY2Vzc2liaWxpdHkvY29sb3Itd2Vs bC5odG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpkZXRlcm1p bmVBY2Nlc3NpYmlsaXR5Um9sZSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKToKKwogMjAxMy0wMS0xMSAgRGFu IEJlYW0gIDxkYmVhbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2NsZWFuIHVwXSBSZW1vdmUg SFRNTEZvcm1FbGVtZW50OjpBdXRvY29tcGxldGVSZXN1bHRFcnJvciBpbiBmYXZvciBvZiBtb3Jl IHNwZWNpZmljIEVycm9yIHJlYXNvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKaW5kZXggMjM1Zjc5YWJmYWVl MmExOTliYzNhNzE4ZTlkODE4NDJkOWRiZmM1OC4uYjhkOTgzOWFjODc1NWM3YmQ2NjdhZjJkOTFk MDY5NDBmMzVjMDE4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKQEAgLTI4NCw2ICsyODQsMTMgQEAgQWNj ZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmRldGVybWluZUFjY2Vzc2li aWxpdHlSb2xlKCkKICAgICAgICAgICAgIHJldHVybiBidXR0b25Sb2xlVHlwZSgpOwogICAgICAg ICBpZiAoaW5wdXQtPmlzUmFuZ2VDb250cm9sKCkpCiAgICAgICAgICAgICByZXR1cm4gU2xpZGVy Um9sZTsKKworI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQorICAgICAgICBjb25zdCBBdG9t aWNTdHJpbmcmIHR5cGUgPSBpbnB1dC0+Z2V0QXR0cmlidXRlKHR5cGVBdHRyKTsKKyAgICAgICAg aWYgKGVxdWFsSWdub3JpbmdDYXNlKHR5cGUsICJjb2xvciIpKQorICAgICAgICAgICAgcmV0dXJu IENvbG9yV2VsbFJvbGU7CisjZW5kaWYKKwogICAgICAgICByZXR1cm4gVGV4dEZpZWxkUm9sZTsK ICAgICB9CiAgICAgaWYgKG5vZGUoKS0+aGFzVGFnTmFtZShzZWxlY3RUYWcpKSB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0LmNwcAppbmRleCA1YmEzYzYwNDVjNTVkMDJhY2I1YTAxZWI0ZTY0NTdjZmVkYzQ0OGMz Li4zMmZiM2RmNGZiYzU2OGNmMmIwMjYyYTlhZWFkNmI2N2E4MjFkNThlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdC5jcHAKQEAgLTI0NjEsNiArMjQ2MSwxMiBAQCBBY2Nlc3NpYmlsaXR5Um9sZSBBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0OjpkZXRlcm1pbmVBY2Nlc3NpYmlsaXR5Um9sZSgpCiAgICAgICAg ICAgICByZXR1cm4gUmFkaW9CdXR0b25Sb2xlOwogICAgICAgICBpZiAoaW5wdXQtPmlzVGV4dEJ1 dHRvbigpKQogICAgICAgICAgICAgcmV0dXJuIGJ1dHRvblJvbGVUeXBlKCk7CisKKyNpZiBFTkFC TEUoSU5QVVRfVFlQRV9DT0xPUikKKyAgICAgICAgY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlID0g aW5wdXQtPmdldEF0dHJpYnV0ZSh0eXBlQXR0cik7CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5n Q2FzZSh0eXBlLCAiY29sb3IiKSkKKyAgICAgICAgICAgIHJldHVybiBDb2xvcldlbGxSb2xlOwor I2VuZGlmCiAgICAgfQogCiAgICAgaWYgKGlzRmlsZVVwbG9hZEJ1dHRvbigpKQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGYx MjMyNmZmYTdlMjdlYjZiNDVkNjIxMzMxOTI5YjdmY2RlNTAwNGMuLjBiMzU3M2ViZTA0NzNmYWI5 ODJjNjNjYzYxOWYxNzk1ZWUyNjNiNzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wMS0x MyAgRG9taW5pYyBNYXp6b25pICA8ZG1henpvbmlAZ29vZ2xlLmNvbT4KKworICAgICAgICBBWDog TmVlZCB0byBpbXBsZW1lbnQgQ29sb3JXZWxsUm9sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NzU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBhIHRlc3QgdGhhdCBwcmludHMgdGhlIHJvbGUg b2YgaW5wdXQgdHlwZT1jb2xvciwKKyAgICAgICAgd2l0aCBleHBlY3RhdGlvbnMgZm9yIE1hYyBh bmQgQ2hyb21pdW0uCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2NvbG9yLXdlbGwuaHRtbDog QWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vYWNjZXNzaWJpbGl0eS9jb2xvci13 ZWxsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2li aWxpdHkvY29sb3Itd2VsbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDEzLTAxLTExICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIFVw ZGF0ZSBwbGF0Zm9ybS9jaHJvbWl1bS92aXJ0dWFsL3NvZnR3YXJlY29tcG9zaXRpbmcvZ2VvbWV0 cnkvdmlkZW8tZml4ZWQtc2Nyb2xsaW5nLmh0bWwgb24gd2luCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbG9yLXdlbGwuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvY29sb3Itd2VsbC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjVkNzNlNmEzNTc4YmZkYzI3Mjk0MTg0 Y2NjY2Q5ZjM0MWUwOGIwNDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3Np YmlsaXR5L2NvbG9yLXdlbGwuaHRtbApAQCAtMCwwICsxLDI3IEBACis8aHRtbD4KKzxodG1sPgor PGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi Pjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorCisgICAgPGlucHV0IGlkPSJj b2xvcndlbGwiIHR5cGU9ImNvbG9yIj4KKyAgICAKKyAgICA8cCBpZD0iZGVzY3JpcHRpb24iPjwv cD4KKyAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKyAgICAgCisgICAgPHNjcmlwdD4KKyAg ICAgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgICAgICAgICAg ZGVzY3JpcHRpb24oIlRoaXMgdGVzdCBjaGVja3MgdGhlIHJvbGUgb2YgYW4gaW5wdXQgd2l0aCB0 eXBlPWNvbG9yIik7CisKKyAgICAgICAgICAgIHZhciBjb2xvcndlbGwgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiY29sb3J3ZWxsIikuZm9jdXMoKTsKKyAgICAgICAgICAgIHZhciBheENvbG9y d2VsbCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OworCisgICAgICAg ICAgICBkZWJ1ZygiUm9sZSBvZiBpbnB1dCB0eXBlPWNvbG9yIGlzOiAiICsgYXhDb2xvcndlbGwu cm9sZSk7CisgICAgICAgIH0KKyAgICA8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uL2Zhc3Qv anMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CisKKzwvYm9keT4gCis8L2h0 bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9hY2Nlc3NpYmls aXR5L2NvbG9yLXdlbGwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21p dW0vYWNjZXNzaWJpbGl0eS9jb2xvci13ZWxsLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42ZTlk MGFkYTgzZDVkNmYzMGQ2NDQ0ZjZlYzJkNzAzNDhjNjE3MmExCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vYWNjZXNzaWJpbGl0eS9jb2xvci13ZWxsLWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBACisKK1RoaXMgdGVzdCBjaGVja3MgdGhlIHJvbGUg b2YgYW4gaW5wdXQgd2l0aCB0eXBlPWNvbG9yCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBh IHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4K KworCitSb2xlIG9mIGlucHV0IHR5cGU9Y29sb3IgaXM6IEFYUm9sZTogQVhDb2xvcldlbGwKK1BB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9jb2xvci13ZWxsLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2NvbG9y LXdlbGwtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQzYWI3YTJkZWIyYWU1NzAwNTNkNjRjMjhk M2JiOTQ5MzEzYzI1YjQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvYWNjZXNzaWJpbGl0eS9jb2xvci13ZWxsLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBA CisKK1RoaXMgdGVzdCBjaGVja3MgdGhlIHJvbGUgb2YgYW4gaW5wdXQgd2l0aCB0eXBlPWNvbG9y CisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMs IGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitSb2xlIG9mIGlucHV0IHR5cGU9Y29s b3IgaXM6IEFYUm9sZTogQVhUZXh0RmllbGQKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorCg== 182599 2013-01-14 10:31:48 -0800 2013-01-14 14:22:26 -0800 Patch bug-106756-20130114102848.patch text/plain 16700 dmazzoni U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM5NDRkYTFiNWI5ZDY2 YmVhN2Q4ZWVkODM1YjBkNDIyYmQ5MDM1My4uNmYzMTA0MzM2ZTVkZjhhMjVhZDYzYzMxMTNlNTk2 NDBiNDJlMzIxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAxLTE0ICBEb21p bmljIE1henpvbmkgIDxkbWF6em9uaUBnb29nbGUuY29tPgorCisgICAgICAgIEFYOiBOZWVkIHRv IGltcGxlbWVudCBDb2xvcldlbGxSb2xlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDY3NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBNYXBzIGlucHV0IHR5cGU9Y29sb3IgdG8gdGhlIGFjY2Vzc2libGUg cm9sZSBDb2xvcldlbGxSb2xlLgorICAgICAgICBBZGRzIGEgbmV3IGFjY2Vzc29yIHRvIEFjY2Vz c2liaWxpdHlPYmplY3QgdG8gZ2V0IHRoZSBjb2xvcgorICAgICAgICB2YWx1ZSBpbiBhIGNyb3Nz LXBsYXRmb3JtIHdheSB0aGF0IGRvZXNuJ3QgcmVxdWlyZSBwYXJzaW5nLgorCisgICAgICAgIFRl c3Q6IGFjY2Vzc2liaWxpdHkvY29sb3Itd2VsbC5odG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vz c2liaWxpdHlOb2RlT2JqZWN0OjpkZXRlcm1pbmVBY2Nlc3NpYmlsaXR5Um9sZSk6CisgICAgICAg IChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Y29sb3JWYWx1ZSk6CisgICAgICAg IChXZWJDb3JlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2Jq ZWN0Lmg6CisgICAgICAgIChBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdCk6CisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpBY2Nl c3NpYmlsaXR5T2JqZWN0Ojppc0NvbG9yV2VsbCk6CisgICAgICAgIChBY2Nlc3NpYmlsaXR5T2Jq ZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmNvbG9yVmFsdWUp OgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzdHJpbmdWYWx1 ZSk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpkZXRlcm1p bmVBY2Nlc3NpYmlsaXR5Um9sZSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKyAgICAgICAgKiBo dG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Ojppc0NvbG9yQ29udHJvbCk6CisgICAgICAgICogaHRt bC9IVE1MSW5wdXRFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW5wdXRFbGVtZW50KToKKwogMjAx My0wMS0xMSAgRGFuIEJlYW0gIDxkYmVhbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2NsZWFu IHVwXSBSZW1vdmUgSFRNTEZvcm1FbGVtZW50OjpBdXRvY29tcGxldGVSZXN1bHRFcnJvciBpbiBm YXZvciBvZiBtb3JlIHNwZWNpZmljIEVycm9yIHJlYXNvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKaW5kZXggYmMwMzU5NzUxODA0MjQ3MmU4NjdjOGU4ZGY4YzZiZTgzM2Y5OGU0ZS4uZTU0MDZk YzQyYzE3ZjliYzExODcxOTA5Yzc2NWIwMDlhZjQ0NzhkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMS0xNCAgRG9taW5pYyBNYXp6b25pICA8ZG1h enpvbmlAZ29vZ2xlLmNvbT4KKworICAgICAgICBBWDogTmVlZCB0byBpbXBsZW1lbnQgQ29sb3JX ZWxsUm9sZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA2NzU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkcyBhbiBhY2Nlc3NpYmlsaXR5IGludGVyZmFjZSB0byBhY2Nlc3MgdGhlIHZhbHVlIG9mIGEK KyAgICAgICAgY29sb3IgY29udHJvbC4KKworICAgICAgICAqIHB1YmxpYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0Lmg6CisgICAgICAgIChXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0KToKKyAgICAgICAg KiBzcmMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkFj Y2Vzc2liaWxpdHlPYmplY3Q6OmNvbG9yVmFsdWUpOgorICAgICAgICAoV2ViS2l0KToKKwogMjAx My0wMS0xMSAgRGFuIEJlYW0gIDxkYmVhbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2NsZWFu IHVwXSBSZW1vdmUgSFRNTEZvcm1FbGVtZW50OjpBdXRvY29tcGxldGVSZXN1bHRFcnJvciBpbiBm YXZvciBvZiBtb3JlIHNwZWNpZmljIEVycm9yIHJlYXNvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKaW5kZXgg MjM1Zjc5YWJmYWVlMmExOTliYzNhNzE4ZTlkODE4NDJkOWRiZmM1OC4uZjc0NjE5YTRhYTRhMjYy ZDM3YjIyMTIxODNhZWQxYjE1ODZiNTM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKQEAgLTI4NCw2ICsy ODQsMTMgQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmRldGVy bWluZUFjY2Vzc2liaWxpdHlSb2xlKCkKICAgICAgICAgICAgIHJldHVybiBidXR0b25Sb2xlVHlw ZSgpOwogICAgICAgICBpZiAoaW5wdXQtPmlzUmFuZ2VDb250cm9sKCkpCiAgICAgICAgICAgICBy ZXR1cm4gU2xpZGVyUm9sZTsKKworI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQorICAgICAg ICBjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUgPSBpbnB1dC0+Z2V0QXR0cmlidXRlKHR5cGVBdHRy KTsKKyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHR5cGUsICJjb2xvciIpKQorICAgICAg ICAgICAgcmV0dXJuIENvbG9yV2VsbFJvbGU7CisjZW5kaWYKKwogICAgICAgICByZXR1cm4gVGV4 dEZpZWxkUm9sZTsKICAgICB9CiAgICAgaWYgKG5vZGUoKS0+aGFzVGFnTmFtZShzZWxlY3RUYWcp KSB7CkBAIC0xNjExLDYgKzE2MTgsMzAgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0 OjpzdHJpbmdWYWx1ZSgpIGNvbnN0CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCit2b2lkIEFj Y2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojpjb2xvclZhbHVlKGludCYgciwgaW50JiBnLCBpbnQmIGIp IGNvbnN0Cit7CisgICAgciA9IDA7CisgICAgZyA9IDA7CisgICAgYiA9IDA7CisKKyAgICBpZiAo IWlzQ29sb3JXZWxsKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICghbm9kZSgpIHx8ICFu b2RlKCktPmhhc1RhZ05hbWUoaW5wdXRUYWcpKQorICAgICAgICByZXR1cm47CisKKyAgICBIVE1M SW5wdXRFbGVtZW50KiBpbnB1dCA9IHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihub2Rl KCkpOworICAgIGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSA9IGlucHV0LT5nZXRBdHRyaWJ1dGUo dHlwZUF0dHIpOworICAgIGlmICghZXF1YWxJZ25vcmluZ0Nhc2UodHlwZSwgImNvbG9yIikpCisg ICAgICAgIHJldHVybjsKKworICAgIC8vIEhUTUxJbnB1dEVsZW1lbnQ6OnZhbHVlIGFsd2F5cyBy ZXR1cm5zIGEgc3RyaW5nIHBhcnNlYWJsZSBieSBDb2xvcigpLgorICAgIENvbG9yIGNvbG9yKGlu cHV0LT52YWx1ZSgpKTsKKyAgICByID0gY29sb3IucmVkKCk7CisgICAgZyA9IGNvbG9yLmdyZWVu KCk7CisgICAgYiA9IGNvbG9yLmJsdWUoKTsKK30KKwogLy8gVGhpcyBmdW5jdGlvbiBpbXBsZW1l bnRzIHRoZSBBUklBIGFjY2Vzc2libGUgbmFtZSBhcyBkZXNjcmliZWQgYnkgdGhlIE1vemlsbGEg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAvLyBBUklBIEltcGxlbWVu dGVyJ3MgR3VpZGUuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKIHN0YXRpYyBT dHJpbmcgYWNjZXNzaWJsZU5hbWVGb3JOb2RlKE5vZGUqIG5vZGUpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmgKaW5kZXgg ZTQ2Y2E3ZTdjNzhlN2Q5ZmYyNTljODAzNGU1MzMwYTdkNzdjZTY1ZS4uOGUwNDg0MTdmMzE0Zjlk OTVkOGJjNWUyNzU4NTBlNWEwZDI1YzNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaApAQCAtMTIzLDYgKzEyMyw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFN0cmluZyB0aXRsZSgpIGNvbnN0OwogICAgIHZpcnR1 YWwgU3RyaW5nIHRleHQoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBzdHJpbmdWYWx1ZSgp IGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCBjb2xvclZhbHVlKGludCYgciwgaW50JiBnLCBpbnQm IGIpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUoKSBj b25zdDsKIAogICAgIHZpcnR1YWwgRWxlbWVudCogYWN0aW9uRWxlbWVudCgpIGNvbnN0OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0 LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApp bmRleCA1YTcwYWUzYmM2ZmY3N2E1ZmI2NTE0MzhkN2Q1YWRjNmMwZTYwY2ZkLi5kZTk2MjE0MThk ZDdmZWY3MzljZTBhMzJjZDhhYzc4MzRhOGFkZDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaApAQCAtNDI5LDYgKzQyOSw3IEBA IHB1YmxpYzoKICAgICBib29sIGlzUG9wVXBCdXR0b24oKSBjb25zdCB7IHJldHVybiByb2xlVmFs dWUoKSA9PSBQb3BVcEJ1dHRvblJvbGU7IH0KICAgICBib29sIGlzQmxvY2txdW90ZSgpIGNvbnN0 OwogICAgIGJvb2wgaXNMYW5kbWFyaygpIGNvbnN0OworICAgIGJvb2wgaXNDb2xvcldlbGwoKSBj b25zdCB7IHJldHVybiByb2xlVmFsdWUoKSA9PSBDb2xvcldlbGxSb2xlOyB9CiAgICAgCiAgICAg dmlydHVhbCBib29sIGlzQ2hlY2tlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmly dHVhbCBib29sIGlzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CkBAIC01NjAsNiAr NTYxLDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFEZXNjcmliZWRCeUF0dHJp YnV0ZSgpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgY29uc3QgQXRvbWljU3RyaW5n JiBwbGFjZWhvbGRlclZhbHVlKCkgY29uc3Q7CiAKKyAgICAvLyBPbmx5IGlmIGlzQ29sb3JXZWxs KCkKKyAgICB2aXJ0dWFsIHZvaWQgY29sb3JWYWx1ZShpbnQmIHIsIGludCYgZywgaW50JiBiKSBj b25zdCB7IHIgPSAwOyBnID0gMDsgYiA9IDA7IH0KKwogICAgIHZvaWQgc2V0Um9sZVZhbHVlKEFj Y2Vzc2liaWxpdHlSb2xlIHJvbGUpIHsgbV9yb2xlID0gcm9sZTsgfQogICAgIHZpcnR1YWwgQWNj ZXNzaWJpbGl0eVJvbGUgcm9sZVZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV9yb2xlOyB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuY3BwCmluZGV4IDViYTNjNjA0NWM1NWQwMmFjYjVhMDFlYjRlNjQ1N2NmZWRj NDQ4YzMuLjMyZmIzZGY0ZmJjNTY4Y2YyYjAyNjJhOWFlYWQ2YjY3YTgyMWQ1OGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0LmNwcApAQCAtMjQ2MSw2ICsyNDYxLDEyIEBAIEFjY2Vzc2liaWxpdHlSb2xlIEFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKCkKICAg ICAgICAgICAgIHJldHVybiBSYWRpb0J1dHRvblJvbGU7CiAgICAgICAgIGlmIChpbnB1dC0+aXNU ZXh0QnV0dG9uKCkpCiAgICAgICAgICAgICByZXR1cm4gYnV0dG9uUm9sZVR5cGUoKTsKKworI2lm IEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQorICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHR5 cGUgPSBpbnB1dC0+Z2V0QXR0cmlidXRlKHR5cGVBdHRyKTsKKyAgICAgICAgaWYgKGVxdWFsSWdu b3JpbmdDYXNlKHR5cGUsICJjb2xvciIpKQorICAgICAgICAgICAgcmV0dXJuIENvbG9yV2VsbFJv bGU7CisjZW5kaWYKICAgICB9CiAKICAgICBpZiAoaXNGaWxlVXBsb2FkQnV0dG9uKCkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlci5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCmluZGV4IGYzY2M4MWQxYWQ4YTNlZDI1MWVhYTBl NzVkZThiOTM4OTc3MTA2YTEuLjRkMTU4MjMwMGI0YzE1Y2U3NmQwOGRmZWVkMDBhNzlmMGQzZTdl MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCkBAIC0yMjQzLDYgKzIyNDMs MTIgQEAgc3RhdGljIE5TU3RyaW5nKiByb2xlVmFsdWVUb05TU3RyaW5nKEFjY2Vzc2liaWxpdHlS b2xlIHZhbHVlKQogICAgICAgICAKICAgICAgICAgaWYgKG1fb2JqZWN0LT5pc1RhYkl0ZW0oKSkK ICAgICAgICAgICAgIHJldHVybiBbTlNOdW1iZXIgbnVtYmVyV2l0aEludDptX29iamVjdC0+aXNT ZWxlY3RlZCgpXTsKKworICAgICAgICBpZiAobV9vYmplY3QtPmlzQ29sb3JXZWxsKCkpIHsKKyAg ICAgICAgICAgIGludCByLCBnLCBiOworICAgICAgICAgICAgbV9vYmplY3QtPmNvbG9yVmFsdWUo ciwgZywgYik7CisgICAgICAgICAgICByZXR1cm4gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6 QCJyZ2IgJTcuNWYgJTcuNWYgJTcuNWYgMSIsIHIgLyAyNTUuLCBnIC8gMjU1LiwgYiAvIDI1NS5d OworICAgICAgICB9CiAgICAgICAgIAogICAgICAgICByZXR1cm4gbV9vYmplY3QtPnN0cmluZ1Zh bHVlKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRF bGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKaW5k ZXggNGFjYjc2ZGY3NTJmNTQ2NzlmMWYxNjQ3YmU4OGYzMjc0MzhiNjE4Zi4uMWQ3ZmViZjVjOWI4 N2M5YTU5ZGVhNWY0ZDUzNTQ0MDBkNjY1MTYzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJ bnB1dEVsZW1lbnQuY3BwCkBAIC0xNjMwLDYgKzE2MzAsMTMgQEAgYm9vbCBIVE1MSW5wdXRFbGVt ZW50Ojppc1JhbmdlQ29udHJvbCgpIGNvbnN0CiAgICAgcmV0dXJuIG1faW5wdXRUeXBlLT5pc1Jh bmdlQ29udHJvbCgpOwogfQogCisjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCitib29sIEhU TUxJbnB1dEVsZW1lbnQ6OmlzQ29sb3JDb250cm9sKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9p bnB1dFR5cGUtPmlzQ29sb3JDb250cm9sKCk7Cit9CisjZW5kaWYKKwogYm9vbCBIVE1MSW5wdXRF bGVtZW50Ojppc1RleHQoKSBjb25zdAogewogICAgIHJldHVybiBtX2lucHV0VHlwZS0+aXNUZXh0 VHlwZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaAppbmRleCBmNTg3YjA0 MjYyM2U0NzRmZmE4NzU2Y2VjODNmNDA0OTIwNTM1MzZkLi4wYTZkNWQ5ODhmZjRjYTRlNWM1ODI5 ZjBhMTNhMDFmODE1N2RmZTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJ bnB1dEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQu aApAQCAtOTcsNiArOTcsMTAgQEAgcHVibGljOgogICAgIGJvb2wgaXNDaGVja2JveCgpIGNvbnN0 OwogICAgIGJvb2wgaXNSYW5nZUNvbnRyb2woKSBjb25zdDsKIAorI2lmIEVOQUJMRShJTlBVVF9U WVBFX0NPTE9SKQorICAgIGJvb2wgaXNDb2xvckNvbnRyb2woKSBjb25zdDsKKyNlbmRpZgorCiAg ICAgLy8gRklYTUU6IEl0J3MgaGlnaGx5IGxpa2VseSB0aGF0IGFueSBjYWxsIHNpdGUgY2FsbGlu ZyB0aGlzIGZ1bmN0aW9uIHNob3VsZCBpbnN0ZWFkCiAgICAgLy8gYmUgdXNpbmcgYSBkaWZmZXJl bnQgb25lLiBNYW55IGlucHV0IGVsZW1lbnRzIGJlaGF2ZSBsaWtlIHRleHQgZmllbGRzLCBhbmQg aW4gYWRkaXRpb24KICAgICAvLyBhbnkgdW5rbm93biBpbnB1dCB0eXBlIGlzIHRyZWF0ZWQgYXMg dGV4dC4gQ29uc2lkZXIsIGZvciBleGFtcGxlLCBpc1RleHRGaWVsZCBvcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5oCmlu ZGV4IGI3N2QxMDg3NmQ5NmY3M2Q2NjJkZjgzZmFhZTlkNTE4MjFiOGVmOTcuLmVkM2UxNzE3ZTIw ODI3OGJhYTIyNTMwNjgxZmYyZDA5NDYyMDIxM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkFjY2Vzc2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0LmgKQEAgLTEyOSw2ICsx MjksNyBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0VYUE9SVCBXZWJSZWN0IGJvdW5kaW5nQm94UmVj dCgpIGNvbnN0OwogICAgIFdFQktJVF9FWFBPUlQgYm9vbCBjYW52YXNIYXNGYWxsYmFja0NvbnRl bnQoKSBjb25zdDsKICAgICBXRUJLSVRfRVhQT1JUIFdlYlBvaW50IGNsaWNrUG9pbnQoKSBjb25z dDsKKyAgICBXRUJLSVRfRVhQT1JUIHZvaWQgY29sb3JWYWx1ZShpbnQmIHIsIGludCYgZywgaW50 JiBiKSBjb25zdDsKICAgICBXRUJLSVRfRVhQT1JUIGRvdWJsZSBlc3RpbWF0ZWRMb2FkaW5nUHJv Z3Jlc3MoKSBjb25zdDsKICAgICBXRUJLSVRfRVhQT1JUIFdlYlN0cmluZyBoZWxwVGV4dCgpIGNv bnN0OwogICAgIFdFQktJVF9FWFBPUlQgaW50IGhlYWRpbmdMZXZlbCgpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0LmNw cAppbmRleCBiOTIwZTRlYzRmYTBhYWFiNzg5MzFkN2ViNzliODNlYjE0M2U2ZTg0Li44MjViNThi MzAxYmIwODM1N2RiYTI1ZThjZTRkNTliMzZiODg2ZTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcApAQCAtNDk4LDYg KzQ5OCwxNCBAQCBXZWJQb2ludCBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0OjpjbGlja1BvaW50KCkg Y29uc3QKICAgICByZXR1cm4gV2ViUG9pbnQobV9wcml2YXRlLT5jbGlja1BvaW50KCkpOwogfQog Cit2b2lkIFdlYkFjY2Vzc2liaWxpdHlPYmplY3Q6OmNvbG9yVmFsdWUoaW50JiByLCBpbnQmIGcs IGludCYgYikgY29uc3QKK3sKKyAgICBpZiAoaXNEZXRhY2hlZCgpKQorICAgICAgICByZXR1cm47 CisKKyAgICBtX3ByaXZhdGUtPmNvbG9yVmFsdWUociwgZywgYik7Cit9CisKIGRvdWJsZSBXZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0Ojplc3RpbWF0ZWRMb2FkaW5nUHJvZ3Jlc3MoKSBjb25zdAogewog ICAgIGlmIChpc0RldGFjaGVkKCkpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggYTEwODhiYTdkNmZkMGIzZTQ0Yzk3ODgyNmIyZjQ5N2NkMmM0MjE1 NC4uMWY2OTdlYWI2MWJiZmQ3ZjBmNGIwNmNkYTY1YjhmYjE3YTk4ODk3OSAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDEzLTAxLTE0ICBEb21pbmljIE1henpvbmkgIDxkbWF6em9uaUBnb29nbGUuY29tPgorCisgICAg ICAgIEFYOiBOZWVkIHRvIGltcGxlbWVudCBDb2xvcldlbGxSb2xlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY3NTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXR1cm5zIGEgc3RyaW5nIHJlcHJlc2Vu dGF0aW9uIG9mIHRoZSB2YWx1ZSBvZiBhIGNvbG9yCisgICAgICAgIHdoZW4gdGhlIHJvbGUgaXMg Q29sb3IgV2VsbCwgdG8gbWFrZSBpdCBlYXN5IHRvIHdyaXRlIGxheW91dAorICAgICAgICB0ZXN0 cyBmb3IgY29sb3IgY29udHJvbHMuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0UnVubmVyL3NyYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50Q2hyb21pdW0uY3BwOgorCiAy MDEzLTAxLTExICBKdWxpZSBQYXJlbnQgIDxqcGFyZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBCdWlsZGVyIHNob3VsZCBub3QgYmUgYSB2YWxpZCBwYXJhbWV0ZXIgZm9yIHN0YXRzIGRhc2hi b2FyZApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1bm5l ci9zcmMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudENocm9taXVtLmNwcCBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRDaHJv bWl1bS5jcHAKaW5kZXggYjFhMzgwODFhOGRjODNlYjg2NzVkZjI3ZjdmMzJiNmE0YTZhYTU0Zi4u ZWJhZjRhYzhkYjhlN2NmMTkxYjVmNTdjZDE4YzNkMmRhZDMwMWViYSAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9zcmMvQWNjZXNzaWJpbGl0eVVJ RWxlbWVudENocm9taXVtLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9U ZXN0UnVubmVyL3NyYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50Q2hyb21pdW0uY3BwCkBAIC0yODUs NyArMjg1LDE1IEBAIHN0cmluZyBnZXRIZWxwVGV4dChjb25zdCBXZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0JiBvYmplY3QpCiAKIHN0cmluZyBnZXRTdHJpbmdWYWx1ZShjb25zdCBXZWJBY2Nlc3NpYmls aXR5T2JqZWN0JiBvYmplY3QpCiB7Ci0gICAgc3RyaW5nIHZhbHVlID0gb2JqZWN0LnN0cmluZ1Zh bHVlKCkudXRmOCgpOworICAgIHN0cmluZyB2YWx1ZTsKKyAgICBpZiAob2JqZWN0LnJvbGVWYWx1 ZSgpID09IFdlYkFjY2Vzc2liaWxpdHlSb2xlQ29sb3JXZWxsKSB7CisgICAgICAgIGludCByLCBn LCBiOworICAgICAgICBjaGFyIGJ1ZmZlclsxMDBdOworICAgICAgICBvYmplY3QuY29sb3JWYWx1 ZShyLCBnLCBiKTsKKyAgICAgICAgc25wcmludGYoYnVmZmVyLCBzaXplb2YoYnVmZmVyKSwgInJn YiAlNy41ZiAlNy41ZiAlNy41ZiAxIiwgciAvIDI1NS4sIGcgLyAyNTUuLCBiIC8gMjU1Lik7Cisg ICAgICAgIHZhbHVlID0gYnVmZmVyOworICAgIH0gZWxzZQorICAgICAgICB2YWx1ZSA9IG9iamVj dC5zdHJpbmdWYWx1ZSgpLnV0ZjgoKTsKICAgICByZXR1cm4gdmFsdWUuaW5zZXJ0KDAsICJBWFZh bHVlOiAiKTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGYxMjMyNmZmYTdlMjdlYjZiNDVkNjIxMzMxOTI5YjdmY2Rl NTAwNGMuLjA0YTg3MWI1Nzk3MjA5N2M3NzUyYTYxMjliOGEyOTc2NmI3YjdmMzYgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNiBAQAorMjAxMy0wMS0xNCAgRG9taW5pYyBNYXp6b25pICA8ZG1henpvbmlAZ29v Z2xlLmNvbT4KKworICAgICAgICBBWDogTmVlZCB0byBpbXBsZW1lbnQgQ29sb3JXZWxsUm9sZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NzU2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBhIHRl c3Qgb2YgYWNjZXNzaWJpbGl0eSBhdHRyaWJ1dGVzIGZvciBpbnB1dCB0eXBlPWNvbG9yLgorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9jb2xvci13ZWxsLmh0bWw6IEFkZGVkLgorICAgICAgICAq IHBsYXRmb3JtL2Nocm9taXVtL2FjY2Vzc2liaWxpdHkvY29sb3Itd2VsbC1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2NvbG9yLXdlbGwt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAxMy0wMS0xMSAgTm9lbCBHb3Jkb24gIDxub2VsLmdv cmRvbkBnbWFpbC5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBVcGRhdGUgcGxhdGZvcm0vY2hy b21pdW0vdmlydHVhbC9zb2Z0d2FyZWNvbXBvc2l0aW5nL2dlb21ldHJ5L3ZpZGVvLWZpeGVkLXNj cm9sbGluZy5odG1sIG9uIHdpbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9jb2xvci13ZWxsLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbG9yLXdlbGwu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi5hMzJhMmVkYmNlM2Y3NDI0MTNkMjA3MTNlZDY2MjY5NzI3ODExZWZl Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb2xvci13ZWxs Lmh0bWwKQEAgLTAsMCArMSwzOCBAQAorPGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBz cmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVh ZD4KKzxib2R5IGlkPSJib2R5Ij4KKworICAgIDxpbnB1dCBpZD0iZW1wdHlfY29sb3J3ZWxsIiB0 eXBlPSJjb2xvciI+CisgICAgPGlucHV0IGlkPSJnb29kX2NvbG9yd2VsbCIgdHlwZT0iY29sb3Ii IHZhbHVlPSIjZmYwMDAwIj4KKyAgICA8aW5wdXQgaWQ9ImJhZF9jb2xvcndlbGwiIHR5cGU9ImNv bG9yIiB2YWx1ZT0icHVycGxlIj4KKyAgICAKKyAgICA8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4K KyAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKyAgICAgCisgICAgPHNjcmlwdD4KKyAgICAg ICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgICAgICAgICAgZGVz Y3JpcHRpb24oIlRoaXMgdGVzdCBjaGVja3MgdGhlIHJvbGUgb2YgQ29sb3JXZWxsUm9sZWFuIGlu cHV0IHdpdGggdHlwZT1jb2xvciIpOworCisgICAgICAgICAgICB2YXIgY29sb3J3ZWxsID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVtcHR5X2NvbG9yd2VsbCIpLmZvY3VzKCk7CisgICAgICAg ICAgICB2YXIgYXhDb2xvcndlbGwgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxl bWVudDsKKyAgICAgICAgICAgIGRlYnVnKCJSb2xlIG9mIGlucHV0IHR5cGU9Y29sb3IgaXM6ICIg KyBheENvbG9yd2VsbC5yb2xlKTsKKworICAgICAgICAgICAgZGVidWcoIlZhbHVlIG9mIGVtcHR5 IGNvbG9yIHdlbGw6ICIgKyBheENvbG9yd2VsbC5zdHJpbmdWYWx1ZSk7CisKKyAgICAgICAgICAg IGNvbG9yd2VsbCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJnb29kX2NvbG9yd2VsbCIpLmZv Y3VzKCk7CisgICAgICAgICAgICBheENvbG9yd2VsbCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVy LmZvY3VzZWRFbGVtZW50OworICAgICAgICAgICAgZGVidWcoIlZhbHVlIG9mIGdvb2QgY29sb3Ig d2VsbDogIiArIGF4Q29sb3J3ZWxsLnN0cmluZ1ZhbHVlKTsKKworICAgICAgICAgICAgY29sb3J3 ZWxsID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJhZF9jb2xvcndlbGwiKS5mb2N1cygpOwor ICAgICAgICAgICAgYXhDb2xvcndlbGwgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2Vk RWxlbWVudDsKKyAgICAgICAgICAgIGRlYnVnKCJWYWx1ZSBvZiBiYWQgY29sb3Igd2VsbDogIiAr IGF4Q29sb3J3ZWxsLnN0cmluZ1ZhbHVlKTsKKyAgICAgICAgfQorICAgIDwvc2NyaXB0PgorCis8 c2NyaXB0IHNyYz0iLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3Njcmlw dD4KKworPC9ib2R5PiAKKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtL2FjY2Vzc2liaWxpdHkvY29sb3Itd2VsbC1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9hY2Nlc3NpYmlsaXR5L2NvbG9yLXdlbGwtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjgyNjc1YzQwYzg1MmQwM2RlNjZmZTc3M2RmNmY5YTBmOGQ4ZjY1ZmUK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9hY2Nlc3Np YmlsaXR5L2NvbG9yLXdlbGwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTQgQEAKKyAgICAKK1Ro aXMgdGVzdCBjaGVja3MgdGhlIHJvbGUgb2YgQ29sb3JXZWxsUm9sZWFuIGlucHV0IHdpdGggdHlw ZT1jb2xvcgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1l c3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUm9sZSBvZiBpbnB1dCB0 eXBlPWNvbG9yIGlzOiBBWFJvbGU6IEFYQ29sb3JXZWxsCitWYWx1ZSBvZiBlbXB0eSBjb2xvciB3 ZWxsOiBBWFZhbHVlOiByZ2IgMC4wMDAwMCAwLjAwMDAwIDAuMDAwMDAgMQorVmFsdWUgb2YgZ29v ZCBjb2xvciB3ZWxsOiBBWFZhbHVlOiByZ2IgMS4wMDAwMCAwLjAwMDAwIDAuMDAwMDAgMQorVmFs dWUgb2YgYmFkIGNvbG9yIHdlbGw6IEFYVmFsdWU6IHJnYiAwLjAwMDAwIDAuMDAwMDAgMC4wMDAw MCAxCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvY29sb3It d2VsbC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0 eS9jb2xvci13ZWxsLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iZjgyZTg4OTJhNDgyODM1ZDc5 MDIwYzQzYTFiZWViMzhiMjA3NjhlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvY29sb3Itd2VsbC1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSwxNCBAQAorICAgIAorVGhpcyB0ZXN0IGNoZWNrcyB0aGUgcm9sZSBvZiBDb2xvcldlbGxSb2xl YW4gaW5wdXQgd2l0aCB0eXBlPWNvbG9yCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNl cmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKwor CitSb2xlIG9mIGlucHV0IHR5cGU9Y29sb3IgaXM6IEFYUm9sZTogQVhUZXh0RmllbGQKK1ZhbHVl IG9mIGVtcHR5IGNvbG9yIHdlbGw6IEFYVmFsdWU6IAorVmFsdWUgb2YgZ29vZCBjb2xvciB3ZWxs OiBBWFZhbHVlOiAjZmYwMDAwCitWYWx1ZSBvZiBiYWQgY29sb3Igd2VsbDogQVhWYWx1ZTogcHVy cGxlCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwo=