171496 2017-05-01 07:37:22 -0700 [ATK] Expose values of aria-rowcount, aria-colcount, aria-rowindex, aria-colindex, aria-rowspan, and aria-colspan as object attributes 2017-05-01 14:19:14 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 jdiggs jdiggs aboxhall apinheiro buildbot cfleizach commit-queue dmazzoni jcraig samuel_white webkit-bug-importer oldest_to_newest 1303231 0 jdiggs 2017-05-01 07:37:22 -0700 Expose values of aria-rowcount, aria-colcount, aria-rowindex, aria-colindex, aria-rowspan, and aria-colspan as object attributes 1303232 1 webkit-bug-importer 2017-05-01 07:37:48 -0700 <rdar://problem/31914069> 1303233 2 308720 jdiggs 2017-05-01 07:56:04 -0700 Created attachment 308720 Patch 1303236 3 308720 cfleizach 2017-05-01 08:48:38 -0700 Comment on attachment 308720 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308720&action=review > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:416 > + if (coreObject->hasAttribute(HTMLNames::aria_rowspanAttr)) surprised we have to query the attribute directly here. should we make a method to expose rowSpan/colSpan? 1303237 4 jdiggs 2017-05-01 08:56:55 -0700 (In reply to chris fleizach from comment #3) > Comment on attachment 308720 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=308720&action=review > > > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:416 > > + if (coreObject->hasAttribute(HTMLNames::aria_rowspanAttr)) > > surprised we have to query the attribute directly here. should we make a > method to expose rowSpan/colSpan? We do have a method to expose it, and I use it, e.g. cell.ariaRowSpan(). The problem is that on my platform, the attribute should be exposed if the author has provided it. We return a default value of 1 on the spans, and 1 is valid. So it it author provided or set by WebCore? I could change the return value to 0, as was done with rowcount and colcount, and then modify the platform code. You think I should go that route? 1303238 5 cfleizach 2017-05-01 08:58:40 -0700 (In reply to Joanmarie Diggs (irc: joanie) from comment #4) > (In reply to chris fleizach from comment #3) > > Comment on attachment 308720 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=308720&action=review > > > > > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:416 > > > + if (coreObject->hasAttribute(HTMLNames::aria_rowspanAttr)) > > > > surprised we have to query the attribute directly here. should we make a > > method to expose rowSpan/colSpan? > > We do have a method to expose it, and I use it, e.g. cell.ariaRowSpan(). > > The problem is that on my platform, the attribute should be exposed if the > author has provided it. We return a default value of 1 on the spans, and 1 > is valid. So it it author provided or set by WebCore? > > I could change the return value to 0, as was done with rowcount and > colcount, and then modify the platform code. You think I should go that > route? It feels like we should be consistent with that model now (0 is no value provided) thanks 1303343 6 308751 jdiggs 2017-05-01 12:41:05 -0700 Created attachment 308751 Patch 1303344 7 jdiggs 2017-05-01 12:43:33 -0700 (In reply to chris fleizach from comment #5) > It feels like we should be consistent with that model now (0 is no value > provided) It turns out 0 is a valid value for authors to provide. Returning -1 is consistent with what we do with ariaRowIndex() and ariaColumnIndex(). 1303397 8 308751 commit-queue 2017-05-01 14:19:13 -0700 Comment on attachment 308751 Patch Clearing flags on attachment: 308751 Committed r216028: <http://trac.webkit.org/changeset/216028> 1303398 9 commit-queue 2017-05-01 14:19:14 -0700 All reviewed patches have been landed. Closing bug. 308720 2017-05-01 07:56:04 -0700 2017-05-01 12:41:03 -0700 Patch bug-171496-20170501105603.patch text/plain 8178 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MDEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTVhOWEyNDJhYWQxY2M4 MTBmZjVlNWE3NDE0MzZiZDg0OTczYTA2Zi4uMjJiNjAyMmUwN2YwMDdmZGI4YmJkMzM4OTI1NjY4 NDgxNzU1ZjlhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE3LTA1LTAxICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQVRLXSBFeHBvc2Ug dmFsdWVzIG9mIGFyaWEtcm93Y291bnQsIGFyaWEtY29sY291bnQsIGFyaWEtcm93aW5kZXgsIGFy aWEtY29saW5kZXgsIGFyaWEtcm93c3BhbiwgYW5kIGFyaWEtY29sc3BhbiBhcyBvYmplY3QgYXR0 cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTcxNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg RXhwb3NlIHZhbGlkLCBhdXRob3ItcHJvdmlkZWQgdmFsdWVzIGFzIGFuIG9iamVjdCBhdHRyaWJ1 dGUuCisKKyAgICAgICAgQWxzbyByZW1vdmVkIHNvbWUgbGVnYWN5IGNvZGUuIFRoZSAibGF5b3V0 LWd1ZXNzIiBhdHRyaWJ1dGUgd2FzIG5lZWRlZCBhbmQgZXhwZWN0ZWQKKyAgICAgICAgYXMgYSB3 YXkgZm9yIEFULVNQSTItYmFzZWQgYXNzaXN0aXZlIHRlY2hub2xvZ2llcyB0byBpZGVudGlmeSBs YXlvdXQgdGFibGVzLiBXZWJDb3JlCisgICAgICAgIEFjY2Vzc2liaWxpdHkgZG9lcyBub3QgZXhw b3NlIHRhYmxlcyB3aGljaCBhcmUgcHVyZWx5IGZvciBsYXlvdXQgYXMgYWNjZXNzaWJsZSB0YWJs ZXMsCisgICAgICAgIGFuZCBXZWJLaXRHdGsgdXNlcyB0aGF0IGltcGxlbWVudGF0aW9uLCB0aHVz IHRoaXMgYXR0cmlidXRlIGlzIG5vIGxvbmdlciByZWxldmFudC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIFVuc2tpcHBlZCBleGlzdGluZyB0ZXN0IHdoaWNoIGlzIG5vdyBwYXNzaW5nLgorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3Bw OgorICAgICAgICAod2Via2l0QWNjZXNzaWJsZUdldEF0dHJpYnV0ZXMpOgorCisyMDE3LTA1LTAx ICBKb2FubWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKwogICAgICAgICBBWDogQWNj ZXNzaWJpbGl0eVRhYmxlOjphcmlhUm93Q291bnQoKSBhbmQgYXJpYUNvbHVtbkNvdW50KCkgc2hv dWxkIG5vdCByZXR1cm4gLTEgdW5sZXNzIHRoYXQgaXMgdGhlIGF1dGhvci1wcm92aWRlZCB2YWx1 ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxNDc1 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFj Y2Vzc2libGVXcmFwcGVyQXRrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRr L1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcAppbmRleCA0YzNmNjBmNGU2NWNiMjJiMGNl NmY4ZWM4NWY4MDRmOTE2ZGY1Zjg0Li5hYzVhODRjYmEyNzNhNDYzMzNmM2Y0NWM0MTcwZGYwMTQw MzA4YzNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJL aXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCkBAIC0zOCw2ICszOCw3IEBA CiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eUxpc3QuaCIKICNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5 TGlzdEJveE9wdGlvbi5oIgogI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlUYWJsZS5oIgorI2luY2x1 ZGUgIkFjY2Vzc2liaWxpdHlUYWJsZUNlbGwuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2lu Y2x1ZGUgIkVkaXRpbmcuaCIKICNpbmNsdWRlICJGcmFtZS5oIgpAQCAtMzkxLDEwICszOTIsMzMg QEAgc3RhdGljIEF0a0F0dHJpYnV0ZVNldCogd2Via2l0QWNjZXNzaWJsZUdldEF0dHJpYnV0ZXMo QXRrT2JqZWN0KiBvYmplY3QpCiAgICAgICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0 dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJtdWx0aXNjcmlwdC10eXBlIiwgInBvc3QiKTsKICAg ICB9CiAKLSAgICAvLyBTZXQgdGhlICdsYXlvdXQtZ3Vlc3MnIGF0dHJpYnV0ZSB0byBoZWxwIEFz c2lzdGl2ZQotICAgIC8vIFRlY2hub2xvZ2llcyBrbm93IHdoZW4gYW4gZXhwb3NlZCB0YWJsZSBp cyBub3QgZGF0YSB0YWJsZS4KLSAgICBpZiAoaXM8QWNjZXNzaWJpbGl0eVRhYmxlPigqY29yZU9i amVjdCkgJiYgZG93bmNhc3Q8QWNjZXNzaWJpbGl0eVRhYmxlPigqY29yZU9iamVjdCkuaXNFeHBv c2FibGVUaHJvdWdoQWNjZXNzaWJpbGl0eSgpICYmICFjb3JlT2JqZWN0LT5pc0RhdGFUYWJsZSgp KQotICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVT ZXQsICJsYXlvdXQtZ3Vlc3MiLCAidHJ1ZSIpOworICAgIGlmIChpczxBY2Nlc3NpYmlsaXR5VGFi bGU+KCpjb3JlT2JqZWN0KSAmJiBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGU+KCpjb3JlT2Jq ZWN0KS5pc0V4cG9zYWJsZVRocm91Z2hBY2Nlc3NpYmlsaXR5KCkpIHsKKyAgICAgICAgYXV0byYg dGFibGUgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGU+KCpjb3JlT2JqZWN0KTsKKyAgICAg ICAgaW50IHJvd0NvdW50ID0gdGFibGUuYXJpYVJvd0NvdW50KCk7CisgICAgICAgIGlmIChyb3dD b3VudCkKKyAgICAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRrQXR0cmlidXRlU2V0KGF0 dHJpYnV0ZVNldCwgInJvd2NvdW50IiwgU3RyaW5nOjpudW1iZXIocm93Q291bnQpLnV0ZjgoKS5k YXRhKCkpOworCisgICAgICAgIGludCBjb2x1bW5Db3VudCA9IHRhYmxlLmFyaWFDb2x1bW5Db3Vu dCgpOworICAgICAgICBpZiAoY29sdW1uQ291bnQpCisgICAgICAgICAgICBhdHRyaWJ1dGVTZXQg PSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJjb2xjb3VudCIsIFN0cmluZzo6 bnVtYmVyKGNvbHVtbkNvdW50KS51dGY4KCkuZGF0YSgpKTsKKyAgICB9CisKKyAgICBpZiAoaXM8 QWNjZXNzaWJpbGl0eVRhYmxlQ2VsbD4oKmNvcmVPYmplY3QpKSB7CisgICAgICAgIGF1dG8mIGNl bGwgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGVDZWxsPigqY29yZU9iamVjdCk7CisgICAg ICAgIGludCByb3dJbmRleCA9IGNlbGwuYXJpYVJvd0luZGV4KCk7CisgICAgICAgIGlmIChyb3dJ bmRleCAhPSAtMSkKKyAgICAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRrQXR0cmlidXRl U2V0KGF0dHJpYnV0ZVNldCwgInJvd2luZGV4IiwgU3RyaW5nOjpudW1iZXIocm93SW5kZXgpLnV0 ZjgoKS5kYXRhKCkpOworCisgICAgICAgIGludCBjb2x1bW5JbmRleCA9IGNlbGwuYXJpYUNvbHVt bkluZGV4KCk7CisgICAgICAgIGlmIChjb2x1bW5JbmRleCAhPSAtMSkKKyAgICAgICAgICAgIGF0 dHJpYnV0ZVNldCA9IGFkZFRvQXRrQXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgImNvbGluZGV4 IiwgU3RyaW5nOjpudW1iZXIoY29sdW1uSW5kZXgpLnV0ZjgoKS5kYXRhKCkpOworCisgICAgICAg IGlmIChjb3JlT2JqZWN0LT5oYXNBdHRyaWJ1dGUoSFRNTE5hbWVzOjphcmlhX3Jvd3NwYW5BdHRy KSkKKyAgICAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRrQXR0cmlidXRlU2V0KGF0dHJp YnV0ZVNldCwgInJvd3NwYW4iLCBTdHJpbmc6Om51bWJlcihjZWxsLmFyaWFSb3dTcGFuKCkpLnV0 ZjgoKS5kYXRhKCkpOworCisgICAgICAgIGlmIChjb3JlT2JqZWN0LT5oYXNBdHRyaWJ1dGUoSFRN TE5hbWVzOjphcmlhX2NvbHNwYW5BdHRyKSkKKyAgICAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFk ZFRvQXRrQXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgImNvbHNwYW4iLCBTdHJpbmc6Om51bWJl cihjZWxsLmFyaWFDb2x1bW5TcGFuKCkpLnV0ZjgoKS5kYXRhKCkpOworICAgIH0KIAogICAgIFN0 cmluZyBwbGFjZWhvbGRlciA9IGNvcmVPYmplY3QtPnBsYWNlaG9sZGVyVmFsdWUoKTsKICAgICBp ZiAoIXBsYWNlaG9sZGVyLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3ZGFmZThmN2FjNjg2ODVjODRhZjkzMzJkZTMxZTA0NmM4 M2ExMGVhLi41ODY2NDViMzVjMTY2ZWVhNTVlM2Q0ODg2MzM0NjdjMDFlYTY1OGMyIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTctMDUtMDEgIEpvYW5tYXJpZSBEaWdncyAgPGpkaWdnc0BpZ2FsaWEuY29tPgorCisg ICAgICAgIFtBVEtdIEV4cG9zZSB2YWx1ZXMgb2YgYXJpYS1yb3djb3VudCwgYXJpYS1jb2xjb3Vu dCwgYXJpYS1yb3dpbmRleCwgYXJpYS1jb2xpbmRleCwgYXJpYS1yb3dzcGFuLCBhbmQgYXJpYS1j b2xzcGFuIGFzIG9iamVjdCBhdHRyaWJ1dGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzE0OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgbmV3IGF0dHJpYnV0ZSBuYW1lcyBzbyB0aGF0IHRoZSB2 YWx1ZXMgb2YgdGhlIG9iamVjdCBhdHRyaWJ1dGVzIGNhbiBiZSB0ZXN0ZWQuCisKKyAgICAgICAg KiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVt ZW50QXRrLmNwcDoKKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6bnVtYmVy QXR0cmlidXRlVmFsdWUpOgorCiAyMDE3LTA1LTAxICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjIxNjAwMCk6IHRlc3Qtd2Via2l0cHkg ZmFpbHMgYWZ0ZXIgYWRkaW5nIG5ldyBzb2Z0LWxpbmtlZCBjbGFzcyBjaGVja2VyCmRpZmYgLS1n aXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmls aXR5VUlFbGVtZW50QXRrLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwCmluZGV4IDYwMzc0YmI4NmM2YWI1 NDQ1ZDQ1YTZjZjc0YWIwNjhiYTRjZTIyNjUuLmUxNTBjMWE5ZTcyZjRmNzI4NmYxM2FkYjU3NzBm ZDgzMTNhZWU5NDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwCisrKyBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsu Y3BwCkBAIC03MSw2ICs3MSwxMiBAQCBlbnVtIEF0dHJpYnV0ZURvbWFpbiB7CiBlbnVtIEF0dHJp YnV0ZXNJbmRleCB7CiAgICAgLy8gQXR0cmlidXRlIG5hbWVzLgogICAgIEludmFsaWROYW1lSW5k ZXggPSAwLAorICAgIENvbHVtbkNvdW50LAorICAgIENvbHVtbkluZGV4LAorICAgIENvbHVtblNw YW4sCisgICAgUm93Q291bnQsCisgICAgUm93SW5kZXgsCisgICAgUm93U3BhbiwKICAgICBQb3NJ blNldEluZGV4LAogICAgIFNldFNpemVJbmRleCwKICAgICBQbGFjZWhvbGRlck5hbWVJbmRleCwK QEAgLTg4LDYgKzk0LDEyIEBAIGVudW0gQXR0cmlidXRlc0luZGV4IHsKIGNvbnN0IFN0cmluZyBh dHRyaWJ1dGVzTWFwW11bMl0gPSB7CiAgICAgLy8gQXR0cmlidXRlIG5hbWVzLgogICAgIHsgIkFY SW52YWxpZCIsICJpbnZhbGlkIiB9LAorICAgIHsgIkFYQVJJQUNvbHVtbkNvdW50IiwgImNvbGNv dW50IiB9LAorICAgIHsgIkFYQVJJQUNvbHVtbkluZGV4IiwgImNvbGluZGV4IiB9LAorICAgIHsg IkFYQVJJQUNvbHVtblNwYW4iLCAiY29sc3BhbiIgfSwKKyAgICB7ICJBWEFSSUFSb3dDb3VudCIs ICJyb3djb3VudCIgfSwKKyAgICB7ICJBWEFSSUFSb3dJbmRleCIsICJyb3dpbmRleCIgfSwKKyAg ICB7ICJBWEFSSUFSb3dTcGFuIiwgInJvd3NwYW4iIH0sCiAgICAgeyAiQVhBUklBUG9zSW5TZXQi LCAicG9zaW5zZXQiIH0sCiAgICAgeyAiQVhBUklBU2V0U2l6ZSIsICJzZXRzaXplIiB9LAogICAg IHsgIkFYUGxhY2Vob2xkZXJWYWx1ZSIsICJwbGFjZWhvbGRlci10ZXh0IiB9ICwKQEAgLTEwMjEs NiArMTAzMywxMiBAQCBkb3VibGUgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6bnVtYmVyQXR0cmli dXRlVmFsdWUoSlNTdHJpbmdSZWYgYXR0cmlidXRlKQogICAgICAgICAgICAgcmV0dXJuIGF0dHJp YnV0ZVZhbHVlLnRvRG91YmxlKCk7CiAgICAgfQogCisgICAgaWYgKGF0a0F0dHJpYnV0ZU5hbWUu c3RhcnRzV2l0aCgicm93IikgfHwgYXRrQXR0cmlidXRlTmFtZS5zdGFydHNXaXRoKCJjb2wiKSkg eworICAgICAgICBTdHJpbmcgYXR0cmlidXRlVmFsdWUgPSBnZXRBdHRyaWJ1dGVTZXRWYWx1ZUZv cklkKEFUS19PQkpFQ1QobV9lbGVtZW50LmdldCgpKSwgT2JqZWN0QXR0cmlidXRlVHlwZSwgYXRr QXR0cmlidXRlTmFtZSk7CisgICAgICAgIGlmICghYXR0cmlidXRlVmFsdWUuaXNFbXB0eSgpKQor ICAgICAgICAgICAgcmV0dXJuIGF0dHJpYnV0ZVZhbHVlLnRvSW50KCk7CisgICAgfQorCiAgICAg cmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmMzU4YmY3M2I1OThjYWVmMjk0MWY1MDg3YjMzN2RmMWMx NjhmMTRhLi5iMzg4ZDk3N2RjMDhlYmY1NzdjNDUwODdhOGVkNGNmMjU5ZmU3YWYyIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTctMDUtMDEgIEpvYW5tYXJpZSBEaWdncyAgPGpkaWdnc0BpZ2Fs aWEuY29tPgorCisgICAgICAgIFtBVEtdIEV4cG9zZSB2YWx1ZXMgb2YgYXJpYS1yb3djb3VudCwg YXJpYS1jb2xjb3VudCwgYXJpYS1yb3dpbmRleCwgYXJpYS1jb2xpbmRleCwgYXJpYS1yb3dzcGFu LCBhbmQgYXJpYS1jb2xzcGFuIGFzIG9iamVjdCBhdHRyaWJ1dGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzE0OTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9UZXN0RXhwZWN0 YXRpb25zOiBVbnNraXAgYWNjZXNzaWJpbGl0eS9hcmlhLXRhYmxlLWF0dHJpYnV0ZXMuaHRtbAor CiAyMDE3LTA1LTAxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkIEdUSysgZ2FyZGVuaW5nLiBSZWJhc2VsaW5lIGdpYW50Um93 c3BhbiB0ZXN0cyBhZnRlciByMjE1OTE0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4 cGVjdGF0aW9ucwppbmRleCAyZWYwZmI5NjUwMjEwODRjNjY1YTQ2ZWI0N2Y3ZDg0N2QyMGMxODNl Li5jNmYyOTQ1NjI5ZTQ2MzcyMzM1MTAyNDA3MjBiMmY5ZTZhNWM4YzViIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTAxOCw5ICsxMDE4LDYgQEAgd2Vi a2l0Lm9yZy9iLzE0NjczMSBmYXN0L2JhY2tncm91bmRzL2hpZHBpLWJhY2tncm91bmQtaW1hZ2Ut Y29udGFpbi1jb3Zlci1zY2FsZS0KIAogd2Via2l0Lm9yZy9iLzE0OTAxNiBhY2Nlc3NpYmlsaXR5 L2FyaWEtY3VycmVudC5odG1sIFsgU2tpcCBdCiAKLSMgQVJJQSAxLjEgdGFibGUgcmVsYXRlZCBh dHRyaWJ1dGVzIGFyZSBub3Qgc3VwcG9ydGVkCi13ZWJraXQub3JnL2IvMTQ4OTY3IGFjY2Vzc2li aWxpdHkvYXJpYS10YWJsZS1hdHRyaWJ1dGVzLmh0bWwgWyBTa2lwIF0KLQogIyBUZXh0IG1hcmtl ciB0ZXN0cyBhcmUgbm90IHN1cHBvcnRlZAogd2Via2l0Lm9yZy9iLzE1MzI5MiBhY2Nlc3NpYmls aXR5L3RleHQtbWFya2VyIFsgU2tpcCBdCiAK 308751 2017-05-01 12:41:05 -0700 2017-05-01 14:19:13 -0700 Patch bug-171496-20170501154103.patch text/plain 12184 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzkxNGE1NzBjMzM1MDc3 ODE5NjE2NWIwNzQwOTY4YTY3NjMxNTU5Yi4uYWVlMGI1MjRkODYyZDQ0MDg2NTEwYWJiOTJmNzFk MGIxNzdkYjExOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE3LTA1LTAxICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBbQVRLXSBFeHBvc2Ug dmFsdWVzIG9mIGFyaWEtcm93Y291bnQsIGFyaWEtY29sY291bnQsIGFyaWEtcm93aW5kZXgsIGFy aWEtY29saW5kZXgsIGFyaWEtcm93c3BhbiwgYW5kIGFyaWEtY29sc3BhbiBhcyBvYmplY3QgYXR0 cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTcxNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg RXhwb3NlIHZhbGlkLCBhdXRob3ItcHJvdmlkZWQgdmFsdWVzIGFzIGFuIG9iamVjdCBhdHRyaWJ1 dGUuIEluIG9yZGVyIHRvIGRpc3Rpbmd1aXNoCisgICAgICAgIGF1dGhvci1wcm92aWRlZCB2YWx1 ZXMgZnJvbSB0aGUgZGVmYXVsdCByZXR1cm5lZCBieSBXZWJDb3JlIEFjY2Vzc2liaWxpdHkgKDEp LCBjaGFuZ2UKKyAgICAgICAgdGhlIGRlZmF1bHQgcmV0dXJuIHZhbHVlIHRvIC0xLiBXZSBjYW5u b3QgcmV0dXJuIDAgYmVjYXVzZSB0aGUgQVJJQSBzcGVjIHN0YXRlcyB0aGF0CisgICAgICAgIDAg aXMgYSB2YWxpZCB2YWx1ZSBmb3IgYXV0aG9ycyB0byBwcm92aWRlIHRvIGluZGljYXRlIHRoYXQg dGhlIGNlbGwgc3BhbnMgdGhlIHJlbWFpbmluZworICAgICAgICByb3dzIGluIHRoZSByb3cgZ3Jv dXAuCisKKyAgICAgICAgQWxzbyByZW1vdmVkIHNvbWUgbGVnYWN5IGNvZGUuIFRoZSAibGF5b3V0 LWd1ZXNzIiBhdHRyaWJ1dGUgd2FzIG5lZWRlZCBhbmQgZXhwZWN0ZWQKKyAgICAgICAgYXMgYSB3 YXkgZm9yIEFULVNQSTItYmFzZWQgYXNzaXN0aXZlIHRlY2hub2xvZ2llcyB0byBpZGVudGlmeSBs YXlvdXQgdGFibGVzLiBXZWJDb3JlCisgICAgICAgIEFjY2Vzc2liaWxpdHkgZG9lcyBub3QgZXhw b3NlIHRhYmxlcyB3aGljaCBhcmUgcHVyZWx5IGZvciBsYXlvdXQgYXMgYWNjZXNzaWJsZSB0YWJs ZXMsCisgICAgICAgIGFuZCBXZWJLaXRHdGsgdXNlcyB0aGF0IGltcGxlbWVudGF0aW9uLCB0aHVz IHRoaXMgYXR0cmlidXRlIGlzIG5vIGxvbmdlciByZWxldmFudC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIFVuc2tpcHBlZCBleGlzdGluZyB0ZXN0IHdoaWNoIGlzIG5vdyBwYXNzaW5nLgorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlBUklBR3JpZENlbGw6OmFyaWFSb3dTcGFuV2l0 aFJvd0luZGV4KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlBUklBR3JpZENlbGw6 OmNvbHVtbkluZGV4UmFuZ2UpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVRhYmxlQ2VsbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVDZWxs OjphcmlhQ29sdW1uU3Bhbik6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVD ZWxsOjphcmlhUm93U3Bhbik6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 VGFibGVDZWxsLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJs ZVdyYXBwZXJBdGsuY3BwOgorICAgICAgICAod2Via2l0QWNjZXNzaWJsZUdldEF0dHJpYnV0ZXMp OgorCiAyMDE3LTA1LTAxICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg ICAgIEFkZCBub3RpZmljYXRpb25zIGZyb20gQ2FwdHVyZURldmljZU1hbmFnZXIgKGFuZCBzdWJj bGFzc2VzKSB3aGVuIGRldmljZSBsaXN0cyBjaGFuZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUFSSUFHcmlkQ2VsbC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlBUklBR3JpZENlbGwuY3BwCmluZGV4 IDM2YWFjODIzZDJiNWZhZDk1MTJkNGJkZTMxMTQ0NjQyMGQ0YzE1OTcuLjkwNjdjNDE4Yjk3N2Jh Mzg5MDUyNDVhZjdmZTM0YzBlMWI4MTVjYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUFSSUFHcmlkQ2VsbC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsLmNwcApAQCAtOTgs NyArOTgsMTAgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsOjpyb3dJbmRleFJhbmdl KHN0ZDo6cGFpcjx1bnNpZ25lZCwgdW5zaWduZWQ+JiByb3cKIAogdW5zaWduZWQgQWNjZXNzaWJp bGl0eUFSSUFHcmlkQ2VsbDo6YXJpYVJvd1NwYW5XaXRoUm93SW5kZXgodW5zaWduZWQgcm93SW5k ZXgpIGNvbnN0CiB7Ci0gICAgdW5zaWduZWQgcm93U3BhbiA9IEFjY2Vzc2liaWxpdHlUYWJsZUNl bGw6OmFyaWFSb3dTcGFuKCk7CisgICAgaW50IHJvd1NwYW4gPSBBY2Nlc3NpYmlsaXR5VGFibGVD ZWxsOjphcmlhUm93U3BhbigpOworICAgIGlmIChyb3dTcGFuID09IC0xKQorICAgICAgICByZXR1 cm4gMTsKKwogICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHBhcmVudCA9IHBhcmVudE9iamVjdFVu aWdub3JlZCgpOwogICAgIGlmICghcGFyZW50KQogICAgICAgICByZXR1cm4gMTsKQEAgLTE0OSw3 ICsxNTIsNyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlBUklBR3JpZENlbGw6OmNvbHVtbkluZGV4UmFu Z2Uoc3RkOjpwYWlyPHVuc2lnbmVkLCB1bnNpZ25lZD4mCiAgICAgCiAgICAgLy8gQVJJQSAxLjEs IGFyaWEtY29sc3BhbiBhdHRyaWJ1dGUgaXMgaW50ZW5kZWQgZm9yIGNlbGxzIGFuZCBncmlkY2Vs bHMgd2hpY2ggYXJlIG5vdCBjb250YWluZWQgaW4gYSBuYXRpdmUgdGFibGUuCiAgICAgLy8gU28g d2Ugc2hvdWxkIGNoZWNrIGZvciB0aGF0IGF0dHJpYnV0ZSBoZXJlLgotICAgIGNvbHVtblJhbmdl LnNlY29uZCA9IGFyaWFDb2x1bW5TcGFuKCk7CisgICAgY29sdW1uUmFuZ2Uuc2Vjb25kID0gc3Rk OjptYXgoYXJpYUNvbHVtblNwYW4oKSwgMSk7CiB9CiAKIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFj Y2Vzc2liaWxpdHlBUklBR3JpZENlbGw6OnBhcmVudFJvd0dyb3VwKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwu Y3BwCmluZGV4IDI4Nzk5N2IwODE3YWQ1YjhmMjZjM2ZkZTYzNjE4YjNjZTA0MDNiNjkuLjM0NmFh N2EyNmEzOTMwOTg5ZGZiNTkwODZmMWY5NWM3MmQwZjBkZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcApAQCAt NDAxLDE3ICs0MDEsMTcgQEAgaW50IEFjY2Vzc2liaWxpdHlUYWJsZUNlbGw6OmFyaWFSb3dJbmRl eCgpIGNvbnN0CiAgICAgcmV0dXJuIC0xOwogfQogCi11bnNpZ25lZCBBY2Nlc3NpYmlsaXR5VGFi bGVDZWxsOjphcmlhQ29sdW1uU3BhbigpIGNvbnN0CitpbnQgQWNjZXNzaWJpbGl0eVRhYmxlQ2Vs bDo6YXJpYUNvbHVtblNwYW4oKSBjb25zdAogewogICAgIGNvbnN0IEF0b21pY1N0cmluZyYgY29s U3BhblZhbHVlID0gZ2V0QXR0cmlidXRlKGFyaWFfY29sc3BhbkF0dHIpOwogICAgIC8vIEFSSUEg MS4xOiBBdXRob3JzIG11c3Qgc2V0IHRoZSB2YWx1ZSBvZiBhcmlhLWNvbHNwYW4gdG8gYW4gaW50 ZWdlciBncmVhdGVyIHRoYW4gb3IgZXF1YWwgdG8gMS4KICAgICBpZiAoY29sU3BhblZhbHVlLnRv SW50KCkgPj0gMSkKICAgICAgICAgcmV0dXJuIGNvbFNwYW5WYWx1ZS50b0ludCgpOwogICAgIAot ICAgIHJldHVybiAxOworICAgIHJldHVybiAtMTsKIH0KIAotdW5zaWduZWQgQWNjZXNzaWJpbGl0 eVRhYmxlQ2VsbDo6YXJpYVJvd1NwYW4oKSBjb25zdAoraW50IEFjY2Vzc2liaWxpdHlUYWJsZUNl bGw6OmFyaWFSb3dTcGFuKCkgY29uc3QKIHsKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHJvd1Nw YW5WYWx1ZSA9IGdldEF0dHJpYnV0ZShhcmlhX3Jvd3NwYW5BdHRyKTsKICAgICAKQEAgLTQyMiw3 ICs0MjIsNyBAQCB1bnNpZ25lZCBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlhUm93U3Bhbigp IGNvbnN0CiAgICAgaWYgKHJvd1NwYW5WYWx1ZS50b0ludCgpID49IDEpCiAgICAgICAgIHJldHVy biByb3dTcGFuVmFsdWUudG9JbnQoKTsKICAgICAKLSAgICByZXR1cm4gMTsKKyAgICByZXR1cm4g LTE7CiB9CiAgICAgCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwuaCBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5oCmluZGV4IDc4YmU5 ZTI1NDQ0MGEwMWQzOGJmZDVjOWQ2MzBmOWYwYTdlMDhlMWEuLjE0YWM0MGE1Mzc2YzlhNjNmZjg1 MTk5ODM4NTM5MGIyNTM2MTJkNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5oCkBAIC01NSw4ICs1NSw4IEBAIHB1Ymxp YzoKICAgICAKICAgICBpbnQgYXJpYUNvbHVtbkluZGV4KCkgY29uc3Q7CiAgICAgaW50IGFyaWFS b3dJbmRleCgpIGNvbnN0OwotICAgIHVuc2lnbmVkIGFyaWFDb2x1bW5TcGFuKCkgY29uc3Q7Ci0g ICAgdW5zaWduZWQgYXJpYVJvd1NwYW4oKSBjb25zdDsKKyAgICBpbnQgYXJpYUNvbHVtblNwYW4o KSBjb25zdDsKKyAgICBpbnQgYXJpYVJvd1NwYW4oKSBjb25zdDsKICAgICB2b2lkIHNldEFSSUFD b2xJbmRleEZyb21Sb3coaW50IGluZGV4KSB7IG1fYXJpYUNvbEluZGV4RnJvbVJvdyA9IGluZGV4 OyB9CiAKIHByb3RlY3RlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcAppbmRleCA0YzNm NjBmNGU2NWNiMjJiMGNlNmY4ZWM4NWY4MDRmOTE2ZGY1Zjg0Li42ZmQ5OGFlNThlMmIzNTZkY2Qy NTlkZjY5MGQ5YTA5ZWZkMTQ2ODI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCkBA IC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eUxpc3QuaCIKICNpbmNsdWRl ICJBY2Nlc3NpYmlsaXR5TGlzdEJveE9wdGlvbi5oIgogI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlU YWJsZS5oIgorI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlUYWJsZUNlbGwuaCIKICNpbmNsdWRlICJE b2N1bWVudC5oIgogI2luY2x1ZGUgIkVkaXRpbmcuaCIKICNpbmNsdWRlICJGcmFtZS5oIgpAQCAt MzkxLDEwICszOTIsMzUgQEAgc3RhdGljIEF0a0F0dHJpYnV0ZVNldCogd2Via2l0QWNjZXNzaWJs ZUdldEF0dHJpYnV0ZXMoQXRrT2JqZWN0KiBvYmplY3QpCiAgICAgICAgICAgICBhdHRyaWJ1dGVT ZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJtdWx0aXNjcmlwdC10eXBl IiwgInBvc3QiKTsKICAgICB9CiAKLSAgICAvLyBTZXQgdGhlICdsYXlvdXQtZ3Vlc3MnIGF0dHJp YnV0ZSB0byBoZWxwIEFzc2lzdGl2ZQotICAgIC8vIFRlY2hub2xvZ2llcyBrbm93IHdoZW4gYW4g ZXhwb3NlZCB0YWJsZSBpcyBub3QgZGF0YSB0YWJsZS4KLSAgICBpZiAoaXM8QWNjZXNzaWJpbGl0 eVRhYmxlPigqY29yZU9iamVjdCkgJiYgZG93bmNhc3Q8QWNjZXNzaWJpbGl0eVRhYmxlPigqY29y ZU9iamVjdCkuaXNFeHBvc2FibGVUaHJvdWdoQWNjZXNzaWJpbGl0eSgpICYmICFjb3JlT2JqZWN0 LT5pc0RhdGFUYWJsZSgpKQotICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0 ZVNldChhdHRyaWJ1dGVTZXQsICJsYXlvdXQtZ3Vlc3MiLCAidHJ1ZSIpOworICAgIGlmIChpczxB Y2Nlc3NpYmlsaXR5VGFibGU+KCpjb3JlT2JqZWN0KSAmJiBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5 VGFibGU+KCpjb3JlT2JqZWN0KS5pc0V4cG9zYWJsZVRocm91Z2hBY2Nlc3NpYmlsaXR5KCkpIHsK KyAgICAgICAgYXV0byYgdGFibGUgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGU+KCpjb3Jl T2JqZWN0KTsKKyAgICAgICAgaW50IHJvd0NvdW50ID0gdGFibGUuYXJpYVJvd0NvdW50KCk7Cisg ICAgICAgIGlmIChyb3dDb3VudCkKKyAgICAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRr QXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgInJvd2NvdW50IiwgU3RyaW5nOjpudW1iZXIocm93 Q291bnQpLnV0ZjgoKS5kYXRhKCkpOworCisgICAgICAgIGludCBjb2x1bW5Db3VudCA9IHRhYmxl LmFyaWFDb2x1bW5Db3VudCgpOworICAgICAgICBpZiAoY29sdW1uQ291bnQpCisgICAgICAgICAg ICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJjb2xj b3VudCIsIFN0cmluZzo6bnVtYmVyKGNvbHVtbkNvdW50KS51dGY4KCkuZGF0YSgpKTsKKyAgICB9 CisKKyAgICBpZiAoaXM8QWNjZXNzaWJpbGl0eVRhYmxlQ2VsbD4oKmNvcmVPYmplY3QpKSB7Cisg ICAgICAgIGF1dG8mIGNlbGwgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGVDZWxsPigqY29y ZU9iamVjdCk7CisgICAgICAgIGludCByb3dJbmRleCA9IGNlbGwuYXJpYVJvd0luZGV4KCk7Cisg ICAgICAgIGlmIChyb3dJbmRleCAhPSAtMSkKKyAgICAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFk ZFRvQXRrQXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgInJvd2luZGV4IiwgU3RyaW5nOjpudW1i ZXIocm93SW5kZXgpLnV0ZjgoKS5kYXRhKCkpOworCisgICAgICAgIGludCBjb2x1bW5JbmRleCA9 IGNlbGwuYXJpYUNvbHVtbkluZGV4KCk7CisgICAgICAgIGlmIChjb2x1bW5JbmRleCAhPSAtMSkK KyAgICAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRrQXR0cmlidXRlU2V0KGF0dHJpYnV0 ZVNldCwgImNvbGluZGV4IiwgU3RyaW5nOjpudW1iZXIoY29sdW1uSW5kZXgpLnV0ZjgoKS5kYXRh KCkpOworCisgICAgICAgIGludCByb3dTcGFuID0gY2VsbC5hcmlhUm93U3BhbigpOworICAgICAg ICBpZiAocm93U3BhbiAhPSAtMSkKKyAgICAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRr QXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgInJvd3NwYW4iLCBTdHJpbmc6Om51bWJlcihyb3dT cGFuKS51dGY4KCkuZGF0YSgpKTsKKworICAgICAgICBpbnQgY29sdW1uU3BhbiA9IGNlbGwuYXJp YUNvbHVtblNwYW4oKTsKKyAgICAgICAgaWYgKGNvbHVtblNwYW4gIT0gLTEpCisgICAgICAgICAg ICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJjb2xz cGFuIiwgU3RyaW5nOjpudW1iZXIoY29sdW1uU3BhbikudXRmOCgpLmRhdGEoKSk7CisgICAgfQog CiAgICAgU3RyaW5nIHBsYWNlaG9sZGVyID0gY29yZU9iamVjdC0+cGxhY2Vob2xkZXJWYWx1ZSgp OwogICAgIGlmICghcGxhY2Vob2xkZXIuaXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDJjNjQxMWI2YTU3MzJkNzJmZGVjMzI4MGU3 ZjJkZGFjMzllOTI2YzMuLjU4NTM1NDcwMGRlZjY3ODBmMWE3NGMyNTYzNWIzNzM5YTQ2OTNjOTkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNy0wNS0wMSAgSm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGlnYWxpYS5j b20+CisKKyAgICAgICAgW0FUS10gRXhwb3NlIHZhbHVlcyBvZiBhcmlhLXJvd2NvdW50LCBhcmlh LWNvbGNvdW50LCBhcmlhLXJvd2luZGV4LCBhcmlhLWNvbGluZGV4LCBhcmlhLXJvd3NwYW4sIGFu ZCBhcmlhLWNvbHNwYW4gYXMgb2JqZWN0IGF0dHJpYnV0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTQ5NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBuZXcgYXR0cmlidXRlIG5hbWVzIHNvIHRo YXQgdGhlIHZhbHVlcyBvZiB0aGUgb2JqZWN0IGF0dHJpYnV0ZXMgY2FuIGJlIHRlc3RlZC4KKwor ICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxp dHlVSUVsZW1lbnRBdGsuY3BwOgorICAgICAgICAoV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 OjpudW1iZXJBdHRyaWJ1dGVWYWx1ZSk6CisKIDIwMTctMDUtMDEgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBjaGVjay13ZWJraXQtc3R5bGU6IEVuYWJsZSBz cHJpbnRmKCksIHN0cmNhdCgpLCBzdHJjcHkoKSBhbmQgcHJpbnRmKCkgZm9ybWF0IGNoZWNrcwpk aWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdGsvQWNj ZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVj dGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcAppbmRleCA1M2FlMTQz OThiYTZjMTVmYmJkOWJiMWRjMjFiMDFjN2MzODdhYzIyLi4wMzI1NTI1OTg1YjM3Njk3MjEzMDY5 ZWEyZmZlYjI2OTdjYmRiNDY0IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcAorKysgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVt ZW50QXRrLmNwcApAQCAtNzEsNiArNzEsMTIgQEAgZW51bSBBdHRyaWJ1dGVEb21haW4gewogZW51 bSBBdHRyaWJ1dGVzSW5kZXggewogICAgIC8vIEF0dHJpYnV0ZSBuYW1lcy4KICAgICBJbnZhbGlk TmFtZUluZGV4ID0gMCwKKyAgICBDb2x1bW5Db3VudCwKKyAgICBDb2x1bW5JbmRleCwKKyAgICBD b2x1bW5TcGFuLAorICAgIFJvd0NvdW50LAorICAgIFJvd0luZGV4LAorICAgIFJvd1NwYW4sCiAg ICAgUG9zSW5TZXRJbmRleCwKICAgICBTZXRTaXplSW5kZXgsCiAgICAgUGxhY2Vob2xkZXJOYW1l SW5kZXgsCkBAIC04OSw2ICs5NSwxMiBAQCBlbnVtIEF0dHJpYnV0ZXNJbmRleCB7CiBjb25zdCBT dHJpbmcgYXR0cmlidXRlc01hcFtdWzJdID0gewogICAgIC8vIEF0dHJpYnV0ZSBuYW1lcy4KICAg ICB7ICJBWEludmFsaWQiLCAiaW52YWxpZCIgfSwKKyAgICB7ICJBWEFSSUFDb2x1bW5Db3VudCIs ICJjb2xjb3VudCIgfSwKKyAgICB7ICJBWEFSSUFDb2x1bW5JbmRleCIsICJjb2xpbmRleCIgfSwK KyAgICB7ICJBWEFSSUFDb2x1bW5TcGFuIiwgImNvbHNwYW4iIH0sCisgICAgeyAiQVhBUklBUm93 Q291bnQiLCAicm93Y291bnQiIH0sCisgICAgeyAiQVhBUklBUm93SW5kZXgiLCAicm93aW5kZXgi IH0sCisgICAgeyAiQVhBUklBUm93U3BhbiIsICJyb3dzcGFuIiB9LAogICAgIHsgIkFYQVJJQVBv c0luU2V0IiwgInBvc2luc2V0IiB9LAogICAgIHsgIkFYQVJJQVNldFNpemUiLCAic2V0c2l6ZSIg fSwKICAgICB7ICJBWFBsYWNlaG9sZGVyVmFsdWUiLCAicGxhY2Vob2xkZXItdGV4dCIgfSAsCkBA IC0xMDI3LDYgKzEwMzksMTIgQEAgZG91YmxlIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Om51bWJl ckF0dHJpYnV0ZVZhbHVlKEpTU3RyaW5nUmVmIGF0dHJpYnV0ZSkKICAgICAgICAgICAgIHJldHVy biBhdHRyaWJ1dGVWYWx1ZS50b0RvdWJsZSgpOwogICAgIH0KIAorICAgIGlmIChhdGtBdHRyaWJ1 dGVOYW1lLnN0YXJ0c1dpdGgoInJvdyIpIHx8IGF0a0F0dHJpYnV0ZU5hbWUuc3RhcnRzV2l0aCgi Y29sIikpIHsKKyAgICAgICAgU3RyaW5nIGF0dHJpYnV0ZVZhbHVlID0gZ2V0QXR0cmlidXRlU2V0 VmFsdWVGb3JJZChBVEtfT0JKRUNUKG1fZWxlbWVudC5nZXQoKSksIE9iamVjdEF0dHJpYnV0ZVR5 cGUsIGF0a0F0dHJpYnV0ZU5hbWUpOworICAgICAgICBpZiAoIWF0dHJpYnV0ZVZhbHVlLmlzRW1w dHkoKSkKKyAgICAgICAgICAgIHJldHVybiBhdHRyaWJ1dGVWYWx1ZS50b0ludCgpOworICAgIH0K KwogICAgIHJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODg1ZDk1MTY5NWQ4YjgzZjJiZDZkN2VlODJl YjVmNDQ0OTIwODhmNS4uYjk1YTcxMzI0NmJiYjRmNzFkY2IzYTc3MDAxMTM5ZWY3NzU4MThjZiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSw1ICsxLDE0IEBACiAyMDE3LTA1LTAxICBKb2FubWFyaWUgRGlnZ3MgIDxqZGln Z3NAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQVRLXSBFeHBvc2UgdmFsdWVzIG9mIGFyaWEtcm93 Y291bnQsIGFyaWEtY29sY291bnQsIGFyaWEtcm93aW5kZXgsIGFyaWEtY29saW5kZXgsIGFyaWEt cm93c3BhbiwgYW5kIGFyaWEtY29sc3BhbiBhcyBvYmplY3QgYXR0cmlidXRlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxNDk2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvVGVz dEV4cGVjdGF0aW9uczogVW5za2lwIGFjY2Vzc2liaWxpdHkvYXJpYS10YWJsZS1hdHRyaWJ1dGVz Lmh0bWwKKworMjAxNy0wNS0wMSAgSm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGlnYWxpYS5jb20+ CisKICAgICAgICAgQVg6IFtHVEtdIEFkZCBzdXBwb3J0IHRvIHF1ZXJ5IGZvciBhcmlhLWN1cnJl bnQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTAx NgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9u cyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGNmMjYx ZjRiM2UzNWM1ODdiMzUzMTk2N2YxMGJhZTllMTBmNjU1MGMuLjMyZjRmMzI5MjA5YjI3ZDlmMmI4 ZWVmZWMwZGI4NDMzNjdlOWQ5NTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhw ZWN0YXRpb25zCkBAIC0xMDE2LDkgKzEwMTYsNiBAQCB3ZWJraXQub3JnL2IvMTQ2NzI0IGZhc3Qv dGV4dC93b3JkLWJyZWFrLWtlZXAtYWxsLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KICMgVGhp cyB0ZXN0cyBmYWlsIHNpbmNlIHRoZSB1cGdyYWRlIG9mIEdUSyB0byAzLjE2IGFuZCBDYWlybyB0 byAxLjE0IG9uIHRoZSBKSEJ1aWxkCiB3ZWJraXQub3JnL2IvMTQ2NzMxIGZhc3QvYmFja2dyb3Vu ZHMvaGlkcGktYmFja2dyb3VuZC1pbWFnZS1jb250YWluLWNvdmVyLXNjYWxlLW5lZWRzLW1vcmUt cHJlY2lzaW9uLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIFRpbWVvdXQgXQogCi0jIEFSSUEgMS4x IHRhYmxlIHJlbGF0ZWQgYXR0cmlidXRlcyBhcmUgbm90IHN1cHBvcnRlZAotd2Via2l0Lm9yZy9i LzE0ODk2NyBhY2Nlc3NpYmlsaXR5L2FyaWEtdGFibGUtYXR0cmlidXRlcy5odG1sIFsgU2tpcCBd Ci0KICMgVGV4dCBtYXJrZXIgdGVzdHMgYXJlIG5vdCBzdXBwb3J0ZWQKIHdlYmtpdC5vcmcvYi8x NTMyOTIgYWNjZXNzaWJpbGl0eS90ZXh0LW1hcmtlciBbIFNraXAgXQogCg==