93284 2012-08-06 11:08:57 -0700 GraphicsLayerAnimation shouldn't use HashMap<String> 2012-08-07 19:26:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93311 93146 1 noam noam dongseong.hwang hausmann jturcotte kenneth webkit.review.bot oldest_to_newest 688292 0 noam 2012-08-06 11:08:57 -0700 GraphicsLayerAnimation shouldn't use HashMap<String> 688298 1 156729 noam 2012-08-06 11:13:22 -0700 Created attachment 156729 Patch 688350 2 156729 kenneth 2012-08-06 12:26:56 -0700 Comment on attachment 156729 Patch It also simplifies the code :-) 688559 3 156729 webkit.review.bot 2012-08-06 16:44:03 -0700 Comment on attachment 156729 Patch Clearing flags on attachment: 156729 Committed r124816: <http://trac.webkit.org/changeset/124816> 688560 4 webkit.review.bot 2012-08-06 16:44:07 -0700 All reviewed patches have been landed. Closing bug. 688604 5 noam 2012-08-06 17:30:16 -0700 Caused some test crashes, investigating. Will roll out if can't find the cause quickly. 689120 6 156936 noam 2012-08-07 07:19:09 -0700 Created attachment 156936 Patch for landing 689293 7 156936 webkit.review.bot 2012-08-07 12:49:27 -0700 Comment on attachment 156936 Patch for landing Clearing flags on attachment: 156936 Committed r124908: <http://trac.webkit.org/changeset/124908> 689294 8 webkit.review.bot 2012-08-07 12:49:32 -0700 All reviewed patches have been landed. Closing bug. 156729 2012-08-06 11:13:22 -0700 2012-08-07 07:19:05 -0700 Patch bug-93284-20120806111248.patch text/plain 10888 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk0YmIyZDVkNjk0MDhh Zjk0ZmRkNTkwYmM0ODAzZDQ5ZmFiODQ5Mi4uOTJjZmUzZmRiYTFhYTI3NjZmZGEwMTJkOTM3ZjE2 MWQ3NTBkYzc2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA4LTA2ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgR3JhcGhp Y3NMYXllckFuaW1hdGlvbiBzaG91bGRuJ3QgdXNlIEhhc2hNYXA8U3RyaW5nPgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMyODQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgYSB2ZWN0b3IgY29udGFp bmluZyBhbGwgdGhlIGFuaW1hdGlvbnMgaW5zdGVhZCBvZiBhIG1hcCBvZiBTdHJpbmcgdG8gVmVj dG9yLgorICAgICAgICBUaGUgSGFzaE1hcCBjb250YWlucyB2ZXJ5IGZldyBlbGVtZW50cywgd2hp Y2ggbWFrZXMgaXQgaW5lZmZpY2llbnQgcmVsYXRpdmVseSB0byBhIHZlY3Rvci4KKyAgICAgICAg VGhpcyBoYXMgYmVlbiBzaG93biB0byBiZSBhIGJvdHRsZW5lY2sgaW4gdmFsZ3JpbmQuCisKKyAg ICAgICAgQ292ZXJlZCBieSBleGlzdGluZyBhbmltYXRpb24gdGVzdHMuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJBbmltYXRpb246OkdyYXBoaWNzTGF5ZXJBbmltYXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckFuaW1hdGlvbnM6Omhhc0FjdGl2ZUFuaW1h dGlvbnNPZlR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckFuaW1hdGlvbnM6 Omhhc1J1bm5pbmdBbmltYXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJB bmltYXRpb25zOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckFuaW1hdGlv bnM6OnBhdXNlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJBbmltYXRpb25zOjpy ZW1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckFuaW1hdGlvbnM6OmFwcGx5 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQW5pbWF0aW9uLmg6 CisgICAgICAgIChHcmFwaGljc0xheWVyQW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJBbmltYXRpb246Om5hbWUpOgorICAgICAgICAoR3JhcGhpY3NMYXllckFuaW1h dGlvbnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlcjo6YWRkQW5pbWF0aW9uKToKKwogMjAxMi0wOC0wNCAgRGFuIEJlcm5zdGVpbiAgPG1p dHpAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMTg3NTc5NT4gUkVHUkVT U0lPTiAodGlsZWQgZHJhd2luZyk6IFBhZ2XigJlzIHNjcm9sbCBiYXJzIGZsYXNoIHdpdGggZWFj aCBjaGFyYWN0ZXIgeW91IHR5cGUgaW4gYSB0ZXh0YXJlYSAoYWZmZWN0cyBXaWtpcGVkaWEgYW5k IFlvdVR1YmUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjhlYmQ5MzUyZGYxZjdhYWEzZWI5MzA5MDRhMTM1YWVi MThkNGQyNy4uNDMzNWQyZTgzOTk3OWM2YTlhOGNlNTI0NDk0ZTIxNzg0M2ZhMzQ1ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDEyLTA4LTA2ICBObydhbSBSb3NlbnRoYWwgIDxub2Ft LnJvc2VudGhhbEBub2tpYS5jb20+CiAKKyAgICAgICAgR3JhcGhpY3NMYXllckFuaW1hdGlvbiBz aG91bGRuJ3QgdXNlIEhhc2hNYXA8U3RyaW5nPgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMyODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBcHBseSB0aGUgY2hhbmdlcyB0byBHcmFwaGljc0xheWVyQW5p bWF0aW9uIEFQSS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdy YXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD b29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmFkZEFuaW1hdGlvbik6CisKKzIwMTItMDgtMDYgIE5v J2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKwogICAgICAgICBbUXRd IFVzZSBHcmFwaGljc0xheWVyQW5pbWF0aW9uIGluIExheWVyVHJlZUNvb3JkaW5hdG9yCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzE0NwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQW5p bWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5 ZXJBbmltYXRpb24uY3BwCmluZGV4IGZjNzRkNDU1MTg2NzM0MTcwN2FjMjhmMWE4Y2M5NDVhMDFk ZDk3NGMuLjU0YjNlMmQ2MmE0YmNjOGU0ZDI1MTdjN2E5MDIxZjRmYTAxN2RlNDIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5 ZXJBbmltYXRpb24uY3BwCkBAIC0xNTUsMTAgKzE1NSwxMSBAQCBzdGF0aWMgVHJhbnNmb3JtYXRp b25NYXRyaXggYXBwbHlUcmFuc2Zvcm1BbmltYXRpb24oY29uc3QgVHJhbnNmb3JtT3BlcmF0aW9u cyogZgogfQogCiAKLUdyYXBoaWNzTGF5ZXJBbmltYXRpb246OkdyYXBoaWNzTGF5ZXJBbmltYXRp b24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIGtleWZyYW1lcywgY29uc3QgSW50U2l6ZSYgYm94 U2l6ZSwgY29uc3QgQW5pbWF0aW9uKiBhbmltYXRpb24sIGRvdWJsZSB0aW1lT2Zmc2V0LCBib29s IGxpc3RzTWF0Y2gpCitHcmFwaGljc0xheWVyQW5pbWF0aW9uOjpHcmFwaGljc0xheWVyQW5pbWF0 aW9uKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIGtleWZyYW1l cywgY29uc3QgSW50U2l6ZSYgYm94U2l6ZSwgY29uc3QgQW5pbWF0aW9uKiBhbmltYXRpb24sIGRv dWJsZSB0aW1lT2Zmc2V0LCBib29sIGxpc3RzTWF0Y2gpCiAgICAgOiBtX2tleWZyYW1lcyhrZXlm cmFtZXMpCiAgICAgLCBtX2JveFNpemUoYm94U2l6ZSkKICAgICAsIG1fYW5pbWF0aW9uKEFuaW1h dGlvbjo6Y3JlYXRlKGFuaW1hdGlvbikpCisgICAgLCBtX25hbWUobmFtZSkKICAgICAsIG1fbGlz dHNNYXRjaChsaXN0c01hdGNoKQogICAgICwgbV9zdGFydFRpbWUoV1RGOjpjdXJyZW50VGltZSgp IC0gdGltZU9mZnNldCkKICAgICAsIG1fcGF1c2VUaW1lKDApCkBAIC0xOTAsMjYgKzE5MSwxOCBA QCBib29sIEdyYXBoaWNzTGF5ZXJBbmltYXRpb246OmlzQWN0aXZlKCkgY29uc3QKIAogYm9vbCBH cmFwaGljc0xheWVyQW5pbWF0aW9uczo6aGFzQWN0aXZlQW5pbWF0aW9uc09mVHlwZShBbmltYXRl ZFByb3BlcnR5SUQgdHlwZSkgY29uc3QKIHsKLSAgICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPEdy YXBoaWNzTGF5ZXJBbmltYXRpb24+ID46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fYW5pbWF0aW9u cy5lbmQoKTsKLSAgICBmb3IgKEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8R3JhcGhpY3NMYXllckFu aW1hdGlvbj4gPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX2FuaW1hdGlvbnMuYmVnaW4oKTsgaXQg IT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0 aW9uPiYgYW5pbWF0aW9ucyA9IGl0LT5zZWNvbmQ7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgYW5pbWF0aW9ucy5zaXplKCk7ICsraSkgewotICAgICAgICAgICAgaWYgKGFuaW1hdGlv bnNbaV0uaXNBY3RpdmUoKSAmJiBhbmltYXRpb25zW2ldLnByb3BlcnR5KCkgPT0gdHlwZSkKLSAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQorICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgbV9hbmltYXRpb25zLnNpemUoKTsgKytpKSB7CisgICAgICAgIGlmIChtX2FuaW1h dGlvbnNbaV0uaXNBY3RpdmUoKSAmJiBtX2FuaW1hdGlvbnNbaV0ucHJvcGVydHkoKSA9PSB0eXBl KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKIH0K IAogYm9vbCBHcmFwaGljc0xheWVyQW5pbWF0aW9uczo6aGFzUnVubmluZ0FuaW1hdGlvbnMoKSBj b25zdAogewotICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8R3JhcGhpY3NMYXllckFuaW1hdGlv bj4gPjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOwotICAgIGZvciAo SGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0aW9uPiA+Ojpjb25zdF9p dGVyYXRvciBpdCA9IG1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAg ICAgICAgY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5ZXJBbmltYXRpb24+JiBhbmltYXRpb25zID0g aXQtPnNlY29uZDsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhbmltYXRpb25zLnNp emUoKTsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoYW5pbWF0aW9uc1tpXS5zdGF0ZSgpID09IEdy YXBoaWNzTGF5ZXJBbmltYXRpb246OlBsYXlpbmdTdGF0ZSkKLSAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKLSAgICAgICAgfQorICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9hbmltYXRp b25zLnNpemUoKTsgKytpKSB7CisgICAgICAgIGlmIChtX2FuaW1hdGlvbnNbaV0uc3RhdGUoKSA9 PSBHcmFwaGljc0xheWVyQW5pbWF0aW9uOjpQbGF5aW5nU3RhdGUpCisgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9CiAKICAgICByZXR1cm4gZmFsc2U7CkBAIC0yNjQsMzYgKzI1NywzMSBA QCB2b2lkIEdyYXBoaWNzTGF5ZXJBbmltYXRpb246OnBhdXNlKGRvdWJsZSBvZmZzZXQpCiAgICAg bV9wYXVzZVRpbWUgPSBXVEY6OmN1cnJlbnRUaW1lKCkgLSBvZmZzZXQ7CiB9CiAKLXZvaWQgR3Jh cGhpY3NMYXllckFuaW1hdGlvbnM6OmFkZChjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IEdyYXBo aWNzTGF5ZXJBbmltYXRpb24mIGFuaW1hdGlvbikKK3ZvaWQgR3JhcGhpY3NMYXllckFuaW1hdGlv bnM6OmFkZChjb25zdCBHcmFwaGljc0xheWVyQW5pbWF0aW9uJiBhbmltYXRpb24pCiB7Ci0gICAg SGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0aW9uPiA+OjppdGVyYXRv ciBpdCA9IG1fYW5pbWF0aW9ucy5maW5kKG5hbWUpOwotICAgIGlmIChpdCAhPSBtX2FuaW1hdGlv bnMuZW5kKCkpIHsKLSAgICAgICAgaXQtPnNlY29uZC5hcHBlbmQoYW5pbWF0aW9uKTsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KLQotICAgIFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0aW9uPiBh bmltYXRpb25zOwotICAgIGFuaW1hdGlvbnMuYXBwZW5kKGFuaW1hdGlvbik7Ci0gICAgbV9hbmlt YXRpb25zLmFkZChuYW1lLCBhbmltYXRpb25zKTsKKyAgICBtX2FuaW1hdGlvbnMuYXBwZW5kKGFu aW1hdGlvbik7CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckFuaW1hdGlvbnM6OnBhdXNlKGNvbnN0 IFN0cmluZyYgbmFtZSwgZG91YmxlIG9mZnNldCkKIHsKLSAgICBIYXNoTWFwPFN0cmluZywgVmVj dG9yPEdyYXBoaWNzTGF5ZXJBbmltYXRpb24+ID46Oml0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25z LmZpbmQobmFtZSk7Ci0gICAgaWYgKGl0ID09IG1fYW5pbWF0aW9ucy5lbmQoKSkKLSAgICAgICAg cmV0dXJuOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9hbmltYXRpb25zLnNpemUoKTsg KytpKSB7CisgICAgICAgIGlmIChtX2FuaW1hdGlvbnNbaV0ubmFtZSgpID09IG5hbWUpCisgICAg ICAgICAgICBtX2FuaW1hdGlvbnNbaV0ucGF1c2Uob2Zmc2V0KTsKKyAgICB9Cit9CiAKLSAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGl0LT5zZWNvbmQuc2l6ZSgpOyBpKyspIAotICAgICAgICBp dC0+c2Vjb25kW2ldLnBhdXNlKG9mZnNldCk7Cit2b2lkIEdyYXBoaWNzTGF5ZXJBbmltYXRpb25z OjpyZW1vdmUoY29uc3QgU3RyaW5nJiBuYW1lKQoreworICAgIGZvciAoaW50IGkgPSBtX2FuaW1h dGlvbnMuc2l6ZSgpOyBpID49IDA7IC0taSkgeworICAgICAgICBpZiAobV9hbmltYXRpb25zW2ld Lm5hbWUoKSA9PSBuYW1lKQorICAgICAgICAgICAgbV9hbmltYXRpb25zLnJlbW92ZShpKTsKKyAg ICB9CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckFuaW1hdGlvbnM6OmFwcGx5KEdyYXBoaWNzTGF5 ZXJBbmltYXRpb246OkNsaWVudCogY2xpZW50KQogewotICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0 b3I8R3JhcGhpY3NMYXllckFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25z LmVuZCgpOwotICAgIGZvciAoSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxHcmFwaGljc0xheWVyQW5p bWF0aW9uPiA+OjppdGVyYXRvciBpdCA9IG1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBlbmQ7 ICsraXQpIHsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBpdC0+c2Vjb25kLnNpemUo KTsgKytpKQotICAgICAgICAgICAgaXQtPnNlY29uZFtpXS5hcHBseShjbGllbnQpOwotICAgIH0K KyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fYW5pbWF0aW9ucy5zaXplKCk7ICsraSkKKyAg ICAgICAgbV9hbmltYXRpb25zW2ldLmFwcGx5KGNsaWVudCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRpb24u aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRp b24uaAppbmRleCBlNDk4MzJlZjMxYjJmYmUyYWE3MTc3YmNmMDNjYWUyNThiYzVjZmQ3Li5lNTgy NzljNmFjODBkN2E2NTk5YWM3NDhiNjZlZjJhNzIzNDEzMTlkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQW5pbWF0aW9uLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllckFuaW1hdGlvbi5o CkBAIC00MSwxMyArNDEsMTQgQEAgcHVibGljOgogICAgIEdyYXBoaWNzTGF5ZXJBbmltYXRpb24o KQogICAgICAgICA6IG1fa2V5ZnJhbWVzKEFuaW1hdGVkUHJvcGVydHlJbnZhbGlkKQogICAgIHsg fQotICAgIEdyYXBoaWNzTGF5ZXJBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmLCBj b25zdCBJbnRTaXplJiwgY29uc3QgQW5pbWF0aW9uKiwgZG91YmxlLCBib29sKTsKKyAgICBHcmFw aGljc0xheWVyQW5pbWF0aW9uKGNvbnN0IFN0cmluZyYsIGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0 JiwgY29uc3QgSW50U2l6ZSYsIGNvbnN0IEFuaW1hdGlvbiosIGRvdWJsZSwgYm9vbCk7CiAgICAg dm9pZCBhcHBseShDbGllbnQqKTsKICAgICB2b2lkIHBhdXNlKGRvdWJsZSk7CiAgICAgQW5pbWF0 aW9uU3RhdGUgc3RhdGUoKSBjb25zdCB7IHJldHVybiBtX3N0YXRlOyB9CiAgICAgdm9pZCBzZXRT dGF0ZShBbmltYXRpb25TdGF0ZSBzKSB7IG1fc3RhdGUgPSBzOyB9CiAgICAgQW5pbWF0ZWRQcm9w ZXJ0eUlEIHByb3BlcnR5KCkgY29uc3QgeyByZXR1cm4gbV9rZXlmcmFtZXMucHJvcGVydHkoKTsg fQogICAgIGJvb2wgaXNBY3RpdmUoKSBjb25zdDsKKyAgICBTdHJpbmcgbmFtZSgpIGNvbnN0IHsg cmV0dXJuIG1fbmFtZTsgfQogCiBwcml2YXRlOgogICAgIHZvaWQgYXBwbHlJbnRlcm5hbChDbGll bnQqLCBjb25zdCBBbmltYXRpb25WYWx1ZSogZnJvbSwgY29uc3QgQW5pbWF0aW9uVmFsdWUqIHRv LCBmbG9hdCBwcm9ncmVzcyk7CkBAIC02Niw4ICs2Nyw4IEBAIGNsYXNzIEdyYXBoaWNzTGF5ZXJB bmltYXRpb25zIHsKIHB1YmxpYzoKICAgICBHcmFwaGljc0xheWVyQW5pbWF0aW9ucygpIHsgfQog Ci0gICAgdm9pZCBhZGQoY29uc3QgU3RyaW5nJiwgY29uc3QgR3JhcGhpY3NMYXllckFuaW1hdGlv biYpOwotICAgIHZvaWQgcmVtb3ZlKGNvbnN0IFN0cmluZyYgbmFtZSkgeyBtX2FuaW1hdGlvbnMu cmVtb3ZlKG5hbWUpOyB9CisgICAgdm9pZCBhZGQoY29uc3QgR3JhcGhpY3NMYXllckFuaW1hdGlv biYpOworICAgIHZvaWQgcmVtb3ZlKGNvbnN0IFN0cmluZyYgbmFtZSk7CiAgICAgdm9pZCBwYXVz ZShjb25zdCBTdHJpbmcmLCBkb3VibGUpOwogICAgIHZvaWQgYXBwbHkoR3JhcGhpY3NMYXllckFu aW1hdGlvbjo6Q2xpZW50Kik7CiAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9h bmltYXRpb25zLmlzRW1wdHkoKTsgfQpAQCAtNzYsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAgYm9v bCBoYXNBY3RpdmVBbmltYXRpb25zT2ZUeXBlKEFuaW1hdGVkUHJvcGVydHlJRCB0eXBlKSBjb25z dDsKIAogcHJpdmF0ZToKLSAgICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPEdyYXBoaWNzTGF5ZXJB bmltYXRpb24+ID4gbV9hbmltYXRpb25zOworICAgIFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0 aW9uPiBtX2FuaW1hdGlvbnM7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0 dXJlTWFwcGVyLmNwcAppbmRleCBmNzM1ZGUyYjNjZjgwZjJlMjc0YTVlOGVmNDFhYzBlNmMyN2U0 ODQ0Li5mMjA1MWVjYjZlYzYwODUzMzRlMDYzZjA4OWVjMjNmYzEzYjc0ODJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTM3OCw3ICszNzgsNyBAQCBi b29sIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjphZGRBbmltYXRpb24oY29uc3QgS2V5ZnJh bWVWYWx1ZUxpc3QmIHZhbHVlTGlzdAogICAgIGlmICh2YWx1ZUxpc3QucHJvcGVydHkoKSA9PSBB bmltYXRlZFByb3BlcnR5V2Via2l0VHJhbnNmb3JtKQogICAgICAgICBsaXN0c01hdGNoID0gdmFs aWRhdGVUcmFuc2Zvcm1PcGVyYXRpb25zKHZhbHVlTGlzdCwgaGFzQmlnUm90YXRpb24pID49IDA7 CiAKLSAgICBtX2FuaW1hdGlvbnMuYWRkKGtleWZyYW1lc05hbWUsIEdyYXBoaWNzTGF5ZXJBbmlt YXRpb24odmFsdWVMaXN0LCBib3hTaXplLCBhbmltLCB0aW1lT2Zmc2V0LCBsaXN0c01hdGNoKSk7 CisgICAgbV9hbmltYXRpb25zLmFkZChHcmFwaGljc0xheWVyQW5pbWF0aW9uKGtleWZyYW1lc05h bWUsIHZhbHVlTGlzdCwgYm94U2l6ZSwgYW5pbSwgdGltZU9mZnNldCwgbGlzdHNNYXRjaCkpOwog ICAgIG5vdGlmeUNoYW5nZShUZXh0dXJlTWFwcGVyTGF5ZXI6OkFuaW1hdGlvbkNoYW5nZSk7CiAg ICAgbV9hbmltYXRpb25TdGFydGVkVGltZXIuc3RhcnRPbmVTaG90KDApOwogICAgIHJldHVybiB0 cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3Jh cGhpY3NMYXllci5jcHAKaW5kZXggOWIyOGY1YWMxMDY1MzJjYmE2NWRmN2NlZmI2NDEwODZkODYw Nzg2YS4uOGE1ZTViM2NlYjFiZDE1ZjA3Nzc3ZDI3NjE4NDY5MmVkZjgwMGY4YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIu Y3BwCkBAIC03OTQsNyArNzk0LDcgQEAgYm9vbCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmFk ZEFuaW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVMaXN0LAogICAgIGlmICh2 YWx1ZUxpc3QucHJvcGVydHkoKSA9PSBBbmltYXRlZFByb3BlcnR5V2Via2l0VHJhbnNmb3JtKQog ICAgICAgICBsaXN0c01hdGNoID0gdmFsaWRhdGVUcmFuc2Zvcm1PcGVyYXRpb25zKHZhbHVlTGlz dCwgaGFzQmlnUm90YXRpb24pID49IDA7CiAKLSAgICBtX2FuaW1hdGlvbnMuYWRkKGtleWZyYW1l c05hbWUsIEdyYXBoaWNzTGF5ZXJBbmltYXRpb24odmFsdWVMaXN0LCBib3hTaXplLCBhbmltLCB0 aW1lT2Zmc2V0LCBsaXN0c01hdGNoKSk7CisgICAgbV9hbmltYXRpb25zLmFkZChHcmFwaGljc0xh eWVyQW5pbWF0aW9uKGtleWZyYW1lc05hbWUsIHZhbHVlTGlzdCwgYm94U2l6ZSwgYW5pbSwgdGlt ZU9mZnNldCwgbGlzdHNNYXRjaCkpOwogICAgIG1fYW5pbWF0aW9uU3RhcnRlZFRpbWVyLnN0YXJ0 T25lU2hvdCgwKTsKICAgICBkaWRDaGFuZ2VMYXllclN0YXRlKCk7CiAgICAgcmV0dXJuIHRydWU7 Cg== 156936 2012-08-07 07:19:09 -0700 2012-08-07 12:49:27 -0700 Patch for landing bug-93284-20120807071844.patch text/plain 10826 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Nzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU0NzgwZWM0NzUzZDU5 ZTY1NGJhOWNhNDQ0NjliMGE3ZTk0OGYxZi4uYzAxNDk2MDY5ZDRhNzQ0NTQzY2IxNmNkMDAzYWFi ODBlYjA2ZjQ5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA4LTA2ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgR3JhcGhp Y3NMYXllckFuaW1hdGlvbiBzaG91bGRuJ3QgdXNlIEhhc2hNYXA8U3RyaW5nPgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMyODQKKworICAgICAgICBS ZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAgICBVc2UgYSB2 ZWN0b3IgY29udGFpbmluZyBhbGwgdGhlIGFuaW1hdGlvbnMgaW5zdGVhZCBvZiBhIG1hcCBvZiBT dHJpbmcgdG8gVmVjdG9yLgorICAgICAgICBUaGUgSGFzaE1hcCBjb250YWlucyB2ZXJ5IGZldyBl bGVtZW50cywgd2hpY2ggbWFrZXMgaXQgaW5lZmZpY2llbnQgcmVsYXRpdmVseSB0byBhIHZlY3Rv ci4KKyAgICAgICAgVGhpcyBoYXMgYmVlbiBzaG93biB0byBiZSBhIGJvdHRsZW5lY2sgaW4gdmFs Z3JpbmQuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyBhbmltYXRpb24gdGVzdHMuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQW5pbWF0aW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJBbmltYXRpb246OkdyYXBoaWNzTGF5ZXJB bmltYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckFuaW1hdGlvbnM6Omhh c0FjdGl2ZUFuaW1hdGlvbnNPZlR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXll ckFuaW1hdGlvbnM6Omhhc1J1bm5pbmdBbmltYXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJBbmltYXRpb25zOjphZGQpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NM YXllckFuaW1hdGlvbnM6OnBhdXNlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJB bmltYXRpb25zOjpyZW1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckFuaW1h dGlvbnM6OmFwcGx5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVy QW5pbWF0aW9uLmg6CisgICAgICAgIChHcmFwaGljc0xheWVyQW5pbWF0aW9uKToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJBbmltYXRpb246Om5hbWUpOgorICAgICAgICAoR3JhcGhp Y3NMYXllckFuaW1hdGlvbnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9H cmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlcjo6YWRkQW5pbWF0aW9uKToKKwogMjAxMi0wNy0zMSAgT2phbiBW YWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIG5lZWQgdGVzdHMgdG8gZW5zdXJl IGZsZXhib3hlcyBwbGF5IG5pY2VseSB3aXRoIGJveC1zaXppbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA5ZTE3 Y2VkZjUwZDE2Y2I2NzBiYjMyOWNjYzU5YjkzM2JkZjRkMmUzLi5jMWRjMTM3NzE1MjI4M2RlNmQ5 YTAzNjMyYzdlY2I5NjUwZDA2M2I4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTIt MDgtMDYgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KIAorICAg ICAgICBHcmFwaGljc0xheWVyQW5pbWF0aW9uIHNob3VsZG4ndCB1c2UgSGFzaE1hcDxTdHJpbmc+ CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzI4NAor CisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAg ICAgIEFwcGx5IHRoZSBjaGFuZ2VzIHRvIEdyYXBoaWNzTGF5ZXJBbmltYXRpb24gQVBJLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhp Y3NMYXllcjo6YWRkQW5pbWF0aW9uKToKKworMjAxMi0wOC0wNiAgTm8nYW0gUm9zZW50aGFsICA8 bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCiAgICAgICAgIFtRdF0gVXNlIEdyYXBoaWNzTGF5 ZXJBbmltYXRpb24gaW4gTGF5ZXJUcmVlQ29vcmRpbmF0b3IKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMTQ3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllckFuaW1hdGlvbi5jcHAK aW5kZXggZmM3NGQ0NTUxODY3MzQxNzA3YWMyOGYxYThjYzk0NWEwMWRkOTc0Yy4uZTA4MTNkZmVj NzgxYzVjYzBhNjJiYWE1YzkwMmViOTg0ODVjODc1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllckFuaW1hdGlvbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllckFuaW1hdGlvbi5jcHAK QEAgLTE1NSwxMCArMTU1LDExIEBAIHN0YXRpYyBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBhcHBseVRy YW5zZm9ybUFuaW1hdGlvbihjb25zdCBUcmFuc2Zvcm1PcGVyYXRpb25zKiBmCiB9CiAKIAotR3Jh cGhpY3NMYXllckFuaW1hdGlvbjo6R3JhcGhpY3NMYXllckFuaW1hdGlvbihjb25zdCBLZXlmcmFt ZVZhbHVlTGlzdCYga2V5ZnJhbWVzLCBjb25zdCBJbnRTaXplJiBib3hTaXplLCBjb25zdCBBbmlt YXRpb24qIGFuaW1hdGlvbiwgZG91YmxlIHRpbWVPZmZzZXQsIGJvb2wgbGlzdHNNYXRjaCkKK0dy YXBoaWNzTGF5ZXJBbmltYXRpb246OkdyYXBoaWNzTGF5ZXJBbmltYXRpb24oY29uc3QgU3RyaW5n JiBuYW1lLCBjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYga2V5ZnJhbWVzLCBjb25zdCBJbnRTaXpl JiBib3hTaXplLCBjb25zdCBBbmltYXRpb24qIGFuaW1hdGlvbiwgZG91YmxlIHRpbWVPZmZzZXQs IGJvb2wgbGlzdHNNYXRjaCkKICAgICA6IG1fa2V5ZnJhbWVzKGtleWZyYW1lcykKICAgICAsIG1f Ym94U2l6ZShib3hTaXplKQogICAgICwgbV9hbmltYXRpb24oQW5pbWF0aW9uOjpjcmVhdGUoYW5p bWF0aW9uKSkKKyAgICAsIG1fbmFtZShuYW1lKQogICAgICwgbV9saXN0c01hdGNoKGxpc3RzTWF0 Y2gpCiAgICAgLCBtX3N0YXJ0VGltZShXVEY6OmN1cnJlbnRUaW1lKCkgLSB0aW1lT2Zmc2V0KQog ICAgICwgbV9wYXVzZVRpbWUoMCkKQEAgLTE5MCwyNiArMTkxLDE4IEBAIGJvb2wgR3JhcGhpY3NM YXllckFuaW1hdGlvbjo6aXNBY3RpdmUoKSBjb25zdAogCiBib29sIEdyYXBoaWNzTGF5ZXJBbmlt YXRpb25zOjpoYXNBY3RpdmVBbmltYXRpb25zT2ZUeXBlKEFuaW1hdGVkUHJvcGVydHlJRCB0eXBl KSBjb25zdAogewotICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8R3JhcGhpY3NMYXllckFuaW1h dGlvbj4gPjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOwotICAgIGZv ciAoSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0aW9uPiA+Ojpjb25z dF9pdGVyYXRvciBpdCA9IG1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsK LSAgICAgICAgY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5ZXJBbmltYXRpb24+JiBhbmltYXRpb25z ID0gaXQtPnNlY29uZDsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhbmltYXRpb25z LnNpemUoKTsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoYW5pbWF0aW9uc1tpXS5pc0FjdGl2ZSgp ICYmIGFuaW1hdGlvbnNbaV0ucHJvcGVydHkoKSA9PSB0eXBlKQotICAgICAgICAgICAgICAgIHJl dHVybiB0cnVlOwotICAgICAgICB9CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2FuaW1h dGlvbnMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgaWYgKG1fYW5pbWF0aW9uc1tpXS5pc0FjdGl2 ZSgpICYmIG1fYW5pbWF0aW9uc1tpXS5wcm9wZXJ0eSgpID09IHR5cGUpCisgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCiBib29sIEdyYXBoaWNz TGF5ZXJBbmltYXRpb25zOjpoYXNSdW5uaW5nQW5pbWF0aW9ucygpIGNvbnN0CiB7Ci0gICAgSGFz aE1hcDxTdHJpbmcsIFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0aW9uPiA+Ojpjb25zdF9pdGVy YXRvciBlbmQgPSBtX2FuaW1hdGlvbnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoTWFwPFN0cmluZywg VmVjdG9yPEdyYXBoaWNzTGF5ZXJBbmltYXRpb24+ID46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9h bmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBjb25zdCBWZWN0 b3I8R3JhcGhpY3NMYXllckFuaW1hdGlvbj4mIGFuaW1hdGlvbnMgPSBpdC0+c2Vjb25kOwotICAg ICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFuaW1hdGlvbnMuc2l6ZSgpOyArK2kpIHsKLSAg ICAgICAgICAgIGlmIChhbmltYXRpb25zW2ldLnN0YXRlKCkgPT0gR3JhcGhpY3NMYXllckFuaW1h dGlvbjo6UGxheWluZ1N0YXRlKQotICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAg ICB9CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2FuaW1hdGlvbnMuc2l6ZSgpOyArK2kp IHsKKyAgICAgICAgaWYgKG1fYW5pbWF0aW9uc1tpXS5zdGF0ZSgpID09IEdyYXBoaWNzTGF5ZXJB bmltYXRpb246OlBsYXlpbmdTdGF0ZSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K IAogICAgIHJldHVybiBmYWxzZTsKQEAgLTI2NCwzNiArMjU3LDMxIEBAIHZvaWQgR3JhcGhpY3NM YXllckFuaW1hdGlvbjo6cGF1c2UoZG91YmxlIG9mZnNldCkKICAgICBtX3BhdXNlVGltZSA9IFdU Rjo6Y3VycmVudFRpbWUoKSAtIG9mZnNldDsKIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQW5pbWF0 aW9uczo6YWRkKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgR3JhcGhpY3NMYXllckFuaW1hdGlv biYgYW5pbWF0aW9uKQordm9pZCBHcmFwaGljc0xheWVyQW5pbWF0aW9uczo6YWRkKGNvbnN0IEdy YXBoaWNzTGF5ZXJBbmltYXRpb24mIGFuaW1hdGlvbikKIHsKLSAgICBIYXNoTWFwPFN0cmluZywg VmVjdG9yPEdyYXBoaWNzTGF5ZXJBbmltYXRpb24+ID46Oml0ZXJhdG9yIGl0ID0gbV9hbmltYXRp b25zLmZpbmQobmFtZSk7Ci0gICAgaWYgKGl0ICE9IG1fYW5pbWF0aW9ucy5lbmQoKSkgewotICAg ICAgICBpdC0+c2Vjb25kLmFwcGVuZChhbmltYXRpb24pOwotICAgICAgICByZXR1cm47Ci0gICAg fQotCi0gICAgVmVjdG9yPEdyYXBoaWNzTGF5ZXJBbmltYXRpb24+IGFuaW1hdGlvbnM7Ci0gICAg YW5pbWF0aW9ucy5hcHBlbmQoYW5pbWF0aW9uKTsKLSAgICBtX2FuaW1hdGlvbnMuYWRkKG5hbWUs IGFuaW1hdGlvbnMpOworICAgIG1fYW5pbWF0aW9ucy5hcHBlbmQoYW5pbWF0aW9uKTsKIH0KIAog dm9pZCBHcmFwaGljc0xheWVyQW5pbWF0aW9uczo6cGF1c2UoY29uc3QgU3RyaW5nJiBuYW1lLCBk b3VibGUgb2Zmc2V0KQogewotICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8R3JhcGhpY3NMYXll ckFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgaXQgPSBtX2FuaW1hdGlvbnMuZmluZChuYW1lKTsKLSAg ICBpZiAoaXQgPT0gbV9hbmltYXRpb25zLmVuZCgpKQotICAgICAgICByZXR1cm47CisgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBtX2FuaW1hdGlvbnMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAg aWYgKG1fYW5pbWF0aW9uc1tpXS5uYW1lKCkgPT0gbmFtZSkKKyAgICAgICAgICAgIG1fYW5pbWF0 aW9uc1tpXS5wYXVzZShvZmZzZXQpOworICAgIH0KK30KIAotICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgaXQtPnNlY29uZC5zaXplKCk7IGkrKykgCi0gICAgICAgIGl0LT5zZWNvbmRbaV0ucGF1 c2Uob2Zmc2V0KTsKK3ZvaWQgR3JhcGhpY3NMYXllckFuaW1hdGlvbnM6OnJlbW92ZShjb25zdCBT dHJpbmcmIG5hbWUpCit7CisgICAgZm9yIChpbnQgaSA9IG1fYW5pbWF0aW9ucy5zaXplKCkgLSAx OyBpID49IDA7IC0taSkgeworICAgICAgICBpZiAobV9hbmltYXRpb25zW2ldLm5hbWUoKSA9PSBu YW1lKQorICAgICAgICAgICAgbV9hbmltYXRpb25zLnJlbW92ZShpKTsKKyAgICB9CiB9CiAKIHZv aWQgR3JhcGhpY3NMYXllckFuaW1hdGlvbnM6OmFwcGx5KEdyYXBoaWNzTGF5ZXJBbmltYXRpb246 OkNsaWVudCogY2xpZW50KQogewotICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8R3JhcGhpY3NM YXllckFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOwotICAg IGZvciAoSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0aW9uPiA+Ojpp dGVyYXRvciBpdCA9IG1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAg ICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBpdC0+c2Vjb25kLnNpemUoKTsgKytpKQotICAg ICAgICAgICAgaXQtPnNlY29uZFtpXS5hcHBseShjbGllbnQpOwotICAgIH0KKyAgICBmb3IgKHNp emVfdCBpID0gMDsgaSA8IG1fYW5pbWF0aW9ucy5zaXplKCk7ICsraSkKKyAgICAgICAgbV9hbmlt YXRpb25zW2ldLmFwcGx5KGNsaWVudCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uaAppbmRleCBl NDk4MzJlZjMxYjJmYmUyYWE3MTc3YmNmMDNjYWUyNThiYzVjZmQ3Li5lNTgyNzljNmFjODBkN2E2 NTk5YWM3NDhiNjZlZjJhNzIzNDEzMTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQW5pbWF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllckFuaW1hdGlvbi5oCkBAIC00MSwxMyAr NDEsMTQgQEAgcHVibGljOgogICAgIEdyYXBoaWNzTGF5ZXJBbmltYXRpb24oKQogICAgICAgICA6 IG1fa2V5ZnJhbWVzKEFuaW1hdGVkUHJvcGVydHlJbnZhbGlkKQogICAgIHsgfQotICAgIEdyYXBo aWNzTGF5ZXJBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmLCBjb25zdCBJbnRTaXpl JiwgY29uc3QgQW5pbWF0aW9uKiwgZG91YmxlLCBib29sKTsKKyAgICBHcmFwaGljc0xheWVyQW5p bWF0aW9uKGNvbnN0IFN0cmluZyYsIGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiwgY29uc3QgSW50 U2l6ZSYsIGNvbnN0IEFuaW1hdGlvbiosIGRvdWJsZSwgYm9vbCk7CiAgICAgdm9pZCBhcHBseShD bGllbnQqKTsKICAgICB2b2lkIHBhdXNlKGRvdWJsZSk7CiAgICAgQW5pbWF0aW9uU3RhdGUgc3Rh dGUoKSBjb25zdCB7IHJldHVybiBtX3N0YXRlOyB9CiAgICAgdm9pZCBzZXRTdGF0ZShBbmltYXRp b25TdGF0ZSBzKSB7IG1fc3RhdGUgPSBzOyB9CiAgICAgQW5pbWF0ZWRQcm9wZXJ0eUlEIHByb3Bl cnR5KCkgY29uc3QgeyByZXR1cm4gbV9rZXlmcmFtZXMucHJvcGVydHkoKTsgfQogICAgIGJvb2wg aXNBY3RpdmUoKSBjb25zdDsKKyAgICBTdHJpbmcgbmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fbmFt ZTsgfQogCiBwcml2YXRlOgogICAgIHZvaWQgYXBwbHlJbnRlcm5hbChDbGllbnQqLCBjb25zdCBB bmltYXRpb25WYWx1ZSogZnJvbSwgY29uc3QgQW5pbWF0aW9uVmFsdWUqIHRvLCBmbG9hdCBwcm9n cmVzcyk7CkBAIC02Niw4ICs2Nyw4IEBAIGNsYXNzIEdyYXBoaWNzTGF5ZXJBbmltYXRpb25zIHsK IHB1YmxpYzoKICAgICBHcmFwaGljc0xheWVyQW5pbWF0aW9ucygpIHsgfQogCi0gICAgdm9pZCBh ZGQoY29uc3QgU3RyaW5nJiwgY29uc3QgR3JhcGhpY3NMYXllckFuaW1hdGlvbiYpOwotICAgIHZv aWQgcmVtb3ZlKGNvbnN0IFN0cmluZyYgbmFtZSkgeyBtX2FuaW1hdGlvbnMucmVtb3ZlKG5hbWUp OyB9CisgICAgdm9pZCBhZGQoY29uc3QgR3JhcGhpY3NMYXllckFuaW1hdGlvbiYpOworICAgIHZv aWQgcmVtb3ZlKGNvbnN0IFN0cmluZyYgbmFtZSk7CiAgICAgdm9pZCBwYXVzZShjb25zdCBTdHJp bmcmLCBkb3VibGUpOwogICAgIHZvaWQgYXBwbHkoR3JhcGhpY3NMYXllckFuaW1hdGlvbjo6Q2xp ZW50Kik7CiAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9hbmltYXRpb25zLmlz RW1wdHkoKTsgfQpAQCAtNzYsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNBY3RpdmVB bmltYXRpb25zT2ZUeXBlKEFuaW1hdGVkUHJvcGVydHlJRCB0eXBlKSBjb25zdDsKIAogcHJpdmF0 ZToKLSAgICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPEdyYXBoaWNzTGF5ZXJBbmltYXRpb24+ID4g bV9hbmltYXRpb25zOworICAgIFZlY3RvcjxHcmFwaGljc0xheWVyQW5pbWF0aW9uPiBtX2FuaW1h dGlvbnM7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNw cAppbmRleCBmNzM1ZGUyYjNjZjgwZjJlMjc0YTVlOGVmNDFhYzBlNmMyN2U0ODQ0Li5mMjA1MWVj YjZlYzYwODUzMzRlMDYzZjA4OWVjMjNmYzEzYjc0ODJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTM3OCw3ICszNzgsNyBAQCBib29sIEdyYXBoaWNz TGF5ZXJUZXh0dXJlTWFwcGVyOjphZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3Qm IHZhbHVlTGlzdAogICAgIGlmICh2YWx1ZUxpc3QucHJvcGVydHkoKSA9PSBBbmltYXRlZFByb3Bl cnR5V2Via2l0VHJhbnNmb3JtKQogICAgICAgICBsaXN0c01hdGNoID0gdmFsaWRhdGVUcmFuc2Zv cm1PcGVyYXRpb25zKHZhbHVlTGlzdCwgaGFzQmlnUm90YXRpb24pID49IDA7CiAKLSAgICBtX2Fu aW1hdGlvbnMuYWRkKGtleWZyYW1lc05hbWUsIEdyYXBoaWNzTGF5ZXJBbmltYXRpb24odmFsdWVM aXN0LCBib3hTaXplLCBhbmltLCB0aW1lT2Zmc2V0LCBsaXN0c01hdGNoKSk7CisgICAgbV9hbmlt YXRpb25zLmFkZChHcmFwaGljc0xheWVyQW5pbWF0aW9uKGtleWZyYW1lc05hbWUsIHZhbHVlTGlz dCwgYm94U2l6ZSwgYW5pbSwgdGltZU9mZnNldCwgbGlzdHNNYXRjaCkpOwogICAgIG5vdGlmeUNo YW5nZShUZXh0dXJlTWFwcGVyTGF5ZXI6OkFuaW1hdGlvbkNoYW5nZSk7CiAgICAgbV9hbmltYXRp b25TdGFydGVkVGltZXIuc3RhcnRPbmVTaG90KDApOwogICAgIHJldHVybiB0cnVlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5j cHAKaW5kZXggODU4NjMyZjczZmQwM2ZmZTZlNzllNmI2NDMyMGZiYWMwZjQxYTg2YS4uZDUwY2Ux YzFjYWZhNmExMDIwNjVmZTc1N2M3NTcwMGFiNTk5NWU3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRH cmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv Q29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCkBAIC03OTQs NyArNzk0LDcgQEAgYm9vbCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmFkZEFuaW1hdGlvbihj b25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVMaXN0LAogICAgIGlmICh2YWx1ZUxpc3QucHJv cGVydHkoKSA9PSBBbmltYXRlZFByb3BlcnR5V2Via2l0VHJhbnNmb3JtKQogICAgICAgICBsaXN0 c01hdGNoID0gdmFsaWRhdGVUcmFuc2Zvcm1PcGVyYXRpb25zKHZhbHVlTGlzdCwgaWdub3JlZEhh c0JpZ1JvdGF0aW9uKSA+PSAwOwogCi0gICAgbV9hbmltYXRpb25zLmFkZChrZXlmcmFtZXNOYW1l LCBHcmFwaGljc0xheWVyQW5pbWF0aW9uKHZhbHVlTGlzdCwgYm94U2l6ZSwgYW5pbSwgdGltZU9m ZnNldCwgbGlzdHNNYXRjaCkpOworICAgIG1fYW5pbWF0aW9ucy5hZGQoR3JhcGhpY3NMYXllckFu aW1hdGlvbihrZXlmcmFtZXNOYW1lLCB2YWx1ZUxpc3QsIGJveFNpemUsIGFuaW0sIHRpbWVPZmZz ZXQsIGxpc3RzTWF0Y2gpKTsKICAgICBtX2FuaW1hdGlvblN0YXJ0ZWRUaW1lci5zdGFydE9uZVNo b3QoMCk7CiAgICAgZGlkQ2hhbmdlTGF5ZXJTdGF0ZSgpOwogICAgIHJldHVybiB0cnVlOwo=