87677 2012-05-28 13:32:20 -0700 [chromium] Unoccluded area in surfaces should always be clipped to the rootScissorRect 2012-05-29 10:46:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj cc-bugs enne jamesr piman shawnsingh webkit.review.bot wjmaclean zlieber oldest_to_newest 635386 0 danakj 2012-05-28 13:32:20 -0700 [chromium] Unoccluded area in the top-most surface should be clipped to the rootScissorRect 635390 1 144393 danakj 2012-05-28 13:38:35 -0700 Created attachment 144393 Patch 635391 2 danakj 2012-05-28 13:39:09 -0700 @zlieber: The RenderSurface::targetRenderSurface() might be of interest to you. 636179 3 144393 enne 2012-05-29 10:20:40 -0700 Comment on attachment 144393 Patch R=me. 636220 4 144393 webkit.review.bot 2012-05-29 10:46:20 -0700 Comment on attachment 144393 Patch Clearing flags on attachment: 144393 Committed r118803: <http://trac.webkit.org/changeset/118803> 636221 5 webkit.review.bot 2012-05-29 10:46:25 -0700 All reviewed patches have been landed. Closing bug. 144393 2012-05-28 13:38:35 -0700 2012-05-29 10:46:20 -0700 Patch bug-87677-20120528163834.patch text/plain 12246 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzJmMTM0Yjg3ZGRmMGEy NDE3YTFjNThlOGZhMDNmMmQwNzE5M2I5YS4uNTY2ODVkYThlMGYzODI1NjgxZjQzMzU5N2JhMzVl MDc4M2QxNmM2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA1LTI4ICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVW5v Y2NsdWRlZCBhcmVhIGluIHN1cmZhY2VzIHNob3VsZCBhbHdheXMgYmUgY2xpcHBlZCB0byB0aGUg cm9vdFNjaXNzb3JSZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NzY3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gYSBjb250cmlidXRpbmcgc3VyZmFjZSBpcyB2aXNpdGVkLCBhbmQgd2UgaGF2 ZSBub3QgdmlzaXRlZCBhbm90aGVyCisgICAgICAgIHN1cmZhY2UsIHRoZW4gd2Uga25vdyB0aGUg c3VyZmFjZSBpcyBjb21wbGV0ZWx5IHVub2NjbHVkZWQuIEhvd2V2ZXIsIHRoZQorICAgICAgICBy b290IHNjaXNzb3IgcmVjdCBzaG91bGQgc3RpbGwgYmUgYXBwbGllZCwgYW5kIGFueXRoaW5nIG91 dHNpZGUgb2YgaXQKKyAgICAgICAgc2hvdWxkIGJlIGNvbnNpZGVyZWQgb2NjbHVkZWQuCisKKyAg ICAgICAgVW5pdCB0ZXN0OiBXZWJLaXRUZXN0czo6Q0NPY2NsdXNpb25UcmFja2VyVGVzdFRvcG1v c3RTdXJmYWNlSXNDbGlwcGVkVG9TY2lzc29yCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyU3VyZmFjZUNocm9taXVtOjp0YXJnZXRSZW5kZXJTdXJmYWNlKToKKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1JlbmRlclN1cmZh Y2VDaHJvbWl1bS5oOgorICAgICAgICAoUmVuZGVyU3VyZmFjZUNocm9taXVtKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ09jY2x1c2lvblRyYWNrZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Ojp1bm9jY2x1ZGVkQ29udHJpYnV0aW5nU3VyZmFjZUNvbnRlbnRS ZWN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1 cmZhY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NSZW5kZXJTdXJmYWNlOjp0YXJnZXRSZW5k ZXJTdXJmYWNlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZS5oOgorICAgICAgICAoQ0NSZW5kZXJTdXJm YWNlKToKKwogMjAxMi0wNS0yOCAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CiAK ICAgICAgICAgW0JsYWNrQmVycnldIEFkZCBhIGNvbnN0cnVjdG9yIHRvIGNyZWF0ZSBhIFBhdGgg ZnJvbSBhbiBTa1BhdGgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZjRhMzgzMDRkYzRl ZGRjMDgxZTc1MTU3YjBkMDkzZTc5OTM4YTllNi4uMDA0NWQ3ZjRhYjAzMjA5ODkzYWFhMGIzMjZj MzE5ODBmODc1NDZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBA QAorMjAxMi0wNS0yOCAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAg ICAgICBbY2hyb21pdW1dIFVub2NjbHVkZWQgYXJlYSBpbiBzdXJmYWNlcyBzaG91bGQgYWx3YXlz IGJlIGNsaXBwZWQgdG8gdGhlIHJvb3RTY2lzc29yUmVjdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc2NzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3Qu Y3BwOgorICAgICAgICAoQ0NPY2NsdXNpb25UcmFja2VyVGVzdFRvcG1vc3RTdXJmYWNlSXNDbGlw cGVkVG9TY2lzc29yKToKKyAgICAgICAgKFdlYktpdFRlc3RzOjpDQ09jY2x1c2lvblRyYWNrZXJU ZXN0VG9wbW9zdFN1cmZhY2VJc0NsaXBwZWRUb1NjaXNzb3I6OnJ1bk15VGVzdCk6CisgICAgICAg IChXZWJLaXRUZXN0cyk6CisKIDIwMTItMDUtMjggIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gQnVpbGQgZml4IGZvciB0aGUgQW5kcm9p ZCBib3QsIHNldCBDWFhfdGFyZ2V0IGF0IGd5cCBnZW5lcmF0aW9uLXRpbWUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1JlbmRlclN1cmZhY2VD aHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9S ZW5kZXJTdXJmYWNlQ2hyb21pdW0uY3BwCmluZGV4IGY1ZmU5YTdiNWQ5NjQzNjk4YTY5ZDBkZWY2 MWNjZGFiMGY5NWVmYTQuLjgwYThhMDNlYmE2MDZhNDI1M2JjYWU3NDg4MjIxNDU0MDJjODU0MTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Jl bmRlclN1cmZhY2VDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vUmVuZGVyU3VyZmFjZUNocm9taXVtLmNwcApAQCAtNjQsNiArNjQsMTQg QEAgRmxvYXRSZWN0IFJlbmRlclN1cmZhY2VDaHJvbWl1bTo6ZHJhd2FibGVDb250ZW50UmVjdCgp IGNvbnN0CiAgICAgcmV0dXJuIGRyYXdhYmxlQ29udGVudFJlY3Q7CiB9CiAKK1JlbmRlclN1cmZh Y2VDaHJvbWl1bSogUmVuZGVyU3VyZmFjZUNocm9taXVtOjp0YXJnZXRSZW5kZXJTdXJmYWNlKCkg Y29uc3QKK3sKKyAgICBMYXllckNocm9taXVtKiBwYXJlbnQgPSBtX293bmluZ0xheWVyLT5wYXJl bnQoKTsKKyAgICBpZiAoIXBhcmVudCkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHBh cmVudC0+dGFyZ2V0UmVuZGVyU3VyZmFjZSgpOworfQorCiBib29sIFJlbmRlclN1cmZhY2VDaHJv bWl1bTo6aGFzUmVwbGljYSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fb3duaW5nTGF5ZXItPnJl cGxpY2FMYXllcigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vUmVuZGVyU3VyZmFjZUNocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uaAppbmRleCA4ZDAx N2EzMTMyMjBkYzMxNzA3Njk4NmUxZDViZDFiMmEwNTQ1MmM5Li4wZWE0OGFkMTM5OWVkYTg1YTc1 YWM3MTQzNWUwZTQxMWFjZWQ3NTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9SZW5kZXJTdXJmYWNlQ2hyb21pdW0u aApAQCAtMTA4LDYgKzEwOCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldE5lYXJlc3RBbmNlc3Rv clRoYXRNb3Zlc1BpeGVscyhSZW5kZXJTdXJmYWNlQ2hyb21pdW0qIHN1cmZhY2UpIHsgbV9uZWFy ZXN0QW5jZXN0b3JUaGF0TW92ZXNQaXhlbHMgPSBzdXJmYWNlOyB9CiAgICAgY29uc3QgUmVuZGVy U3VyZmFjZUNocm9taXVtKiBuZWFyZXN0QW5jZXN0b3JUaGF0TW92ZXNQaXhlbHMoKSBjb25zdCB7 IHJldHVybiBtX25lYXJlc3RBbmNlc3RvclRoYXRNb3Zlc1BpeGVsczsgfQogCisgICAgUmVuZGVy U3VyZmFjZUNocm9taXVtKiB0YXJnZXRSZW5kZXJTdXJmYWNlKCkgY29uc3Q7CisKICAgICBib29s IGhhc1JlcGxpY2EoKSBjb25zdDsKIAogICAgIGJvb2wgaGFzTWFzaygpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NPY2Ns dXNpb25UcmFja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDT2NjbHVzaW9uVHJhY2tlci5jcHAKaW5kZXggNzkyZjg2MjlhM2JjMzI5YjY4Zjgz OThjNzU3ZDU5YTFhNmYyZTEyNy4uYzdiMWYyMDQzYWI4ZTU5ZjEzYmRjZDA5ZTYxOTA1ZDQzZDBi NmU2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NPY2NsdXNpb25UcmFja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ09jY2x1c2lvblRyYWNrZXIuY3BwCkBAIC00MzksMzQg KzQzOSw0NSBAQCBJbnRSZWN0IENDT2NjbHVzaW9uVHJhY2tlckJhc2U8TGF5ZXJUeXBlLCBSZW5k ZXJTdXJmYWNlVHlwZT46OnVub2NjbHVkZWRDb250cmlidQogICAgIC8vIFRoaXMgc2hvdWxkIGJl IGNhbGxlZCB3aGlsZSB0aGUgY29udHJpYnV0aW5nIHJlbmRlciBzdXJmYWNlIGlzIHN0aWxsIGNv bnNpZGVyZWQgdGhlIGN1cnJlbnQgdGFyZ2V0IGluIHRoZSBvY2NsdXNpb24gdHJhY2tlci4KICAg ICBBU1NFUlQoc3VyZmFjZSA9PSBtX3N0YWNrLmxhc3QoKS5zdXJmYWNlKTsKIAotICAgIC8vIEEg Y29udHJpYnV0aW5nIHN1cmZhY2UgZG9lc24ndCBnZXQgb2NjbHVkZWQgYnkgdGhpbmdzIGluc2lk ZSBpdHMgb3duIHN1cmZhY2UsIHNvIG9ubHkgdGhpbmdzIG91dHNpZGUgdGhlIHN1cmZhY2UgY2Fu IG9jY2x1ZGUgaXQuIFRoYXQgb2NjbHVzaW9uIGlzCi0gICAgLy8gZm91bmQganVzdCBiZWxvdyB0 aGUgdG9wIG9mIHRoZSBzdGFjayAoaWYgaXQgZXhpc3RzKS4KLSAgICBpZiAobV9zdGFjay5zaXpl KCkgPCAyKQotICAgICAgICByZXR1cm4gY29udGVudFJlY3Q7CiAgICAgaWYgKGNvbnRlbnRSZWN0 LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGNvbnRlbnRSZWN0OwogCi0gICAgY29uc3QgU3Rh Y2tPYmplY3QmIHNlY29uZExhc3QgPSBtX3N0YWNrW21fc3RhY2suc2l6ZSgpIC0gMl07Ci0KICAg ICBJbnRSZWN0IHN1cmZhY2VDbGlwUmVjdCA9IHN1cmZhY2UtPmNsaXBSZWN0KCk7CiAgICAgaWYg KHN1cmZhY2VDbGlwUmVjdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgY29uc3QgUmVuZGVyU3VyZmFj ZVR5cGUqIHRhcmdldFN1cmZhY2UgPSBzZWNvbmRMYXN0LnN1cmZhY2U7Ci0gICAgICAgIHN1cmZh Y2VDbGlwUmVjdCA9IGludGVyc2VjdGlvbih0YXJnZXRTdXJmYWNlLT5jb250ZW50UmVjdCgpLCBl bmNsb3NpbmdJbnRSZWN0KHN1cmZhY2UtPmRyYXdhYmxlQ29udGVudFJlY3QoKSkpOworICAgICAg ICBjb25zdCBSZW5kZXJTdXJmYWNlVHlwZSogdGFyZ2V0U3VyZmFjZSA9IHN1cmZhY2UtPnRhcmdl dFJlbmRlclN1cmZhY2UoKTsKKyAgICAgICAgaWYgKHRhcmdldFN1cmZhY2UpCisgICAgICAgICAg ICBzdXJmYWNlQ2xpcFJlY3QgPSBpbnRlcnNlY3Rpb24odGFyZ2V0U3VyZmFjZS0+Y29udGVudFJl Y3QoKSwgZW5jbG9zaW5nSW50UmVjdChzdXJmYWNlLT5kcmF3YWJsZUNvbnRlbnRSZWN0KCkpKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgc3VyZmFjZUNsaXBSZWN0ID0gbV9zY2lzc29yUmVj dEluU2NyZWVuU3BhY2U7CiAgICAgfQogCisgICAgLy8gQSBjb250cmlidXRpbmcgc3VyZmFjZSBk b2Vzbid0IGdldCBvY2NsdWRlZCBieSB0aGluZ3MgaW5zaWRlIGl0cyBvd24gc3VyZmFjZSwgc28g b25seSB0aGluZ3Mgb3V0c2lkZSB0aGUgc3VyZmFjZSBjYW4gb2NjbHVkZSBpdC4gVGhhdCBvY2Ns dXNpb24gaXMKKyAgICAvLyBmb3VuZCBqdXN0IGJlbG93IHRoZSB0b3Agb2YgdGhlIHN0YWNrIChp ZiBpdCBleGlzdHMpLgorICAgIGJvb2wgaGFzT2NjbHVzaW9uID0gbV9zdGFjay5zaXplKCkgPiAx OworCiAgICAgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHRyYW5zZm9ybVRvU2NyZWVuID0g Zm9yUmVwbGljYSA/IHN1cmZhY2UtPnJlcGxpY2FTY3JlZW5TcGFjZVRyYW5zZm9ybSgpIDogc3Vy ZmFjZS0+c2NyZWVuU3BhY2VUcmFuc2Zvcm0oKTsKICAgICBjb25zdCBUcmFuc2Zvcm1hdGlvbk1h dHJpeCYgdHJhbnNmb3JtVG9UYXJnZXQgPSBmb3JSZXBsaWNhID8gc3VyZmFjZS0+cmVwbGljYU9y aWdpblRyYW5zZm9ybSgpIDogc3VyZmFjZS0+b3JpZ2luVHJhbnNmb3JtKCk7CiAKICAgICBJbnRS ZWN0IHVub2NjbHVkZWRJblNjcmVlbiA9IGNvbnRlbnRSZWN0OwotICAgIGlmIChzdXJmYWNlVHJh bnNmb3Jtc1RvU2NyZWVuS25vd24oc3VyZmFjZSkpCi0gICAgICAgIHVub2NjbHVkZWRJblNjcmVl biA9IGNvbXB1dGVVbm9jY2x1ZGVkQ29udGVudFJlY3QoY29udGVudFJlY3QsIHRyYW5zZm9ybVRv U2NyZWVuLCBtX3NjaXNzb3JSZWN0SW5TY3JlZW5TcGFjZSwgc2Vjb25kTGFzdC5vY2NsdXNpb25J blNjcmVlbik7CisgICAgaWYgKHN1cmZhY2VUcmFuc2Zvcm1zVG9TY3JlZW5Lbm93bihzdXJmYWNl KSkgeworICAgICAgICBpZiAoaGFzT2NjbHVzaW9uKSB7CisgICAgICAgICAgICBjb25zdCBTdGFj a09iamVjdCYgc2Vjb25kTGFzdCA9IG1fc3RhY2tbbV9zdGFjay5zaXplKCkgLSAyXTsKKyAgICAg ICAgICAgIHVub2NjbHVkZWRJblNjcmVlbiA9IGNvbXB1dGVVbm9jY2x1ZGVkQ29udGVudFJlY3Qo Y29udGVudFJlY3QsIHRyYW5zZm9ybVRvU2NyZWVuLCBtX3NjaXNzb3JSZWN0SW5TY3JlZW5TcGFj ZSwgc2Vjb25kTGFzdC5vY2NsdXNpb25JblNjcmVlbik7CisgICAgICAgIH0gZWxzZQorICAgICAg ICAgICAgdW5vY2NsdWRlZEluU2NyZWVuID0gY29tcHV0ZVVub2NjbHVkZWRDb250ZW50UmVjdChj b250ZW50UmVjdCwgdHJhbnNmb3JtVG9TY3JlZW4sIG1fc2Npc3NvclJlY3RJblNjcmVlblNwYWNl LCBSZWdpb24oKSk7CisgICAgfQogCiAgICAgaWYgKHVub2NjbHVkZWRJblNjcmVlbi5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybiB1bm9jY2x1ZGVkSW5TY3JlZW47CiAKICAgICBJbnRSZWN0IHVu b2NjbHVkZWRJblRhcmdldCA9IGNvbnRlbnRSZWN0OwotICAgIGlmIChzdXJmYWNlVHJhbnNmb3Jt c1RvVGFyZ2V0S25vd24oc3VyZmFjZSkpCi0gICAgICAgIHVub2NjbHVkZWRJblRhcmdldCA9IGNv bXB1dGVVbm9jY2x1ZGVkQ29udGVudFJlY3QoY29udGVudFJlY3QsIHRyYW5zZm9ybVRvVGFyZ2V0 LCBzdXJmYWNlQ2xpcFJlY3QsIHNlY29uZExhc3Qub2NjbHVzaW9uSW5UYXJnZXQpOworICAgIGlm IChzdXJmYWNlVHJhbnNmb3Jtc1RvVGFyZ2V0S25vd24oc3VyZmFjZSkpIHsKKyAgICAgICAgaWYg KGhhc09jY2x1c2lvbikgeworICAgICAgICAgICAgY29uc3QgU3RhY2tPYmplY3QmIHNlY29uZExh c3QgPSBtX3N0YWNrW21fc3RhY2suc2l6ZSgpIC0gMl07CisgICAgICAgICAgICB1bm9jY2x1ZGVk SW5UYXJnZXQgPSBjb21wdXRlVW5vY2NsdWRlZENvbnRlbnRSZWN0KGNvbnRlbnRSZWN0LCB0cmFu c2Zvcm1Ub1RhcmdldCwgc3VyZmFjZUNsaXBSZWN0LCBzZWNvbmRMYXN0Lm9jY2x1c2lvbkluVGFy Z2V0KTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICB1bm9jY2x1ZGVkSW5UYXJnZXQgPSBj b21wdXRlVW5vY2NsdWRlZENvbnRlbnRSZWN0KGNvbnRlbnRSZWN0LCB0cmFuc2Zvcm1Ub1Rhcmdl dCwgc3VyZmFjZUNsaXBSZWN0LCBSZWdpb24oKSk7CisgICAgfQogCiAgICAgcmV0dXJuIGludGVy c2VjdGlvbih1bm9jY2x1ZGVkSW5TY3JlZW4sIHVub2NjbHVkZWRJblRhcmdldCk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Jl bmRlclN1cmZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NSZW5kZXJTdXJmYWNlLmNwcAppbmRleCA2YWI1MDk5OGQ0MzNmNTYzNGRiZTBmMjBi YzY3MTgyN2Q2ZTkyYjMyLi4yNmM0NjdhYjQwMzNkZDJjYjFkMjM4YjJiYzFiZjc5MzVhZDA5YmEw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ1JlbmRlclN1cmZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZS5jcHAKQEAgLTM5MSw2ICszOTEsMTQgQEAg aW50IENDUmVuZGVyU3VyZmFjZTo6b3duaW5nTGF5ZXJJZCgpIGNvbnN0CiAgICAgcmV0dXJuIG1f b3duaW5nTGF5ZXIgPyBtX293bmluZ0xheWVyLT5pZCgpIDogMDsKIH0KIAorQ0NSZW5kZXJTdXJm YWNlKiBDQ1JlbmRlclN1cmZhY2U6OnRhcmdldFJlbmRlclN1cmZhY2UoKSBjb25zdAoreworICAg IENDTGF5ZXJJbXBsKiBwYXJlbnQgPSBtX293bmluZ0xheWVyLT5wYXJlbnQoKTsKKyAgICBpZiAo IXBhcmVudCkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHBhcmVudC0+dGFyZ2V0UmVu ZGVyU3VyZmFjZSgpOworfQorCiBib29sIENDUmVuZGVyU3VyZmFjZTo6aGFzUmVwbGljYSgpIGNv bnN0CiB7CiAgICAgcmV0dXJuIG1fb3duaW5nTGF5ZXItPnJlcGxpY2FMYXllcigpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5k ZXJTdXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ1JlbmRlclN1cmZhY2UuaAppbmRleCBhNmRlZTEwZWNlZDA5N2M4MjBhNGE5ODIzNWNkODJl YjllMThlNWFkLi42YTY3MWE3MDBlZDY3NzA4NjdlYmU5MjY5YzEyOTY3NjBkMjA0NGExIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Jl bmRlclN1cmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ1JlbmRlclN1cmZhY2UuaApAQCAtMTM4LDYgKzEzOCw3IEBAIHB1YmxpYzoKICAg ICBNYW5hZ2VkVGV4dHVyZSogYmFja2dyb3VuZFRleHR1cmUoKSBjb25zdCB7IHJldHVybiBtX2Jh Y2tncm91bmRUZXh0dXJlLmdldCgpOyB9CiAKICAgICBpbnQgb3duaW5nTGF5ZXJJZCgpIGNvbnN0 OworICAgIENDUmVuZGVyU3VyZmFjZSogdGFyZ2V0UmVuZGVyU3VyZmFjZSgpIGNvbnN0OwogCiAg ICAgYm9vbCBoYXNSZXBsaWNhKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vdGVzdHMvQ0NPY2NsdXNpb25UcmFja2VyVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwCmluZGV4IDk3NmRjM2Yy OTg2NDY4N2M5MDdlZDI2Nzk3MWQ4NWUyMTEwNmI2M2UuLjQ0YzYyZTNlM2M1Yzg4MjkxNDBkNDEx MTUzZTBhZTQ5YTVmNzcwNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NPY2NsdXNpb25UcmFja2VyVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9DQ09jY2x1c2lvblRyYWNrZXJUZXN0LmNwcApAQCAtMjQyNiw2ICsyNDI2LDQ1IEBA IHByb3RlY3RlZDoKIEFMTF9DQ09DQ0xVU0lPTlRSQUNLRVJfVEVTVChDQ09jY2x1c2lvblRyYWNr ZXJUZXN0U3VyZmFjZUNoaWxkT2ZTdXJmYWNlKTsKIAogdGVtcGxhdGU8Y2xhc3MgVHlwZXMsIGJv b2wgb3BhcXVlTGF5ZXJzPgorY2xhc3MgQ0NPY2NsdXNpb25UcmFja2VyVGVzdFRvcG1vc3RTdXJm YWNlSXNDbGlwcGVkVG9TY2lzc29yIDogcHVibGljIENDT2NjbHVzaW9uVHJhY2tlclRlc3Q8VHlw ZXMsIG9wYXF1ZUxheWVycz4geworcHJvdGVjdGVkOgorICAgIHZvaWQgcnVuTXlUZXN0KCkKKyAg ICB7CisgICAgICAgIC8vIFRoaXMgdGVzdCB2ZXJpZmllcyB0aGF0IHRoZSB0b3AtbW9zdCBzdXJm YWNlIGlzIGNvbnNpZGVyZWQgb2NjbHVkZWQgb3V0c2lkZSBvZiBpdHMgc2Npc3NvciByZWN0IGFu ZCBvdXRzaWRlIHRoZSBzY3JlZW4ncyBzY2lzc29yIHJlY3QuCisKKyAgICAgICAgdHlwZW5hbWUg VHlwZXM6OkNvbnRlbnRMYXllclR5cGUqIHBhcmVudCA9IHRoaXMtPmNyZWF0ZVJvb3QodGhpcy0+ aWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQoMCwgMCksIEludFNpemUoMTAwLCAyMDApKTsKKyAg ICAgICAgdHlwZW5hbWUgVHlwZXM6OkxheWVyVHlwZSogc3VyZmFjZSA9IHRoaXMtPmNyZWF0ZURy YXdpbmdTdXJmYWNlKHBhcmVudCwgdGhpcy0+aWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQoMCwg MCksIEludFNpemUoMTAwLCAzMDApLCB0cnVlKTsKKyAgICAgICAgdGhpcy0+Y2FsY0RyYXdFdGMo cGFyZW50KTsKKworICAgICAgICB7CisgICAgICAgICAgICAvLyBNYWtlIGEgc2NyZWVuIHNjaXNz b3IgcmVjdCB0aGF0IGlzIGxhcmdlciB0aGFuIHRoZSByb290IGxheWVyJ3MuCisgICAgICAgICAg ICBUZXN0Q0NPY2NsdXNpb25UcmFja2VyV2l0aFNjaXNzb3I8dHlwZW5hbWUgVHlwZXM6OkxheWVy VHlwZSwgdHlwZW5hbWUgVHlwZXM6OlJlbmRlclN1cmZhY2VUeXBlPiBvY2NsdXNpb24oSW50UmVj dCgwLCAwLCAxMDAwLCAxMDAwKSk7CisKKyAgICAgICAgICAgIHRoaXMtPnZpc2l0TGF5ZXIoc3Vy ZmFjZSwgb2NjbHVzaW9uKTsKKworICAgICAgICAgICAgLy8gVGhlIHJvb3QgbGF5ZXIgYWx3YXlz IGhhcyBhIGNsaXBSZWN0LiBTbyB0aGUgcGFyZW50IG9mIHxzdXJmYWNlfCBoYXMgYSBjbGlwUmVj dCBnaXZpbmcgdGhlIHN1cmZhY2UgaXRzZWxmIGEgY2xpcFJlY3QuCisgICAgICAgICAgICB0aGlz LT5lbnRlckNvbnRyaWJ1dGluZ1N1cmZhY2Uoc3VyZmFjZSwgb2NjbHVzaW9uKTsKKyAgICAgICAg ICAgIC8vIE1ha2Ugc3VyZSB0aGUgcGFyZW50J3MgY2xpcFJlY3QgY2xpcHMgdGhlIHVub2NjbHVk ZWQgcmVnaW9uIG9mIHRoZSBjaGlsZCBzdXJmYWNlLgorICAgICAgICAgICAgRVhQRUNUX0VRX1JF Q1QoSW50UmVjdCgwLCAwLCAxMDAsIDIwMCksIG9jY2x1c2lvbi51bm9jY2x1ZGVkQ29udHJpYnV0 aW5nU3VyZmFjZUNvbnRlbnRSZWN0KHN1cmZhY2UtPnJlbmRlclN1cmZhY2UoKSwgZmFsc2UsIElu dFJlY3QoMCwgMCwgMTAwLCAzMDApKSk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy0+cmVzZXRM YXllckl0ZXJhdG9yKCk7CisgICAgICAgIHsKKyAgICAgICAgICAgIC8vIE1ha2UgYSBzY3JlZW4g c2Npc3NvciByZWN0IHRoYXQgaXMgc21hbGxlciB0aGFuIHRoZSByb290IGxheWVyJ3MuCisgICAg ICAgICAgICBUZXN0Q0NPY2NsdXNpb25UcmFja2VyV2l0aFNjaXNzb3I8dHlwZW5hbWUgVHlwZXM6 OkxheWVyVHlwZSwgdHlwZW5hbWUgVHlwZXM6OlJlbmRlclN1cmZhY2VUeXBlPiBvY2NsdXNpb24o SW50UmVjdCgwLCAwLCAxMDAsIDEwMCkpOworCisgICAgICAgICAgICB0aGlzLT52aXNpdExheWVy KHN1cmZhY2UsIG9jY2x1c2lvbik7CisKKyAgICAgICAgICAgIC8vIFRoZSByb290IGxheWVyIGFs d2F5cyBoYXMgYSBjbGlwUmVjdC4gU28gdGhlIHBhcmVudCBvZiB8c3VyZmFjZXwgaGFzIGEgY2xp cFJlY3QgZ2l2aW5nIHRoZSBzdXJmYWNlIGl0c2VsZiBhIGNsaXBSZWN0LgorICAgICAgICAgICAg dGhpcy0+ZW50ZXJDb250cmlidXRpbmdTdXJmYWNlKHN1cmZhY2UsIG9jY2x1c2lvbik7CisgICAg ICAgICAgICAvLyBNYWtlIHN1cmUgdGhlIHNjcmVlbiBzY2lzc29yIHJlY3QgY2xpcHMgdGhlIHVu b2NjbHVkZWQgcmVnaW9uIG9mIHRoZSBjaGlsZCBzdXJmYWNlLgorICAgICAgICAgICAgRVhQRUNU X0VRX1JFQ1QoSW50UmVjdCgwLCAwLCAxMDAsIDEwMCksIG9jY2x1c2lvbi51bm9jY2x1ZGVkQ29u dHJpYnV0aW5nU3VyZmFjZUNvbnRlbnRSZWN0KHN1cmZhY2UtPnJlbmRlclN1cmZhY2UoKSwgZmFs c2UsIEludFJlY3QoMCwgMCwgMTAwLCAzMDApKSk7CisgICAgICAgIH0KKyAgICB9Cit9OworCitB TExfQ0NPQ0NMVVNJT05UUkFDS0VSX1RFU1QoQ0NPY2NsdXNpb25UcmFja2VyVGVzdFRvcG1vc3RT dXJmYWNlSXNDbGlwcGVkVG9TY2lzc29yKTsKKwordGVtcGxhdGU8Y2xhc3MgVHlwZXMsIGJvb2wg b3BhcXVlTGF5ZXJzPgogY2xhc3MgQ0NPY2NsdXNpb25UcmFja2VyVGVzdFN1cmZhY2VDaGlsZE9m Q2xpcHBpbmdTdXJmYWNlIDogcHVibGljIENDT2NjbHVzaW9uVHJhY2tlclRlc3Q8VHlwZXMsIG9w YXF1ZUxheWVycz4gewogcHJvdGVjdGVkOgogICAgIHZvaWQgcnVuTXlUZXN0KCkK