160141 2016-07-23 20:22:16 -0700 RenderBox::haveSameDirection is used only by table items. 2016-07-25 19:17:05 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1214008 0 zalan 2016-07-23 20:22:16 -0700 It does not need to be on RenderBox. 1214010 1 284434 zalan 2016-07-23 20:38:16 -0700 Created attachment 284434 Patch 1214023 2 284434 simon.fraser 2016-07-23 22:32:04 -0700 Comment on attachment 284434 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=284434&action=review > Source/WebCore/rendering/RenderTable.h:381 > +inline bool isDirectionSame(const RenderBox* tableItem, const RenderBox* otherTableItem) { return tableItem && otherTableItem ? tableItem->style().direction() == otherTableItem->style().direction() : true; } Why not use references? The old code never null-checked. 1214434 3 284434 commit-queue 2016-07-25 19:17:01 -0700 Comment on attachment 284434 Patch Clearing flags on attachment: 284434 Committed r203705: <http://trac.webkit.org/changeset/203705> 1214435 4 commit-queue 2016-07-25 19:17:05 -0700 All reviewed patches have been landed. Closing bug. 284434 2016-07-23 20:38:16 -0700 2016-07-25 19:17:01 -0700 Patch bug-160141-20160723203712.patch text/plain 10617 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzNjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZkOGE5ZTAzZDA2MjZh OGU3NzMwZDgyM2M5YmIyMzQ4NjRkYzI0My4uYTQxNmUyZjVkMzUxMGNlMmM2YzczOTkxYjQ1ZDVl N2RhOWFmM2U1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQzIEBACiAyMDE2LTA3LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVuZGVyQm94OjpoYXZlU2Ft ZURpcmVjdGlvbiBpcyB1c2VkIG9ubHkgYnkgdGFibGUgaXRlbXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjAxNDEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgUmVuZGVyQm94OjpoYXZlU2Ft ZURpcmVjdGlvbigpIHNpbmNlIGl0J3MgdXNlZCBvbmx5IGJ5IFJlbmRlclRhYmxlKgorICAgICAg ICBjbGFzc2VzLiBUaGUgbmV3IHN0YW5kIGFsb25lIGZ1bmN0aW9uICh3aXRoIDIgYXJndW1lbnRz KSBub3cgY2hlY2tzIGlmIGJvdGggb2YKKyAgICAgICAgdGhlIG9iamVjdHMgYXJlIHZhbGlkLiAK KworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aGFzU2FtZURp cmVjdGlvbkFzKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6OnRhYmxlU3RhcnRCb3JkZXJBZGpvaW5p bmdDZWxsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjp0YWJsZUVuZEJvcmRlckFk am9pbmluZ0NlbGwpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5oOgorICAgICAg ICAoV2ViQ29yZTo6aGF2ZVNhbWVEaXJlY3Rpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJUYWJsZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpoYXNT dGFydEJvcmRlckFkam9pbmluZ1RhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxl Q2VsbDo6aGFzRW5kQm9yZGVyQWRqb2luaW5nVGFibGUpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUYWJsZUNlbGwuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlQ2VsbDo6Ym9y ZGVyQWRqb2luaW5nVGFibGVTdGFydCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZUNl bGw6OmJvcmRlckFkam9pbmluZ1RhYmxlRW5kKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGFibGVSb3cuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlUm93Ojpib3JkZXJBZGpv aW5pbmdUYWJsZVN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlUm93Ojpib3Jk ZXJBZGpvaW5pbmdUYWJsZUVuZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlU2Vj dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZVNlY3Rpb246OmJvcmRlckFk am9pbmluZ1N0YXJ0Q2VsbCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZVNlY3Rpb246 OmJvcmRlckFkam9pbmluZ0VuZENlbGwpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVT ZWN0aW9uOjpmaXJzdFJvd0NlbGxBZGpvaW5pbmdUYWJsZVN0YXJ0KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6Zmlyc3RSb3dDZWxsQWRqb2luaW5nVGFibGVFbmQpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uaDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6Ym9yZGVyQWRqb2luaW5nVGFibGVTdGFydCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZVNlY3Rpb246OmJvcmRlckFkam9pbmluZ1RhYmxlRW5k KToKKworMjAxNi0wNy0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCiAgICAg ICAgIHRhYmxlKkJvcmRlckFkam9pbmluZ0NlbGwgYW5kIGJvcmRlckFkam9pbmluZ0NlbGwqIHNo b3VsZCB0YWtlIHJlZmVyZW5jZSBpbnN0ZWFkIG9mIFJlbmRlclRhYmxlQ2VsbCouCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjAxMjMKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDk5YTJiYzY0ZTQ4OTQzZDM3ZWVmOWQ0ZGU2 YWU5MDMxYzBlNGIxMGUuLjIzZTAxNzRiNTg4MDFiYmI0ZDg3ZTRkNDU4NDZkZDQ0NTg0OGVlYjUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTYwNCw4ICs2MDQsNiBAQCBw dWJsaWM6CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAgIGJvb2wgaGFzU2Ft ZURpcmVjdGlvbkFzKGNvbnN0IFJlbmRlckJveCogb2JqZWN0KSBjb25zdCB7IHJldHVybiBzdHls ZSgpLmRpcmVjdGlvbigpID09IG9iamVjdC0+c3R5bGUoKS5kaXJlY3Rpb24oKTsgfQotCiAjaWYg RU5BQkxFKENTU19TSEFQRVMpCiAgICAgU2hhcGVPdXRzaWRlSW5mbyogc2hhcGVPdXRzaWRlSW5m bygpIGNvbnN0CiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAK aW5kZXggZjYzNzYyMzFkNGRhNDNhZDEwZTA4YmM0MTAxYmMyY2YwZThhYjg3Zi4uYzRiZGEwM2E0 NTQ5YWE5MGY5MDM3MThhMjY0MmI0ZmRmZmE5MDRmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGUuY3BwCkBAIC0xNTY1LDcgKzE1NjUsNyBAQCBSZW5kZXJUYWJsZSogUmVu ZGVyVGFibGU6OmNyZWF0ZUFub255bW91c1dpdGhQYXJlbnRSZW5kZXJlcihjb25zdCBSZW5kZXJP YmplY3QqCiBjb25zdCBCb3JkZXJWYWx1ZSYgUmVuZGVyVGFibGU6OnRhYmxlU3RhcnRCb3JkZXJB ZGpvaW5pbmdDZWxsKGNvbnN0IFJlbmRlclRhYmxlQ2VsbCYgY2VsbCkgY29uc3QKIHsKICAgICBB U1NFUlQoY2VsbC5pc0ZpcnN0T3JMYXN0Q2VsbEluUm93KCkpOwotICAgIGlmIChoYXNTYW1lRGly ZWN0aW9uQXMoY2VsbC5yb3coKSkpCisgICAgaWYgKGlzRGlyZWN0aW9uU2FtZSh0aGlzLCBjZWxs LnJvdygpKSkKICAgICAgICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVyU3RhcnQoKTsKIAogICAgIHJl dHVybiBzdHlsZSgpLmJvcmRlckVuZCgpOwpAQCAtMTU3NCw3ICsxNTc0LDcgQEAgY29uc3QgQm9y ZGVyVmFsdWUmIFJlbmRlclRhYmxlOjp0YWJsZVN0YXJ0Qm9yZGVyQWRqb2luaW5nQ2VsbChjb25z dCBSZW5kZXJUYWJsZUMKIGNvbnN0IEJvcmRlclZhbHVlJiBSZW5kZXJUYWJsZTo6dGFibGVFbmRC b3JkZXJBZGpvaW5pbmdDZWxsKGNvbnN0IFJlbmRlclRhYmxlQ2VsbCYgY2VsbCkgY29uc3QKIHsK ICAgICBBU1NFUlQoY2VsbC5pc0ZpcnN0T3JMYXN0Q2VsbEluUm93KCkpOwotICAgIGlmIChoYXNT YW1lRGlyZWN0aW9uQXMoY2VsbC5yb3coKSkpCisgICAgaWYgKGlzRGlyZWN0aW9uU2FtZSh0aGlz LCBjZWxsLnJvdygpKSkKICAgICAgICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVyRW5kKCk7CiAKICAg ICByZXR1cm4gc3R5bGUoKS5ib3JkZXJTdGFydCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGFibGUuaAppbmRleCA0Njg1YmRlMGJhZDg1YTc1ZGRkNGQzZDVhNGI3ODRjNGRiMTgzNTI5 Li5jNDhhNThmNGQ2NjM2MTk5ZDhmNmM3MzA5ZmU5ZGJlNDcwNzYyMjA1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaApAQCAtMzc4LDYgKzM3OCw4IEBAIGlubGluZSBSZW5k ZXJUYWJsZVNlY3Rpb24qIFJlbmRlclRhYmxlOjp0b3BTZWN0aW9uKCkgY29uc3QKICAgICByZXR1 cm4gbV9mb290OwogfQogCitpbmxpbmUgYm9vbCBpc0RpcmVjdGlvblNhbWUoY29uc3QgUmVuZGVy Qm94KiB0YWJsZUl0ZW0sIGNvbnN0IFJlbmRlckJveCogb3RoZXJUYWJsZUl0ZW0pIHsgcmV0dXJu IHRhYmxlSXRlbSAmJiBvdGhlclRhYmxlSXRlbSA/IHRhYmxlSXRlbS0+c3R5bGUoKS5kaXJlY3Rp b24oKSA9PSBvdGhlclRhYmxlSXRlbS0+c3R5bGUoKS5kaXJlY3Rpb24oKSA6IHRydWU7IH0KKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX1JFTkRFUl9P QkpFQ1QoUmVuZGVyVGFibGUsIGlzVGFibGUoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRhYmxlQ2VsbC5jcHAKaW5kZXggYTViMzFmZWQ0YmU2YzE3YmRhZjA4Y2FmOTkwNzg1 YTQ5NWNhZDhlNi4uYjI4ZTQ5YmRkYTNlYjNiN2NhNTNjOTI3MmQzYTVkNzExZDk4MjlmZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHAKQEAgLTUwNiw3 ICs1MDYsNyBAQCBib29sIFJlbmRlclRhYmxlQ2VsbDo6aGFzU3RhcnRCb3JkZXJBZGpvaW5pbmdU YWJsZSgpIGNvbnN0CiB7CiAgICAgYm9vbCBpc1N0YXJ0Q29sdW1uID0gIWNvbCgpOwogICAgIGJv b2wgaXNFbmRDb2x1bW4gPSB0YWJsZSgpLT5jb2xUb0VmZkNvbChjb2woKSArIGNvbFNwYW4oKSAt IDEpID09IHRhYmxlKCktPm51bUVmZkNvbHMoKSAtIDE7Ci0gICAgYm9vbCBoYXNTYW1lRGlyZWN0 aW9uQXNUYWJsZSA9IGhhc1NhbWVEaXJlY3Rpb25BcyhzZWN0aW9uKCkpOworICAgIGJvb2wgaGFz U2FtZURpcmVjdGlvbkFzVGFibGUgPSBpc0RpcmVjdGlvblNhbWUodGhpcywgc2VjdGlvbigpKTsK IAogICAgIC8vIFRoZSB0YWJsZSBkaXJlY3Rpb24gZGV0ZXJtaW5lcyB0aGUgcm93IGRpcmVjdGlv bi4gSW4gbWl4ZWQgZGlyZWN0aW9uYWxpdHksIHdlIGNhbm5vdCBndWFyYW50ZWUgdGhhdAogICAg IC8vIHdlIGhhdmUgYSBjb21tb24gYm9yZGVyIHdpdGggdGhlIHRhYmxlICh0aGluayBhIGx0ciB0 YWJsZSB3aXRoIHJ0bCBzdGFydCBjZWxsKS4KQEAgLTUxNyw3ICs1MTcsNyBAQCBib29sIFJlbmRl clRhYmxlQ2VsbDo6aGFzRW5kQm9yZGVyQWRqb2luaW5nVGFibGUoKSBjb25zdAogewogICAgIGJv b2wgaXNTdGFydENvbHVtbiA9ICFjb2woKTsKICAgICBib29sIGlzRW5kQ29sdW1uID0gdGFibGUo KS0+Y29sVG9FZmZDb2woY29sKCkgKyBjb2xTcGFuKCkgLSAxKSA9PSB0YWJsZSgpLT5udW1FZmZD b2xzKCkgLSAxOwotICAgIGJvb2wgaGFzU2FtZURpcmVjdGlvbkFzVGFibGUgPSBoYXNTYW1lRGly ZWN0aW9uQXMoc2VjdGlvbigpKTsKKyAgICBib29sIGhhc1NhbWVEaXJlY3Rpb25Bc1RhYmxlID0g aXNEaXJlY3Rpb25TYW1lKHRoaXMsIHNlY3Rpb24oKSk7CiAKICAgICAvLyBUaGUgdGFibGUgZGly ZWN0aW9uIGRldGVybWluZXMgdGhlIHJvdyBkaXJlY3Rpb24uIEluIG1peGVkIGRpcmVjdGlvbmFs aXR5LCB3ZSBjYW5ub3QgZ3VhcmFudGVlIHRoYXQKICAgICAvLyB3ZSBoYXZlIGEgY29tbW9uIGJv cmRlciB3aXRoIHRoZSB0YWJsZSAodGhpbmsgYSBsdHIgdGFibGUgd2l0aCBsdHIgZW5kIGNlbGwp LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5oCmluZGV4IDZmZDQ2 YmJiNDJiZDI1ZTEwNGVkMjY4MzI4M2EzYzhkODQ2YjM0MmMuLjc0Mzk2Mjg3MDAzOTAwOGRkYjYw N2E5Mjc3MzJjZTFkNzI2YThiN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZUNlbGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGVDZWxsLmgKQEAgLTMwMSw3ICszMDEsNyBAQCBpbmxpbmUgYm9vbCBSZW5kZXJUYWJsZUNl bGw6OmlzQmFzZWxpbmVBbGlnbmVkKCkgY29uc3QKIGlubGluZSBjb25zdCBCb3JkZXJWYWx1ZSYg UmVuZGVyVGFibGVDZWxsOjpib3JkZXJBZGpvaW5pbmdUYWJsZVN0YXJ0KCkgY29uc3QKIHsKICAg ICBBU1NFUlQoaXNGaXJzdE9yTGFzdENlbGxJblJvdygpKTsKLSAgICBpZiAoc2VjdGlvbigpLT5o YXNTYW1lRGlyZWN0aW9uQXModGFibGUoKSkpCisgICAgaWYgKGlzRGlyZWN0aW9uU2FtZShzZWN0 aW9uKCksIHRhYmxlKCkpKQogICAgICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJTdGFydCgpOwog CiAgICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVyRW5kKCk7CkBAIC0zMTAsNyArMzEwLDcgQEAgaW5s aW5lIGNvbnN0IEJvcmRlclZhbHVlJiBSZW5kZXJUYWJsZUNlbGw6OmJvcmRlckFkam9pbmluZ1Rh YmxlU3RhcnQoKSBjb25zdAogaW5saW5lIGNvbnN0IEJvcmRlclZhbHVlJiBSZW5kZXJUYWJsZUNl bGw6OmJvcmRlckFkam9pbmluZ1RhYmxlRW5kKCkgY29uc3QKIHsKICAgICBBU1NFUlQoaXNGaXJz dE9yTGFzdENlbGxJblJvdygpKTsKLSAgICBpZiAoc2VjdGlvbigpLT5oYXNTYW1lRGlyZWN0aW9u QXModGFibGUoKSkpCisgICAgaWYgKGlzRGlyZWN0aW9uU2FtZShzZWN0aW9uKCksIHRhYmxlKCkp KQogICAgICAgICByZXR1cm4gc3R5bGUoKS5ib3JkZXJFbmQoKTsKIAogICAgIHJldHVybiBzdHls ZSgpLmJvcmRlclN0YXJ0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVSb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJv dy5oCmluZGV4IDMzOTllNDFhM2E5MDkwMDUzZjk0MjEzYjc3YWEwY2NjNmVkMDM1NzUuLjY1MWU3 YzBkMmQzZjllOTMwZjYwM2M5NTNmNTEzNTBmNGZiN2ZjZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUYWJsZVJvdy5oCkBAIC0xMDcsMTYgKzEwNywxNCBAQCBpbmxpbmUgdW5z aWduZWQgUmVuZGVyVGFibGVSb3c6OnJvd0luZGV4KCkgY29uc3QKIAogaW5saW5lIGNvbnN0IEJv cmRlclZhbHVlJiBSZW5kZXJUYWJsZVJvdzo6Ym9yZGVyQWRqb2luaW5nVGFibGVTdGFydCgpIGNv bnN0CiB7Ci0gICAgUmVuZGVyVGFibGVTZWN0aW9uKiBzZWN0aW9uID0gdGhpcy0+c2VjdGlvbigp OwotICAgIGlmIChzZWN0aW9uICYmIHNlY3Rpb24tPmhhc1NhbWVEaXJlY3Rpb25Bcyh0YWJsZSgp KSkKKyAgICBpZiAoaXNEaXJlY3Rpb25TYW1lKHNlY3Rpb24oKSwgdGFibGUoKSkpCiAgICAgICAg IHJldHVybiBzdHlsZSgpLmJvcmRlclN0YXJ0KCk7CiAgICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVy RW5kKCk7CiB9CiAKIGlubGluZSBjb25zdCBCb3JkZXJWYWx1ZSYgUmVuZGVyVGFibGVSb3c6OmJv cmRlckFkam9pbmluZ1RhYmxlRW5kKCkgY29uc3QKIHsKLSAgICBSZW5kZXJUYWJsZVNlY3Rpb24q IHNlY3Rpb24gPSB0aGlzLT5zZWN0aW9uKCk7Ci0gICAgaWYgKHNlY3Rpb24gJiYgc2VjdGlvbi0+ aGFzU2FtZURpcmVjdGlvbkFzKHRhYmxlKCkpKQorICAgIGlmIChpc0RpcmVjdGlvblNhbWUoc2Vj dGlvbigpLCB0YWJsZSgpKSkKICAgICAgICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVyRW5kKCk7CiAg ICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVyU3RhcnQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKaW5kZXggNGY4NmU0YjBlYzg1NTYzZWMy MmVmZTQxYTY1Njk3ZjczMTRlODgzZC4uZjdiNzRhOTM2OWQ0MGY3Yzc5ODg4MTdiM2M2MDI0ZGNj N2IyMmEwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl U2VjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2Vj dGlvbi5jcHAKQEAgLTE0MjIsMjQgKzE0MjIsMjQgQEAgdW5zaWduZWQgUmVuZGVyVGFibGVTZWN0 aW9uOjpudW1Db2x1bW5zKCkgY29uc3QKIGNvbnN0IEJvcmRlclZhbHVlJiBSZW5kZXJUYWJsZVNl Y3Rpb246OmJvcmRlckFkam9pbmluZ1N0YXJ0Q2VsbChjb25zdCBSZW5kZXJUYWJsZUNlbGwmIGNl bGwpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGNlbGwuaXNGaXJzdE9yTGFzdENlbGxJblJvdygpKTsK LSAgICByZXR1cm4gaGFzU2FtZURpcmVjdGlvbkFzKCZjZWxsKSA/IHN0eWxlKCkuYm9yZGVyU3Rh cnQoKSA6IHN0eWxlKCkuYm9yZGVyRW5kKCk7CisgICAgcmV0dXJuIGlzRGlyZWN0aW9uU2FtZSh0 aGlzLCAmY2VsbCkgPyBzdHlsZSgpLmJvcmRlclN0YXJ0KCkgOiBzdHlsZSgpLmJvcmRlckVuZCgp OwogfQogCiBjb25zdCBCb3JkZXJWYWx1ZSYgUmVuZGVyVGFibGVTZWN0aW9uOjpib3JkZXJBZGpv aW5pbmdFbmRDZWxsKGNvbnN0IFJlbmRlclRhYmxlQ2VsbCYgY2VsbCkgY29uc3QKIHsKICAgICBB U1NFUlQoY2VsbC5pc0ZpcnN0T3JMYXN0Q2VsbEluUm93KCkpOwotICAgIHJldHVybiBoYXNTYW1l RGlyZWN0aW9uQXMoJmNlbGwpID8gc3R5bGUoKS5ib3JkZXJFbmQoKSA6IHN0eWxlKCkuYm9yZGVy U3RhcnQoKTsKKyAgICByZXR1cm4gaXNEaXJlY3Rpb25TYW1lKHRoaXMsICZjZWxsKSA/IHN0eWxl KCkuYm9yZGVyRW5kKCkgOiBzdHlsZSgpLmJvcmRlclN0YXJ0KCk7CiB9CiAKIGNvbnN0IFJlbmRl clRhYmxlQ2VsbCogUmVuZGVyVGFibGVTZWN0aW9uOjpmaXJzdFJvd0NlbGxBZGpvaW5pbmdUYWJs ZVN0YXJ0KCkgY29uc3QKIHsKLSAgICB1bnNpZ25lZCBhZGpvaW5pbmdTdGFydENlbGxDb2x1bW5J bmRleCA9IGhhc1NhbWVEaXJlY3Rpb25Bcyh0YWJsZSgpKSA/IDAgOiB0YWJsZSgpLT5sYXN0Q29s dW1uSW5kZXgoKTsKKyAgICB1bnNpZ25lZCBhZGpvaW5pbmdTdGFydENlbGxDb2x1bW5JbmRleCA9 IGlzRGlyZWN0aW9uU2FtZSh0aGlzLCB0YWJsZSgpKSA/IDAgOiB0YWJsZSgpLT5sYXN0Q29sdW1u SW5kZXgoKTsKICAgICByZXR1cm4gY2VsbEF0KDAsIGFkam9pbmluZ1N0YXJ0Q2VsbENvbHVtbklu ZGV4KS5wcmltYXJ5Q2VsbCgpOwogfQogCiBjb25zdCBSZW5kZXJUYWJsZUNlbGwqIFJlbmRlclRh YmxlU2VjdGlvbjo6Zmlyc3RSb3dDZWxsQWRqb2luaW5nVGFibGVFbmQoKSBjb25zdAogewotICAg IHVuc2lnbmVkIGFkam9pbmluZ0VuZENlbGxDb2x1bW5JbmRleCA9IGhhc1NhbWVEaXJlY3Rpb25B cyh0YWJsZSgpKSA/IHRhYmxlKCktPmxhc3RDb2x1bW5JbmRleCgpIDogMDsKKyAgICB1bnNpZ25l ZCBhZGpvaW5pbmdFbmRDZWxsQ29sdW1uSW5kZXggPSBpc0RpcmVjdGlvblNhbWUodGhpcywgdGFi bGUoKSkgPyB0YWJsZSgpLT5sYXN0Q29sdW1uSW5kZXgoKSA6IDA7CiAgICAgcmV0dXJuIGNlbGxB dCgwLCBhZGpvaW5pbmdFbmRDZWxsQ29sdW1uSW5kZXgpLnByaW1hcnlDZWxsKCk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uaAppbmRleCAzYjc3 N2Y1ZmNiZGNhZjVkMWNmZWFkODc2NWJlOWRlY2QzYzc0M2ZjLi42ZDEwODgxZmUxZDVmMjAzODM4 NDgyMjNiZGNkMWVhYmIwNTg1YzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGVTZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlU2VjdGlvbi5oCkBAIC0yNDIsMTQgKzI0MiwxNCBAQCBwcml2YXRlOgogCiBpbmxp bmUgY29uc3QgQm9yZGVyVmFsdWUmIFJlbmRlclRhYmxlU2VjdGlvbjo6Ym9yZGVyQWRqb2luaW5n VGFibGVTdGFydCgpIGNvbnN0CiB7Ci0gICAgaWYgKGhhc1NhbWVEaXJlY3Rpb25Bcyh0YWJsZSgp KSkKKyAgICBpZiAoaXNEaXJlY3Rpb25TYW1lKHRoaXMsIHRhYmxlKCkpKQogICAgICAgICByZXR1 cm4gc3R5bGUoKS5ib3JkZXJTdGFydCgpOwogICAgIHJldHVybiBzdHlsZSgpLmJvcmRlckVuZCgp OwogfQogCiBpbmxpbmUgY29uc3QgQm9yZGVyVmFsdWUmIFJlbmRlclRhYmxlU2VjdGlvbjo6Ym9y ZGVyQWRqb2luaW5nVGFibGVFbmQoKSBjb25zdAogewotICAgIGlmIChoYXNTYW1lRGlyZWN0aW9u QXModGFibGUoKSkpCisgICAgaWYgKGlzRGlyZWN0aW9uU2FtZSh0aGlzLCB0YWJsZSgpKSkKICAg ICAgICAgcmV0dXJuIHN0eWxlKCkuYm9yZGVyRW5kKCk7CiAgICAgcmV0dXJuIHN0eWxlKCkuYm9y ZGVyU3RhcnQoKTsKIH0K