146300 2015-06-24 17:06:15 -0700 AX: AccessibilityObject focus events that don't cause a selection change can leave m_isSynchronizingSelection set to true 2015-06-25 18:01:17 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 d_russell webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario samuel_white webkit-bug-importer oldest_to_newest 1104551 0 d_russell 2015-06-24 17:06:15 -0700 If an accessibilityObject is focused, it calls cache->setIsSynchronizingSelection(true) assuming that the focus will cause a selection change, but doesn't validate that the change occurred or reset this state. After any event that's assuming a selection change will happen, m_isSynchronizingSelection should be reset to false. 1104552 1 webkit-bug-importer 2015-06-24 17:10:07 -0700 <rdar://problem/21536941> 1104553 2 255531 d_russell 2015-06-24 17:11:45 -0700 Created attachment 255531 patch 1104604 3 255531 cfleizach 2015-06-24 22:51:20 -0700 Comment on attachment 255531 patch View in context: https://bugs.webkit.org/attachment.cgi?id=255531&action=review > LayoutTests/ChangeLog:3 > + Bug 146300 AX: AccessibilityObject focus event that doesn't cause a selection "focus events that don't cause a" > Source/WebCore/accessibility/AccessibilityRenderObject.cpp:1513 > + AXObjectCache* cache = renderObject.axObjectCache(); It looks like this method might be better off taking a point to the axobject cache > Source/WebCore/accessibility/mac/AXObjectCacheMac.mm:337 > + [rootWebArea()->wrapper() accessibilityPostedNotification:NSAccessibilityFocusedUIElementChangedNotification userInfo:nil]; since this looks like it's only for testing, i would change the name to something like "AXFocusedChanged" so that when checking this in the test it will be clear what the value should be, and will also let other platforms follow suit 1104797 4 255597 d_russell 2015-06-25 17:00:32 -0700 Created attachment 255597 patch 1104798 5 d_russell 2015-06-25 17:01:32 -0700 I changed to AXFocusedChanged, but it's worth noting that other logic can still post NSAccessibilityFocusedUIElementChangedNotification so we may end up writing tests some times that need to listen for both. Probably not an issue, but thought I'd note it. 1104818 6 255597 commit-queue 2015-06-25 18:01:12 -0700 Comment on attachment 255597 patch Clearing flags on attachment: 255597 Committed r185974: <http://trac.webkit.org/changeset/185974> 1104819 7 commit-queue 2015-06-25 18:01:17 -0700 All reviewed patches have been landed. Closing bug. 255531 2015-06-24 17:11:45 -0700 2015-06-25 17:00:32 -0700 patch focus.patch text/plain 10951 d_russell Y29tbWl0IDY2ZjAyNDBkOTdkNmIxOTRiOTFkYzc4NTU5NWVhYjcwYWYxMmVlY2EKQXV0aG9yOiBE b3VnIFJ1c3NlbGwgPGRfcnVzc2VsbEBhcHBsZS5jb20+CkRhdGU6ICAgV2VkIEp1biAyNCAxNzow NjoxMCAyMDE1IC0wNzAwCgogICAgQnVnIDE0NjMwMAogICAgCiAgICBBWDogQWNjZXNzaWJpbGl0 eU9iamVjdCBmb2N1cyBldmVudCB0aGF0IGRvZXNuJ3QgY2F1c2UgYSBzZWxlY3Rpb24gY2hhbmdl IGNhbiBsZWF2ZSBtX2lzU3luY2hyb25pemluZ1NlbGVjdGlvbiBzZXQgdG8gdHJ1ZQogICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjMwMAoKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3MTUz ZWVmLi4yMzM5MzA3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTUtMDYtMjQgIERvdWcgUnVz c2VsbCAgPGRfcnVzc2VsbEBhcHBsZS5jb20+CiAKKyAgICAgICAgQnVnIDE0NjMwMCBBWDogQWNj ZXNzaWJpbGl0eU9iamVjdCBmb2N1cyBldmVudCB0aGF0IGRvZXNuJ3QgY2F1c2UgYSBzZWxlY3Rp b24gCisgICAgICAgIGNoYW5nZSBjYW4gbGVhdmUgbV9pc1N5bmNocm9uaXppbmdTZWxlY3Rpb24g c2V0IHRvIHRydWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NjMwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIGEgY2xlYXJUZXh0U2VsZWN0aW9uSW50ZW50KCkgY29udmVuaWVuY2UgZnVuY3Rp b24gdG8gYmUgdXNlZCBhZnRlciBhbnkKKyAgICAgICAgZXZlbnQgdGhhdCBjYW4sIGJ1dCBpc24n dCBndWFyYW50ZWVkIHRvIHJlc3VsdCBpbiBhIHNlbGVjdGlvbiBjaGFuZ2UuIE1hdGNoZXMKKyAg ICAgICAgY2FsbHMgdG8gc2V0VGV4dFNlbGVjdGlvbkludGVudCgpIGNvbnZlbmllbmNlIGZ1bmN0 aW9uLgorICAgICAgICBBZGRlZCBzdXBwb3J0IGZvciB0ZXN0cyBsaXN0ZW5pbmcgZm9yIGZvY3Vz IGNoYW5nZSBub3RpZmljYXRpb25zLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2li aWxpdHkvZm9jdXMtc2V0dGluZy1zZWxlY3Rpb24tc3luY3Jvbml6aW5nLW5vdC1jbGVhcmluZy1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5 L2ZvY3VzLXNldHRpbmctc2VsZWN0aW9uLXN5bmNyb25pemluZy1ub3QtY2xlYXJpbmcuaHRtbDog QWRkZWQuCisKKzIwMTUtMDYtMjQgIERvdWcgUnVzc2VsbCAgPGRfcnVzc2VsbEBhcHBsZS5jb20+ CisKICAgICAgICAgQnVnIDE0NjE3NyAtIEFYOiBBWE9iamVjdENhY2hlIHNob3VsZCB0cnkgdG8g dXNlIGFuIHVuaWdub3JlZCBhY2Nlc3NpYmlsaXR5T2JqZWN0CiAgICAgICAgIHdoZW4gcG9zdGlu ZyBhIHNlbGVjdGlvbiBub3RpZmljYXRpb24gd2hlbiBvbiB0aGUgYm9yZGVyIGJldHdlZW4gdHdv IGFjY2Vzc2liaWxpdHlPYmplY3RzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDYxNzcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy9hY2Nlc3NpYmlsaXR5L2ZvY3VzLXNldHRpbmctc2VsZWN0aW9uLXN5bmNyb25pemluZy1ub3Qt Y2xlYXJpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2li aWxpdHkvZm9jdXMtc2V0dGluZy1zZWxlY3Rpb24tc3luY3Jvbml6aW5nLW5vdC1jbGVhcmluZy1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTBlODllYwot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5 L2ZvY3VzLXNldHRpbmctc2VsZWN0aW9uLXN5bmNyb25pemluZy1ub3QtY2xlYXJpbmctZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsMTcgQEAKKworIDEKKyAyCitUaGlzIHRlc3RzIHRoYXQgY2FsbGlu ZyBmb2N1cyBvbiBhIHJlbmRlciBvYmplY3Qgd2hlbiBpdCBkb2Vzbid0IHJlc3VsdCBpbiBhIHNl bGVjdGlvbiBjaGFuZ2Ugd29uJ3QgbGVhdmUgaXNTeW5jaHJvbml6aW5nU2VsZWN0aW9uIHNldCB0 byB0cnVlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1l c3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBhZGRlZE5vdGlm aWNhdGlvbiBpcyB0cnVlCitQQVNTIGF4VGV4dFN0YXRlU3luY09uZSBpcyB1bmRlZmluZWQKK1BB U1MgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCIxIikuaXNG b2N1c2FibGUgaXMgdHJ1ZQorUEFTUyBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxl bWVudC5pc0VxdWFsKGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJ ZCgiMSIpKSBpcyB0cnVlCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1Qg Q09NUExFVEUKK1BBU1MgYXhUZXh0U3RhdGVTeW5jVHdvIGlzIHVuZGVmaW5lZAorCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9mb2N1cy1zZXR0aW5n LXNlbGVjdGlvbi1zeW5jcm9uaXppbmctbm90LWNsZWFyaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9mb2N1cy1zZXR0aW5nLXNlbGVjdGlvbi1zeW5jcm9u aXppbmctbm90LWNsZWFyaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uYjk3OTBlNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9h Y2Nlc3NpYmlsaXR5L2ZvY3VzLXNldHRpbmctc2VsZWN0aW9uLXN5bmNyb25pemluZy1ub3QtY2xl YXJpbmcuaHRtbApAQCAtMCwwICsxLDgwIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lF VEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4u L3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0i Ym9keSI+CisKKzxmaWVsZHNldD4KKyAgICA8ZGl2PgorICAgICAgICA8aW5wdXQgaWQ9IjEiPgor ICAgICAgICA8bGFiZWwgZm9yPSIxIj4xPC9sYWJlbD4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2Pgor ICAgICAgICA8aW5wdXQgaWQ9IjIiPgorICAgICAgICA8bGFiZWwgZm9yPSIyIj4yPC9sYWJlbD4K KyAgICA8L2Rpdj4KKzwvZmllbGRzZXQ+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRp diBpZD0iY29uc29sZSI+PC9kaXY+Cis8ZGl2IGlkPSJub3RpZmljYXRpb25zIj48L2Rpdj4KKwor PHNjcmlwdD4KKworICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3RzIHRoYXQgY2FsbGluZyBmb2N1 cyBvbiBhIHJlbmRlciBvYmplY3Qgd2hlbiBpdCBkb2Vzbid0IHJlc3VsdCBpbiBhIHNlbGVjdGlv biBjaGFuZ2Ugd29uJ3QgbGVhdmUgaXNTeW5jaHJvbml6aW5nU2VsZWN0aW9uIHNldCB0byB0cnVl LiIpOworCisgICAgdmFyIHdlYkFyZWEgPSAwOworICAgIHZhciBheFRleHRTdGF0ZVN5bmNPbmUg PSAwOworICAgIHZhciBheFRleHRTdGF0ZVN5bmNUd28gPSAwOworICAgIHZhciBzZWxlY3RDb3Vu dCA9IDA7CisgICAgdmFyIGZvY3VzQ291bnQgPSAwOworCisgICAgLy8gTm90aWZpY2F0aW9uIG9y ZGVyaW5nOgorICAgIC8vIFRoZSBmaXJzdCB0YWIgd2lsbCByZXN1bHQgaW4gYSBzZWxlY3Rpb24g YW5kIGZvY3VzIG5vdGlmaWNhdGlvbiBwYWlyICAgICAgICAgc2VsZWN0Q291bnQ9MSwgZm9jdXND b3VudD0xCisgICAgLy8gdGFrZUZvY3VzKCkgd2lsbCByZXN1bHQgaW4gYSBmb2N1cyBub3RpZmlj YXRpb24gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3RDb3VudD0xLCBmb2N1c0Nv dW50PTIKKyAgICAvLyBUaGUgc2Vjb25kIHRhYiB3aWxsIHJlc3VsdCBpbiBhbm90aGVyIHNlbGVj dGlvbiBhbmQgZm9jdXMgbm90aWZpY2F0aW9uIHBhaXIgIHNlbGVjdENvdW50PTIsIGZvY3VzQ291 bnQ9MworICAgIGZ1bmN0aW9uIG5vdGlmaWNhdGlvbkNhbGxiYWNrKG5vdGlmaWNhdGlvbiwgdXNl ckluZm8pIHsKKyAgICAgICAgaWYgKG5vdGlmaWNhdGlvbiA9PSAiQVhTZWxlY3RlZFRleHRDaGFu Z2VkIikgeworICAgICAgICAgICAgc2VsZWN0Q291bnQrKzsKKyAgICAgICAgICAgIGlmIChzZWxl Y3RDb3VudCA9PSAxKSB7CisgICAgICAgICAgICAgICAgYXhUZXh0U3RhdGVTeW5jT25lID0gdXNl ckluZm9bIkFYVGV4dFN0YXRlU3luYyJdOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJheFRl eHRTdGF0ZVN5bmNPbmUiLCAidW5kZWZpbmVkIik7CisKKyAgICAgICAgICAgICAgICBzaG91bGRC ZSgiYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKFwiMVwiKS5p c0ZvY3VzYWJsZSIsICJ0cnVlIik7CisgICAgICAgICAgICAgICAgYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCIxIikudGFrZUZvY3VzKCk7CisgICAgICAgICAg ICB9IGVsc2UgaWYgKHNlbGVjdENvdW50ID09IDIpIHsKKyAgICAgICAgICAgICAgICBheFRleHRT dGF0ZVN5bmNUd28gPSB1c2VySW5mb1siQVhUZXh0U3RhdGVTeW5jIl07CisgICAgICAgICAgICAg ICAgc2hvdWxkQmUoImF4VGV4dFN0YXRlU3luY1R3byIsICJ1bmRlZmluZWQiKTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChub3RpZmljYXRpb24gPT0gIkFYRm9jdXNlZFVJRWxl bWVudENoYW5nZWQiKSB7CisgICAgICAgICAgICBmb2N1c0NvdW50Kys7CisgICAgICAgICAgICBp ZiAoZm9jdXNDb3VudCA9PSAyKSB7CisgICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIuc2NoZWR1 bGVBc3luY2hyb25vdXNLZXlEb3duKCJcdCIpOworICAgICAgICAgICAgfQorICAgICAgICB9Cisg ICAgICAgIGlmIChzZWxlY3RDb3VudCA9PSAyICYmIGZvY3VzQ291bnQgPT0gMykgeworICAgICAg ICAgICAgd2ViQXJlYS5yZW1vdmVOb3RpZmljYXRpb25MaXN0ZW5lcigpOworICAgICAgICAgICAg dGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBpZiAod2lu ZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAgIHRlc3RSdW5uZXIud2FpdFVu dGlsRG9uZSgpOworICAgICAgICB0ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0 VGFiVG9MaW5rc1ByZWZlcmVuY2VLZXkiLCAxKTsKKworICAgICAgICBhY2Nlc3NpYmlsaXR5Q29u dHJvbGxlci5lbmFibGVFbmhhbmNlZEFjY2Vzc2liaWxpdHkodHJ1ZSk7CisgICAgICAgIHdlYkFy ZWEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5yb290RWxlbWVudC5jaGlsZEF0SW5kZXgoMCk7 CisKKyAgICAgICAgdmFyIGFkZGVkTm90aWZpY2F0aW9uID0gd2ViQXJlYS5hZGROb3RpZmljYXRp b25MaXN0ZW5lcihub3RpZmljYXRpb25DYWxsYmFjayk7CisgICAgICAgIHNob3VsZEJlKCJhZGRl ZE5vdGlmaWNhdGlvbiIsICJ0cnVlIik7CisKKyAgICAgICAgZXZlbnRTZW5kZXIua2V5RG93bigi XHQiKTsKKyAgICAgICAgc2hvdWxkQmUoImFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRF bGVtZW50LmlzRXF1YWwoYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRC eUlkKFwiMVwiKSkiLCAidHJ1ZSIpOworICAgIH0KKworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3Jj PSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzNDNkNjdjLi45YTViMDVhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjYgQEAKKzIwMTUtMDYtMjQgIERvdWcgUnVzc2VsbCAgPGRfcnVzc2VsbEBhcHBsZS5j b20+CisKKyAgICAgICAgQnVnIDE0NjMwMCBBWDogQWNjZXNzaWJpbGl0eU9iamVjdCBmb2N1cyBl dmVudCB0aGF0IGRvZXNuJ3QgY2F1c2UgYSBzZWxlY3Rpb24gCisgICAgICAgIGNoYW5nZSBjYW4g bGVhdmUgbV9pc1N5bmNocm9uaXppbmdTZWxlY3Rpb24gc2V0IHRvIHRydWUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjMwMAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGEgY2xlYXJUZXh0U2Vs ZWN0aW9uSW50ZW50KCkgY29udmVuaWVuY2UgZnVuY3Rpb24gdG8gYmUgdXNlZCBhZnRlciBhbnkK KyAgICAgICAgZXZlbnQgdGhhdCBjYW4sIGJ1dCBpc24ndCBndWFyYW50ZWVkIHRvIHJlc3VsdCBp biBhIHNlbGVjdGlvbiBjaGFuZ2UuIE1hdGNoZXMKKyAgICAgICAgY2FsbHMgdG8gc2V0VGV4dFNl bGVjdGlvbkludGVudCgpIGNvbnZlbmllbmNlIGZ1bmN0aW9uLgorICAgICAgICBBZGRlZCBzdXBw b3J0IGZvciB0ZXN0cyBsaXN0ZW5pbmcgZm9yIGZvY3VzIGNoYW5nZSBub3RpZmljYXRpb25zLgor CisgICAgICAgIFRlc3Q6IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ZvY3VzLXNldHRpbmct c2VsZWN0aW9uLXN5bmNyb25pemluZy1ub3QtY2xlYXJpbmcuaHRtbAorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmNsZWFyVGV4dFNlbGVjdGlvbkludGVudCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxlY3RlZFRleHRSYW5nZSk6CisgICAgICAgIChXZWJD b3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRGb2N1c2VkKToKKyAgICAgICAgKFdl YkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVmlzaWJsZVBvc2l0 aW9uUmFuZ2UpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpwbGF0Zm9ybUhhbmRsZUZvY3Vz ZWRVSUVsZW1lbnRDaGFuZ2VkKToKKwogMjAxNS0wNi0yNCAgTWF0dCBSYWpjYSAgPG1yYWpjYUBh cHBsZS5jb20+CiAKICAgICAgICAgTWVkaWFTZXNzaW9uOiBwcm9wYWdhdGUgTWVkaWFTZXNzaW9u TWV0YWRhdGEgdG8gV2ViUGFnZVByb3h5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCBlODNhZmVi Li40ZDIyYTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKQEAgLTE1MDgsMTIgKzE1MDgsMjIgQEAg c3RhdGljIHZvaWQgc2V0VGV4dFNlbGVjdGlvbkludGVudChjb25zdCBBY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0JiByZW5kZXJPYmplY3QKICAgICBjYWNoZS0+c2V0SXNTeW5jaHJvbml6aW5nU2Vs ZWN0aW9uKHRydWUpOwogfQogCitzdGF0aWMgdm9pZCBjbGVhclRleHRTZWxlY3Rpb25JbnRlbnQo Y29uc3QgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCYgcmVuZGVyT2JqZWN0KQoreworICAgIEFY T2JqZWN0Q2FjaGUqIGNhY2hlID0gcmVuZGVyT2JqZWN0LmF4T2JqZWN0Q2FjaGUoKTsKKyAgICBp ZiAoIWNhY2hlKQorICAgICAgICByZXR1cm47CisgICAgY2FjaGUtPnNldFRleHRTZWxlY3Rpb25J bnRlbnQoQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQoKSk7CisgICAgY2FjaGUtPnNldElzU3luY2hy b25pemluZ1NlbGVjdGlvbihmYWxzZSk7Cit9CisKIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6c2V0U2VsZWN0ZWRUZXh0UmFuZ2UoY29uc3QgUGxhaW5UZXh0UmFuZ2UmIHJhbmdlKQog ewogICAgIGlmIChpc05hdGl2ZVRleHRDb250cm9sKCkpIHsKICAgICAgICAgc2V0VGV4dFNlbGVj dGlvbkludGVudCgqdGhpcywgcmFuZ2UubGVuZ3RoID8gQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2Vs ZWN0aW9uRXh0ZW5kIDogQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uTW92ZSk7CiAgICAg ICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50JiB0ZXh0Q29udHJvbCA9IGRvd25jYXN0PFJl bmRlclRleHRDb250cm9sPigqbV9yZW5kZXJlcikudGV4dEZvcm1Db250cm9sRWxlbWVudCgpOwog ICAgICAgICB0ZXh0Q29udHJvbC5zZXRTZWxlY3Rpb25SYW5nZShyYW5nZS5zdGFydCwgcmFuZ2Uu c3RhcnQgKyByYW5nZS5sZW5ndGgpOworICAgICAgICBjbGVhclRleHRTZWxlY3Rpb25JbnRlbnQo KnRoaXMpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xNTIxLDYgKzE1MzEsNyBAQCB2 b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldFNlbGVjdGVkVGV4dFJhbmdlKGNvbnN0 IFBsYWluVGV4dFJhbmdlJiByYW5nZQogICAgIFZpc2libGVTZWxlY3Rpb24gbmV3U2VsZWN0aW9u KFBvc2l0aW9uKG5vZGUsIHJhbmdlLnN0YXJ0LCBQb3NpdGlvbjo6UG9zaXRpb25Jc09mZnNldElu QW5jaG9yKSwgUG9zaXRpb24obm9kZSwgcmFuZ2Uuc3RhcnQgKyByYW5nZS5sZW5ndGgsIFBvc2l0 aW9uOjpQb3NpdGlvbklzT2Zmc2V0SW5BbmNob3IpLCBET1dOU1RSRUFNKTsKICAgICBzZXRUZXh0 U2VsZWN0aW9uSW50ZW50KCp0aGlzLCByYW5nZS5sZW5ndGggPyBBWFRleHRTdGF0ZUNoYW5nZVR5 cGVTZWxlY3Rpb25FeHRlbmQgOiBBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25Nb3ZlKTsK ICAgICBtX3JlbmRlcmVyLT5mcmFtZSgpLnNlbGVjdGlvbigpLnNldFNlbGVjdGlvbihuZXdTZWxl Y3Rpb24sIEZyYW1lU2VsZWN0aW9uOjpkZWZhdWx0U2V0U2VsZWN0aW9uT3B0aW9ucygpKTsKKyAg ICBjbGVhclRleHRTZWxlY3Rpb25JbnRlbnQoKnRoaXMpOwogfQogCiBVUkwgQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6dXJsKCkgY29uc3QKQEAgLTE2NzYsNiArMTY4Nyw3IEBAIHZvaWQgQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2V0Rm9jdXNlZChib29sIG9uKQogCiAgICAgc2V0VGV4 dFNlbGVjdGlvbkludGVudCgqdGhpcywgQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uTW92 ZSk7CiAgICAgZG93bmNhc3Q8RWxlbWVudD4oKm5vZGUpLmZvY3VzKCk7CisgICAgY2xlYXJUZXh0 U2VsZWN0aW9uSW50ZW50KCp0aGlzKTsKIH0KIAogdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0OjpzZXRTZWxlY3RlZFJvd3MoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBzZWxlY3Rl ZFJvd3MpCkBAIC0xOTkxLDExICsyMDAzLDEzIEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6c2V0U2VsZWN0ZWRWaXNpYmxlUG9zaXRpb25SYW5nZShjb25zdCBWaXNpYmxlUG9zCiAg ICAgaWYgKHJhbmdlLnN0YXJ0ID09IHJhbmdlLmVuZCkgewogICAgICAgICBzZXRUZXh0U2VsZWN0 aW9uSW50ZW50KCp0aGlzLCBBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25Nb3ZlKTsKICAg ICAgICAgbV9yZW5kZXJlci0+ZnJhbWUoKS5zZWxlY3Rpb24oKS5tb3ZlVG8ocmFuZ2Uuc3RhcnQs IFVzZXJUcmlnZ2VyZWQpOworICAgICAgICBjbGVhclRleHRTZWxlY3Rpb25JbnRlbnQoKnRoaXMp OwogICAgIH0KICAgICBlbHNlIHsKICAgICAgICAgc2V0VGV4dFNlbGVjdGlvbkludGVudCgqdGhp cywgQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uRXh0ZW5kKTsKICAgICAgICAgVmlzaWJs ZVNlbGVjdGlvbiBuZXdTZWxlY3Rpb24gPSBWaXNpYmxlU2VsZWN0aW9uKHJhbmdlLnN0YXJ0LCBy YW5nZS5lbmQpOwogICAgICAgICBtX3JlbmRlcmVyLT5mcmFtZSgpLnNlbGVjdGlvbigpLnNldFNl bGVjdGlvbihuZXdTZWxlY3Rpb24sIEZyYW1lU2VsZWN0aW9uOjpkZWZhdWx0U2V0U2VsZWN0aW9u T3B0aW9ucygpKTsKKyAgICAgICAgY2xlYXJUZXh0U2VsZWN0aW9uSW50ZW50KCp0aGlzKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FY T2JqZWN0Q2FjaGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9i amVjdENhY2hlTWFjLm1tCmluZGV4IDFiMzY2ODAuLjQxYmRkNDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQpAQCAtMzMz LDYgKzMzMyw4IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6ZnJhbWVMb2FkaW5nRXZlbnRQbGF0Zm9y bU5vdGlmaWNhdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBhCiB2b2lkIEFYT2JqZWN0Q2FjaGU6 OnBsYXRmb3JtSGFuZGxlRm9jdXNlZFVJRWxlbWVudENoYW5nZWQoTm9kZSosIE5vZGUqKQogewog ICAgIHdrQWNjZXNzaWJpbGl0eUhhbmRsZUZvY3VzQ2hhbmdlZCgpOworICAgIGlmIChVTkxJS0VM WShheFNob3VsZFJlcG9zdE5vdGlmaWNhdGlvbnNGb3JUZXN0cykpCisgICAgICAgIFtyb290V2Vi QXJlYSgpLT53cmFwcGVyKCkgYWNjZXNzaWJpbGl0eVBvc3RlZE5vdGlmaWNhdGlvbjpOU0FjY2Vz c2liaWxpdHlGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZE5vdGlmaWNhdGlvbiB1c2VySW5mbzpuaWxd OwogfQogCiB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZVNjcm9sbGVkVG9BbmNob3IoY29uc3Qg Tm9kZSopCg== 255597 2015-06-25 17:00:32 -0700 2015-06-25 18:01:12 -0700 patch focus.patch text/plain 11902 d_russell Y29tbWl0IGUzN2EyMWU3MDY2ZTkwMTNiNDE5NTRhZTIxMzUyMjk5NmQxZjllMzUKQXV0aG9yOiBE b3VnIFJ1c3NlbGwgPGRfcnVzc2VsbEBhcHBsZS5jb20+CkRhdGU6ICAgV2VkIEp1biAyNCAxNzow NjoxMCAyMDE1IC0wNzAwCgogICAgQnVnIDE0NjMwMAoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5NmVmNmY0Li5lNGQ2NDg5 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTUtMDYtMjUgIERvdWcgUnVzc2VsbCAgPGRfcnVz c2VsbEBhcHBsZS5jb20+CisKKyAgICAgICAgQnVnIDE0NjMwMCBBWDogQWNjZXNzaWJpbGl0eU9i amVjdCBmb2N1cyBldmVudHMgdGhhdCBkb24ndCBjYXVzZSBhIHNlbGVjdGlvbiAKKyAgICAgICAg Y2hhbmdlIGNhbiBsZWF2ZSBtX2lzU3luY2hyb25pemluZ1NlbGVjdGlvbiBzZXQgdG8gdHJ1ZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MzAwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBj bGVhclRleHRTZWxlY3Rpb25JbnRlbnQoKSBjb252ZW5pZW5jZSBmdW5jdGlvbiB0byBiZSB1c2Vk IGFmdGVyIGFueQorICAgICAgICBldmVudCB0aGF0IGNhbiwgYnV0IGlzbid0IGd1YXJhbnRlZWQg dG8gcmVzdWx0IGluIGEgc2VsZWN0aW9uIGNoYW5nZS4gTWF0Y2hlcworICAgICAgICBjYWxscyB0 byBzZXRUZXh0U2VsZWN0aW9uSW50ZW50KCkgY29udmVuaWVuY2UgZnVuY3Rpb24uCisgICAgICAg IEFkZGVkIHN1cHBvcnQgZm9yIHRlc3RzIGxpc3RlbmluZyBmb3IgZm9jdXMgY2hhbmdlIG5vdGlm aWNhdGlvbnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9mb2N1cy1z ZXR0aW5nLXNlbGVjdGlvbi1zeW5jcm9uaXppbmctbm90LWNsZWFyaW5nLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvZm9jdXMtc2V0dGlu Zy1zZWxlY3Rpb24tc3luY3Jvbml6aW5nLW5vdC1jbGVhcmluZy5odG1sOiBBZGRlZC4KKwogMjAx NS0wNi0yNSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAg ICBWaWV3cG9ydCB1bml0cyBhcmUgd3Jvbmcgd2hlbiBzY2FsZWQgaW4gMi11cCBtb2RlLCBjYXVz ZSBjb250ZW50IHRvIGhvcCBhcm91bmQgb24gYXBwbGUuY29tL211c2ljCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9mb2N1cy1zZXR0aW5nLXNlbGVj dGlvbi1zeW5jcm9uaXppbmctbm90LWNsZWFyaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ZvY3VzLXNldHRpbmctc2VsZWN0aW9uLXN5bmNy b25pemluZy1ub3QtY2xlYXJpbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmUwZTg5ZWMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9mb2N1cy1zZXR0aW5nLXNlbGVjdGlvbi1zeW5jcm9uaXpp bmctbm90LWNsZWFyaW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE3IEBACisKKyAxCisgMgor VGhpcyB0ZXN0cyB0aGF0IGNhbGxpbmcgZm9jdXMgb24gYSByZW5kZXIgb2JqZWN0IHdoZW4gaXQg ZG9lc24ndCByZXN1bHQgaW4gYSBzZWxlY3Rpb24gY2hhbmdlIHdvbid0IGxlYXZlIGlzU3luY2hy b25pemluZ1NlbGVjdGlvbiBzZXQgdG8gdHJ1ZS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2Vl IGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUi LgorCisKK1BBU1MgYWRkZWROb3RpZmljYXRpb24gaXMgdHJ1ZQorUEFTUyBheFRleHRTdGF0ZVN5 bmNPbmUgaXMgdW5kZWZpbmVkCitQQVNTIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2li bGVFbGVtZW50QnlJZCgiMSIpLmlzRm9jdXNhYmxlIGlzIHRydWUKK1BBU1MgYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuaXNFcXVhbChhY2Nlc3NpYmlsaXR5Q29udHJvbGxl ci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoIjEiKSkgaXMgdHJ1ZQorUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCitQQVNTIGF4VGV4dFN0YXRlU3luY1R3byBp cyB1bmRlZmluZWQKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vz c2liaWxpdHkvZm9jdXMtc2V0dGluZy1zZWxlY3Rpb24tc3luY3Jvbml6aW5nLW5vdC1jbGVhcmlu Zy5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvZm9jdXMtc2V0 dGluZy1zZWxlY3Rpb24tc3luY3Jvbml6aW5nLW5vdC1jbGVhcmluZy5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjljYzBkMWUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9mb2N1cy1zZXR0aW5nLXNlbGVjdGlv bi1zeW5jcm9uaXppbmctbm90LWNsZWFyaW5nLmh0bWwKQEAgLTAsMCArMSw4MCBAQAorPCFET0NU WVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4K KzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0 PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorCis8ZmllbGRzZXQ+CisgICAgPGRpdj4KKyAg ICAgICAgPGlucHV0IGlkPSIxIj4KKyAgICAgICAgPGxhYmVsIGZvcj0iMSI+MTwvbGFiZWw+Cisg ICAgPC9kaXY+CisgICAgPGRpdj4KKyAgICAgICAgPGlucHV0IGlkPSIyIj4KKyAgICAgICAgPGxh YmVsIGZvcj0iMiI+MjwvbGFiZWw+CisgICAgPC9kaXY+Cis8L2ZpZWxkc2V0PgorCis8cCBpZD0i ZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPGRpdiBpZD0ibm90 aWZpY2F0aW9ucyI+PC9kaXY+CisKKzxzY3JpcHQ+CisKKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0 ZXN0cyB0aGF0IGNhbGxpbmcgZm9jdXMgb24gYSByZW5kZXIgb2JqZWN0IHdoZW4gaXQgZG9lc24n dCByZXN1bHQgaW4gYSBzZWxlY3Rpb24gY2hhbmdlIHdvbid0IGxlYXZlIGlzU3luY2hyb25pemlu Z1NlbGVjdGlvbiBzZXQgdG8gdHJ1ZS4iKTsKKworICAgIHZhciB3ZWJBcmVhID0gMDsKKyAgICB2 YXIgYXhUZXh0U3RhdGVTeW5jT25lID0gMDsKKyAgICB2YXIgYXhUZXh0U3RhdGVTeW5jVHdvID0g MDsKKyAgICB2YXIgc2VsZWN0Q291bnQgPSAwOworICAgIHZhciBmb2N1c0NvdW50ID0gMDsKKwor ICAgIC8vIE5vdGlmaWNhdGlvbiBvcmRlcmluZzoKKyAgICAvLyBUaGUgZmlyc3QgdGFiIHdpbGwg cmVzdWx0IGluIGEgc2VsZWN0aW9uIGFuZCBmb2N1cyBub3RpZmljYXRpb24gcGFpciAgICAgICAg IHNlbGVjdENvdW50PTEsIGZvY3VzQ291bnQ9MQorICAgIC8vIHRha2VGb2N1cygpIHdpbGwgcmVz dWx0IGluIGEgZm9jdXMgbm90aWZpY2F0aW9uICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2VsZWN0Q291bnQ9MSwgZm9jdXNDb3VudD0yCisgICAgLy8gVGhlIHNlY29uZCB0YWIgd2lsbCBy ZXN1bHQgaW4gYW5vdGhlciBzZWxlY3Rpb24gYW5kIGZvY3VzIG5vdGlmaWNhdGlvbiBwYWlyICBz ZWxlY3RDb3VudD0yLCBmb2N1c0NvdW50PTMKKyAgICBmdW5jdGlvbiBub3RpZmljYXRpb25DYWxs YmFjayhub3RpZmljYXRpb24sIHVzZXJJbmZvKSB7CisgICAgICAgIGlmIChub3RpZmljYXRpb24g PT0gIkFYU2VsZWN0ZWRUZXh0Q2hhbmdlZCIpIHsKKyAgICAgICAgICAgIHNlbGVjdENvdW50Kys7 CisgICAgICAgICAgICBpZiAoc2VsZWN0Q291bnQgPT0gMSkgeworICAgICAgICAgICAgICAgIGF4 VGV4dFN0YXRlU3luY09uZSA9IHVzZXJJbmZvWyJBWFRleHRTdGF0ZVN5bmMiXTsKKyAgICAgICAg ICAgICAgICBzaG91bGRCZSgiYXhUZXh0U3RhdGVTeW5jT25lIiwgInVuZGVmaW5lZCIpOworCisg ICAgICAgICAgICAgICAgc2hvdWxkQmUoImFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2li bGVFbGVtZW50QnlJZChcIjFcIikuaXNGb2N1c2FibGUiLCAidHJ1ZSIpOworICAgICAgICAgICAg ICAgIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiMSIpLnRh a2VGb2N1cygpOworICAgICAgICAgICAgfSBlbHNlIGlmIChzZWxlY3RDb3VudCA9PSAyKSB7Cisg ICAgICAgICAgICAgICAgYXhUZXh0U3RhdGVTeW5jVHdvID0gdXNlckluZm9bIkFYVGV4dFN0YXRl U3luYyJdOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJheFRleHRTdGF0ZVN5bmNUd28iLCAi dW5kZWZpbmVkIik7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSBpZiAobm90aWZpY2F0 aW9uID09ICJBWEZvY3VzQ2hhbmdlZCIpIHsKKyAgICAgICAgICAgIGZvY3VzQ291bnQrKzsKKyAg ICAgICAgICAgIGlmIChmb2N1c0NvdW50ID09IDIpIHsKKyAgICAgICAgICAgICAgICBldmVudFNl bmRlci5zY2hlZHVsZUFzeW5jaHJvbm91c0tleURvd24oIlx0Iik7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KKyAgICAgICAgaWYgKHNlbGVjdENvdW50ID09IDIgJiYgZm9jdXNDb3VudCA9PSAz KSB7CisgICAgICAgICAgICB3ZWJBcmVhLnJlbW92ZU5vdGlmaWNhdGlvbkxpc3RlbmVyKCk7Cisg ICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgfQorICAgIH0KKwor ICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgdGVzdFJ1 bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgIHRlc3RSdW5uZXIub3ZlcnJpZGVQcmVmZXJl bmNlKCJXZWJLaXRUYWJUb0xpbmtzUHJlZmVyZW5jZUtleSIsIDEpOworCisgICAgICAgIGFjY2Vz c2liaWxpdHlDb250cm9sbGVyLmVuYWJsZUVuaGFuY2VkQWNjZXNzaWJpbGl0eSh0cnVlKTsKKyAg ICAgICAgd2ViQXJlYSA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLnJvb3RFbGVtZW50LmNoaWxk QXRJbmRleCgwKTsKKworICAgICAgICB2YXIgYWRkZWROb3RpZmljYXRpb24gPSB3ZWJBcmVhLmFk ZE5vdGlmaWNhdGlvbkxpc3RlbmVyKG5vdGlmaWNhdGlvbkNhbGxiYWNrKTsKKyAgICAgICAgc2hv dWxkQmUoImFkZGVkTm90aWZpY2F0aW9uIiwgInRydWUiKTsKKworICAgICAgICBldmVudFNlbmRl ci5rZXlEb3duKCJcdCIpOworICAgICAgICBzaG91bGRCZSgiYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIuZm9jdXNlZEVsZW1lbnQuaXNFcXVhbChhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3Np YmxlRWxlbWVudEJ5SWQoXCIxXCIpKSIsICJ0cnVlIik7CisgICAgfQorCis8L3NjcmlwdD4KKwor PHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0 PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDRkZmQxY2YuLjIzYjg1OTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxNS0wNi0yNSAgRG91ZyBSdXNzZWxsICA8ZF9ydXNz ZWxsQGFwcGxlLmNvbT4KKworICAgICAgICBCdWcgMTQ2MzAwIEFYOiBBY2Nlc3NpYmlsaXR5T2Jq ZWN0IGZvY3VzIGV2ZW50cyB0aGF0IGRvbid0IGNhdXNlIGEgc2VsZWN0aW9uIAorICAgICAgICBj aGFuZ2UgY2FuIGxlYXZlIG1faXNTeW5jaHJvbml6aW5nU2VsZWN0aW9uIHNldCB0byB0cnVlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDYzMDAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBhIGNs ZWFyVGV4dFNlbGVjdGlvbkludGVudCgpIGNvbnZlbmllbmNlIGZ1bmN0aW9uIHRvIGJlIHVzZWQg YWZ0ZXIgYW55CisgICAgICAgIGV2ZW50IHRoYXQgY2FuLCBidXQgaXNuJ3QgZ3VhcmFudGVlZCB0 byByZXN1bHQgaW4gYSBzZWxlY3Rpb24gY2hhbmdlLiBNYXRjaGVzCisgICAgICAgIGNhbGxzIHRv IHNldFRleHRTZWxlY3Rpb25JbnRlbnQoKSBjb252ZW5pZW5jZSBmdW5jdGlvbi4KKyAgICAgICAg QWRkZWQgc3VwcG9ydCBmb3IgdGVzdHMgbGlzdGVuaW5nIGZvciBmb2N1cyBjaGFuZ2Ugbm90aWZp Y2F0aW9ucy4KKworICAgICAgICBUZXN0OiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9mb2N1 cy1zZXR0aW5nLXNlbGVjdGlvbi1zeW5jcm9uaXppbmctbm90LWNsZWFyaW5nLmh0bWwKKworICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpjbGVhclRleHRTZWxlY3Rpb25JbnRlbnQpOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2V0U2VsZWN0ZWRUZXh0UmFuZ2UpOgorICAg ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2V0Rm9jdXNlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxlY3RlZFZp c2libGVQb3NpdGlvblJhbmdlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVj dENhY2hlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cGxhdGZvcm1I YW5kbGVGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZCk6CisKIDIwMTUtMDYtMjUgIERlYW4gSmFja3Nv biAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIElubGluZSBtZWRpYSBjb250cm9scyBkaXNh cHBlYXIgd2hlbiByZXR1cm5pbmcgYSB2aWRlbyB0byBpbmxpbmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw CmluZGV4IGU4M2FmZWIuLmFlNGZiMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcApAQCAtMTQ5OCw5 ICsxNDk4LDggQEAgUGxhaW5UZXh0UmFuZ2UgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2Vs ZWN0ZWRUZXh0UmFuZ2UoKSBjb25zdAogICAgIHJldHVybiBkb2N1bWVudEJhc2VkU2VsZWN0ZWRU ZXh0UmFuZ2UoKTsKIH0KIAotc3RhdGljIHZvaWQgc2V0VGV4dFNlbGVjdGlvbkludGVudChjb25z dCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0JiByZW5kZXJPYmplY3QsIEFYVGV4dFN0YXRlQ2hh bmdlVHlwZSB0eXBlKQorc3RhdGljIHZvaWQgc2V0VGV4dFNlbGVjdGlvbkludGVudChBWE9iamVj dENhY2hlKiBjYWNoZSwgQVhUZXh0U3RhdGVDaGFuZ2VUeXBlIHR5cGUpCiB7Ci0gICAgQVhPYmpl Y3RDYWNoZSogY2FjaGUgPSByZW5kZXJPYmplY3QuYXhPYmplY3RDYWNoZSgpOwogICAgIGlmICgh Y2FjaGUpCiAgICAgICAgIHJldHVybjsKICAgICBBWFRleHRTdGF0ZUNoYW5nZUludGVudCBpbnRl bnQodHlwZSwgQVhUZXh0U2VsZWN0aW9uIHsgQVhUZXh0U2VsZWN0aW9uRGlyZWN0aW9uRGlzY29u dGlndW91cywgQVhUZXh0U2VsZWN0aW9uR3JhbnVsYXJpdHlVbmtub3duIH0pOwpAQCAtMTUwOCwx OSArMTUwNywyOSBAQCBzdGF0aWMgdm9pZCBzZXRUZXh0U2VsZWN0aW9uSW50ZW50KGNvbnN0IEFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3QmIHJlbmRlck9iamVjdAogICAgIGNhY2hlLT5zZXRJc1N5 bmNocm9uaXppbmdTZWxlY3Rpb24odHJ1ZSk7CiB9CiAKK3N0YXRpYyB2b2lkIGNsZWFyVGV4dFNl bGVjdGlvbkludGVudChBWE9iamVjdENhY2hlKiBjYWNoZSkKK3sKKyAgICBpZiAoIWNhY2hlKQor ICAgICAgICByZXR1cm47CisgICAgY2FjaGUtPnNldFRleHRTZWxlY3Rpb25JbnRlbnQoQVhUZXh0 U3RhdGVDaGFuZ2VJbnRlbnQoKSk7CisgICAgY2FjaGUtPnNldElzU3luY2hyb25pemluZ1NlbGVj dGlvbihmYWxzZSk7Cit9CisKIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2V0U2Vs ZWN0ZWRUZXh0UmFuZ2UoY29uc3QgUGxhaW5UZXh0UmFuZ2UmIHJhbmdlKQogewogICAgIGlmIChp c05hdGl2ZVRleHRDb250cm9sKCkpIHsKLSAgICAgICAgc2V0VGV4dFNlbGVjdGlvbkludGVudCgq dGhpcywgcmFuZ2UubGVuZ3RoID8gQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uRXh0ZW5k IDogQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uTW92ZSk7CisgICAgICAgIHNldFRleHRT ZWxlY3Rpb25JbnRlbnQoYXhPYmplY3RDYWNoZSgpLCByYW5nZS5sZW5ndGggPyBBWFRleHRTdGF0 ZUNoYW5nZVR5cGVTZWxlY3Rpb25FeHRlbmQgOiBBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rp b25Nb3ZlKTsKICAgICAgICAgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQmIHRleHRDb250cm9s ID0gZG93bmNhc3Q8UmVuZGVyVGV4dENvbnRyb2w+KCptX3JlbmRlcmVyKS50ZXh0Rm9ybUNvbnRy b2xFbGVtZW50KCk7CiAgICAgICAgIHRleHRDb250cm9sLnNldFNlbGVjdGlvblJhbmdlKHJhbmdl LnN0YXJ0LCByYW5nZS5zdGFydCArIHJhbmdlLmxlbmd0aCk7CisgICAgICAgIGNsZWFyVGV4dFNl bGVjdGlvbkludGVudChheE9iamVjdENhY2hlKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQog CiAgICAgTm9kZSogbm9kZSA9IG1fcmVuZGVyZXItPm5vZGUoKTsKICAgICBWaXNpYmxlU2VsZWN0 aW9uIG5ld1NlbGVjdGlvbihQb3NpdGlvbihub2RlLCByYW5nZS5zdGFydCwgUG9zaXRpb246OlBv c2l0aW9uSXNPZmZzZXRJbkFuY2hvciksIFBvc2l0aW9uKG5vZGUsIHJhbmdlLnN0YXJ0ICsgcmFu Z2UubGVuZ3RoLCBQb3NpdGlvbjo6UG9zaXRpb25Jc09mZnNldEluQW5jaG9yKSwgRE9XTlNUUkVB TSk7Ci0gICAgc2V0VGV4dFNlbGVjdGlvbkludGVudCgqdGhpcywgcmFuZ2UubGVuZ3RoID8gQVhU ZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uRXh0ZW5kIDogQVhUZXh0U3RhdGVDaGFuZ2VUeXBl U2VsZWN0aW9uTW92ZSk7CisgICAgc2V0VGV4dFNlbGVjdGlvbkludGVudChheE9iamVjdENhY2hl KCksIHJhbmdlLmxlbmd0aCA/IEFYVGV4dFN0YXRlQ2hhbmdlVHlwZVNlbGVjdGlvbkV4dGVuZCA6 IEFYVGV4dFN0YXRlQ2hhbmdlVHlwZVNlbGVjdGlvbk1vdmUpOwogICAgIG1fcmVuZGVyZXItPmZy YW1lKCkuc2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9uKG5ld1NlbGVjdGlvbiwgRnJhbWVTZWxlY3Rp b246OmRlZmF1bHRTZXRTZWxlY3Rpb25PcHRpb25zKCkpOworICAgIGNsZWFyVGV4dFNlbGVjdGlv bkludGVudChheE9iamVjdENhY2hlKCkpOwogfQogCiBVUkwgQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6dXJsKCkgY29uc3QKQEAgLTE2NzQsOCArMTY4Myw5IEBAIHZvaWQgQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6c2V0Rm9jdXNlZChib29sIG9uKQogICAgIGlmIChkb2N1bWVudC0+Zm9j dXNlZEVsZW1lbnQoKSA9PSBub2RlKQogICAgICAgICBkb2N1bWVudC0+c2V0Rm9jdXNlZEVsZW1l bnQobnVsbHB0cik7CiAKLSAgICBzZXRUZXh0U2VsZWN0aW9uSW50ZW50KCp0aGlzLCBBWFRleHRT dGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25Nb3ZlKTsKKyAgICBzZXRUZXh0U2VsZWN0aW9uSW50ZW50 KGF4T2JqZWN0Q2FjaGUoKSwgQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uTW92ZSk7CiAg ICAgZG93bmNhc3Q8RWxlbWVudD4oKm5vZGUpLmZvY3VzKCk7CisgICAgY2xlYXJUZXh0U2VsZWN0 aW9uSW50ZW50KGF4T2JqZWN0Q2FjaGUoKSk7CiB9CiAKIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6c2V0U2VsZWN0ZWRSb3dzKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgc2Vs ZWN0ZWRSb3dzKQpAQCAtMTk4OSwxMyArMTk5OSwxNSBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OnNldFNlbGVjdGVkVmlzaWJsZVBvc2l0aW9uUmFuZ2UoY29uc3QgVmlzaWJsZVBv cwogCiAgICAgLy8gbWFrZSBzZWxlY3Rpb24gYW5kIHRlbGwgdGhlIGRvY3VtZW50IHRvIHVzZSBp dC4gaWYgaXQncyB6ZXJvIGxlbmd0aCwgdGhlbiBtb3ZlIHRvIHRoYXQgcG9zaXRpb24KICAgICBp ZiAocmFuZ2Uuc3RhcnQgPT0gcmFuZ2UuZW5kKSB7Ci0gICAgICAgIHNldFRleHRTZWxlY3Rpb25J bnRlbnQoKnRoaXMsIEFYVGV4dFN0YXRlQ2hhbmdlVHlwZVNlbGVjdGlvbk1vdmUpOworICAgICAg ICBzZXRUZXh0U2VsZWN0aW9uSW50ZW50KGF4T2JqZWN0Q2FjaGUoKSwgQVhUZXh0U3RhdGVDaGFu Z2VUeXBlU2VsZWN0aW9uTW92ZSk7CiAgICAgICAgIG1fcmVuZGVyZXItPmZyYW1lKCkuc2VsZWN0 aW9uKCkubW92ZVRvKHJhbmdlLnN0YXJ0LCBVc2VyVHJpZ2dlcmVkKTsKKyAgICAgICAgY2xlYXJU ZXh0U2VsZWN0aW9uSW50ZW50KGF4T2JqZWN0Q2FjaGUoKSk7CiAgICAgfQogICAgIGVsc2Ugewot ICAgICAgICBzZXRUZXh0U2VsZWN0aW9uSW50ZW50KCp0aGlzLCBBWFRleHRTdGF0ZUNoYW5nZVR5 cGVTZWxlY3Rpb25FeHRlbmQpOworICAgICAgICBzZXRUZXh0U2VsZWN0aW9uSW50ZW50KGF4T2Jq ZWN0Q2FjaGUoKSwgQVhUZXh0U3RhdGVDaGFuZ2VUeXBlU2VsZWN0aW9uRXh0ZW5kKTsKICAgICAg ICAgVmlzaWJsZVNlbGVjdGlvbiBuZXdTZWxlY3Rpb24gPSBWaXNpYmxlU2VsZWN0aW9uKHJhbmdl LnN0YXJ0LCByYW5nZS5lbmQpOwogICAgICAgICBtX3JlbmRlcmVyLT5mcmFtZSgpLnNlbGVjdGlv bigpLnNldFNlbGVjdGlvbihuZXdTZWxlY3Rpb24sIEZyYW1lU2VsZWN0aW9uOjpkZWZhdWx0U2V0 U2VsZWN0aW9uT3B0aW9ucygpKTsKKyAgICAgICAgY2xlYXJUZXh0U2VsZWN0aW9uSW50ZW50KGF4 T2JqZWN0Q2FjaGUoKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQppbmRleCAxYjM2NjgwLi44MDEwODc1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENh Y2hlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0 Q2FjaGVNYWMubW0KQEAgLTMzMyw2ICszMzMsOSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmZyYW1l TG9hZGluZ0V2ZW50UGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCogYQog dm9pZCBBWE9iamVjdENhY2hlOjpwbGF0Zm9ybUhhbmRsZUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2Vk KE5vZGUqLCBOb2RlKikKIHsKICAgICB3a0FjY2Vzc2liaWxpdHlIYW5kbGVGb2N1c0NoYW5nZWQo KTsKKyAgICAvLyBBWEZvY3VzQ2hhbmdlZCBpcyBhIHRlc3Qgc3BlY2lmaWMgbm90aWZpY2F0aW9u IG5hbWUgYW5kIG5vdCBzb21ldGhpbmcgYSByZWFsIEFUIHdpbGwgYmUgbGlzdGVuaW5nIGZvcgor ICAgIGlmIChVTkxJS0VMWShheFNob3VsZFJlcG9zdE5vdGlmaWNhdGlvbnNGb3JUZXN0cykpCisg ICAgICAgIFtyb290V2ViQXJlYSgpLT53cmFwcGVyKCkgYWNjZXNzaWJpbGl0eVBvc3RlZE5vdGlm aWNhdGlvbjpAIkFYRm9jdXNDaGFuZ2VkIiB1c2VySW5mbzpuaWxdOwogfQogCiB2b2lkIEFYT2Jq ZWN0Q2FjaGU6OmhhbmRsZVNjcm9sbGVkVG9BbmNob3IoY29uc3QgTm9kZSopCg==