51240 2010-12-17 02:22:05 -0800 [Chromium][Skia] Border with a color with alpha != 1 breaks webkit gradient on skia 2010-12-20 20:55:52 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 morrita morrita abarth agl dglazkov eric senorblanco thakis tony webkit.review.bot oldest_to_newest 323671 0 morrita 2010-12-17 02:22:05 -0800 From http://code.google.com/p/chromium/issues/detail?id=48278 323688 1 76862 morrita 2010-12-17 03:13:28 -0800 Created attachment 76862 Patch 323828 2 agl 2010-12-17 09:32:33 -0800 (Note: I am not a WebKit reviewer. You also need an r+ from a real reviewer.) LGTM 323839 3 thakis 2010-12-17 09:41:50 -0800 I believe senorblanco wrote this code. I don't quite understand why the patch works (it looks like setFillColor() still sets the gradient to NULL), but since the layout test passes and agl says it's ok, this is my fault and not the patch's :-) 323859 4 agl 2010-12-17 10:32:54 -0800 (In reply to comment #3) > since the layout test passes Yes, I largely defer to the reality of layout tests when evaluating correctness! 324074 5 morrita 2010-12-17 19:16:43 -0800 So could any kind reviewer give r+ to this ? (In reply to comment #3) > I don't quite understand why the patch works (it looks like setFillColor() still sets the gradient to NULL), but since the layout test passes and agl says it's ok, this is my fault and not the patch's :-) What wrong here is, in my understanding, not the fill code but the gradient code. The gradient rendering refers color value which is set by setFillColor(), and uses the alpha component of that color to make things transparent. So setFillColor() and setFillGradient() weren't mutually exclusive, regardless they should be. Actually there are some confusions around how the transparency of each pixel is determined: we have State::m_alpha and State::m_fillColor on the chromium land, and have layers, blitters and shaders in the Skia land... 324663 6 76862 jamesr 2010-12-20 16:56:31 -0800 Comment on attachment 76862 Patch OK 324749 7 morrita 2010-12-20 20:32:56 -0800 Committed r74386: <http://trac.webkit.org/changeset/74386> 324752 8 morrita 2010-12-20 20:37:34 -0800 (In reply to comment #6) > (From update of attachment 76862 [details]) > OK Landed. thank you for your r+! 324760 9 webkit.review.bot 2010-12-20 20:55:52 -0800 http://trac.webkit.org/changeset/74386 might have broken Qt Linux Release The following tests are not passing: fast/gradients/gradient-after-transparent-border.html 76862 2010-12-17 03:13:28 -0800 2010-12-20 16:56:31 -0800 Patch bug-51240-20101217201326.patch text/plain 7713 morrita ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxYjFjMjgwNzk3YjBjMzE0NmViNWVmOTVhNTM3MGRkYmQ0OTMyNTFlLi4yODViYjk5 NDc5NjE0NGRlNGRkZjU1MGEzNTI0ZjJhN2ExYjdhY2JjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTItMTcgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMjQwCisgICAgICAgIFtDaHJvbWl1bV1bU2tpYV0g Qm9yZGVyIHdpdGggYSBjb2xvciB3aXRoIGFscGhhICE9IDEgYnJlYWtzIHdlYmtpdCBncmFkaWVu dCBvbiBza2lhLgorCisgICAgICAgICogZmFzdC9ncmFkaWVudHMvZ3JhZGllbnQtYWZ0ZXItdHJh bnNwYXJlbnQtYm9yZGVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9ncmFk aWVudHMvZ3JhZGllbnQtYWZ0ZXItdHJhbnNwYXJlbnQtYm9yZGVyLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIHBsYXRmb3JtL2Nocm9taXVtLXdpbi9mYXN0L2dyYWRpZW50cy9ncmFkaWVudC1hZnRl ci10cmFuc3BhcmVudC1ib3JkZXItZXhwZWN0ZWQuY2hlY2tzdW06IEFkZGVkLgorICAgICAgICAq IHBsYXRmb3JtL2Nocm9taXVtLXdpbi9mYXN0L2dyYWRpZW50cy9ncmFkaWVudC1hZnRlci10cmFu c3BhcmVudC1ib3JkZXItZXhwZWN0ZWQucG5nOiBBZGRlZC4KKwogMjAxMC0xMi0xNyAgSmFtZXMg U2ltb25zZW4gIDxzaW1vbmphbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gRmlzaGVyLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ncmFkaWVudHMvZ3Jh ZGllbnQtYWZ0ZXItdHJhbnNwYXJlbnQtYm9yZGVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2Zhc3QvZ3JhZGllbnRzL2dyYWRpZW50LWFmdGVyLXRyYW5zcGFyZW50LWJvcmRlci1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uYjY0ZmYzYzBkOTI1OTYwOTEzNjc3Mzg4YzMzMjlmYzNhZjk2NGZh NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZ3JhZGllbnRzL2dyYWRpZW50 LWFmdGVyLXRyYW5zcGFyZW50LWJvcmRlci1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorVGVz dCBmb3IgQnVnIDUxMjQwOiBQQVNTIGlmIHRoZSBzZWNvbmQgYm94IGlzIHBhaW50ZWQgYXMgYW4g b3BhcXVlIGJsdWUtdG8tZ3JlZW4gc3F1YXJlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9ncmFkaWVudHMvZ3JhZGllbnQtYWZ0ZXItdHJhbnNwYXJlbnQtYm9yZGVyLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2dyYWRpZW50cy9ncmFkaWVudC1hZnRlci10cmFuc3BhcmVudC1ib3JkZXIu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi44ZDEzMTE3ZDIxYWQ4NzA1MGY3NGYxZjA5NGM2YTczNjY2ZDdjMTBl Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ncmFkaWVudHMvZ3JhZGllbnQt YWZ0ZXItdHJhbnNwYXJlbnQtYm9yZGVyLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPCFET0NUWVBF IGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLnNxdWFyZSB7CisgIHdpZHRoOiAxMDBw eDsKKyAgaGVpZ2h0OiAxMDBweDsKKyAgZmxvYXQ6IGxlZnQ7CisgIG1hcmdpbjogNTBweDsKK30K KworLnRyYW5zcGFyZW50LWJvcmRlciB7CisgIGJhY2tncm91bmQtY29sb3I6cmVkOworICBib3Jk ZXItYm90dG9tOiAxMHB4IHNvbGlkIHJnYmEoMSwgNTIsIDE5MywgMC41KTsKK30KKworLmdyYWRp ZW50IHsKKyAgYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIDAlIDAlLCAwJSAx MDAlLCBmcm9tKHJnYmEoMCwwLDI1NSwxKSksIHRvKHJnYmEoMCwyNTUsMCwxKSkpOworfQorPC9z dHlsZT4KKzxzY3JpcHQ+CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQodHJ1ZSk7Cis8L3NjcmlwdD4KKzwvaGVhZD48 Ym9keT4KKzxwPlRlc3QgZm9yIEJ1ZyA1MTI0MDogUEFTUyBpZiB0aGUgc2Vjb25kIGJveCBpcyBw YWludGVkIGFzIGFuIG9wYXF1ZSBibHVlLXRvLWdyZWVuIHNxdWFyZS48L3A+Cis8ZGl2IGNsYXNz PSJzcXVhcmUgdHJhbnNwYXJlbnQtYm9yZGVyIj48L2Rpdj4KKzxkaXYgY2xhc3M9InNxdWFyZSBn cmFkaWVudCI+PC9kaXY+Cis8L2JvZHk+PC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vY2hyb21pdW0td2luL2Zhc3QvZ3JhZGllbnRzL2dyYWRpZW50LWFmdGVyLXRyYW5z cGFyZW50LWJvcmRlci1leHBlY3RlZC5jaGVja3N1bSBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2No cm9taXVtLXdpbi9mYXN0L2dyYWRpZW50cy9ncmFkaWVudC1hZnRlci10cmFuc3BhcmVudC1ib3Jk ZXItZXhwZWN0ZWQuY2hlY2tzdW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNzJiNzQwYmEwNGYxYzY0ZWM3NTVjMWJl ZmRiMmY4OTRlMmZkZmY1OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtLXdpbi9mYXN0L2dyYWRpZW50cy9ncmFkaWVudC1hZnRlci10cmFuc3BhcmVudC1i b3JkZXItZXhwZWN0ZWQuY2hlY2tzdW0KQEAgLTAsMCArMSBAQAorY2JmNWMzOWYyZmNjMWFiMTBm ZWE5NjFiZDAxZDhmNmIKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS13aW4vZmFzdC9ncmFkaWVudHMvZ3JhZGllbnQt YWZ0ZXItdHJhbnNwYXJlbnQtYm9yZGVyLWV4cGVjdGVkLnBuZyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtLXdpbi9mYXN0L2dyYWRpZW50cy9ncmFkaWVudC1hZnRlci10cmFuc3BhcmVu dC1ib3JkZXItZXhwZWN0ZWQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmIxY2EzMGE0NDdhOTgyMzBiOWQ1MTEy NDBhZGQwMDQwMzVmMDg2YjYKR0lUIGJpbmFyeSBwYXRjaApsaXRlcmFsIDQyMzEKemNtZUhMZHI7 Rj83WEFUKzI+NHRqNnBYPVlpfCFVZ0x7VElPcUcteWxnaV9rLWlqcihhYWdtcnZnaFVkRTVUfEhH CnpRbX0wWnVhc3B2UDc2cFJoS0JAX0BDWUMjITc5KUtOaVlGfExMP3kmNjd0Jk1LUmYkfXlXTj9j UENMVllYWVFUdgp6LWdDZTZlZG87Rm47KVcoWWRtfkMwMDNBTXtYeGA2ME59Q30wR3Y7KmEoMWtF WlN2WHkwUDlpRlFJUXskJH4zWigKenczby02NTUqQ1JPZ0J2ck88ITR6Kkl7S0lNXz5ILWtSMj5h b1BNemh7ODRxYC09M3p1JEN6R05hc20jaWhwSXNVCnpwcH5yKDBJbjRhb1BpdGV8RUl2KFlAcWNg KUVsWkNfWlZ8PD03QClsQ1A5KHpGJWp7elcrSUlsdT9II2BqdSpNZQp6c2t3UzxQeXgzNz1QeyZT UiZrKWFFPiV4cTV4KXhKTio2Tis1Vz9aPiNYSDl5MzwjRSolKlc0SUk8cT5IXjc3PkUKeioqSHJO KVIzUHRYQyRlKGJQZX16S0ZESHBVej1ENTUxSlVCWmN7X31fMXZOMGkyZXtuNW88bSRtJWlYMDk0 RlhiCnpMQjU1VGhDZnJXQXA4QGJLfVVOQGMyJVNWI0JSeitDeSE1RV5LUGBhYzBgSX42KWtFY1Ml bH1hSGordXJUfkZHRQp6eyNYOzE4M3hDX0o5YDBwXz1sVCtOWVJHV3goI3ZeU0szTXh4TGlpeElk I2tQJkVrJjk2ZCQxOVNHRW4zYTlVSnMKeiQmelhjT2AmKFh6NHkwaGxKeFglej42SHhqblpCTz16 VGJIT0o9NEczOGg3Yz9gNl5YbHQkWFVFJDhabWxWMUMlCnpPQV5vWGMyLS1oJTxUK2g5RnQxNi1N fHRBY1R7cGtjbS1PbU4xYDVnUjVDRUlYWFZgbz1STVgrRT9gZD8/RTlXOAp6em5yQXwkdXRyTExy QjI2LThKMWBEQUhWd2I4OSljemF0IyFzVGstTG9VJS1wblc+Wi1gPGV4ZGp0a0ZNb3hTfTEKei17 PFpWJjVNKClqa2wycEdBXmp+WFNXUjcjfHloRWNlUG91d3k2ZzckVHhIek1kaS1xXjxSd3I+eGd2 SG1EOFpKCnpQKGFBajZwTC0lYHxneCZDKyowcms1OzJ0PG17eW1DY1JEZSRITHJjSzYxKlZGJj55 am4oYFdqUlV4eWpwdElSWQp6anBTQEo3JVMwV0xRJVkod31SJWtod3Vtd3c3MUxjbmBgPmBsTXg1 IU85fVNVUH00JldHamN5b0RvR35HVFNWQjsKenI1ZUtTNVMzcn5mcXNpbklDMC1Gcyo0Qmp4VD89 KHJ0LXFfeHpoWUQ+RE9KMV5QMmIhVF9NLTFhTkYlQ0glNDhHCnpFcWdwKGFrYmN3TmIjVW03OWc5 e1VYYSl4Tmt8RmczTUZ6RWJWKDxaRyk1ND1yR01SZzF8az8ybU5VZHdrLXFYMwp6YkAwaVBjNEUy Pns5S3RWdlhVb35PUTxteGhAS2A8eWc8PVleemtXYilTeVdGRVA1bmdXJV9SSm5Cb0V2QzN+VGAK ekZ+WDUjWjdRJG1IQ141eGAmP0xBMHNTZUNsfkp5czxMIX1CXyhpT1dmVzhCekVYd3UxdHhza1R6 K089PmZ4WkVlCnp7NlZGKzUrc2YjS29nfEpkMGp0QGFLMTJubSZnYnJlP04yQ3dDTFg+ITVRKlVg Y0RYWlJfVkJgWXtgZDs+MXw9SAp6YXYxZXBZVHQwaz1MQyo1djJGdlVVQFlQKHA4QShfSm1Fak1y RilSd1l7TXNXd280TTYrN0shfnVmTFVeUnVXei0Keml9dFprNjs/ckhzVEsheVlzS1M5RHRLTlpr SCNyeG13TnVHRz00OWx1JlIyV1VOaHY2PD5gQm1yb0hOU3BgRmw8CnpVU0dZZFNYZnIkZ1pgTDRW XkgtQmtmI0RLVmdXT25Ac3dZci0pSFYjMlUydjEpS0FCVUZ1R2QyPTlSZnlNdChHbQp6Nzsxbn0o aTFHPSkzOHBmWl51fWFUVUNrdTNaaC1kOEZYdUM3QXI0LTspIUghTHNQd1JVUj45T3l0YDs/VEhI SmYKemR1MDU9Y1AxR3hUeiMqRE9NZjdxIztTNytzZClaYEdLPCotS09UVXhQMVo/Q1AleUV7bz9l RC1Cdi1VI1dFSmQ0CnolRHhAckxEQzRoIWhsT2BRblcrKSFee0hLVChDSzJsK2FvV1omSF94NWB4 I0FDc0UjOFU5amlnYW5pKklyN3woVQp6bjF4cVQmaDJXeWlTIT5ZamhYYk9ea3RmV0ZeIVEwY0w2 JUhBMkV1PTNEPm51IXwxN3tJNEpXPVRvQERtR0heT1UKenZLdXhNeVc5X0JScDU3a0wmcV5ySzw4 V0ZtRWdhVEZlNSMmWnRVQj5pR2w0VHpvRkBCcSZEPlFyez9Bd3ooOHNnCno8UiUrY19CeUM9dnE/ NEowKzN2c0pyUmcodE0lbXUtaTkxa2JfXiFSdExCSkp8SSFLSUlwdyYxJTNodkY+fDlwfAp6X2M+ a3h6LVB7JEg1ak0kOCY2X2ZKKHM3fGB6TXpSO3V1fHlqblFweVpTYGpoSml0S2tlKmtXTWVJb3dX YGhVU3MKejNZfnY1Syo4JSYwdVI2OHJFZ0M0Uns9VnxDY1NaJCg9UkI+em9xKUMwUkk7bUViSGZ8 UXJBSlctS3diMCh9dm5JCno3WFckQjA+aCFQS2wybWUwQn4qZyplYEpWT2o+SXE4dHcqTSEqd315 eDYmWTFuJlpsWlNhSEZNM3N6azRgKnkqTQpaVSM1cm4+WDkmQC1TTlF5TD8xOygtOCtvUXtVYDRR ai1DSmoKCmxpdGVyYWwgMApIY21WP2QwMDAwMQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdl TG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWM5ZDI5ZjBiMzAzODdiOTc2NTZhOGNmNjAy MTdmYmFjZmMzMDJiOC4uMmE2MTVjZDA3Y2MwZWYzODJlYjlhYzcwYWJmZjNkNWRjMWQ2ZGIxZCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAxMC0xMi0xNyAgTU9SSVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTEyNDAKKyAgICAgICAgW0No cm9taXVtXVtTa2lhXSBCb3JkZXIgd2l0aCBhIGNvbG9yIHdpdGggYWxwaGEgIT0gMSBicmVha3Mg d2Via2l0IGdyYWRpZW50IG9uIHNraWEuCisKKyAgICAgICAgRXZlbiBhZnRlciBhIHNoYWRlciB3 YXMgc2V0LCBvbGQgY29sb3IgdmFsdWUgaGFkIGJlZW4gcmVtYWluaW5nIGFuZCBwYXNzZWQgdG8g U2tpYS4KKyAgICAgICAgVGhlbiBTa2lhIHJlZmVyZWQgYW4gYWxwaGEgY29tcG9uZW50IG9mIHRo YXQgY29sb3IgdG8gbWFrZSBwaXhlbHMgdHJhbnNwYXJlbnQuCisgICAgICAgIFRoaXMgY2hhbmdl IGludmFsaWRhdGVzIGV4aXN0aW5nIGNvbG9yIHZhbHVlIHdoZW4gYSBzaGFkZXIgaXMgZ2l2ZW4s IAorICAgICAgICB3aGljaCBtZWFucyB0aGUgcmVuZGVyZXIgd2lsbCBwYWludCBzaGFwZXMgd2l0 aCBncmFkaWVudHMgb3IgcGF0dGVybnMuCisgICAgICAgIAorICAgICAgICBUZXN0OiBmYXN0L2dy YWRpZW50cy9ncmFkaWVudC1hZnRlci10cmFuc3BhcmVudC1ib3JkZXIuaHRtbAorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OnNldFN0cm9rZVNoYWRlcik6CisgICAg ICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpzZXRGaWxsU2hhZGVyKToKKwogMjAx MC0xMi0xNyAgSmFtZXMgU2ltb25zZW4gIDxzaW1vbmphbUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCmluZGV4IDhjNjc3ZGYyYjQ4 OTUxMjhjNWI4ZTI1MWQ3MTQxMmVlNzExMGUzMDcuLmQzYzBlMDA3ODJjZThkZTg4NDRhOTFkOGUy NTE3MmZjNDM0YTExZTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKQEAgLTQ5Nyw2ICs0OTcsOSBAQCB2b2lkIFBs YXRmb3JtQ29udGV4dFNraWE6OnNldFN0cm9rZVRoaWNrbmVzcyhmbG9hdCB0aGlja25lc3MpCiAK IHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0U3Ryb2tlU2hhZGVyKFNrU2hhZGVyKiBzdHJv a2VTaGFkZXIpCiB7CisgICAgaWYgKHN0cm9rZVNoYWRlcikKKyAgICAgICAgbV9zdGF0ZS0+bV9z dHJva2VDb2xvciA9IENvbG9yOjpibGFjazsKKwogICAgIGlmIChzdHJva2VTaGFkZXIgIT0gbV9z dGF0ZS0+bV9zdHJva2VTaGFkZXIpIHsKICAgICAgICAgU2tTYWZlVW5yZWYobV9zdGF0ZS0+bV9z dHJva2VTaGFkZXIpOwogICAgICAgICBtX3N0YXRlLT5tX3N0cm9rZVNoYWRlciA9IHN0cm9rZVNo YWRlcjsKQEAgLTU4MSw2ICs1ODQsOSBAQCB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldEZp bGxSdWxlKFNrUGF0aDo6RmlsbFR5cGUgZnIpCiAKIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6 c2V0RmlsbFNoYWRlcihTa1NoYWRlciogZmlsbFNoYWRlcikKIHsKKyAgICBpZiAoZmlsbFNoYWRl cikKKyAgICAgICAgbV9zdGF0ZS0+bV9maWxsQ29sb3IgPSBDb2xvcjo6YmxhY2s7CisKICAgICBp ZiAoZmlsbFNoYWRlciAhPSBtX3N0YXRlLT5tX2ZpbGxTaGFkZXIpIHsKICAgICAgICAgU2tTYWZl VW5yZWYobV9zdGF0ZS0+bV9maWxsU2hhZGVyKTsKICAgICAgICAgbV9zdGF0ZS0+bV9maWxsU2hh ZGVyID0gZmlsbFNoYWRlcjsK