171214 2017-04-24 03:08:25 -0700 AX: aria-rowspan value should be ignored if td/th rowspan value is provided 2017-05-03 18:40:50 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jdiggs jdiggs aboxhall apinheiro buildbot cfleizach commit-queue dmazzoni jcraig samuel_white webkit-bug-importer oldest_to_newest 1300456 0 jdiggs 2017-04-24 03:08:25 -0700 The ARIA spec states: "If aria-rowspan is used on an element for which the host language provides an equivalent attribute, user agents must ignore the value of aria-rowspan and instead expose the value of the host language's attribute to assistive technologies." https://rawgit.com/w3c/aria/master/aria/aria.html#aria-rowspan With this in mind, given this test case: <table> <tr> <th id="test" role="columnheader" rowspan="3" aria-rowspan="2">test cell</th> </tr> </table> Shouldn't AXRowIndexRange.length be 3? I'm getting 2. 1300457 1 webkit-bug-importer 2017-04-24 03:08:39 -0700 <rdar://problem/31784254> 1304009 2 308898 jdiggs 2017-05-03 05:42:11 -0700 Created attachment 308898 Patch 1304032 3 308898 cfleizach 2017-05-03 08:54:07 -0700 Comment on attachment 308898 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308898&action=review > Source/WebCore/ChangeLog:9 > + accessible object's renderer is a RenderTableCell. This is consistent with what this would mean that you can't use aria table semantics on <table> and friends right? I understand that native semantics should win, but with the proliferation of <Table> being used to styling rather than data grid purposes, I don't know if this is the right move 1304033 4 jdiggs 2017-05-03 09:01:06 -0700 (In reply to chris fleizach from comment #3) > Comment on attachment 308898 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=308898&action=review > > > Source/WebCore/ChangeLog:9 > > + accessible object's renderer is a RenderTableCell. This is consistent with what > > this would mean that you can't use aria table semantics on <table> and > friends right? I understand that native semantics should win, but with the > proliferation of <Table> being used to styling rather than data grid > purposes, I don't know if this is the right move It's just for the column span and row span. And I am open to other suggestions. 1304039 5 308898 cfleizach 2017-05-03 09:11:31 -0700 Comment on attachment 308898 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308898&action=review >>> Source/WebCore/ChangeLog:9 >>> + accessible object's renderer is a RenderTableCell. This is consistent with what >> >> this would mean that you can't use aria table semantics on <table> and friends right? I understand that native semantics should win, but with the proliferation of <Table> being used to styling rather than data grid purposes, I don't know if this is the right move > > It's just for the column span and row span. And I am open to other suggestions. I would think that ARIA semantics would override the default values <td aria-colspan=2> => 2 <td aria-colspan=2 colspan=3> => 3 <td colspan=3> => 3 <td> => 1 1304048 6 jdiggs 2017-05-03 09:31:34 -0700 (In reply to chris fleizach from comment #5) > Comment on attachment 308898 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=308898&action=review > > >>> Source/WebCore/ChangeLog:9 > >>> + accessible object's renderer is a RenderTableCell. This is consistent with what > >> > >> this would mean that you can't use aria table semantics on <table> and friends right? I understand that native semantics should win, but with the proliferation of <Table> being used to styling rather than data grid purposes, I don't know if this is the right move > > > > It's just for the column span and row span. And I am open to other suggestions. > > I would think that ARIA semantics would override the default values > > <td aria-colspan=2> => 2 The first one is, I believe, the only one in which I'm not doing what you suggest. So regarding that particular case: What you describe doesn't strike me as what the spec's normative statement is saying. So are you reading it differently? Or are you saying that what is in the spec is a bad idea, and we shouldn't implement it as described in the absence of explicit native host language attributes? 1304060 7 308898 cfleizach 2017-05-03 09:44:19 -0700 Comment on attachment 308898 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308898&action=review >>>>> Source/WebCore/ChangeLog:9 >>>>> + accessible object's renderer is a RenderTableCell. This is consistent with what >>>> >>>> this would mean that you can't use aria table semantics on <table> and friends right? I understand that native semantics should win, but with the proliferation of <Table> being used to styling rather than data grid purposes, I don't know if this is the right move >>> >>> It's just for the column span and row span. And I am open to other suggestions. >> >> I would think that ARIA semantics would override the default values >> >> <td aria-colspan=2> => 2 >> <td aria-colspan=2 colspan=3> => 3 >> <td colspan=3> => 3 >> <td> => 1 > > The first one is, I believe, the only one in which I'm not doing what you suggest. So regarding that particular case: What you describe doesn't strike me as what the spec's normative statement is saying. So are you reading it differently? Or are you saying that what is in the spec is a bad idea, and we shouldn't implement it as described in the absence of explicit native host language attributes? I haven't studied the spec in detail, but from a similar example <div required aria-required=false>. -> required == TRUE but <div aria-required=false>. -> required == FALSE To me it seems like we would honor aria attribute the author put over implicit default values 1304199 8 jdiggs 2017-05-03 13:16:17 -0700 (In reply to chris fleizach from comment #7) > I haven't studied the spec in detail, but from a similar example > > <div required aria-required=false>. -> required == TRUE > but > > <div aria-required=false>. -> required == FALSE > > To me it seems like we would honor aria attribute the author put over > implicit default values OK. I'll do a new patch which does that. Thanks for the review and thoughts on the matter! 1304355 9 308981 jdiggs 2017-05-03 16:23:51 -0700 Created attachment 308981 Patch 1304461 10 308981 commit-queue 2017-05-03 18:40:48 -0700 Comment on attachment 308981 Patch Clearing flags on attachment: 308981 Committed r216167: <http://trac.webkit.org/changeset/216167> 1304462 11 commit-queue 2017-05-03 18:40:50 -0700 All reviewed patches have been landed. Closing bug. 308898 2017-05-03 05:42:11 -0700 2017-05-03 16:23:49 -0700 Patch bug-171214-20170503084210.patch text/plain 8718 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzgyM2Y4ZDc0MGJmZmJi M2IxNDA2YWFiMDg2OGI3YzI4NGE0MGEwNy4uZWNhMTk5YWUwMTIwYmUxNmM5ZjJhNWI2ZWU1ODky NjRhODkwM2JhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA1LTAzICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBBWDogYXJpYS1yb3dz cGFuIHZhbHVlIHNob3VsZCBiZSBpZ25vcmVkIGlmIHRkL3RoIHJvd3NwYW4gdmFsdWUgaXMgcHJv dmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTIxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl dHVybiAtMSBpbiBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlhQ29sdW1uU3BhbigpIGFuZCBh cmlhUm93U3BhbigpIGlmIHRoZQorICAgICAgICBhY2Nlc3NpYmxlIG9iamVjdCdzIHJlbmRlcmVy IGlzIGEgUmVuZGVyVGFibGVDZWxsLiBUaGlzIGlzIGNvbnNpc3RlbnQgd2l0aCB3aGF0CisgICAg ICAgIHdlIGRvIHdoZW4gdGhlIGF1dGhvciBoYXMgbm90IHByb3ZpZGVkIGEgdmFsaWQgdmFsdWUu IEdldCB0aGUgbmF0aXZlIHJhbmdlIGluCisgICAgICAgIEFjY2Vzc2liaWxpdHlBUklBR3JpZENl bGw6OmNvbHVtbkluZGV4UmFuZ2UoKSBhbmQgcm93SW5kZXhSYW5nZSgpIGFuZCB1c2UgdGhlCisg ICAgICAgIG5hdGl2ZSBzcGFuIGlmIG9uZSBpcyBwcmVzZW50LgorCisgICAgICAgIFRlc3Q6IGFj Y2Vzc2liaWxpdHkvYXJpYS1jZWxsc3BhbnMtd2l0aC1uYXRpdmUtY2VsbHNwYW5zLmh0bWwKKwor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUFSSUFHcmlkQ2VsbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsOjpyb3dJbmRleFJhbmdl KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlBUklBR3JpZENlbGw6OmNvbHVtbklu ZGV4UmFuZ2UpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2Vs bC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlhQ29s dW1uU3Bhbik6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlh Um93U3Bhbik6CisKIDIwMTctMDUtMDIgIEFuZHJldyBHb2xkICA8YWdvbGRAYXBwbGUuY29tPgog CiAgICAgICAgIFR5cG8gaW4gQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlTWFuYWdlci5tbQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJ QUdyaWRDZWxsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eUFSSUFHcmlkQ2VsbC5jcHAKaW5kZXggOTA2N2M0MThiOTc3YmEzODkwNTI0NWFmN2ZlMzRjMGUx YjgxNWNhOC4uNzBkNjFhYWM1YWZjNWRmMWRjOWY4M2YyNDc0YTk3YjI1NDg2MWJmNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWRD ZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlB UklBR3JpZENlbGwuY3BwCkBAIC05Miw4ICs5MiwxMCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlBUklB R3JpZENlbGw6OnJvd0luZGV4UmFuZ2Uoc3RkOjpwYWlyPHVuc2lnbmVkLCB1bnNpZ25lZD4mIHJv dwogICAgIH0KIAogICAgIC8vIEFSSUEgMS4xLCBhcmlhLXJvd3NwYW4gYXR0cmlidXRlIGlzIGlu dGVuZGVkIGZvciBjZWxscyBhbmQgZ3JpZGNlbGxzIHdoaWNoIGFyZSBub3QgY29udGFpbmVkIGlu IGEgbmF0aXZlIHRhYmxlLgotICAgIC8vIFNvIHdlIHNob3VsZCBjaGVjayBmb3IgdGhhdCBhdHRy aWJ1dGUgaGVyZS4KLSAgICByb3dSYW5nZS5zZWNvbmQgPSBhcmlhUm93U3BhbldpdGhSb3dJbmRl eChyb3dSYW5nZS5maXJzdCk7CisgICAgLy8gU28gd2Ugc2hvdWxkIGNoZWNrIGZvciB0aGF0IGF0 dHJpYnV0ZSBoZXJlIGlmIHRoZSBjZWxsIGlzIG5vdCBpbiBhIG5hdGl2ZSB0YWJsZS4KKyAgICBz dGQ6OnBhaXI8dW5zaWduZWQsIHVuc2lnbmVkPiBuYXRpdmVSYW5nZTsKKyAgICBBY2Nlc3NpYmls aXR5VGFibGVDZWxsOjpyb3dJbmRleFJhbmdlKG5hdGl2ZVJhbmdlKTsKKyAgICByb3dSYW5nZS5z ZWNvbmQgPSBuYXRpdmVSYW5nZS5zZWNvbmQgPyBuYXRpdmVSYW5nZS5zZWNvbmQgOiBhcmlhUm93 U3BhbldpdGhSb3dJbmRleChyb3dSYW5nZS5maXJzdCk7CiB9CiAKIHVuc2lnbmVkIEFjY2Vzc2li aWxpdHlBUklBR3JpZENlbGw6OmFyaWFSb3dTcGFuV2l0aFJvd0luZGV4KHVuc2lnbmVkIHJvd0lu ZGV4KSBjb25zdApAQCAtMTUxLDggKzE1MywxMCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlBUklBR3Jp ZENlbGw6OmNvbHVtbkluZGV4UmFuZ2Uoc3RkOjpwYWlyPHVuc2lnbmVkLCB1bnNpZ25lZD4mCiAg ICAgfQogICAgIAogICAgIC8vIEFSSUEgMS4xLCBhcmlhLWNvbHNwYW4gYXR0cmlidXRlIGlzIGlu dGVuZGVkIGZvciBjZWxscyBhbmQgZ3JpZGNlbGxzIHdoaWNoIGFyZSBub3QgY29udGFpbmVkIGlu IGEgbmF0aXZlIHRhYmxlLgotICAgIC8vIFNvIHdlIHNob3VsZCBjaGVjayBmb3IgdGhhdCBhdHRy aWJ1dGUgaGVyZS4KLSAgICBjb2x1bW5SYW5nZS5zZWNvbmQgPSBzdGQ6Om1heChhcmlhQ29sdW1u U3BhbigpLCAxKTsKKyAgICAvLyBTbyB3ZSBzaG91bGQgY2hlY2sgZm9yIHRoYXQgYXR0cmlidXRl IGhlcmUgaWYgdGhlIGNlbGwgaXMgbm90IGluIGEgbmF0aXZlIHRhYmxlLgorICAgIHN0ZDo6cGFp cjx1bnNpZ25lZCwgdW5zaWduZWQ+IG5hdGl2ZVJhbmdlOworICAgIEFjY2Vzc2liaWxpdHlUYWJs ZUNlbGw6OmNvbHVtbkluZGV4UmFuZ2UobmF0aXZlUmFuZ2UpOworICAgIGNvbHVtblJhbmdlLnNl Y29uZCA9IG5hdGl2ZVJhbmdlLnNlY29uZCA/IG5hdGl2ZVJhbmdlLnNlY29uZCA6IHN0ZDo6bWF4 KGFyaWFDb2x1bW5TcGFuKCksIDEpOwogfQogCiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3Np YmlsaXR5QVJJQUdyaWRDZWxsOjpwYXJlbnRSb3dHcm91cCgpIGNvbnN0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwuY3BwIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcApp bmRleCAzNDZhYTdhMjZhMzkzMDk4OWRmYjU5MDg2ZjFmOTVjNzJkMGYwZGQxLi4xNzhmYzNlZTdh NmJlOWY2MzA0YjMzMDA2MDUwYmY4OWRmOTY1YmZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5jcHAKQEAgLTQwMyw2 ICs0MDMsMTEgQEAgaW50IEFjY2Vzc2liaWxpdHlUYWJsZUNlbGw6OmFyaWFSb3dJbmRleCgpIGNv bnN0CiAKIGludCBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlhQ29sdW1uU3BhbigpIGNvbnN0 CiB7CisgICAgLy8gQWNjb3JkaW5nIHRvIHRoZSBBUklBIHNwZWMsICJJZiBhcmlhLWNvbHBhbiBp cyB1c2VkIG9uIGFuIGVsZW1lbnQgZm9yIHdoaWNoIHRoZSBob3N0IGxhbmd1YWdlCisgICAgLy8g cHJvdmlkZXMgYW4gZXF1aXZhbGVudCBhdHRyaWJ1dGUsIHVzZXIgYWdlbnRzIG11c3QgaWdub3Jl IHRoZSB2YWx1ZSBvZiBhcmlhLWNvbHNwYW4uIgorICAgIGlmIChpczxSZW5kZXJUYWJsZUNlbGw+ KG1fcmVuZGVyZXIpKQorICAgICAgICByZXR1cm4gLTE7CisKICAgICBjb25zdCBBdG9taWNTdHJp bmcmIGNvbFNwYW5WYWx1ZSA9IGdldEF0dHJpYnV0ZShhcmlhX2NvbHNwYW5BdHRyKTsKICAgICAv LyBBUklBIDEuMTogQXV0aG9ycyBtdXN0IHNldCB0aGUgdmFsdWUgb2YgYXJpYS1jb2xzcGFuIHRv IGFuIGludGVnZXIgZ3JlYXRlciB0aGFuIG9yIGVxdWFsIHRvIDEuCiAgICAgaWYgKGNvbFNwYW5W YWx1ZS50b0ludCgpID49IDEpCkBAIC00MTMsNiArNDE4LDExIEBAIGludCBBY2Nlc3NpYmlsaXR5 VGFibGVDZWxsOjphcmlhQ29sdW1uU3BhbigpIGNvbnN0CiAKIGludCBBY2Nlc3NpYmlsaXR5VGFi bGVDZWxsOjphcmlhUm93U3BhbigpIGNvbnN0CiB7CisgICAgLy8gQWNjb3JkaW5nIHRvIHRoZSBB UklBIHNwZWMsICJJZiBhcmlhLXJvd3NwYW4gaXMgdXNlZCBvbiBhbiBlbGVtZW50IGZvciB3aGlj aCB0aGUgaG9zdCBsYW5ndWFnZQorICAgIC8vIHByb3ZpZGVzIGFuIGVxdWl2YWxlbnQgYXR0cmli dXRlLCB1c2VyIGFnZW50cyBtdXN0IGlnbm9yZSB0aGUgdmFsdWUgb2YgYXJpYS1yb3dzcGFuLiIK KyAgICBpZiAoaXM8UmVuZGVyVGFibGVDZWxsPihtX3JlbmRlcmVyKSkKKyAgICAgICAgcmV0dXJu IC0xOworCiAgICAgY29uc3QgQXRvbWljU3RyaW5nJiByb3dTcGFuVmFsdWUgPSBnZXRBdHRyaWJ1 dGUoYXJpYV9yb3dzcGFuQXR0cik7CiAgICAgCiAgICAgLy8gQVJJQSAxLjE6IEF1dGhvcnMgbXVz dCBzZXQgdGhlIHZhbHVlIG9mIGFyaWEtcm93c3BhbiB0byBhbiBpbnRlZ2VyIGdyZWF0ZXIgdGhh biBvciBlcXVhbCB0byAwLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDNhZTNkMzY0YTA5MDY3NmFmYWZlYmQ0MTU0NGI3MTk4 ODA3MDE4MWUuLmFjY2E1ZjQyMDE5ZDM0NjgyN2I3Y2NhMjhhMzVmNzU2OTJhMTdmZmIgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMyBAQAorMjAxNy0wNS0wMyAgSm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGln YWxpYS5jb20+CisKKyAgICAgICAgQVg6IGFyaWEtcm93c3BhbiB2YWx1ZSBzaG91bGQgYmUgaWdu b3JlZCBpZiB0ZC90aCByb3dzcGFuIHZhbHVlIGlzIHByb3ZpZGVkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzEyMTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXJpYS1jZWxs c3BhbnMtd2l0aC1uYXRpdmUtY2VsbHNwYW5zLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9hcmlhLWNlbGxzcGFucy13aXRoLW5hdGl2ZS1jZWxsc3BhbnMuaHRt bDogQWRkZWQuCisKIDIwMTctMDUtMDIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CiAKICAgICAgICAgRHluYW1pY2FsbHkgYWRkZWQgcG9zaXRpb246Zml4ZWQgZWxlbWVu dCBpcyBpbiB0aGUgd3JvbmcgcGxhY2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvYXJpYS1jZWxsc3BhbnMtd2l0aC1uYXRpdmUtY2VsbHNwYW5zLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1jZWxsc3BhbnMtd2l0aC1uYXRpdmUtY2Vs bHNwYW5zLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hNmU4YWI0NTMwNzM1OWUxMzE4MTViYzM4 YzVkYWM1YjMzMTIzNGFjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9hcmlhLWNlbGxzcGFucy13aXRoLW5hdGl2ZS1jZWxsc3BhbnMtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTUgQEAKK1RoaXMgdmVyaWZpZXMgdGhhdCBBUklBIGNlbGwgc3BhbnMgYXJlIGln bm9yZWQgd2hlbiBuYXRpdmUgY2VsbCBzcGFucyBhcmUgc2V0LgorCitPbiBzdWNjZXNzLCB5b3Ug d2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBD T01QTEVURSIuCisKKworY29sdW1uaGVhZGVyMSBzcGFucyAzIHJvdyhzKSBhbmQgMiBjb2x1bW4o cykuCitjb2x1bW5oZWFkZXIyIHNwYW5zIDEgcm93KHMpIGFuZCAxIGNvbHVtbihzKS4KK2NvbHVt bmhlYWRlcjMgc3BhbnMgMSByb3cocykgYW5kIDMgY29sdW1uKHMpLgorY2VsbDEgc3BhbnMgMiBy b3cocykgYW5kIDIgY29sdW1uKHMpLgorY2VsbDIgc3BhbnMgMSByb3cocykgYW5kIDEgY29sdW1u KHMpLgorY2VsbDMgc3BhbnMgMyByb3cocykgYW5kIDEgY29sdW1uKHMpLgorUEFTUyBzdWNjZXNz ZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1jZWxsc3BhbnMtd2l0aC1uYXRpdmUtY2VsbHNwYW5z Lmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtY2VsbHNwYW5zLXdpdGgtbmF0 aXZlLWNlbGxzcGFucy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJhMzJkYTUwMmUyNjg2NGExMjhkZDNhZDQ5 Y2EwMTQxZDhkYTdjNDIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2FyaWEtY2VsbHNwYW5zLXdpdGgtbmF0aXZlLWNlbGxzcGFucy5odG1sCkBAIC0wLDAgKzEs NTggQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxo dG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5Ij4KKzxkaXYgaWQ9ImNvbnRlbnQiPgor ICA8dGFibGUgYm9yZGVyPSIxIj4KKyAgICA8dHI+CisgICAgICA8dGggaWQ9ImNvbHVtbmhlYWRl cjEiIHJvbGU9ImNvbHVtbmhlYWRlciIgcm93c3Bhbj0iMyIgY29sc3Bhbj0iMiIgYXJpYS1yb3dz cGFuPSIxMCIgYXJpYS1jb2xzcGFuPSIxMCI+aGVhZGVyIDE8L3RoPgorICAgICAgPHRoIGlkPSJj b2x1bW5oZWFkZXIyIiByb2xlPSJjb2x1bW5oZWFkZXIiIGFyaWEtcm93c3Bhbj0iMTAiIGFyaWEt Y29sc3Bhbj0iMTAiPmhlYWRlciAyPC90aD4KKyAgICAgIDx0aCBpZD0iY29sdW1uaGVhZGVyMyIg cm9sZT0iY29sdW1uaGVhZGVyIiBjb2xzcGFuPSIzIiBhcmlhLXJvd3NwYW49IjEwIiBhcmlhLWNv bHNwYW49IjEwIj5oZWFkZXIgMzwvdGg+CisgICAgPC90cj4KKyAgICA8dHI+CisgICAgICA8dGQg aWQ9ImNlbGwxIiByb3dzcGFuPSIyIiBjb2xzcGFuPSIyIiBhcmlhLXJvd3NwYW49IjEwIiBhcmlh LWNvbHNwYW49IjEwIj5jZWxsIDE8L3RkPgorICAgICAgPHRkIGlkPSJjZWxsMiIgYXJpYS1yb3dz cGFuPSIxMCIgYXJpYS1jb2xzcGFuPSIxMCI+Y2VsbCAyPC90ZD4KKyAgICAgIDx0ZCBpZD0iY2Vs bDMiIHJvd3NwYW49IjMiIGFyaWEtcm93c3Bhbj0iMTAiIGFyaWEtY29sc3Bhbj0iMTAiPmNlbGwg MzwvdGQ+CisgICAgPC90cj4KKyAgICA8dHI+CisgICAgICA8dGQ+Y2VsbCA0PC90ZD4KKyAgICA8 L3RyPgorICAgIDx0cj4KKyAgICAgIDx0ZD5jZWxsIDU8L3RkPgorICAgICAgPHRkPmNlbGwgNjwv dGQ+CisgICAgICA8dGQ+Y2VsbCA3PC90ZD4KKyAgICAgIDx0ZD5jZWxsIDg8L3RkPgorICAgICAg PHRkPmNlbGwgOTwvdGQ+CisgICAgPC90cj4KKyAgPC90YWJsZT4KKzwvZGl2PgorCis8c2NyaXB0 PgorICAgIGRlc2NyaXB0aW9uKCJUaGlzIHZlcmlmaWVzIHRoYXQgQVJJQSBjZWxsIHNwYW5zIGFy ZSBpZ25vcmVkIHdoZW4gbmF0aXZlIGNlbGwgc3BhbnMgYXJlIHNldC4iKTsKKworICAgIGZ1bmN0 aW9uIHNwYW4ocmFuZ2VTdHJpbmcpIHsKKyAgICAgICAgcmV0dXJuIHJhbmdlU3RyaW5nLnNwbGl0 KC9cRC8pLmZpbHRlcihmdW5jdGlvbih4KXsgcmV0dXJuIHggIT0gIiI7IH0pWzFdOworICAgIH0K KworICAgIGZ1bmN0aW9uIG91dHB1dFNwYW5zKGlkKSB7CisgICAgICAgIHZhciBheEVsZW1lbnQg PSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoaWQpOworICAg ICAgICB2YXIgcm93U3BhbiA9IHNwYW4oYXhFbGVtZW50LnJvd0luZGV4UmFuZ2UoKSk7CisgICAg ICAgIHZhciBjb2x1bW5TcGFuID0gc3BhbihheEVsZW1lbnQuY29sdW1uSW5kZXhSYW5nZSgpKTsK KyAgICAgICAgZGVidWcoaWQgKyAiIHNwYW5zICIgKyByb3dTcGFuICsgIiByb3cocykgYW5kICIg KyBjb2x1bW5TcGFuICsgIiBjb2x1bW4ocykuIik7CisgICAgfQorCisgICAgaWYgKHdpbmRvdy5h Y2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgICAgICBpZHMgPSBbImNvbHVtbmhlYWRlcjEi LCAiY29sdW1uaGVhZGVyMiIsICJjb2x1bW5oZWFkZXIzIiwgImNlbGwxIiwgImNlbGwyIiwgImNl bGwzIl07CisgICAgICAgIGlkQ291bnQgPSBpZHMubGVuZ3RoOworICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IGlkQ291bnQ7IGkrKykKKyAgICAgICAgICAgIG91dHB1dFNwYW5zKGlkc1tpXSk7 CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnRlbnQiKS5zdHlsZS52aXNp YmlsaXR5ID0gImhpZGRlbiI7CisgICAgfQorPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi9y ZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 308981 2017-05-03 16:23:51 -0700 2017-05-03 18:40:48 -0700 Patch bug-171214-20170503192350.patch text/plain 10436 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTZhMzA5ZjlmYzMxZGFm NTA4NGE1OWMyNzFiMTZmMmViNDE2ZGM3My4uOWVhYWRmNjIyYTMwYTdhZGFmYjYzZjBiN2RjMzg0 ZjNhZjE1ZjE4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA1LTAzICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBBWDogYXJpYS1yb3dz cGFuIHZhbHVlIHNob3VsZCBiZSBpZ25vcmVkIGlmIHRkL3RoIHJvd3NwYW4gdmFsdWUgaXMgcHJv dmlkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTIxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl dHVybiAtMSBpbiBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlhQ29sdW1uU3BhbigpIGFuZCBh cmlhUm93U3BhbigpIGlmIHRoZQorICAgICAgICBjZWxsIGVsZW1lbnQgaGFzIGFuIGV4cGxpY2l0 IHZhbHVlIGZvciB0aGUgbmF0aXZlIGhvc3QgbGFuZ3VhZ2UncyBzcGFuIGF0dHJpYnV0ZS4KKyAg ICAgICAgQWRkIGNoZWNrcyB0byBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjpjb2x1bW5JbmRleFJh bmdlKCkgYW5kIHJvd0luZGV4UmFuZ2UoKSBzbworICAgICAgICB0aGF0IHdlIHByZWZlciBhbiBh dXRob3ItcHJvdmlkZWQgQVJJQSBzcGFuIHZhbHVlIG92ZXIgYW4gaW1wbGljaXQgaG9zdC1sYW5n dWFnZQorICAgICAgICBzcGFuIHZhbHVlLiBTaW1pbGFybHksIGFkZCBjaGVja3MgdG8gQWNjZXNz aWJpbGl0eUFSSUFHcmlkQ2VsbDo6Y29sdW1uSW5kZXhSYW5nZSgpCisgICAgICAgIGFuZCByb3dJ bmRleFJhbmdlKCkgc28gdGhhdCB3ZSBmYWxsIGJhY2sgb24gaW1wbGljaXQgaG9zdC1sYW5ndWFn ZSBzcGFuIHZhbHVlcworICAgICAgICB3aGVuIHRoZXJlIGlzIG5vIGF1dGhvci1wcm92aWRlZCBB UklBIHNwYW4gdmFsdWUgYW5kIHRoZSBBUklBIGNlbGwgaXMgYXNzb2NpYXRlZAorICAgICAgICB3 aXRoIGEgY2VsbCBlbGVtZW50LgorCisgICAgICAgIFRlc3Q6IGFjY2Vzc2liaWxpdHkvYXJpYS1j ZWxsc3BhbnMtd2l0aC1uYXRpdmUtY2VsbHNwYW5zLmh0bWwKKworICAgICAgICAqIGFjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eUFSSUFHcmlkQ2VsbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpB Y2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsOjphcmlhUm93U3BhbldpdGhSb3dJbmRleCk6CisgICAg ICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsOjpjb2x1bW5JbmRleFJhbmdl KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6cm93SW5kZXhSYW5nZSk6 CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjpjb2x1bW5JbmRleFJh bmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlUYWJsZUNlbGw6OmFyaWFDb2x1 bW5TcGFuKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlUYWJsZUNlbGw6OmFyaWFS b3dTcGFuKToKKwogMjAxNy0wNS0wMyAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgogCiAg ICAgICAgIEFYOiBWTyBza2lwcyBjZWxscyBhZnRlciBjZWxsIHdpdGggYXJpYS1jb2xzcGFuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlBUklB R3JpZENlbGwuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 QVJJQUdyaWRDZWxsLmNwcAppbmRleCA2YzM2NzJmMDIzODQxM2YxZmI3NTdmZDgzNDk4ZjA0YmNm MGYzMWIwLi5hMDM2YjQzYjFjYTNkMzk3NWY2NTJmOWZkZTdlM2Y4ZTZmN2YwN2Y1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlBUklBR3JpZENl bGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUFS SUFHcmlkQ2VsbC5jcHAKQEAgLTk5LDggKzk5LDExIEBAIHZvaWQgQWNjZXNzaWJpbGl0eUFSSUFH cmlkQ2VsbDo6cm93SW5kZXhSYW5nZShzdGQ6OnBhaXI8dW5zaWduZWQsIHVuc2lnbmVkPiYgcm93 CiB1bnNpZ25lZCBBY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsOjphcmlhUm93U3BhbldpdGhSb3dJ bmRleCh1bnNpZ25lZCByb3dJbmRleCkgY29uc3QKIHsKICAgICBpbnQgcm93U3BhbiA9IEFjY2Vz c2liaWxpdHlUYWJsZUNlbGw6OmFyaWFSb3dTcGFuKCk7Ci0gICAgaWYgKHJvd1NwYW4gPT0gLTEp Ci0gICAgICAgIHJldHVybiAxOworICAgIGlmIChyb3dTcGFuID09IC0xKSB7CisgICAgICAgIHN0 ZDo6cGFpcjx1bnNpZ25lZCwgdW5zaWduZWQ+IHJhbmdlOworICAgICAgICBBY2Nlc3NpYmlsaXR5 VGFibGVDZWxsOjpyb3dJbmRleFJhbmdlKHJhbmdlKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4 KHN0YXRpY19jYXN0PGludD4ocmFuZ2Uuc2Vjb25kKSwgMSk7CisgICAgfQogCiAgICAgQWNjZXNz aWJpbGl0eU9iamVjdCogcGFyZW50ID0gcGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7CiAgICAgaWYg KCFwYXJlbnQpCkBAIC0xNTUsNyArMTU4LDE0IEBAIHZvaWQgQWNjZXNzaWJpbGl0eUFSSUFHcmlk Q2VsbDo6Y29sdW1uSW5kZXhSYW5nZShzdGQ6OnBhaXI8dW5zaWduZWQsIHVuc2lnbmVkPiYKICAg ICAKICAgICAvLyBBUklBIDEuMSwgYXJpYS1jb2xzcGFuIGF0dHJpYnV0ZSBpcyBpbnRlbmRlZCBm b3IgY2VsbHMgYW5kIGdyaWRjZWxscyB3aGljaCBhcmUgbm90IGNvbnRhaW5lZCBpbiBhIG5hdGl2 ZSB0YWJsZS4KICAgICAvLyBTbyB3ZSBzaG91bGQgY2hlY2sgZm9yIHRoYXQgYXR0cmlidXRlIGhl cmUuCi0gICAgY29sdW1uUmFuZ2Uuc2Vjb25kID0gc3RkOjptYXgoYXJpYUNvbHVtblNwYW4oKSwg MSk7CisgICAgaW50IGNvbHVtblNwYW4gPSBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlhQ29s dW1uU3BhbigpOworICAgIGlmIChjb2x1bW5TcGFuID09IC0xKSB7CisgICAgICAgIHN0ZDo6cGFp cjx1bnNpZ25lZCwgdW5zaWduZWQ+IHJhbmdlOworICAgICAgICBBY2Nlc3NpYmlsaXR5VGFibGVD ZWxsOjpjb2x1bW5JbmRleFJhbmdlKHJhbmdlKTsKKyAgICAgICAgY29sdW1uU3BhbiA9IHJhbmdl LnNlY29uZDsKKyAgICB9CisKKyAgICBjb2x1bW5SYW5nZS5zZWNvbmQgPSBzdGQ6Om1heChjb2x1 bW5TcGFuLCAxKTsKIH0KIAogQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eUFSSUFH cmlkQ2VsbDo6cGFyZW50Um93R3JvdXAoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbC5jcHAKaW5kZXggMzQ2YWE3 YTI2YTM5MzA5ODlkZmI1OTA4NmYxZjk1YzcyZDBmMGRkMS4uMWU0MzhjNmIxYTc1ODg2MzliMjll NGFmOTMxZTczZjlkNDRhYTYxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNlbGwuY3BwCkBAIC0zMTgsNyArMzE4LDEzIEBA IHZvaWQgQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbDo6cm93SW5kZXhSYW5nZShzdGQ6OnBhaXI8dW5z aWduZWQsIHVuc2lnbmVkPiYgcm93UmFuCiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBSZW5k ZXJUYWJsZUNlbGwmIHJlbmRlckNlbGwgPSBkb3duY2FzdDxSZW5kZXJUYWJsZUNlbGw+KCptX3Jl bmRlcmVyKTsKLSAgICByb3dSYW5nZS5zZWNvbmQgPSByZW5kZXJDZWxsLnJvd1NwYW4oKTsKKwor ICAgIC8vIEFSSUEgMS4xJ3MgYXJpYS1yb3dzcGFuIGF0dHJpYnV0ZSBpcyBpbnRlbmRlZCBmb3Ig Y2VsbHMgYW5kIGdyaWRjZWxscyB3aGljaCBhcmUgbm90IGNvbnRhaW5lZAorICAgIC8vIGluIGEg bmF0aXZlIHRhYmxlLiBCdXQgaWYgd2UgaGF2ZSBhIHZhbGlkIGF1dGhvci1wcm92aWRlZCB2YWx1 ZSBhbmQgZG8gbm90IGhhdmUgYW4gZXhwbGljaXQKKyAgICAvLyBuYXRpdmUgaG9zdCBsYW5ndWFn ZSB2YWx1ZSBmb3IgdGhlIHJvd3NwYW4sIGV4cG9zZSB0aGUgQVJJQSB2YWx1ZS4KKyAgICByb3dS YW5nZS5zZWNvbmQgPSBhcmlhUm93U3BhbigpOworICAgIGlmIChzdGF0aWNfY2FzdDxpbnQ+KHJv d1JhbmdlLnNlY29uZCkgPT0gLTEpCisgICAgICAgIHJvd1JhbmdlLnNlY29uZCA9IHJlbmRlckNl bGwucm93U3BhbigpOwogICAgIAogICAgIGlmIChBY2Nlc3NpYmlsaXR5VGFibGVSb3cqIHBhcmVu dFJvdyA9IHRoaXMtPnBhcmVudFJvdygpKQogICAgICAgICByb3dSYW5nZS5maXJzdCA9IHBhcmVu dFJvdy0+cm93SW5kZXgoKTsKQEAgLTMzMSw2ICszMzcsMTQgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5 VGFibGVDZWxsOjpjb2x1bW5JbmRleFJhbmdlKHN0ZDo6cGFpcjx1bnNpZ25lZCwgdW5zaWduZWQ+ JiBjb2wKICAgICAKICAgICBjb25zdCBSZW5kZXJUYWJsZUNlbGwmIGNlbGwgPSBkb3duY2FzdDxS ZW5kZXJUYWJsZUNlbGw+KCptX3JlbmRlcmVyKTsKICAgICBjb2x1bW5SYW5nZS5maXJzdCA9IGNl bGwudGFibGUoKS0+Y29sVG9FZmZDb2woY2VsbC5jb2woKSk7CisKKyAgICAvLyBBUklBIDEuMSdz IGFyaWEtY29sc3BhbiBhdHRyaWJ1dGUgaXMgaW50ZW5kZWQgZm9yIGNlbGxzIGFuZCBncmlkY2Vs bHMgd2hpY2ggYXJlIG5vdCBjb250YWluZWQKKyAgICAvLyBpbiBhIG5hdGl2ZSB0YWJsZS4gQnV0 IGlmIHdlIGhhdmUgYSB2YWxpZCBhdXRob3ItcHJvdmlkZWQgdmFsdWUgYW5kIGRvIG5vdCBoYXZl IGFuIGV4cGxpY2l0CisgICAgLy8gbmF0aXZlIGhvc3QgbGFuZ3VhZ2UgdmFsdWUgZm9yIHRoZSBj b2xzcGFuLCBleHBvc2UgdGhlIEFSSUEgdmFsdWUuCisgICAgY29sdW1uUmFuZ2Uuc2Vjb25kID0g YXJpYUNvbHVtblNwYW4oKTsKKyAgICBpZiAoc3RhdGljX2Nhc3Q8aW50Pihjb2x1bW5SYW5nZS5z ZWNvbmQpICE9IC0xKQorICAgICAgICByZXR1cm47CisKICAgICBjb2x1bW5SYW5nZS5zZWNvbmQg PSBjZWxsLnRhYmxlKCktPmNvbFRvRWZmQ29sKGNlbGwuY29sKCkgKyBjZWxsLmNvbFNwYW4oKSkg LSBjb2x1bW5SYW5nZS5maXJzdDsKIH0KICAgICAKQEAgLTQwMyw2ICs0MTcsMTEgQEAgaW50IEFj Y2Vzc2liaWxpdHlUYWJsZUNlbGw6OmFyaWFSb3dJbmRleCgpIGNvbnN0CiAKIGludCBBY2Nlc3Np YmlsaXR5VGFibGVDZWxsOjphcmlhQ29sdW1uU3BhbigpIGNvbnN0CiB7CisgICAgLy8gQWNjb3Jk aW5nIHRvIHRoZSBBUklBIHNwZWMsICJJZiBhcmlhLWNvbHBhbiBpcyB1c2VkIG9uIGFuIGVsZW1l bnQgZm9yIHdoaWNoIHRoZSBob3N0IGxhbmd1YWdlCisgICAgLy8gcHJvdmlkZXMgYW4gZXF1aXZh bGVudCBhdHRyaWJ1dGUsIHVzZXIgYWdlbnRzIG11c3QgaWdub3JlIHRoZSB2YWx1ZSBvZiBhcmlh LWNvbHNwYW4uIgorICAgIGlmIChoYXNBdHRyaWJ1dGUoY29sc3BhbkF0dHIpKQorICAgICAgICBy ZXR1cm4gLTE7CisKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGNvbFNwYW5WYWx1ZSA9IGdldEF0 dHJpYnV0ZShhcmlhX2NvbHNwYW5BdHRyKTsKICAgICAvLyBBUklBIDEuMTogQXV0aG9ycyBtdXN0 IHNldCB0aGUgdmFsdWUgb2YgYXJpYS1jb2xzcGFuIHRvIGFuIGludGVnZXIgZ3JlYXRlciB0aGFu IG9yIGVxdWFsIHRvIDEuCiAgICAgaWYgKGNvbFNwYW5WYWx1ZS50b0ludCgpID49IDEpCkBAIC00 MTMsNiArNDMyLDExIEBAIGludCBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlhQ29sdW1uU3Bh bigpIGNvbnN0CiAKIGludCBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsOjphcmlhUm93U3BhbigpIGNv bnN0CiB7CisgICAgLy8gQWNjb3JkaW5nIHRvIHRoZSBBUklBIHNwZWMsICJJZiBhcmlhLXJvd3Nw YW4gaXMgdXNlZCBvbiBhbiBlbGVtZW50IGZvciB3aGljaCB0aGUgaG9zdCBsYW5ndWFnZQorICAg IC8vIHByb3ZpZGVzIGFuIGVxdWl2YWxlbnQgYXR0cmlidXRlLCB1c2VyIGFnZW50cyBtdXN0IGln bm9yZSB0aGUgdmFsdWUgb2YgYXJpYS1yb3dzcGFuLiIKKyAgICBpZiAoaGFzQXR0cmlidXRlKHJv d3NwYW5BdHRyKSkKKyAgICAgICAgcmV0dXJuIC0xOworCiAgICAgY29uc3QgQXRvbWljU3RyaW5n JiByb3dTcGFuVmFsdWUgPSBnZXRBdHRyaWJ1dGUoYXJpYV9yb3dzcGFuQXR0cik7CiAgICAgCiAg ICAgLy8gQVJJQSAxLjE6IEF1dGhvcnMgbXVzdCBzZXQgdGhlIHZhbHVlIG9mIGFyaWEtcm93c3Bh biB0byBhbiBpbnRlZ2VyIGdyZWF0ZXIgdGhhbiBvciBlcXVhbCB0byAwLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDBjYTk3 NzhiYmFlZTBmYjkzNmIxNjEzNzE2YTE1ZjU1NmFkMjhkOWIuLjkzMWQyNWQ0MTA5MTkwN2U1OGM3 ZThiZTYzOTI4Yzg5MjRiOTFlM2EgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNy0wNS0wMyAg Sm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQVg6IGFyaWEt cm93c3BhbiB2YWx1ZSBzaG91bGQgYmUgaWdub3JlZCBpZiB0ZC90aCByb3dzcGFuIHZhbHVlIGlz IHByb3ZpZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzEyMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvYXJpYS1jZWxsc3BhbnMtd2l0aC1uYXRpdmUtY2VsbHNwYW5zLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hcmlhLWNlbGxzcGFu cy13aXRoLW5hdGl2ZS1jZWxsc3BhbnMuaHRtbDogQWRkZWQuCisKIDIwMTctMDUtMDMgIE5hbiBX YW5nICA8bl93YW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogVk8gc2tpcHMgY2VsbHMgYWZ0 ZXIgY2VsbCB3aXRoIGFyaWEtY29sc3BhbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9hcmlhLWNlbGxzcGFucy13aXRoLW5hdGl2ZS1jZWxsc3BhbnMtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLWNlbGxzcGFucy13aXRoLW5hdGl2ZS1j ZWxsc3BhbnMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE2MDBjYTEwNDNlY2VhZmVhYWMxNTZi YWMxMGZiOTc5NmNlZTc0NWUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3Np YmlsaXR5L2FyaWEtY2VsbHNwYW5zLXdpdGgtbmF0aXZlLWNlbGxzcGFucy1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwxNSBAQAorVGhpcyB2ZXJpZmllcyB0aGF0IEFSSUEgY2VsbCBzcGFucyBhcmUg aWdub3JlZCB3aGVuIG5hdGl2ZSBjZWxsIHNwYW5zIGFyZSBzZXQuCisKK09uIHN1Y2Nlc3MsIHlv dSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNU IENPTVBMRVRFIi4KKworCitjb2x1bW5oZWFkZXIxIHNwYW5zIDMgcm93KHMpIGFuZCAyIGNvbHVt bihzKS4KK2NvbHVtbmhlYWRlcjIgc3BhbnMgMTAgcm93KHMpIGFuZCAxMCBjb2x1bW4ocykuCitj b2x1bW5oZWFkZXIzIHNwYW5zIDEwIHJvdyhzKSBhbmQgMyBjb2x1bW4ocykuCitjZWxsMSBzcGFu cyAyIHJvdyhzKSBhbmQgMiBjb2x1bW4ocykuCitjZWxsMiBzcGFucyAxMCByb3cocykgYW5kIDEw IGNvbHVtbihzKS4KK2NlbGwzIHNwYW5zIDMgcm93KHMpIGFuZCAxMCBjb2x1bW4ocykuCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLWNlbGxzcGFucy13aXRoLW5hdGl2ZS1j ZWxsc3BhbnMuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1jZWxsc3BhbnMt d2l0aC1uYXRpdmUtY2VsbHNwYW5zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMmEzMmRhNTAyZTI2ODY0YTEy OGRkM2FkNDljYTAxNDFkOGRhN2M0MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvYXJpYS1jZWxsc3BhbnMtd2l0aC1uYXRpdmUtY2VsbHNwYW5zLmh0bWwKQEAg LTAsMCArMSw1OCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8v RU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC1w cmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgorPGRpdiBpZD0iY29u dGVudCI+CisgIDx0YWJsZSBib3JkZXI9IjEiPgorICAgIDx0cj4KKyAgICAgIDx0aCBpZD0iY29s dW1uaGVhZGVyMSIgcm9sZT0iY29sdW1uaGVhZGVyIiByb3dzcGFuPSIzIiBjb2xzcGFuPSIyIiBh cmlhLXJvd3NwYW49IjEwIiBhcmlhLWNvbHNwYW49IjEwIj5oZWFkZXIgMTwvdGg+CisgICAgICA8 dGggaWQ9ImNvbHVtbmhlYWRlcjIiIHJvbGU9ImNvbHVtbmhlYWRlciIgYXJpYS1yb3dzcGFuPSIx MCIgYXJpYS1jb2xzcGFuPSIxMCI+aGVhZGVyIDI8L3RoPgorICAgICAgPHRoIGlkPSJjb2x1bW5o ZWFkZXIzIiByb2xlPSJjb2x1bW5oZWFkZXIiIGNvbHNwYW49IjMiIGFyaWEtcm93c3Bhbj0iMTAi IGFyaWEtY29sc3Bhbj0iMTAiPmhlYWRlciAzPC90aD4KKyAgICA8L3RyPgorICAgIDx0cj4KKyAg ICAgIDx0ZCBpZD0iY2VsbDEiIHJvd3NwYW49IjIiIGNvbHNwYW49IjIiIGFyaWEtcm93c3Bhbj0i MTAiIGFyaWEtY29sc3Bhbj0iMTAiPmNlbGwgMTwvdGQ+CisgICAgICA8dGQgaWQ9ImNlbGwyIiBh cmlhLXJvd3NwYW49IjEwIiBhcmlhLWNvbHNwYW49IjEwIj5jZWxsIDI8L3RkPgorICAgICAgPHRk IGlkPSJjZWxsMyIgcm93c3Bhbj0iMyIgYXJpYS1yb3dzcGFuPSIxMCIgYXJpYS1jb2xzcGFuPSIx MCI+Y2VsbCAzPC90ZD4KKyAgICA8L3RyPgorICAgIDx0cj4KKyAgICAgIDx0ZD5jZWxsIDQ8L3Rk PgorICAgIDwvdHI+CisgICAgPHRyPgorICAgICAgPHRkPmNlbGwgNTwvdGQ+CisgICAgICA8dGQ+ Y2VsbCA2PC90ZD4KKyAgICAgIDx0ZD5jZWxsIDc8L3RkPgorICAgICAgPHRkPmNlbGwgODwvdGQ+ CisgICAgICA8dGQ+Y2VsbCA5PC90ZD4KKyAgICA8L3RyPgorICA8L3RhYmxlPgorPC9kaXY+CisK KzxzY3JpcHQ+CisgICAgZGVzY3JpcHRpb24oIlRoaXMgdmVyaWZpZXMgdGhhdCBBUklBIGNlbGwg c3BhbnMgYXJlIGlnbm9yZWQgd2hlbiBuYXRpdmUgY2VsbCBzcGFucyBhcmUgc2V0LiIpOworCisg ICAgZnVuY3Rpb24gc3BhbihyYW5nZVN0cmluZykgeworICAgICAgICByZXR1cm4gcmFuZ2VTdHJp bmcuc3BsaXQoL1xELykuZmlsdGVyKGZ1bmN0aW9uKHgpeyByZXR1cm4geCAhPSAiIjsgfSlbMV07 CisgICAgfQorCisgICAgZnVuY3Rpb24gb3V0cHV0U3BhbnMoaWQpIHsKKyAgICAgICAgdmFyIGF4 RWxlbWVudCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZChp ZCk7CisgICAgICAgIHZhciByb3dTcGFuID0gc3BhbihheEVsZW1lbnQucm93SW5kZXhSYW5nZSgp KTsKKyAgICAgICAgdmFyIGNvbHVtblNwYW4gPSBzcGFuKGF4RWxlbWVudC5jb2x1bW5JbmRleFJh bmdlKCkpOworICAgICAgICBkZWJ1ZyhpZCArICIgc3BhbnMgIiArIHJvd1NwYW4gKyAiIHJvdyhz KSBhbmQgIiArIGNvbHVtblNwYW4gKyAiIGNvbHVtbihzKS4iKTsKKyAgICB9CisKKyAgICBpZiAo d2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAgIGlkcyA9IFsiY29sdW1u aGVhZGVyMSIsICJjb2x1bW5oZWFkZXIyIiwgImNvbHVtbmhlYWRlcjMiLCAiY2VsbDEiLCAiY2Vs bDIiLCAiY2VsbDMiXTsKKyAgICAgICAgaWRDb3VudCA9IGlkcy5sZW5ndGg7CisgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgaWRDb3VudDsgaSsrKQorICAgICAgICAgICAgb3V0cHV0U3BhbnMo aWRzW2ldKTsKKworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGVudCIpLnN0 eWxlLnZpc2liaWxpdHkgPSAiaGlkZGVuIjsKKyAgICB9Cis8L3NjcmlwdD4KKworPHNjcmlwdCBz cmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgo=