147632 2015-08-04 10:14:56 -0700 RenderTheme::baselinePosition() should take RenderBox instead of RenderObject. 2015-08-04 12:48:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue oldest_to_newest 1114633 0 zalan 2015-08-04 10:14:56 -0700 SSIA 1114636 1 258181 zalan 2015-08-04 10:21:35 -0700 Created attachment 258181 Patch 1114717 2 258181 commit-queue 2015-08-04 12:48:09 -0700 Comment on attachment 258181 Patch Clearing flags on attachment: 258181 Committed r187878: <http://trac.webkit.org/changeset/187878> 1114718 3 commit-queue 2015-08-04 12:48:13 -0700 All reviewed patches have been landed. Closing bug. 258181 2015-08-04 10:21:35 -0700 2015-08-04 12:48:09 -0700 Patch bug-147632-20150804102128.patch text/plain 11238 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc0OWU1MDU3ZGQ1OGEx ZjhlZTIzYzFiZmI2ZGUzMWNjMDg2MmEwMy4uN2NmYzYzNWMzMzRiMmFjYjkzYThkZWEwMTYxODNj MTY4MGJkNWI3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA4LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVGhlbWU6OmJhc2Vs aW5lUG9zaXRpb24oKSBzaG91bGQgdGFrZSBSZW5kZXJCb3ggaW5zdGVhZCBvZiBSZW5kZXJPYmpl Y3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc2 MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBl bGltaW5hdGVzIHNvbWUgcmVkdW5kYW50IHR5cGUgY2hlY2tpbmcgYW5kIGNhc3RpbmcuCisKKyAg ICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9l ZmwvUmVuZGVyVGhlbWVFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVFZmw6 OmJhc2VsaW5lUG9zaXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVm bC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUaGVtZTo6YmFzZWxpbmVQb3NpdGlvbik6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRoZW1lLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpiYXNlbGluZVBvc2l0aW9uKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsuaDoKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGhlbWVJT1MuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW06 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUlPUzo6YmFzZWxpbmVQb3NpdGlvbik6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRoZW1lU2FmYXJpOjpiYXNlbGluZVBvc2l0aW9uKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyVGhlbWVTYWZhcmkuaDoKKwogMjAxNS0wOC0wMyAgQ3NhYmEgT3N6dHJvZ29u w6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIEludHJvZHVjZSBDT01QSUxFUihHQ0Nf T1JfQ0xBTkcpIGd1YXJkIGFuZCBtYWtlIENPTVBJTEVSKEdDQykgdHJ1ZSBvbmx5IGZvciBHQ0MK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCmluZGV4 IGFmYmQ3ZmY1MjhiYTYyZGY4ZDY0M2E5NTljMmQxN2RjMTNiOTkwZmQuLjBmZTRkM2YxNjRiOThk NjM2NWY4ZDUwMTZhYzVjZTkxZjBkMmMxNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcApAQCAtNjUzLDE2ICs2NTMsMTEgQEAgYm9vbCBSZW5k ZXJUaGVtZUVmbDo6Y29udHJvbFN1cHBvcnRzVGludHMoY29uc3QgUmVuZGVyT2JqZWN0JiBvYmpl Y3QpIGNvbnN0CiAgICAgcmV0dXJuIGlzRW5hYmxlZChvYmplY3QpOwogfQogCi1pbnQgUmVuZGVy VGhlbWVFZmw6OmJhc2VsaW5lUG9zaXRpb24oY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QpIGNv bnN0CitpbnQgUmVuZGVyVGhlbWVFZmw6OmJhc2VsaW5lUG9zaXRpb24oY29uc3QgUmVuZGVyQm94 JiBib3gpIGNvbnN0CiB7Ci0gICAgaWYgKCFpczxSZW5kZXJCb3g+KG9iamVjdCkpCi0gICAgICAg IHJldHVybiAwOwotCi0gICAgaWYgKG9iamVjdC5zdHlsZSgpLmFwcGVhcmFuY2UoKSA9PSBDaGVj a2JveFBhcnQKLSAgICB8fCAgb2JqZWN0LnN0eWxlKCkuYXBwZWFyYW5jZSgpID09IFJhZGlvUGFy dCkKLSAgICAgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlckJveD4ob2JqZWN0KS5tYXJnaW5Ub3Ao KSArIGRvd25jYXN0PFJlbmRlckJveD4ob2JqZWN0KS5oZWlnaHQoKSAtIDM7Ci0KLSAgICByZXR1 cm4gUmVuZGVyVGhlbWU6OmJhc2VsaW5lUG9zaXRpb24ob2JqZWN0KTsKKyAgICBpZiAoYm94LnN0 eWxlKCkuYXBwZWFyYW5jZSgpID09IENoZWNrYm94UGFydCB8fCBib3guc3R5bGUoKS5hcHBlYXJh bmNlKCkgPT0gUmFkaW9QYXJ0KQorICAgICAgICByZXR1cm4gYm94Lm1hcmdpblRvcCgpICsgYm94 LmhlaWdodCgpIC0gMzsKKyAgICByZXR1cm4gUmVuZGVyVGhlbWU6OmJhc2VsaW5lUG9zaXRpb24o Ym94KTsKIH0KIAogQ29sb3IgUmVuZGVyVGhlbWVFZmw6OnBsYXRmb3JtQWN0aXZlU2VsZWN0aW9u QmFja2dyb3VuZENvbG9yKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Jl bmRlclRoZW1lRWZsLmgKaW5kZXggNGYyNjc0OWMyNjlhM2M2NGZhNGI5MDNhMjc0NmUyMDY5OGMx MjMxNS4uNzdmN2I4MDNjODZkZmRiYTk4MzE3OTgzOTE5OTk4YzM4NDg1OGNkZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmgKQEAgLTkwLDcgKzkwLDcg QEAgcHVibGljOgogICAgIC8vIEEgbWV0aG9kIHRvIG9idGFpbiB0aGUgYmFzZWxpbmUgcG9zaXRp b24gZm9yIGEgImxlYWYiIGNvbnRyb2wuIFRoaXMgd2lsbCBvbmx5IGJlIHVzZWQgaWYgYSBiYXNl bGluZQogICAgIC8vIHBvc2l0aW9uIGNhbm5vdCBiZSBkZXRlcm1pbmVkIGJ5IGV4YW1pbmluZyBj aGlsZCBjb250ZW50LiBDaGVja2JveGVzIGFuZCByYWRpbyBidXR0b25zIGFyZSBleGFtcGxlcyBv ZgogICAgIC8vIGNvbnRyb2xzIHRoYXQgbmVlZCB0byBkbyB0aGlzLgotICAgIHZpcnR1YWwgaW50 IGJhc2VsaW5lUG9zaXRpb24oY29uc3QgUmVuZGVyT2JqZWN0JikgY29uc3Qgb3ZlcnJpZGU7Cisg ICAgdmlydHVhbCBpbnQgYmFzZWxpbmVQb3NpdGlvbihjb25zdCBSZW5kZXJCb3gmKSBjb25zdCBv dmVycmlkZTsKIAogICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1BY3RpdmVTZWxlY3Rpb25CYWNr Z3JvdW5kQ29sb3IoKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIENvbG9yIHBsYXRmb3Jt SW5hY3RpdmVTZWxlY3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCBvdmVycmlkZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCmluZGV4IGI0ZGYyM2M4YWEyMmQxZGYz MWU5NGUxMWE2YzU5NzUzNTk2ZTRiYmIuLmMzODI5YzhkMmI0YjBiMmNhZjM1YzBkZDgwMGZjMGM5 NmVlYzhhMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcApAQCAt NjY0LDE1ICs2NjQsMTAgQEAgQ29sb3IgUmVuZGVyVGhlbWU6OnBsYXRmb3JtSW5hY3RpdmVMaXN0 Qm94U2VsZWN0aW9uRm9yZWdyb3VuZENvbG9yKCkgY29uc3QKICAgICByZXR1cm4gcGxhdGZvcm1J bmFjdGl2ZVNlbGVjdGlvbkZvcmVncm91bmRDb2xvcigpOwogfQogCi1pbnQgUmVuZGVyVGhlbWU6 OmJhc2VsaW5lUG9zaXRpb24oY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlcikgY29uc3QKK2lu dCBSZW5kZXJUaGVtZTo6YmFzZWxpbmVQb3NpdGlvbihjb25zdCBSZW5kZXJCb3gmIGJveCkgY29u c3QKIHsKLSAgICBpZiAoIWlzPFJlbmRlckJveD4ocmVuZGVyZXIpKQotICAgICAgICByZXR1cm4g MDsKLQotICAgIGNvbnN0IGF1dG8mIGJveCA9IGRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIp OwotCiAjaWYgVVNFKE5FV19USEVNRSkKLSAgICByZXR1cm4gYm94LmhlaWdodCgpICsgYm94Lm1h cmdpblRvcCgpICsgbV90aGVtZS0+YmFzZWxpbmVQb3NpdGlvbkFkanVzdG1lbnQocmVuZGVyZXIu c3R5bGUoKS5hcHBlYXJhbmNlKCkpICogcmVuZGVyZXIuc3R5bGUoKS5lZmZlY3RpdmVab29tKCk7 CisgICAgcmV0dXJuIGJveC5oZWlnaHQoKSArIGJveC5tYXJnaW5Ub3AoKSArIG1fdGhlbWUtPmJh c2VsaW5lUG9zaXRpb25BZGp1c3RtZW50KGJveC5zdHlsZSgpLmFwcGVhcmFuY2UoKSkgKiBib3gu c3R5bGUoKS5lZmZlY3RpdmVab29tKCk7CiAjZWxzZQogICAgIHJldHVybiBib3guaGVpZ2h0KCkg KyBib3gubWFyZ2luVG9wKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lLmgKaW5kZXggNzFiNjRhOGY1ZWMyNzc3MjI1N2U1Y2M1YTc2N2QzZTQzZTU0MzU3Mi4uODY4 MzhkYTMxOTRmNDkzZWQ1NGRjNDEyNTRjNDk4ZTVjZGRjODhhNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lLmgKQEAgLTEwNiw3ICsxMDYsNyBAQCBwdWJsaWM6CiAgICAgLy8g QSBtZXRob2QgdG8gb2J0YWluIHRoZSBiYXNlbGluZSBwb3NpdGlvbiBmb3IgYSAibGVhZiIgY29u dHJvbC4gIFRoaXMgd2lsbCBvbmx5IGJlIHVzZWQgaWYgYSBiYXNlbGluZQogICAgIC8vIHBvc2l0 aW9uIGNhbm5vdCBiZSBkZXRlcm1pbmVkIGJ5IGV4YW1pbmluZyBjaGlsZCBjb250ZW50LiBDaGVj a2JveGVzIGFuZCByYWRpbyBidXR0b25zIGFyZSBleGFtcGxlcyBvZgogICAgIC8vIGNvbnRyb2xz IHRoYXQgbmVlZCB0byBkbyB0aGlzLgotICAgIHZpcnR1YWwgaW50IGJhc2VsaW5lUG9zaXRpb24o Y29uc3QgUmVuZGVyT2JqZWN0JikgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgYmFzZWxpbmVQb3Np dGlvbihjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKIAogICAgIC8vIEEgbWV0aG9kIGZvciBhc2tp bmcgaWYgYSBjb250cm9sIGlzIGEgY29udGFpbmVyIG9yIG5vdC4gIExlYWYgY29udHJvbHMgaGF2 ZSB0byBoYXZlIHNvbWUgc3BlY2lhbCBiZWhhdmlvciAobGlrZQogICAgIC8vIHRoZSBiYXNlbGlu ZSBwb3NpdGlvbiBBUEkgYWJvdmUpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUd0ay5jcHAKaW5kZXggYzdjYTQ0MzRjOWFlNzUwYjgxNDAzZWZjZjVjNWJiY2I5MzY3OGRh ZS4uMGYxNWZiYjkyNTMzNDE4OTc3ODg2OTBkMGIwYmY2ZjEwMTc0YTkyNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC0zNzQsMTggKzM3NCwxMiBA QCBib29sIFJlbmRlclRoZW1lR3RrOjpjb250cm9sU3VwcG9ydHNUaW50cyhjb25zdCBSZW5kZXJP YmplY3QmIG8pIGNvbnN0CiAgICAgcmV0dXJuIGlzRW5hYmxlZChvKTsKIH0KIAotaW50IFJlbmRl clRoZW1lR3RrOjpiYXNlbGluZVBvc2l0aW9uKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIp IGNvbnN0CitpbnQgUmVuZGVyVGhlbWVHdGs6OmJhc2VsaW5lUG9zaXRpb24oY29uc3QgUmVuZGVy Qm94JiBib3gpIGNvbnN0CiB7Ci0gICAgaWYgKCFpczxSZW5kZXJCb3g+KHJlbmRlcmVyKSkKLSAg ICAgICAgcmV0dXJuIDA7Ci0KICAgICAvLyBGSVhNRTogVGhpcyBzdHJhdGVneSBpcyBwb3NzaWJs eSBpbmNvcnJlY3QgZm9yIHRoZSBHVEsrIHBvcnQuCi0gICAgaWYgKHJlbmRlcmVyLnN0eWxlKCku YXBwZWFyYW5jZSgpID09IENoZWNrYm94UGFydCB8fCByZW5kZXJlci5zdHlsZSgpLmFwcGVhcmFu Y2UoKSA9PSBSYWRpb1BhcnQpIHsKLSAgICAgICAgY29uc3QgYXV0byYgYm94ID0gZG93bmNhc3Q8 UmVuZGVyQm94PihyZW5kZXJlcik7CisgICAgaWYgKGJveC5zdHlsZSgpLmFwcGVhcmFuY2UoKSA9 PSBDaGVja2JveFBhcnQgfHwgYm94LnN0eWxlKCkuYXBwZWFyYW5jZSgpID09IFJhZGlvUGFydCkK ICAgICAgICAgcmV0dXJuIGJveC5tYXJnaW5Ub3AoKSArIGJveC5oZWlnaHQoKSAtIDI7Ci0gICAg fQotCi0gICAgcmV0dXJuIFJlbmRlclRoZW1lOjpiYXNlbGluZVBvc2l0aW9uKHJlbmRlcmVyKTsK KyAgICByZXR1cm4gUmVuZGVyVGhlbWU6OmJhc2VsaW5lUG9zaXRpb24oYm94KTsKIH0KIAogc3Rh dGljIEd0a1RleHREaXJlY3Rpb24gZ3RrVGV4dERpcmVjdGlvbihUZXh0RGlyZWN0aW9uIGRpcmVj dGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUd0 ay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lR3RrLmgKaW5kZXggMjRl NjhkZjIyOTU3NWM2NGM4MjgwOGE2NWRiZTc1YTYwY2Q0NjljOC4uNzI1NDRmZmEwYTgyNjI5NTQ0 NTlkYjQ1ZWVjNjJhMDNlYzEyMzE1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lR3RrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lR3RrLmgKQEAgLTY4LDcgKzY4LDcgQEAgcHVibGljOgogICAgIC8vIEEgbWV0aG9kIHRv IG9idGFpbiB0aGUgYmFzZWxpbmUgcG9zaXRpb24gZm9yIGEgImxlYWYiIGNvbnRyb2wuICBUaGlz IHdpbGwgb25seSBiZSB1c2VkIGlmIGEgYmFzZWxpbmUKICAgICAvLyBwb3NpdGlvbiBjYW5ub3Qg YmUgZGV0ZXJtaW5lZCBieSBleGFtaW5pbmcgY2hpbGQgY29udGVudC4gQ2hlY2tib3hlcyBhbmQg cmFkaW8gYnV0dG9ucyBhcmUgZXhhbXBsZXMgb2YKICAgICAvLyBjb250cm9scyB0aGF0IG5lZWQg dG8gZG8gdGhpcy4KLSAgICB2aXJ0dWFsIGludCBiYXNlbGluZVBvc2l0aW9uKGNvbnN0IFJlbmRl ck9iamVjdCYpIGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgaW50IGJhc2VsaW5lUG9zaXRp b24oY29uc3QgUmVuZGVyQm94JikgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICAvLyBUaGUgcGxhdGZv cm0gc2VsZWN0aW9uIGNvbG9yLgogICAgIHZpcnR1YWwgQ29sb3IgcGxhdGZvcm1BY3RpdmVTZWxl Y3Rpb25CYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lSU9TLmgKaW5kZXggZGMwNGUzZWI3MWE5NjZlMWU4YjU5ODFkOTY0 MjRkZjBhOWM3ZWY5Zi4uMjYwYTQ0ZDYyMzg3NGE1ZWI2ZjViNDFmOGVjZWRhNGU1MjRkNmVkMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLmgKQEAgLTUwLDcgKzUw LDcgQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgRm9udERlc2NyaXB0aW9uJiBj YWNoZWRTeXN0ZW1Gb250RGVzY3JpcHRpb24oQ1NTVmFsdWVJRCBzeXN0ZW1Gb250SUQpIGNvbnN0 IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDYWNoZWRTeXN0ZW1Gb250RGVzY3Jp cHRpb24oQ1NTVmFsdWVJRCwgRm9udERlc2NyaXB0aW9uJikgY29uc3Qgb3ZlcnJpZGU7Ci0gICAg dmlydHVhbCBpbnQgYmFzZWxpbmVQb3NpdGlvbihjb25zdCBSZW5kZXJPYmplY3QmKSBjb25zdCBv dmVycmlkZTsKKyAgICB2aXJ0dWFsIGludCBiYXNlbGluZVBvc2l0aW9uKGNvbnN0IFJlbmRlckJv eCYpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCBib29sIGlzQ29udHJvbFN0eWxlZChj b25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IEJvcmRlckRhdGEmLCBjb25zdCBGaWxsTGF5ZXImIGJh Y2tncm91bmQsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IpIGNvbnN0IG92ZXJyaWRlOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0g Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KaW5kZXggZWExMGE4 MTYyYzcyOGUyM2U2ODUzYzllNTZjMTJhNjM4YzkzZDJjMS4uMzI3YmE1YWUyNjllYmQ2YzcyMGNl YjAyZTM1NjU3YTk4OWUzNjBiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUlPUy5tbQpAQCAtNDE2LDEzICs0MTYsOCBAQCBib29sIFJlbmRlclRoZW1lSU9TOjpwYWlu dENoZWNrYm94RGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyT2JqZWN0JiBib3gsIGNvbnN0IFBhaQog ICAgIHJldHVybiBmYWxzZTsKIH0KIAotaW50IFJlbmRlclRoZW1lSU9TOjpiYXNlbGluZVBvc2l0 aW9uKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpIGNvbnN0CitpbnQgUmVuZGVyVGhlbWVJ T1M6OmJhc2VsaW5lUG9zaXRpb24oY29uc3QgUmVuZGVyQm94JiBib3gpIGNvbnN0CiB7Ci0gICAg aWYgKCFpczxSZW5kZXJCb3g+KHJlbmRlcmVyKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBj b25zdCBhdXRvJiBib3ggPSBkb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKTsKLQogICAgIGlm IChib3guc3R5bGUoKS5hcHBlYXJhbmNlKCkgPT0gQ2hlY2tib3hQYXJ0IHx8IGJveC5zdHlsZSgp LmFwcGVhcmFuY2UoKSA9PSBSYWRpb1BhcnQpCiAgICAgICAgIHJldHVybiBib3gubWFyZ2luVG9w KCkgKyBib3guaGVpZ2h0KCkgLSAyOyAvLyBUaGUgYmFzZWxpbmUgaXMgMnB4IHVwIGZyb20gdGhl IGJvdHRvbSBvZiB0aGUgY2hlY2tib3gvcmFkaW8gaW4gQXBwS2l0LgogICAgIGlmIChib3guc3R5 bGUoKS5hcHBlYXJhbmNlKCkgPT0gTWVudWxpc3RQYXJ0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5jcHAKaW5kZXggODM2Mjk5OGMzZDdjMmFmOGMxOGNm NTgyYzM3NzkyMDkzMTQxMTcyMy4uNTVjMDhkNTY1MjNlOTVmZGU3MjU2M2VjZTI0ODgxYWYxMDA5 MDNjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2Fm YXJpLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVTYWZhcmku Y3BwCkBAIC0yOTMsMTcgKzI5MywxMSBAQCBJbnRSZWN0IFJlbmRlclRoZW1lU2FmYXJpOjppbmZs YXRlUmVjdChjb25zdCBJbnRSZWN0JiByLCBjb25zdCBJbnRTaXplJiBzaXplLCBjbwogICAgIHJl dHVybiByZXN1bHQ7CiB9CiAKLWludCBSZW5kZXJUaGVtZVNhZmFyaTo6YmFzZWxpbmVQb3NpdGlv bihjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyKSBjb25zdAoraW50IFJlbmRlclRoZW1lU2Fm YXJpOjpiYXNlbGluZVBvc2l0aW9uKGNvbnN0IFJlbmRlckJveCYgYm94KSBjb25zdAogewotICAg IGlmICghaXM8UmVuZGVyQm94PihyZW5kZXJlcikpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAg aWYgKHJlbmRlcmVyLnN0eWxlKCkuYXBwZWFyYW5jZSgpID09IENoZWNrYm94UGFydCB8fCByZW5k ZXJlci5zdHlsZSgpLmFwcGVhcmFuY2UoKSA9PSBSYWRpb1BhcnQpIHsKLSAgICAgICAgY29uc3Qg YXV0byYgYm94ID0gZG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcik7CisgICAgaWYgKGJveC5z dHlsZSgpLmFwcGVhcmFuY2UoKSA9PSBDaGVja2JveFBhcnQgfHwgYm94LnN0eWxlKCkuYXBwZWFy YW5jZSgpID09IFJhZGlvUGFydCkKICAgICAgICAgcmV0dXJuIGJveC5tYXJnaW5Ub3AoKSArIGJv eC5oZWlnaHQoKSAtIDI7IC8vIFRoZSBiYXNlbGluZSBpcyAycHggdXAgZnJvbSB0aGUgYm90dG9t IG9mIHRoZSBjaGVja2JveC9yYWRpbyBpbiBBcHBLaXQuCi0gICAgfQotCi0gICAgcmV0dXJuIFJl bmRlclRoZW1lOjpiYXNlbGluZVBvc2l0aW9uKHJlbmRlcmVyKTsKKyAgICByZXR1cm4gUmVuZGVy VGhlbWU6OmJhc2VsaW5lUG9zaXRpb24oYm94KTsKIH0KIAogYm9vbCBSZW5kZXJUaGVtZVNhZmFy aTo6Y29udHJvbFN1cHBvcnRzVGludHMoY29uc3QgUmVuZGVyT2JqZWN0JiBvKSBjb25zdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVTYWZhcmkuaAppbmRleCA2MGYxMjA3 MmMwYTk3MWZhNDQxNjQxZDQ0NzZjYjJhZDEzMzZhZWJiLi4zMmJlYWQ1MTE2OGFjYWUxNzM3NjEy MWU1NDcyNzYxZDNjNjE2MjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVTYWZhcmkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVTYWZhcmkuaApAQCAtNTIsNyArNTIsNyBAQCBwdWJsaWM6CiAgICAgLy8gQSBtZXRob2Qg dG8gb2J0YWluIHRoZSBiYXNlbGluZSBwb3NpdGlvbiBmb3IgYSAibGVhZiIgY29udHJvbC4gIFRo aXMgd2lsbCBvbmx5IGJlIHVzZWQgaWYgYSBiYXNlbGluZQogICAgIC8vIHBvc2l0aW9uIGNhbm5v dCBiZSBkZXRlcm1pbmVkIGJ5IGV4YW1pbmluZyBjaGlsZCBjb250ZW50LiBDaGVja2JveGVzIGFu ZCByYWRpbyBidXR0b25zIGFyZSBleGFtcGxlcyBvZgogICAgIC8vIGNvbnRyb2xzIHRoYXQgbmVl ZCB0byBkbyB0aGlzLgotICAgIHZpcnR1YWwgaW50IGJhc2VsaW5lUG9zaXRpb24oY29uc3QgUmVu ZGVyT2JqZWN0JikgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgYmFzZWxpbmVQb3NpdGlvbihjb25z dCBSZW5kZXJCb3gmKSBjb25zdDsKIAogICAgIC8vIEEgbWV0aG9kIGFza2luZyBpZiB0aGUgY29u dHJvbCBjaGFuZ2VzIGl0cyB0aW50IHdoZW4gdGhlIHdpbmRvdyBoYXMgZm9jdXMgb3Igbm90Lgog ICAgIHZpcnR1YWwgYm9vbCBjb250cm9sU3VwcG9ydHNUaW50cyhjb25zdCBSZW5kZXJPYmplY3Qm KSBjb25zdDsK