148263 2015-08-20 16:24:52 -0700 Make outline: auto repaint rect inflate more explicit. 2015-08-20 19:57:46 -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 mmaxfield simon.fraser WebkitBugTracker oldest_to_newest 1119432 0 zalan 2015-08-20 16:24:52 -0700 Call RenderObject::adjustRectWithMaximumOutline() by passing the paint phase where outline inflate is conditional while use RenderView::maximalOutlineSize() where the caller unconditionally uses the outline value. 1119443 1 259519 zalan 2015-08-20 16:36:44 -0700 Created attachment 259519 Patch 1119604 2 259519 commit-queue 2015-08-20 19:57:42 -0700 Comment on attachment 259519 Patch Clearing flags on attachment: 259519 Committed r188744: <http://trac.webkit.org/changeset/188744> 1119605 3 commit-queue 2015-08-20 19:57:46 -0700 All reviewed patches have been landed. Closing bug. 259519 2015-08-20 16:36:44 -0700 2015-08-20 19:57:42 -0700 Patch bug-148263-20150820163639.patch text/plain 19379 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTNjZWFjNTgyYzUxODQ1 ZDI1MWVmNzczMzNiNzk5ZDI4ZDhhNzhmMS4uN2NhZWU5YjFkYTI0Zjc5NjcwMGUxNTA0ZDQ4NTA1 Y2E5MDI4YzJkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE1LTA4LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBvdXRsaW5lOiBhdXRv IHJlcGFpbnQgcmVjdCBpbmZsYXRlIG1vcmUgZXhwbGljaXQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgyNjMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgUmVuZGVyT2JqZWN0OjphZGp1c3RSZWN0 V2l0aE1heGltdW1PdXRsaW5lKCkgd2hlbiBpbmZsYXRpbmcgaXMgY29uZGl0aW9uYWwgYW5kIGNh bGwKKyAgICAgICAgUmVuZGVyVmlldzo6bWF4aW1hbE91dGxpbmVTaXplKCkgd2hlbiBpdCBpcyBu b3QuCisgICAgICAgIEFmdGVyIHRoaXMgY2hhbmdlc2V0LCB3ZSBjYW4gY2xlYXJseSB0ZWxsIGNh bGxzIHdoZW4gaW5mbGF0aW5nIGlzIHVuY29uZGl0aW9uYWwgKGFkanVzdGluZyB0aGUgc2l6ZSBv ZiB0aGUgY29tcG9zaXRpbmcgbGF5ZXIpIGFwYXJ0IGZyb20KKyAgICAgICAgY2FsbHMgd2hlbiB3 ZSBqdXN0IHNpbXBseSBpbmZsYXRlIHRoZSByZXBhaW50IHJlY3QgZHVyaW5nIG91dGxpbmUgcGFp bnRpbmcgcGhhc2UuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW91ci4KKworICAgICAg ICAqIHJlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklubGlu ZUZsb3dCb3g6OnBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnBhaW50KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxv dzo6bGF5b3V0QmxvY2spOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJEZXRhaWxzTWFya2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckRldGFpbHNNYXJrZXI6OnBhaW50KToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJFbGVtZW50Ojpjb21wdXRlTWF4T3V0bGluZVNpemUpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3Vs YXRlQ2xpcFJlY3RzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGluZUJveExpc3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6aXNPdXRsaW5lUGhhc2UpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGluZUJveExpc3Q6OmxpbmVJbnRlcnNlY3RzRGlydHlSZWN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxpbmVCb3hMaXN0OjpwYWludCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxpc3RNYXJrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdE1hcmtlcjo6 cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyT2JqZWN0OjphZGp1c3RSZWN0V2l0aE1heGltdW1PdXRsaW5lKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6bWF4aW1hbE91dGxpbmVTaXplKTogRGVsZXRl ZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclJlZ2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZWdpb246Om92 ZXJmbG93UmVjdEZvckZsb3dUaHJlYWRQb3J0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyUmVwbGFjZWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OnNob3Vs ZFBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGFibGU6OnBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGFibGVDZWxsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlQ2VsbDo6cGFpbnRD b2xsYXBzZWRCb3JkZXJzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6cGFpbnRPYmplY3Qp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclZpZXc6OnNldE1heGltYWxPdXRsaW5lU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJWaWV3OjpSZW5kZXJWaWV3KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVmlldy5oOgorCiAyMDE1LTA4LTE5ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBw bGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBFTkFCTEVfV0VCVlRUX1JFR0lPTlMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAppbmRleCAyZDZmYjY5NDQ4ZjhmMWJi NTk0NGMxMGJhNTQ5MDExNTY3ZDY3NzM3Li4zNTliZWQ2NTYzMWYxN2RmODU0OWI3ZWMzNDYwYThi MDkzZmUwMWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxv d0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3Bw CkBAIC0xMTI2LDcgKzExMjYsNyBAQCB2b2lkIElubGluZUZsb3dCb3g6OnBhaW50KFBhaW50SW5m byYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsCiAgICAgICAgIHJl dHVybjsKIAogICAgIExheW91dFJlY3Qgb3ZlcmZsb3dSZWN0KHZpc3VhbE92ZXJmbG93UmVjdChs aW5lVG9wLCBsaW5lQm90dG9tKSk7Ci0gICAgb3ZlcmZsb3dSZWN0LmluZmxhdGUocmVuZGVyZXIo KS5tYXhpbWFsT3V0bGluZVNpemUocGFpbnRJbmZvLnBoYXNlKSk7CisgICAgcmVuZGVyZXIoKS5h ZGp1c3RSZWN0V2l0aE1heGltdW1PdXRsaW5lKHBhaW50SW5mby5waGFzZSwgb3ZlcmZsb3dSZWN0 KTsKICAgICBmbGlwRm9yV3JpdGluZ01vZGUob3ZlcmZsb3dSZWN0KTsKICAgICBvdmVyZmxvd1Jl Y3QubW92ZUJ5KHBhaW50T2Zmc2V0KTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwCmluZGV4IDU4NWI2NTA2OWU5ZmU2ZmYxYzBkY2RmN2RhMTVkMzU0OGI0ZTQ5 OTAuLjlhZGU3OTRhNTdmMWQwMGNhNzQ2NWI0Y2MzZmQwZjhjODYwM2M1MmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMTQwMCw3ICsxNDAwLDcgQEAgdm9p ZCBSZW5kZXJCbG9jazo6cGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBv aW50JiBwYWludE9mZnNldCkKICAgICBpZiAoIWlzUm9vdCgpKSB7CiAgICAgICAgIExheW91dFJl Y3Qgb3ZlcmZsb3dCb3ggPSBvdmVyZmxvd1JlY3RGb3JQYWludFJlamVjdGlvbihuYW1lZEZsb3dG cmFnbWVudCk7CiAgICAgICAgIGZsaXBGb3JXcml0aW5nTW9kZShvdmVyZmxvd0JveCk7Ci0gICAg ICAgIG92ZXJmbG93Qm94LmluZmxhdGUobWF4aW1hbE91dGxpbmVTaXplKHBoYXNlKSk7CisgICAg ICAgIGFkanVzdFJlY3RXaXRoTWF4aW11bU91dGxpbmUocGhhc2UsIG92ZXJmbG93Qm94KTsKICAg ICAgICAgb3ZlcmZsb3dCb3gubW92ZUJ5KGFkanVzdGVkUGFpbnRPZmZzZXQpOwogICAgICAgICBp ZiAoIW92ZXJmbG93Qm94LmludGVyc2VjdHMocGFpbnRJbmZvLnJlY3QpCiAjaWYgUExBVEZPUk0o SU9TKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRl eCBmNjAzNjU3ODhkMzFkZjFiZGFlZjE2NjdjYTUwYjE3YTA3ZDdkMzAwLi42N2Q3MjE0MDQyYjJh NzUyZDcyOTQwNDk4NzhmNDVhOTI5ZjE2NGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtNTYxLDcgKzU2MSw3IEBAIHZvaWQgUmVuZGVyQmxv Y2tGbG93OjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQgcGFn ZUxvZ2ljYWxICiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHJlcGFpbnRSZWN0ID0gTGF5b3V0 UmVjdChyZXBhaW50TG9naWNhbFRvcCwgcmVwYWludExvZ2ljYWxMZWZ0LCByZXBhaW50TG9naWNh bEJvdHRvbSAtIHJlcGFpbnRMb2dpY2FsVG9wLCByZXBhaW50TG9naWNhbFJpZ2h0IC0gcmVwYWlu dExvZ2ljYWxMZWZ0KTsKIAotICAgICAgICByZXBhaW50UmVjdC5pbmZsYXRlKG1heGltYWxPdXRs aW5lU2l6ZShQYWludFBoYXNlT3V0bGluZSkpOworICAgICAgICByZXBhaW50UmVjdC5pbmZsYXRl KHZpZXcoKS5tYXhpbWFsT3V0bGluZVNpemUoKSk7CiAgICAgICAgIAogICAgICAgICBpZiAoaGFz T3ZlcmZsb3dDbGlwKCkpIHsKICAgICAgICAgICAgIC8vIEFkanVzdCByZXBhaW50IHJlY3QgZm9y IHNjcm9sbCBvZmZzZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJEZXRhaWxzTWFya2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXRh aWxzTWFya2VyLmNwcAppbmRleCBjZWYzNGQyOTgwYmIwYmQ4NzgwMDhiZTgwODYwMmI5Nzk0NDZk YjU1Li41ZWVmNzYyNTI5NDA1OWNiYjA5N2UxMGZmOWQ5NGQ4ZDU4N2ViYjcwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGV0YWlsc01hcmtlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRldGFpbHNNYXJrZXIuY3BwCkBAIC0xMjQs NyArMTI0LDcgQEAgdm9pZCBSZW5kZXJEZXRhaWxzTWFya2VyOjpwYWludChQYWludEluZm8mIHBh aW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2YKICAgICBMYXlvdXRQb2ludCBib3hP cmlnaW4ocGFpbnRPZmZzZXQgKyBsb2NhdGlvbigpKTsKICAgICBMYXlvdXRSZWN0IG92ZXJmbG93 UmVjdCh2aXN1YWxPdmVyZmxvd1JlY3QoKSk7CiAgICAgb3ZlcmZsb3dSZWN0Lm1vdmVCeShib3hP cmlnaW4pOwotICAgIG92ZXJmbG93UmVjdC5pbmZsYXRlKG1heGltYWxPdXRsaW5lU2l6ZShwYWlu dEluZm8ucGhhc2UpKTsKKyAgICBhZGp1c3RSZWN0V2l0aE1heGltdW1PdXRsaW5lKHBhaW50SW5m by5waGFzZSwgb3ZlcmZsb3dSZWN0KTsKIAogICAgIGlmICghcGFpbnRJbmZvLnJlY3QuaW50ZXJz ZWN0cyhzbmFwcGVkSW50UmVjdChvdmVyZmxvd1JlY3QpKSkKICAgICAgICAgcmV0dXJuOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCmluZGV4IDBhM2RmM2IyMGNm YzVkZmUxYjMwYTU2MTU2NDMwOTAyYjQyY2E3NTUuLjI1ODIwNGUwYjBiMGJhMDVlNTRjZGNlNDc3 NDM2MjgzNTg2Y2U2MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVu dC5jcHAKQEAgLTM3NCw3ICszNzQsNyBAQCB2b2lkIFJlbmRlckVsZW1lbnQ6OmNvbXB1dGVNYXhP dXRsaW5lU2l6ZSgpIGNvbnN0CiAgICAgaWYgKG1fc3R5bGUtPm91dGxpbmVTdHlsZUlzQXV0bygp KQogICAgICAgICBtYXhPdXRsaW5lU2l6ZSA9IHN0ZDo6bWF4KHRoZW1lKCkucGxhdGZvcm1Gb2N1 c1JpbmdXaWR0aCgpICsgbV9zdHlsZS0+b3V0bGluZU9mZnNldCgpLCBtYXhPdXRsaW5lU2l6ZSk7 CiAKLSAgICBpZiAobWF4T3V0bGluZVNpemUgPCBtYXhpbWFsT3V0bGluZVNpemUoUGFpbnRQaGFz ZU91dGxpbmUpKQorICAgIGlmIChtYXhPdXRsaW5lU2l6ZSA8IHZpZXcoKS5tYXhpbWFsT3V0bGlu ZVNpemUoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgdmlldygpLnNldE1heGltYWxPdXRsaW5l U2l6ZShtYXhPdXRsaW5lU2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcAppbmRleCA0MWU2MWU0NDA1ZTk5NjIwM2RmY2NlZDQ4ODNhNTJmODRkYzQwMDQ4Li5iODU5 ZGZlYmZkM2U0MzFjNGYwNGIxNmRhNjI5OGQxZWY3MjEwYThkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTU2MTIsNyArNTYxMiw3IEBAIHZvaWQgUmVuZGVy TGF5ZXI6OmNhbGN1bGF0ZVJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQmIGNsaXBSZWN0c0Nv bnRleHQsIGNvbnN0CiAgICAgICAgIC8vIElmIHRoZSByZWdpb24gZG9lcyBub3QgY2xpcCBpdHMg b3ZlcmZsb3csIGluZmxhdGUgdGhlIG91dGxpbmUgcmVjdC4KICAgICAgICAgaWYgKG5hbWVkRmxv d0ZyYWdtZW50KSB7CiAgICAgICAgICAgICBpZiAoIShuYW1lZEZsb3dGcmFnbWVudC0+cGFyZW50 KCktPmhhc092ZXJmbG93Q2xpcCgpICYmICgmbmFtZWRGbG93RnJhZ21lbnQtPmZyYWdtZW50Q29u dGFpbmVyTGF5ZXIoKSAhPSBjbGlwUmVjdHNDb250ZXh0LnJvb3RMYXllciB8fCBjbGlwUmVjdHND b250ZXh0LnJlc3BlY3RPdmVyZmxvd0NsaXAgPT0gUmVzcGVjdE92ZXJmbG93Q2xpcCkpKQotICAg ICAgICAgICAgICAgIG91dGxpbmVSZWN0LmluZmxhdGUocmVuZGVyZXIoKS5tYXhpbWFsT3V0bGlu ZVNpemUoUGFpbnRQaGFzZU91dGxpbmUpKTsKKyAgICAgICAgICAgICAgICBvdXRsaW5lUmVjdC5p bmZsYXRlKHJlbmRlcmVyKCkudmlldygpLm1heGltYWxPdXRsaW5lU2l6ZSgpKTsKICAgICAgICAg fQogICAgIH0KIApAQCAtNTgzMCw3ICs1ODMwLDcgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXllcjo6 bG9jYWxCb3VuZGluZ0JveChDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIGZsYWdzKSBjb25zdAog ICAgICAgICB9CiAgICAgfQogCi0gICAgcmVzdWx0LmluZmxhdGUocmVuZGVyZXIoKS52aWV3KCku bWF4aW1hbE91dGxpbmVTaXplKCkpOyAvLyBVc2VkIHRvIGFwcGx5IGEgZnVkZ2UgZmFjdG9yIHRv IGRpcnR5LXJlY3QgY2hlY2tzIG9uIGJsb2Nrcy90YWJsZXMuCisgICAgcmVzdWx0LmluZmxhdGUo cmVuZGVyZXIoKS52aWV3KCkubWF4aW1hbE91dGxpbmVTaXplKCkpOwogICAgIHJldHVybiByZXN1 bHQ7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5l Qm94TGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJveExpc3Qu Y3BwCmluZGV4IGUxY2ZjYTU2NGRiOWIzNGI1OTFjNzQyMjU1ZDM2Zjk5ZDdkYWQxMjUuLmY3NDFi NDg3MTBlMzBhNzlhNjhkZDRhNTE4NTI3ZDY2OTI0OGY5OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQm94TGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmNwcApAQCAtMjAwLDExICsyMDAsMTcgQEAg Ym9vbCBSZW5kZXJMaW5lQm94TGlzdDo6YW55TGluZUludGVyc2VjdHNSZWN0KFJlbmRlckJveE1v ZGVsT2JqZWN0KiByZW5kZXJlciwgY28KICAgICByZXR1cm4gcmFuZ2VJbnRlcnNlY3RzUmVjdChy ZW5kZXJlciwgbG9naWNhbFRvcCwgbG9naWNhbEJvdHRvbSwgcmVjdCwgb2Zmc2V0KTsKIH0KIAor c3RhdGljIGJvb2wgaXNPdXRsaW5lUGhhc2UoUGFpbnRQaGFzZSBwaGFzZSkKK3sKKyAgICByZXR1 cm4gcGhhc2UgPT0gUGFpbnRQaGFzZU91dGxpbmUgfHwgcGhhc2UgPT0gUGFpbnRQaGFzZVNlbGZP dXRsaW5lIHx8IHBoYXNlID09IFBhaW50UGhhc2VDaGlsZE91dGxpbmVzOworfQorCiBib29sIFJl bmRlckxpbmVCb3hMaXN0OjpsaW5lSW50ZXJzZWN0c0RpcnR5UmVjdChSZW5kZXJCb3hNb2RlbE9i amVjdCogcmVuZGVyZXIsIElubGluZUZsb3dCb3gqIGJveCwgY29uc3QgUGFpbnRJbmZvJiBwYWlu dEluZm8sIGNvbnN0IExheW91dFBvaW50JiBvZmZzZXQpIGNvbnN0CiB7CiAgICAgY29uc3QgUm9v dElubGluZUJveCYgcm9vdEJveCA9IGJveC0+cm9vdCgpOwotICAgIExheW91dFVuaXQgbG9naWNh bFRvcCA9IHN0ZDo6bWluPExheW91dFVuaXQ+KGJveC0+bG9naWNhbFRvcFZpc3VhbE92ZXJmbG93 KHJvb3RCb3gubGluZVRvcCgpKSwgcm9vdEJveC5zZWxlY3Rpb25Ub3AoKSkgLSByZW5kZXJlci0+ bWF4aW1hbE91dGxpbmVTaXplKHBhaW50SW5mby5waGFzZSk7Ci0gICAgTGF5b3V0VW5pdCBsb2dp Y2FsQm90dG9tID0gYm94LT5sb2dpY2FsQm90dG9tVmlzdWFsT3ZlcmZsb3cocm9vdEJveC5saW5l Qm90dG9tKCkpICsgcmVuZGVyZXItPm1heGltYWxPdXRsaW5lU2l6ZShwYWludEluZm8ucGhhc2Up OworICAgIGNvbnN0IExheW91dFVuaXQgb3V0bGluZVNpemUgPSBpc091dGxpbmVQaGFzZShwYWlu dEluZm8ucGhhc2UpID8gcmVuZGVyZXItPnZpZXcoKS5tYXhpbWFsT3V0bGluZVNpemUoKSA6IDA7 CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wID0gc3RkOjptaW4oYm94LT5sb2dpY2FsVG9wVmlz dWFsT3ZlcmZsb3cocm9vdEJveC5saW5lVG9wKCkpLCByb290Qm94LnNlbGVjdGlvblRvcCgpKSAt IG91dGxpbmVTaXplOworICAgIExheW91dFVuaXQgbG9naWNhbEJvdHRvbSA9IGJveC0+bG9naWNh bEJvdHRvbVZpc3VhbE92ZXJmbG93KHJvb3RCb3gubGluZUJvdHRvbSgpKSArIG91dGxpbmVTaXpl OwogICAgIAogICAgIHJldHVybiByYW5nZUludGVyc2VjdHNSZWN0KHJlbmRlcmVyLCBsb2dpY2Fs VG9wLCBsb2dpY2FsQm90dG9tLCBwYWludEluZm8ucmVjdCwgb2Zmc2V0KTsKIH0KQEAgLTIyMSw3 ICsyMjcsNyBAQCB2b2lkIFJlbmRlckxpbmVCb3hMaXN0OjpwYWludChSZW5kZXJCb3hNb2RlbE9i amVjdCogcmVuZGVyZXIsIFBhaW50SW5mbyYgcGFpbnRJbgogICAgIC8vIE5TVmlld3MuICBEbyBu b3QgYWRkIGFueSBtb3JlIGNvZGUgZm9yIHRoaXMuCiAgICAgUmVuZGVyVmlldyYgdiA9IHJlbmRl cmVyLT52aWV3KCk7CiAgICAgYm9vbCB1c2VQcmludFJlY3QgPSAhdi5wcmludFJlY3QoKS5pc0Vt cHR5KCk7Ci0gICAgTGF5b3V0VW5pdCBvdXRsaW5lU2l6ZSA9IHJlbmRlcmVyLT5tYXhpbWFsT3V0 bGluZVNpemUocGFpbnRJbmZvLnBoYXNlKTsKKyAgICBMYXlvdXRVbml0IG91dGxpbmVTaXplID0g aXNPdXRsaW5lUGhhc2UocGFpbnRJbmZvLnBoYXNlKSA/IHYubWF4aW1hbE91dGxpbmVTaXplKCkg OiAwOwogICAgIGlmICghYW55TGluZUludGVyc2VjdHNSZWN0KHJlbmRlcmVyLCBwYWludEluZm8u cmVjdCwgcGFpbnRPZmZzZXQsIHVzZVByaW50UmVjdCwgb3V0bGluZVNpemUpKQogICAgICAgICBy ZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0 TWFya2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0TWFya2VyLmNw cAppbmRleCA5MDBjODcwMDM4NjM2N2JiZDAyMGQ1MzhkMGI3NmNlNTY5NzA1ZDE0Li5hODU1YTQ4 ZTUyODgwOGIyNGNmOTVjODE3MjBlMGM5OTFjNGI1ODYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwCkBAIC0xMTg0LDcgKzExODQsNyBAQCB2b2lk IFJlbmRlckxpc3RNYXJrZXI6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlv dXRQb2ludCYgcGFpbnRPZmZzZQogICAgIExheW91dFBvaW50IGJveE9yaWdpbihwYWludE9mZnNl dCArIGxvY2F0aW9uKCkpOwogICAgIExheW91dFJlY3Qgb3ZlcmZsb3dSZWN0KHZpc3VhbE92ZXJm bG93UmVjdCgpKTsKICAgICBvdmVyZmxvd1JlY3QubW92ZUJ5KGJveE9yaWdpbik7Ci0gICAgb3Zl cmZsb3dSZWN0LmluZmxhdGUobWF4aW1hbE91dGxpbmVTaXplKHBhaW50SW5mby5waGFzZSkpOwor ICAgIGFkanVzdFJlY3RXaXRoTWF4aW11bU91dGxpbmUocGFpbnRJbmZvLnBoYXNlLCBvdmVyZmxv d1JlY3QpOwogCiAgICAgaWYgKCFwYWludEluZm8ucmVjdC5pbnRlcnNlY3RzKG92ZXJmbG93UmVj dCkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5jcHAKaW5kZXggZmJlYzMzODk2YjIwZWRiNGU2NGZjOGM2NDRhMTk4MDc2ZDBlMzVlNi4uMTcw N2YwNjE0OWYyYjEzYWZjZmQ4MzExYzg0NmRjZmY5NGYzYTEyYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTE4NzgsMTEgKzE4NzgsMTEgQEAgdm9pZCBS ZW5kZXJPYmplY3Q6OmNvbGxlY3RBbm5vdGF0ZWRSZWdpb25zKFZlY3RvcjxBbm5vdGF0ZWRSZWdp b25WYWx1ZT4mIHJlZ2lvbnMKIH0KICNlbmRpZgogCi1pbnQgUmVuZGVyT2JqZWN0OjptYXhpbWFs T3V0bGluZVNpemUoUGFpbnRQaGFzZSBwKSBjb25zdAordm9pZCBSZW5kZXJPYmplY3Q6OmFkanVz dFJlY3RXaXRoTWF4aW11bU91dGxpbmUoUGFpbnRQaGFzZSBwaGFzZSwgTGF5b3V0UmVjdCYgcmVj dCkgY29uc3QKIHsKLSAgICBpZiAocCAhPSBQYWludFBoYXNlT3V0bGluZSAmJiBwICE9IFBhaW50 UGhhc2VTZWxmT3V0bGluZSAmJiBwICE9IFBhaW50UGhhc2VDaGlsZE91dGxpbmVzKQotICAgICAg ICByZXR1cm4gMDsKLSAgICByZXR1cm4gdmlldygpLm1heGltYWxPdXRsaW5lU2l6ZSgpOworICAg IGlmIChwaGFzZSAhPSBQYWludFBoYXNlT3V0bGluZSAmJiBwaGFzZSAhPSBQYWludFBoYXNlU2Vs Zk91dGxpbmUgJiYgcGhhc2UgIT0gUGFpbnRQaGFzZUNoaWxkT3V0bGluZXMpCisgICAgICAgIHJl dHVybjsKKyAgICByZWN0LmluZmxhdGUodmlldygpLm1heGltYWxPdXRsaW5lU2l6ZSgpKTsKIH0K IAogaW50IFJlbmRlck9iamVjdDo6Y2FyZXRNaW5PZmZzZXQoKSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IDY4MDc4YWMxNzY0M2UyNzM2MzZhY2YyZDIx MDkwNTExNmQwY2U3MDcuLmNiYzBiOTAyNGZiZjkzYmUyYjlkZGFmNzdiNTFhZDEzMGM2ZGY1NTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTc2NCw3ICs3NjQs NyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkg Y29uc3QgeyByZXR1cm4gKGlzRmxvYXRpbmcoKSB8fCBpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7 IH0KIAogICAgIC8vIEFwcGxpZWQgYXMgYSAic2xvcCIgdG8gZGlydHkgcmVjdCBjaGVja3MgZHVy aW5nIHRoZSBvdXRsaW5lIHBhaW50aW5nIHBoYXNlJ3MgZGlydHktcmVjdCBjaGVja3MuCi0gICAg aW50IG1heGltYWxPdXRsaW5lU2l6ZShQYWludFBoYXNlKSBjb25zdDsKKyAgICB2b2lkIGFkanVz dFJlY3RXaXRoTWF4aW11bU91dGxpbmUoUGFpbnRQaGFzZSwgTGF5b3V0UmVjdCYpIGNvbnN0Owog CiAgICAgZW51bSBTZWxlY3Rpb25TdGF0ZSB7CiAgICAgICAgIFNlbGVjdGlvbk5vbmUsIC8vIFRo ZSBvYmplY3QgaXMgbm90IHNlbGVjdGVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy UmVnaW9uLmNwcAppbmRleCBkMjlkNjcxZGQwMmM4ZmNiN2U0MGE3ZjEyOWJhNmVlMTI3NzFkMGZk Li41OWFhY2I3MTFkMTc4YWZlM2I1NTJhY2ExNGI2NzYxMzNkMTg0NmUwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyUmVnaW9uLmNwcApAQCAtMTU5LDcgKzE1OSw3IEBAIExheW91 dFJlY3QgUmVuZGVyUmVnaW9uOjpvdmVyZmxvd1JlY3RGb3JGbG93VGhyZWFkUG9ydGlvbihjb25z dCBMYXlvdXRSZWN0JiBmbG93CiAgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkT3ZlcmZsb3cgPSBv dmVyZmxvd1R5cGUgPT0gVmlzdWFsT3ZlcmZsb3cgPyB2aXN1YWxPdmVyZmxvd1JlY3RGb3JCb3go Km1fZmxvd1RocmVhZCkgOiBsYXlvdXRPdmVyZmxvd1JlY3RGb3JCb3gobV9mbG93VGhyZWFkKTsK IAogICAgIC8vIFdlIGFyZSBpbnRlcmVzdGVkIGFib3V0IHRoZSBvdXRsaW5lIHNpemUgb25seSB3 aGVuIGNvbXB1dGluZyB0aGUgdmlzdWFsIG92ZXJmbG93LgotICAgIExheW91dFVuaXQgb3V0bGlu ZVNpemUgPSBvdmVyZmxvd1R5cGUgPT0gVmlzdWFsT3ZlcmZsb3cgPyBMYXlvdXRVbml0KG1heGlt YWxPdXRsaW5lU2l6ZShQYWludFBoYXNlT3V0bGluZSkpIDogTGF5b3V0VW5pdCgpOworICAgIExh eW91dFVuaXQgb3V0bGluZVNpemUgPSBvdmVyZmxvd1R5cGUgPT0gVmlzdWFsT3ZlcmZsb3cgPyBM YXlvdXRVbml0KHZpZXcoKS5tYXhpbWFsT3V0bGluZVNpemUoKSkgOiBMYXlvdXRVbml0KCk7CiAg ICAgTGF5b3V0UmVjdCBjbGlwUmVjdDsKICAgICBpZiAobV9mbG93VGhyZWFkLT5pc0hvcml6b250 YWxXcml0aW5nTW9kZSgpKSB7CiAgICAgICAgIExheW91dFVuaXQgbWluWSA9IGlzRmlyc3RQb3J0 aW9uID8gKGZsb3dUaHJlYWRPdmVyZmxvdy55KCkgLSBvdXRsaW5lU2l6ZSkgOiBmbG93VGhyZWFk UG9ydGlvblJlY3QueSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclJlcGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNl ZC5jcHAKaW5kZXggYmRjZDNkODYyOGY0NmRiN2MyNzcwODI0MzkxMGI0MDUwMGQwMzAyYS4uOGM5 OGJiYTg1NDYzNjBmYTAyZWQ1Y2I1YWE3N2UyNTRhMGFlZjI5ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC0yMzMsNyArMjMzLDcgQEAgYm9vbCBS ZW5kZXJSZXBsYWNlZDo6c2hvdWxkUGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExh eW91dFBvaW50JiBwYWludE8KICAgICB9CiAgICAgCiAgICAgTGF5b3V0UmVjdCBsb2NhbFJlcGFp bnRSZWN0ID0gcGFpbnRJbmZvLnJlY3Q7Ci0gICAgbG9jYWxSZXBhaW50UmVjdC5pbmZsYXRlKG1h eGltYWxPdXRsaW5lU2l6ZShwYWludEluZm8ucGhhc2UpKTsKKyAgICBhZGp1c3RSZWN0V2l0aE1h eGltdW1PdXRsaW5lKHBhaW50SW5mby5waGFzZSwgbG9jYWxSZXBhaW50UmVjdCk7CiAgICAgaWYg KGFkanVzdGVkUGFpbnRPZmZzZXQueCgpICsgdmlzdWFsT3ZlcmZsb3dSZWN0KCkueCgpID49IGxv Y2FsUmVwYWludFJlY3QubWF4WCgpIHx8IGFkanVzdGVkUGFpbnRPZmZzZXQueCgpICsgdmlzdWFs T3ZlcmZsb3dSZWN0KCkubWF4WCgpIDw9IGxvY2FsUmVwYWludFJlY3QueCgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCmlu ZGV4IDA0YTc2OTg3YTY2YzkxZWQ0ZDNiMGNmMTA3M2EyZTEzNmJiMzNiNzYuLjU4MjNhOGI2NDA3 NjRiNDVlYjU1ZDViYmY0MjNiMzdjZjdkOGJhNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRhYmxlLmNwcApAQCAtNjYxLDggKzY2MSw4IEBAIHZvaWQgUmVuZGVyVGFibGU6OnBh aW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQp CiAKICAgICBpZiAoIWlzUm9vdCgpKSB7CiAgICAgICAgIExheW91dFJlY3Qgb3ZlcmZsb3dCb3gg PSB2aXN1YWxPdmVyZmxvd1JlY3QoKTsKKyAgICAgICAgYWRqdXN0UmVjdFdpdGhNYXhpbXVtT3V0 bGluZShwYWludEluZm8ucGhhc2UsIG92ZXJmbG93Qm94KTsKICAgICAgICAgZmxpcEZvcldyaXRp bmdNb2RlKG92ZXJmbG93Qm94KTsKLSAgICAgICAgb3ZlcmZsb3dCb3guaW5mbGF0ZShtYXhpbWFs T3V0bGluZVNpemUocGFpbnRJbmZvLnBoYXNlKSk7CiAgICAgICAgIG92ZXJmbG93Qm94Lm1vdmVC eShhZGp1c3RlZFBhaW50T2Zmc2V0KTsKICAgICAgICAgaWYgKCFvdmVyZmxvd0JveC5pbnRlcnNl Y3RzKHBhaW50SW5mby5yZWN0KSkKICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHAKaW5kZXggZWYyNDkyMzlmODQ0NzExNTVj NWVkMmJiOWY2MGJhMWI1MGFmYzFmNS4uMTdlNWFjNDU0MGI0NzNiYWU2ZmE2ZjliNTc1MzZlNGM0 MzRkODY1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl Q2VsbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5j cHAKQEAgLTExOTIsNyArMTE5Miw3IEBAIHZvaWQgUmVuZGVyVGFibGVDZWxsOjpwYWludENvbGxh cHNlZEJvcmRlcnMoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvCiAgICAgICAg IHJldHVybjsKIAogICAgIExheW91dFJlY3QgbG9jYWxSZXBhaW50UmVjdCA9IHBhaW50SW5mby5y ZWN0OwotICAgIGxvY2FsUmVwYWludFJlY3QuaW5mbGF0ZShtYXhpbWFsT3V0bGluZVNpemUocGFp bnRJbmZvLnBoYXNlKSk7CisgICAgYWRqdXN0UmVjdFdpdGhNYXhpbXVtT3V0bGluZShwYWludElu Zm8ucGhhc2UsIGxvY2FsUmVwYWludFJlY3QpOwogCiAgICAgTGF5b3V0UmVjdCBwYWludFJlY3Qg PSBMYXlvdXRSZWN0KHBhaW50T2Zmc2V0ICsgbG9jYXRpb24oKSwgc25hcHBlZEludFJlY3QoZnJh bWVSZWN0KCkpLnNpemUoKSk7CiAgICAgaWYgKHBhaW50UmVjdC55KCkgLSB0YWJsZSgpLT5vdXRl ckJvcmRlclRvcCgpID49IGxvY2FsUmVwYWludFJlY3QubWF4WSgpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAppbmRleCA0YjE3MTRhNGIzMGFk ZTEyZWQwMjUzZjk4ZWI0MzVlODZlN2E4NTYxLi5jOTEwYWI2ZjZhYjA2OWJhNGI2MzI1MjI0ZmVh MDAxMmM0NmY3ZTUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGFibGVTZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFi bGVTZWN0aW9uLmNwcApAQCAtMTIyOCwxMSArMTIyOCw5IEBAIHN0YXRpYyBCb3hTaWRlIHBoeXNp Y2FsQm9yZGVyRm9yRGlyZWN0aW9uKFJlbmRlclN0eWxlKiBzdHlsZUZvckNlbGxGbG93LCBDb2xs YXBzCiAKIHZvaWQgUmVuZGVyVGFibGVTZWN0aW9uOjpwYWludE9iamVjdChQYWludEluZm8mIHBh aW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQogewotICAgIFBhaW50UGhh c2UgcGFpbnRQaGFzZSA9IHBhaW50SW5mby5waGFzZTsKLQogICAgIExheW91dFJlY3QgbG9jYWxS ZXBhaW50UmVjdCA9IHBhaW50SW5mby5yZWN0OworICAgIGFkanVzdFJlY3RXaXRoTWF4aW11bU91 dGxpbmUocGFpbnRJbmZvLnBoYXNlLCBsb2NhbFJlcGFpbnRSZWN0KTsKICAgICBsb2NhbFJlcGFp bnRSZWN0Lm1vdmVCeSgtcGFpbnRPZmZzZXQpOwotICAgIGxvY2FsUmVwYWludFJlY3QuaW5mbGF0 ZShtYXhpbWFsT3V0bGluZVNpemUocGFpbnRQaGFzZSkpOwogCiAgICAgTGF5b3V0UmVjdCB0YWJs ZUFsaWduZWRSZWN0ID0gbG9naWNhbFJlY3RGb3JXcml0aW5nTW9kZUFuZERpcmVjdGlvbihsb2Nh bFJlcGFpbnRSZWN0KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCmlu ZGV4IDQyOGMxNjAyOWJjMDc1ZjY0OGMyMmRhNTcxZTRjYzg3YmNmOWM5MDcuLmQzOTIyZmUzNzI1 MTBiNmVhZjVhMGMzMDE3NjdmNWE0ZmFhYTEzNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVmlldy5jcHAKQEAgLTEyMiw3ICsxMjIsNiBAQCBSZW5kZXJWaWV3OjpSZW5kZXJWaWV3 KERvY3VtZW50JiBkb2N1bWVudCwgUmVmPFJlbmRlclN0eWxlPiYmIHN0eWxlKQogICAgICwgbV9z ZWxlY3Rpb25VbnNwbGl0U3RhcnRQb3MoLTEpCiAgICAgLCBtX3NlbGVjdGlvblVuc3BsaXRFbmRQ b3MoLTEpCiAgICAgLCBtX3JlbmRlcmVyQ291bnQoMCkKLSAgICAsIG1fbWF4aW1hbE91dGxpbmVT aXplKDApCiAgICAgLCBtX2xhenlSZXBhaW50VGltZXIoKnRoaXMsICZSZW5kZXJWaWV3OjpsYXp5 UmVwYWludFRpbWVyRmlyZWQpCiAgICAgLCBtX3BhZ2VMb2dpY2FsSGVpZ2h0KDApCiAgICAgLCBt X3BhZ2VMb2dpY2FsSGVpZ2h0Q2hhbmdlZChmYWxzZSkKQEAgLTg1NCwxNCArODUzLDE1IEBAIHZv aWQgUmVuZGVyVmlldzo6cmVwYWludFN1YnRyZWVTZWxlY3Rpb24oY29uc3QgU2VsZWN0aW9uU3Vi dHJlZVJvb3QmIHJvb3QpIGNvbnN0CiAvLyBDb21wb3NpdGluZyBsYXllciBkaW1lbnNpb25zIHRh a2Ugb3V0bGluZSBzaXplIGludG8gYWNjb3VudCwgc28gd2UgaGF2ZSB0byByZWNvbXB1dGUgbGF5 ZXIKIC8vIGJvdW5kcyB3aGVuIGl0IGNoYW5nZXMuCiAvLyBGSVhNRTogVGhpcyBpcyB1Z2x5OyBp dCB3b3VsZCBiZSBuaWNlIHRvIGhhdmUgYSBiZXR0ZXIgd2F5IHRvIGRvIHRoaXMuCi12b2lkIFJl bmRlclZpZXc6OnNldE1heGltYWxPdXRsaW5lU2l6ZShpbnQgbykKK3ZvaWQgUmVuZGVyVmlldzo6 c2V0TWF4aW1hbE91dGxpbmVTaXplKGludCBvdXRsaW5lU2l6ZSkKIHsKLSAgICBpZiAobyAhPSBt X21heGltYWxPdXRsaW5lU2l6ZSkgewotICAgICAgICBtX21heGltYWxPdXRsaW5lU2l6ZSA9IG87 Ci0KLSAgICAgICAgLy8gbWF4aW1hbE91dGxpbmVTaXplIGFmZmVjdHMgY29tcG9zaXRpbmcgbGF5 ZXIgZGltZW5zaW9ucy4KLSAgICAgICAgY29tcG9zaXRvcigpLnNldENvbXBvc2l0aW5nTGF5ZXJz TmVlZFJlYnVpbGQoKTsgICAgLy8gRklYTUU6IHRoaXMgcmVhbGx5IGp1c3QgbmVlZHMgdG8gYmUg YSBnZW9tZXRyeSB1cGRhdGUuCi0gICAgfQorICAgIGlmIChvdXRsaW5lU2l6ZSA9PSBtX21heGlt YWxPdXRsaW5lU2l6ZSkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIG1fbWF4aW1hbE91dGxp bmVTaXplID0gb3V0bGluZVNpemU7CisgICAgLy8gbWF4aW1hbE91dGxpbmVTaXplIGFmZmVjdHMg Y29tcG9zaXRpbmcgbGF5ZXIgZGltZW5zaW9ucy4KKyAgICAvLyBGSVhNRTogdGhpcyByZWFsbHkg anVzdCBuZWVkcyB0byBiZSBhIGdlb21ldHJ5IHVwZGF0ZS4KKyAgICBjb21wb3NpdG9yKCkuc2V0 Q29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZCgpOwogfQogCiB2b2lkIFJlbmRlclZpZXc6OnNl dFNlbGVjdGlvbihSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVj dCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFpbnRNb2Rl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKaW5kZXggYzMzNTExMTRmNzRjOWEy MTM1MTI3NjIyMmMyNDY5MzYzMjUyYmZmYS4uYjhlYTEzNzk1ODEwNzEwYjE2MGY5NjQwMGZhMDgw YmZkNjJmMDkwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZp ZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCkBAIC05OCw3 ICs5OCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgYWJzb2x1dGVSZWN0cyhWZWN0b3I8 SW50UmVjdD4mLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQpIGNvbnN0IG92 ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBhYnNvbHV0ZVF1YWRzKFZlY3RvcjxGbG9hdFF1YWQ+ JiwgYm9vbCogd2FzRml4ZWQpIGNvbnN0IG92ZXJyaWRlOwogCi0gICAgdm9pZCBzZXRNYXhpbWFs T3V0bGluZVNpemUoaW50IG8pOworICAgIHZvaWQgc2V0TWF4aW1hbE91dGxpbmVTaXplKGludCk7 CiAgICAgaW50IG1heGltYWxPdXRsaW5lU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWF4aW1hbE91 dGxpbmVTaXplOyB9CiAKICAgICBMYXlvdXRSZWN0IHZpZXdSZWN0KCkgY29uc3Q7CkBAIC0zNDUs NyArMzQ1LDggQEAgcHJpdmF0ZToKICAgICBMZWdhY3lQcmludGluZyBtX2xlZ2FjeVByaW50aW5n OwogICAgIC8vIEVuZCBkZXByZWNhdGVkIG1lbWJlcnMuCiAKLSAgICBpbnQgbV9tYXhpbWFsT3V0 bGluZVNpemU7IC8vIFVzZWQgdG8gYXBwbHkgYSBmdWRnZSBmYWN0b3IgdG8gZGlydHktcmVjdCBj aGVja3Mgb24gYmxvY2tzL3RhYmxlcy4KKyAgICAvLyBVc2VkIHRvIGluZmxhdGUgY29tcG9zaXRp bmcgbGF5ZXJzIGFuZCByZXBhaW50IHJlY3RzLgorICAgIGludCBtX21heGltYWxPdXRsaW5lU2l6 ZSB7IDAgfTsKIAogICAgIGJvb2wgc2hvdWxkVXNlUHJpbnRpbmdMYXlvdXQoKSBjb25zdDsKIAo=