123982 2013-11-07 03:02:10 -0800 [AX] Use toAccessibilityTable() instead of using manual static_cast<> 2013-11-07 04:08:44 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 gyuyoung.kim gyuyoung.kim aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario samuel_white webkit-bug-importer oldest_to_newest 948176 0 gyuyoung.kim 2013-11-07 03:02:10 -0800 Though there is toAccessibilityTable(), static_cast<> are being used by many places. We need to use toAccessibilityTable(). 948179 1 webkit-bug-importer 2013-11-07 03:02:37 -0800 <rdar://problem/15412760> 948180 2 216281 gyuyoung.kim 2013-11-07 03:03:56 -0800 Created attachment 216281 Patch 948198 3 216281 mario 2013-11-07 03:43:04 -0800 Comment on attachment 216281 Patch That's correct. Thanks! 948201 4 216281 mario 2013-11-07 03:44:47 -0800 Comment on attachment 216281 Patch Sorry I set the cq+ flag by mistake 948209 5 216281 commit-queue 2013-11-07 04:08:41 -0800 Comment on attachment 216281 Patch Clearing flags on attachment: 216281 Committed r158843: <http://trac.webkit.org/changeset/158843> 948210 6 commit-queue 2013-11-07 04:08:44 -0800 All reviewed patches have been landed. Closing bug. 216281 2013-11-07 03:03:56 -0800 2013-11-07 04:08:40 -0800 Patch bug-123982-20131107200353.patch text/plain 12729 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4ODI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjE4MTQzNWIyMDYwOTZi YjUxYTJhYmQ0NWI2NjQwOTcwYWQwZjM1OC4uYjRhNjhiZDczMTkzMTU0ZjI1YmM5MzZhMTE2ZGRh OWQ1MzY1ZWM1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTExLTA3ICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0FYXSBVc2Ug dG9BY2Nlc3NpYmlsaXR5VGFibGUoKSBpbnN0ZWFkIG9mIHVzaW5nIG1hbnVhbCBzdGF0aWNfY2Fz dDw+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM5 ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaG91 Z2ggdGhlcmUgaXMgdG9BY2Nlc3NpYmlsaXR5VGFibGUoKSwgc3RhdGljX2Nhc3Q8PiBhcmUgYmVp bmcgdXNlZCBieSBtYW55IHBsYWNlcy4KKyAgICAgICAgV2UgbmVlZCB0byB1c2UgdG9BY2Nlc3Np YmlsaXR5VGFibGUoKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5n ZXMuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlBUklBR3JpZFJvdy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QVJJQUdyaWRSb3c6OmRpc2Nsb3Nl ZFJvd3MpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUFSSUFHcmlkUm93OjpkaXNj bG9zZWRCeVJvdyk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVI ZWFkZXJDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRhYmxl SGVhZGVyQ29udGFpbmVyOjphZGRDaGlsZHJlbik6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9h dGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZVRhYmxlLmNwcDoKKyAgICAgICAgKGNlbGwpOgor ICAgICAgICAoY2VsbEF0SW5kZXgpOgorICAgICAgICAod2Via2l0QWNjZXNzaWJsZVRhYmxlR2V0 SW5kZXhBdCk6CisgICAgICAgICh3ZWJraXRBY2Nlc3NpYmxlVGFibGVHZXROQ29sdW1ucyk6Cisg ICAgICAgICh3ZWJraXRBY2Nlc3NpYmxlVGFibGVHZXROUm93cyk6CisgICAgICAgICh3ZWJraXRB Y2Nlc3NpYmxlVGFibGVHZXRDb2x1bW5IZWFkZXIpOgorICAgICAgICAod2Via2l0QWNjZXNzaWJs ZVRhYmxlR2V0Um93SGVhZGVyKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXIgdGFibGVQYXJlbnRdKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21h Yy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToKKyAgICAgICAgKC1bV2ViQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWRkaXRpb25hbEFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVO YW1lc10pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3Np YmlsaXR5QXR0cmlidXRlVmFsdWU6XSk6CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpmb3JQYXJhbWV0ZXI6XSk6CisK IDIwMTMtMTEtMDcgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAg U2ltcGxpZnkgQXR0ciBieSByZW1vdmluZyBtX3NwZWNpZmllZCBtZW1iZXIgdmFyaWFibGUgYW5k IHNldHRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5QVJJQUdyaWRSb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5QVJJQUdyaWRSb3cuY3BwCmluZGV4IGQwOGQyNzllZDE4MjAwOTdiNzhkZjQ4M2Zk ZDE2OWY3OGQyMmEwODMuLmQxMTQ2ODI4ZTdhMWI0NjUxMTBhMDM2ZTIyMDk1YTQ0YTJmYjMzMTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUFS SUFHcmlkUm93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlBUklBR3JpZFJvdy5jcHAKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5 QVJJQUdyaWRSb3c6OmRpc2Nsb3NlZFJvd3MoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBk aXNjbG8KICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIHVuc2lnbmVkIGxldmVsID0gaGllcmFy Y2hpY2FsTGV2ZWwoKTsKLSAgICBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGFsbFJvd3Mg PSBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGUqPihwYXJlbnQpLT5yb3dzKCk7CisgICAg QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBhbGxSb3dzID0gdG9BY2Nlc3NpYmlsaXR5VGFi bGUocGFyZW50KS0+cm93cygpOwogICAgIGludCByb3dDb3VudCA9IGFsbFJvd3Muc2l6ZSgpOwog ICAgIGZvciAoaW50IGsgPSBpbmRleCArIDE7IGsgPCByb3dDb3VudDsgKytrKSB7CiAgICAgICAg IEFjY2Vzc2liaWxpdHlPYmplY3QqIHJvdyA9IGFsbFJvd3Nba10uZ2V0KCk7CkBAIC0xMDAsNyAr MTAwLDcgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eUFSSUFHcmlkUm93Ojpk aXNjbG9zZWRCeVJvdygpIGNvbnN0CiAgICAgCiAgICAgLy8gU2VhcmNoIGZvciB0aGUgcHJldmlv dXMgcm93IHRoYXQgbWF0Y2hlcyB0aGUgY29ycmVjdCBsZXZlbC4KICAgICBpbnQgaW5kZXggPSBy b3dJbmRleCgpOwotICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgYWxsUm93cyA9IHN0 YXRpY19jYXN0PEFjY2Vzc2liaWxpdHlUYWJsZSo+KHBhcmVudCktPnJvd3MoKTsKKyAgICBBY2Nl c3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGFsbFJvd3MgPSB0b0FjY2Vzc2liaWxpdHlUYWJsZShw YXJlbnQpLT5yb3dzKCk7CiAgICAgaW50IHJvd0NvdW50ID0gYWxsUm93cy5zaXplKCk7CiAgICAg aWYgKGluZGV4ID49IHJvd0NvdW50KQogICAgICAgICByZXR1cm4gMDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29udGFp bmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxl SGVhZGVyQ29udGFpbmVyLmNwcAppbmRleCAwMTlmMzEyMzAyN2NhMGJlNzNkYWI2N2EzMTdmYzE2 MWIzZTBmM2JlLi4yMzc1ZjFhOTc3ZDU5YzRmZGI1NTY5OTM2YTQ4YTAxNjMxYzUyNmFjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUhl YWRlckNvbnRhaW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5VGFibGVIZWFkZXJDb250YWluZXIuY3BwCkBAIC03Myw3ICs3Myw3IEBAIHZvaWQg QWNjZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29udGFpbmVyOjphZGRDaGlsZHJlbigpCiAgICAgaWYg KCFtX3BhcmVudCB8fCAhbV9wYXJlbnQtPmlzQWNjZXNzaWJpbGl0eVRhYmxlKCkpCiAgICAgICAg IHJldHVybjsKICAgICAKLSAgICBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGUqPihtX3Bh cmVudCktPmNvbHVtbkhlYWRlcnMobV9jaGlsZHJlbik7CisgICAgdG9BY2Nlc3NpYmlsaXR5VGFi bGUobV9wYXJlbnQpLT5jb2x1bW5IZWFkZXJzKG1fY2hpbGRyZW4pOwogICAgIAogICAgIHVuc2ln bmVkIGxlbmd0aCA9IG1fY2hpbGRyZW4uc2l6ZSgpOwogICAgIGZvciAodW5zaWduZWQgayA9IDA7 IGsgPCBsZW5ndGg7ICsraykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VUYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlVGFibGUuY3BwCmlu ZGV4IDdkZWFkMTZlMzE1YWFkYTBmM2JhYTI4ZDg0ODk4NmYwYjBmYWY2MGIuLmM5MzgwYzU2ODQw MWI4MDkyMDZiNzNhOWMwOTJkMDA3NmE2OGQ2NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VUYWJsZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZUludGVy ZmFjZVRhYmxlLmNwcApAQCAtNTksNyArNTksNyBAQCBzdGF0aWMgQWNjZXNzaWJpbGl0eVRhYmxl Q2VsbCogY2VsbChBdGtUYWJsZSogdGFibGUsIGd1aW50IHJvdywgZ3VpbnQgY29sdW1uKQogewog ICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGFjY1RhYmxlID0gY29yZSh0YWJsZSk7CiAgICAgaWYg KGFjY1RhYmxlLT5pc0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoKSkKLSAgICAgICAgcmV0dXJu IHN0YXRpY19jYXN0PEFjY2Vzc2liaWxpdHlUYWJsZSo+KGFjY1RhYmxlKS0+Y2VsbEZvckNvbHVt bkFuZFJvdyhjb2x1bW4sIHJvdyk7CisgICAgICAgIHJldHVybiB0b0FjY2Vzc2liaWxpdHlUYWJs ZShhY2NUYWJsZSktPmNlbGxGb3JDb2x1bW5BbmRSb3coY29sdW1uLCByb3cpOwogICAgIHJldHVy biAwOwogfQogCkBAIC04MSw3ICs4MSw3IEBAIHN0YXRpYyBBY2Nlc3NpYmlsaXR5VGFibGVDZWxs KiBjZWxsQXRJbmRleChBdGtUYWJsZSogdGFibGUsIGdpbnQgaW5kZXgpCiAgICAgQWNjZXNzaWJp bGl0eU9iamVjdCogYWNjVGFibGUgPSBjb3JlKHRhYmxlKTsKICAgICBpZiAoYWNjVGFibGUtPmlz QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCgpKSB7CiAgICAgICAgIEFjY2Vzc2liaWxpdHlPYmpl Y3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhbGxDZWxsczsKLSAgICAgICAgc3RhdGlj X2Nhc3Q8QWNjZXNzaWJpbGl0eVRhYmxlKj4oYWNjVGFibGUpLT5jZWxscyhhbGxDZWxscyk7Cisg ICAgICAgIHRvQWNjZXNzaWJpbGl0eVRhYmxlKGFjY1RhYmxlKS0+Y2VsbHMoYWxsQ2VsbHMpOwog ICAgICAgICBpZiAoMCA8PSBpbmRleCAmJiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oaW5kZXgpIDwg YWxsQ2VsbHMuc2l6ZSgpKSB7CiAgICAgICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBhY2ND ZWxsID0gYWxsQ2VsbHMuYXQoaW5kZXgpLmdldCgpOwogICAgICAgICAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PEFjY2Vzc2liaWxpdHlUYWJsZUNlbGwqPihhY2NDZWxsKTsKQEAgLTExNCw3ICsxMTQs NyBAQCBzdGF0aWMgZ2ludCB3ZWJraXRBY2Nlc3NpYmxlVGFibGVHZXRJbmRleEF0KEF0a1RhYmxl KiB0YWJsZSwgZ2ludCByb3csIGdpbnQgY29sdQogICAgIHJldHVyblZhbElmV2ViS2l0QWNjZXNz aWJsZUlzSW52YWxpZChXRUJLSVRfQUNDRVNTSUJMRSh0YWJsZSksIC0xKTsKIAogICAgIEFjY2Vz c2liaWxpdHlUYWJsZUNlbGwqIGF4Q2VsbCA9IGNlbGwodGFibGUsIHJvdywgY29sdW1uKTsKLSAg ICBBY2Nlc3NpYmlsaXR5VGFibGUqIGF4VGFibGUgPSBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5 VGFibGUqPihjb3JlKHRhYmxlKSk7CisgICAgQWNjZXNzaWJpbGl0eVRhYmxlKiBheFRhYmxlID0g dG9BY2Nlc3NpYmlsaXR5VGFibGUoY29yZSh0YWJsZSkpOwogICAgIHJldHVybiBjZWxsSW5kZXgo YXhDZWxsLCBheFRhYmxlKTsKIH0KIApAQCAtMTUzLDcgKzE1Myw3IEBAIHN0YXRpYyBnaW50IHdl YmtpdEFjY2Vzc2libGVUYWJsZUdldE5Db2x1bW5zKEF0a1RhYmxlKiB0YWJsZSkKIAogICAgIEFj Y2Vzc2liaWxpdHlPYmplY3QqIGFjY1RhYmxlID0gY29yZSh0YWJsZSk7CiAgICAgaWYgKGFjY1Rh YmxlLT5pc0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoKSkKLSAgICAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PEFjY2Vzc2liaWxpdHlUYWJsZSo+KGFjY1RhYmxlKS0+Y29sdW1uQ291bnQoKTsKKyAg ICAgICAgcmV0dXJuIHRvQWNjZXNzaWJpbGl0eVRhYmxlKGFjY1RhYmxlKS0+Y29sdW1uQ291bnQo KTsKICAgICByZXR1cm4gMDsKIH0KIApAQCAtMTY0LDcgKzE2NCw3IEBAIHN0YXRpYyBnaW50IHdl YmtpdEFjY2Vzc2libGVUYWJsZUdldE5Sb3dzKEF0a1RhYmxlKiB0YWJsZSkKIAogICAgIEFjY2Vz c2liaWxpdHlPYmplY3QqIGFjY1RhYmxlID0gY29yZSh0YWJsZSk7CiAgICAgaWYgKGFjY1RhYmxl LT5pc0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoKSkKLSAgICAgICAgcmV0dXJuIHN0YXRpY19j YXN0PEFjY2Vzc2liaWxpdHlUYWJsZSo+KGFjY1RhYmxlKS0+cm93Q291bnQoKTsKKyAgICAgICAg cmV0dXJuIHRvQWNjZXNzaWJpbGl0eVRhYmxlKGFjY1RhYmxlKS0+cm93Q291bnQoKTsKICAgICBy ZXR1cm4gMDsKIH0KIApAQCAtMjA0LDcgKzIwNCw3IEBAIHN0YXRpYyBBdGtPYmplY3QqIHdlYmtp dEFjY2Vzc2libGVUYWJsZUdldENvbHVtbkhlYWRlcihBdGtUYWJsZSogdGFibGUsIGdpbnQgY29s CiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogYWNjVGFibGUgPSBjb3JlKHRhYmxlKTsKICAgICBp ZiAoYWNjVGFibGUtPmlzQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCgpKSB7CiAgICAgICAgIEFj Y2Vzc2liaWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhbGxDb2x1bW5I ZWFkZXJzOwotICAgICAgICBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGUqPihhY2NUYWJs ZSktPmNvbHVtbkhlYWRlcnMoYWxsQ29sdW1uSGVhZGVycyk7CisgICAgICAgIHRvQWNjZXNzaWJp bGl0eVRhYmxlKGFjY1RhYmxlKS0+Y29sdW1uSGVhZGVycyhhbGxDb2x1bW5IZWFkZXJzKTsKICAg ICAgICAgdW5zaWduZWQgY29sdW1uQ291bnQgPSBhbGxDb2x1bW5IZWFkZXJzLnNpemUoKTsKICAg ICAgICAgZm9yICh1bnNpZ25lZCBrID0gMDsgayA8IGNvbHVtbkNvdW50OyArK2spIHsKICAgICAg ICAgICAgIHBhaXI8dW5zaWduZWQsIHVuc2lnbmVkPiBjb2x1bW5SYW5nZTsKQEAgLTIyNSw3ICsy MjUsNyBAQCBzdGF0aWMgQXRrT2JqZWN0KiB3ZWJraXRBY2Nlc3NpYmxlVGFibGVHZXRSb3dIZWFk ZXIoQXRrVGFibGUqIHRhYmxlLCBnaW50IHJvdykKICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBh Y2NUYWJsZSA9IGNvcmUodGFibGUpOwogICAgIGlmIChhY2NUYWJsZS0+aXNBY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0KCkpIHsKICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJp bGl0eUNoaWxkcmVuVmVjdG9yIGFsbFJvd0hlYWRlcnM7Ci0gICAgICAgIHN0YXRpY19jYXN0PEFj Y2Vzc2liaWxpdHlUYWJsZSo+KGFjY1RhYmxlKS0+cm93SGVhZGVycyhhbGxSb3dIZWFkZXJzKTsK KyAgICAgICAgdG9BY2Nlc3NpYmlsaXR5VGFibGUoYWNjVGFibGUpLT5yb3dIZWFkZXJzKGFsbFJv d0hlYWRlcnMpOwogICAgICAgICB1bnNpZ25lZCByb3dDb3VudCA9IGFsbFJvd0hlYWRlcnMuc2l6 ZSgpOwogICAgICAgICBmb3IgKHVuc2lnbmVkIGsgPSAwOyBrIDwgcm93Q291bnQ7ICsraykgewog ICAgICAgICAgICAgcGFpcjx1bnNpZ25lZCwgdW5zaWduZWQ+IHJvd1JhbmdlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXJJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQppbmRleCAzOTI3ZTM5NGViZTJiYTUxY2M3NWE1 NjA4YTFhM2E5YmM5MmQ2YWVmLi4xMDcxNDQ5Y2JmNjUyMDk0YmU2NzllZWM1MzM1MjM0YjEwMmEw MTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQpAQCAtNzgzLDcg Kzc4Myw3IEBAIHN0YXRpYyB2b2lkIGFwcGVuZFN0cmluZ1RvUmVzdWx0KE5TTXV0YWJsZVN0cmlu ZyAqcmVzdWx0LCBOU1N0cmluZyAqc3RyaW5nKQogICAgIGlmICghcGFyZW50VGFibGUpCiAgICAg ICAgIHJldHVybiAwOwogICAgIAotICAgIHJldHVybiBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5 VGFibGUqPihwYXJlbnRUYWJsZSk7CisgICAgcmV0dXJuIHRvQWNjZXNzaWJpbGl0eVRhYmxlKHBh cmVudFRhYmxlKTsKIH0KIAogLSAoaWQpYWNjZXNzaWJpbGl0eVRpdGxlRWxlbWVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9i amVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCBlYzJjMzJiMGM5ZDgyNmJmYjdl NThjODBmY2EzZTdkYWU0ODVmOTNlLi43MzkyZGY1ZjlmYWY2NGZhNmEwOWZmNTkzMWQ4ODE1MGJk MTFhZmJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMTAx OSw3ICsxMDE5LDcgQEAgc3RhdGljIGlkIHRleHRNYXJrZXJSYW5nZUZyb21WaXNpYmxlUG9zaXRp b25zKEFYT2JqZWN0Q2FjaGUgKmNhY2hlLCBWaXNpYmxlUG9zaXQKICAgICBpZiAobV9vYmplY3Qt PnN1cHBvcnRzQVJJQURyb3BwaW5nKCkpCiAgICAgICAgIFthZGRpdGlvbmFsIGFkZE9iamVjdDpO U0FjY2Vzc2liaWxpdHlEcm9wRWZmZWN0c0F0dHJpYnV0ZV07CiAgICAgCi0gICAgaWYgKG1fb2Jq ZWN0LT5pc0FjY2Vzc2liaWxpdHlUYWJsZSgpICYmIHN0YXRpY19jYXN0PEFjY2Vzc2liaWxpdHlU YWJsZSo+KG1fb2JqZWN0KS0+c3VwcG9ydHNTZWxlY3RlZFJvd3MoKSkKKyAgICBpZiAobV9vYmpl Y3QtPmlzQWNjZXNzaWJpbGl0eVRhYmxlKCkgJiYgdG9BY2Nlc3NpYmlsaXR5VGFibGUobV9vYmpl Y3QpLT5zdXBwb3J0c1NlbGVjdGVkUm93cygpKQogICAgICAgICBbYWRkaXRpb25hbCBhZGRPYmpl Y3Q6TlNBY2Nlc3NpYmlsaXR5U2VsZWN0ZWRSb3dzQXR0cmlidXRlXTsKICAgICAKICAgICBpZiAo bV9vYmplY3QtPnN1cHBvcnRzQVJJQUxpdmVSZWdpb24oKSkgewpAQCAtMjM1NCwxMiArMjM1NCwx MiBAQCBzdGF0aWMgTlNTdHJpbmcqIHJvbGVWYWx1ZVRvTlNTdHJpbmcoQWNjZXNzaWJpbGl0eVJv bGUgdmFsdWUpCiAgICAgICAgIC8vIFRPRE86IGRpc3Rpbmd1aXNoIGJldHdlZW4gdmlzaWJsZSBh bmQgbm9uLXZpc2libGUgcm93cwogICAgICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRv U3RyaW5nOk5TQWNjZXNzaWJpbGl0eVJvd3NBdHRyaWJ1dGVdIHx8CiAgICAgICAgICAgICBbYXR0 cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5VmlzaWJsZVJvd3NBdHRy aWJ1dGVdKSB7Ci0gICAgICAgICAgICByZXR1cm4gY29udmVydFRvTlNBcnJheShzdGF0aWNfY2Fz dDxBY2Nlc3NpYmlsaXR5VGFibGUqPihtX29iamVjdCktPnJvd3MoKSk7CisgICAgICAgICAgICBy ZXR1cm4gY29udmVydFRvTlNBcnJheSh0b0FjY2Vzc2liaWxpdHlUYWJsZShtX29iamVjdCktPnJv d3MoKSk7CiAgICAgICAgIH0KICAgICAgICAgLy8gVE9ETzogZGlzdGluZ3Vpc2ggYmV0d2VlbiB2 aXNpYmxlIGFuZCBub24tdmlzaWJsZSBjb2x1bW5zCiAgICAgICAgIGlmIChbYXR0cmlidXRlTmFt ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5Q29sdW1uc0F0dHJpYnV0ZV0gfHwKICAg ICAgICAgICAgIFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlW aXNpYmxlQ29sdW1uc0F0dHJpYnV0ZV0pIHsKLSAgICAgICAgICAgIHJldHVybiBjb252ZXJ0VG9O U0FycmF5KHN0YXRpY19jYXN0PEFjY2Vzc2liaWxpdHlUYWJsZSo+KG1fb2JqZWN0KS0+Y29sdW1u cygpKTsKKyAgICAgICAgICAgIHJldHVybiBjb252ZXJ0VG9OU0FycmF5KHRvQWNjZXNzaWJpbGl0 eVRhYmxlKG1fb2JqZWN0KS0+Y29sdW1ucygpKTsKICAgICAgICAgfQogICAgICAgICAKICAgICAg ICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlTZWxl Y3RlZFJvd3NBdHRyaWJ1dGVdKSB7CkBAIC0yMzc1LDEyICsyMzc1LDEyIEBAIHN0YXRpYyBOU1N0 cmluZyogcm9sZVZhbHVlVG9OU1N0cmluZyhBY2Nlc3NpYmlsaXR5Um9sZSB2YWx1ZSkKICAgICAg ICAgCiAgICAgICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6KE5TU3RyaW5n ICopa0FYQ29sdW1uSGVhZGVyVUlFbGVtZW50c0F0dHJpYnV0ZV0pIHsKICAgICAgICAgICAgIEFj Y2Vzc2liaWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBjb2x1bW5IZWFk ZXJzOwotICAgICAgICAgICAgc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVRhYmxlKj4obV9vYmpl Y3QpLT5jb2x1bW5IZWFkZXJzKGNvbHVtbkhlYWRlcnMpOworICAgICAgICAgICAgdG9BY2Nlc3Np YmlsaXR5VGFibGUobV9vYmplY3QpLT5jb2x1bW5IZWFkZXJzKGNvbHVtbkhlYWRlcnMpOwogICAg ICAgICAgICAgcmV0dXJuIGNvbnZlcnRUb05TQXJyYXkoY29sdW1uSGVhZGVycyk7CiAgICAgICAg IH0KICAgICAgICAgCiAgICAgICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6 TlNBY2Nlc3NpYmlsaXR5SGVhZGVyQXR0cmlidXRlXSkgewotICAgICAgICAgICAgQWNjZXNzaWJp bGl0eU9iamVjdCogaGVhZGVyQ29udGFpbmVyID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVRh YmxlKj4obV9vYmplY3QpLT5oZWFkZXJDb250YWluZXIoKTsKKyAgICAgICAgICAgIEFjY2Vzc2li aWxpdHlPYmplY3QqIGhlYWRlckNvbnRhaW5lciA9IHRvQWNjZXNzaWJpbGl0eVRhYmxlKG1fb2Jq ZWN0KS0+aGVhZGVyQ29udGFpbmVyKCk7CiAgICAgICAgICAgICBpZiAoaGVhZGVyQ29udGFpbmVy KQogICAgICAgICAgICAgICAgIHJldHVybiBoZWFkZXJDb250YWluZXItPndyYXBwZXIoKTsKICAg ICAgICAgICAgIHJldHVybiBuaWw7CkBAIC0yMzg4LDEzICsyMzg4LDEzIEBAIHN0YXRpYyBOU1N0 cmluZyogcm9sZVZhbHVlVG9OU1N0cmluZyhBY2Nlc3NpYmlsaXR5Um9sZSB2YWx1ZSkKICAgICAg ICAgCiAgICAgICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3Np YmlsaXR5Um93SGVhZGVyVUlFbGVtZW50c0F0dHJpYnV0ZV0pIHsKICAgICAgICAgICAgIEFjY2Vz c2liaWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciByb3dIZWFkZXJzOwot ICAgICAgICAgICAgc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVRhYmxlKj4obV9vYmplY3QpLT5y b3dIZWFkZXJzKHJvd0hlYWRlcnMpOworICAgICAgICAgICAgdG9BY2Nlc3NpYmlsaXR5VGFibGUo bV9vYmplY3QpLT5yb3dIZWFkZXJzKHJvd0hlYWRlcnMpOwogICAgICAgICAgICAgcmV0dXJuIGNv bnZlcnRUb05TQXJyYXkocm93SGVhZGVycyk7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAg IGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5VmlzaWJs ZUNlbGxzQXR0cmlidXRlXSkgewogICAgICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdDo6QWNj ZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGNlbGxzOwotICAgICAgICAgICAgc3RhdGljX2Nhc3Q8 QWNjZXNzaWJpbGl0eVRhYmxlKj4obV9vYmplY3QpLT5jZWxscyhjZWxscyk7CisgICAgICAgICAg ICB0b0FjY2Vzc2liaWxpdHlUYWJsZShtX29iamVjdCktPmNlbGxzKGNlbGxzKTsKICAgICAgICAg ICAgIHJldHVybiBjb252ZXJ0VG9OU0FycmF5KGNlbGxzKTsKICAgICAgICAgfQogICAgIH0KQEAg LTM0OTMsNyArMzQ5Myw3IEBAIHN0YXRpYyBSZW5kZXJPYmplY3QqIHJlbmRlcmVyRm9yVmlldyhO U1ZpZXcqIHZpZXcpCiAgICAgICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzpOU0Fj Y2Vzc2liaWxpdHlDZWxsRm9yQ29sdW1uQW5kUm93UGFyYW1ldGVyaXplZEF0dHJpYnV0ZV0pIHsK ICAgICAgICAgICAgIGlmIChhcnJheSA9PSBuaWwgfHwgW2FycmF5IGNvdW50XSAhPSAyKQogICAg ICAgICAgICAgICAgIHJldHVybiBuaWw7Ci0gICAgICAgICAgICBBY2Nlc3NpYmlsaXR5VGFibGVD ZWxsKiBjZWxsID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVRhYmxlKj4obV9vYmplY3QpLT5j ZWxsRm9yQ29sdW1uQW5kUm93KFtbYXJyYXkgb2JqZWN0QXRJbmRleDowXSB1bnNpZ25lZEludFZh bHVlXSwgW1thcnJheSBvYmplY3RBdEluZGV4OjFdIHVuc2lnbmVkSW50VmFsdWVdKTsKKyAgICAg ICAgICAgIEFjY2Vzc2liaWxpdHlUYWJsZUNlbGwqIGNlbGwgPSB0b0FjY2Vzc2liaWxpdHlUYWJs ZShtX29iamVjdCktPmNlbGxGb3JDb2x1bW5BbmRSb3coW1thcnJheSBvYmplY3RBdEluZGV4OjBd IHVuc2lnbmVkSW50VmFsdWVdLCBbW2FycmF5IG9iamVjdEF0SW5kZXg6MV0gdW5zaWduZWRJbnRW YWx1ZV0pOwogICAgICAgICAgICAgaWYgKCFjZWxsKQogICAgICAgICAgICAgICAgIHJldHVybiBu aWw7CiAgICAgICAgICAgICAK