133065 2014-05-18 23:10:57 -0700 Images missing sometimes with composited clipping layers 2014-12-11 15:32:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bdakin commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1010154 0 simon.fraser 2014-05-18 23:10:57 -0700 Images missing sometimes with composited clipping layers 1010155 1 231678 simon.fraser 2014-05-18 23:14:56 -0700 Created attachment 231678 Patch 1010156 2 simon.fraser 2014-05-18 23:15:21 -0700 <rdar://problem/15224559> 1010196 3 231692 simon.fraser 2014-05-19 08:55:45 -0700 Created attachment 231692 Patch 1010245 4 simon.fraser 2014-05-19 11:34:39 -0700 http://trac.webkit.org/changeset/169053 1054653 5 simon.fraser 2014-12-11 15:32:13 -0800 *** Bug 122784 has been marked as a duplicate of this bug. *** 231678 2014-05-18 23:14:56 -0700 2014-05-19 08:55:40 -0700 Patch bug-133065-20140518231432.patch text/plain 15059 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4OTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTMwN2JjYWMyY2VjZmY5 NGNhYjk1Y2JmZDE4M2Q0MjQ1OTY3ZTA3ZC4uMzA1ZTFlM2I2YmMxYTE4NmQ2NjIwYzc5NmNhOTY2 MGNkN2FkOGFiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQzIEBACiAyMDE0LTA1LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEltYWdlcyBtaXNz aW5nIHNvbWV0aW1lcyB3aXRoIGNvbXBvc2l0ZWQgY2xpcHBpbmcgbGF5ZXJzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMwNjUKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzE1MjI0NTU5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorICAgICAgICAKKyAgICAgICAgV2hlbiBzdXBwb3J0IGZvciBzb2xpZCBjb2xvcnMgb24g bGF5ZXJzIHdhcyBhZGRlZCwgYSBsYXllciB3YXMgY29uc2lkZXJlZCBhIGNhbmRpZGF0ZQorICAg ICAgICBmb3IgdGhlIHNvbGlkIGNvbG9yIG9wdGltaXphdGlvbiB3aXRob3V0IHJlZ2FyZCB0byB3 aGV0aGVyIGl0IGhhZCBkZXNjZW5kZW50IGxheWVycworICAgICAgICB3aXRoICJwYWludHNJbnRv Q29tcG9zaXRlZEFuY2VzdG9yIiByZXF1aXJlbWVudHMuCisgICAgICAgIAorICAgICAgICBGaXgg aGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2VuZGFudExheWVycygpLCByZW5hbWluZyBpdCB0 byBpc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKCkKKyAgICAgICAgYW5kIGhh dmluZyBpdCB0YWtlIGludG8gYWNjb3VudCB3aGV0aGVyIGRlc2NlbmRlbnQgbGF5ZXJzIG5lZWQg dG8gcGFpbnQgaW50byBhbgorICAgICAgICBhbmNlc3Rvci4KKyAgICAgICAgCisgICAgICAgIEFs c28sIHRoaXMgdGVzdCBoYXMgdG8gaGFwcGVuIGFmdGVyIHRob3NlIGRlc2NlbmRlbnQgbGF5ZXJz IGhhdmUgaGFkIHRoZWlyCisgICAgICAgIGNvbXBvc2l0aW5nIHN0YXRlIHVwZGF0ZWQsIHNvIG1v dmUgdGhlIGlzU2ltcGxlQ29udGFpbmVyQ29tcG9zaXRpbmdMYXllcigpIHRvCisgICAgICAgIGEg bmV3IHVwZGF0ZUFmdGVyRGVzY2VuZGVudHMoKSBmdW5jdGlvbiB3aGljaCBpcyBjYWxsZWQgZnJv bSB0aGUgdmFyaW91cworICAgICAgICBwbGFjZXMgd2UgZG8gY29tcG9zaXRpbmctdWRwYXRlLXRy ZWUtd2Fsa3MuCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRpbmcvYmFja2luZy9zb2xpZC1jb2xv ci13aXRoLXBhaW50cy1pbnRvLWFuY2VzdG9yLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNr aW5nOjp1cGRhdGVHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUFmdGVyRGVzY2VuZGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXJCYWNraW5nOjpwYWludHNDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpjb21wb3NpdGVk V2l0aE93bkJhY2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpkZXNjZW5kZW50TGF5ZXJQ YWludHNJbnRvQW5jZXN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5n Ojppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKToKKyAgICAgICAgKFdlYkNv cmU6Omhhc1Zpc2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnQpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpoYXNWaXNpYmxlTm9uQ29tcG9zaXRpbmdE ZXNjZW5kYW50TGF5ZXJzKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRDb21w b3NpdGluZ0xheWVyVHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZUxheWVyVHJlZUdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdEZXNjZW5kYW50R2VvbWV0cnkpOgorCisy MDE0LTA1LTE4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAg ICAgIFVzZSBSZW5kZXJTdHlsZSYgaW4gbW9yZSBwbGFjZXMgaW4gUmVuZGVyTGF5ZXJCYWNraW5n CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMwNjEK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApp bmRleCAyMWNlMjc4YmIwYWMwMWVhNmVmYzU0ZWZhNmQ1Y2U5NTBhZTcwNWFkLi4yOGJkMzQxMTc3 OWFkNTRhYWVhZDk1MWEwNjI5NTY4MTgxNjExMTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtNjcwLDE1ICs2NzAsOCBAQCB2b2lk IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR2VvbWV0cnkoKQogICAgIHVwZGF0ZUJsZW5kTW9k ZShzdHlsZSk7CiAjZW5kaWYKIAotICAgIGJvb2wgaXNTaW1wbGVDb250YWluZXIgPSBpc1NpbXBs ZUNvbnRhaW5lckNvbXBvc2l0aW5nTGF5ZXIoKTsKLSAgICAKICAgICBtX293bmluZ0xheWVyLnVw ZGF0ZURlc2NlbmRhbnREZXBlbmRlbnRGbGFncygpOwogCi0gICAgLy8gbV9ncmFwaGljc0xheWVy IGlzIHRoZSBjb3JyZXNwb25kaW5nIEdyYXBoaWNzTGF5ZXIgZm9yIHRoaXMgUmVuZGVyTGF5ZXIg YW5kIGl0cyBub24tY29tcG9zaXRpbmcKLSAgICAvLyBkZXNjZW5kYW50cy4gU28sIHRoZSB2aXNp YmlsaXR5IGZsYWcgZm9yIG1fZ3JhcGhpY3NMYXllciBzaG91bGQgYmUgdHJ1ZSBpZiB0aGVyZSBh cmUgYW55Ci0gICAgLy8gbm9uLWNvbXBvc2l0aW5nIHZpc2libGUgbGF5ZXJzLgotICAgIG1fZ3Jh cGhpY3NMYXllci0+c2V0Q29udGVudHNWaXNpYmxlKG1fb3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNv bnRlbnQoKSB8fCBoYXNWaXNpYmxlTm9uQ29tcG9zaXRpbmdEZXNjZW5kYW50TGF5ZXJzKCkpOwot CiAgICAgLy8gRklYTUU6IHJlZmxlY3Rpb25zIHNob3VsZCBmb3JjZSB0cmFuc2Zvcm0tc3R5bGUg dG8gYmUgZmxhdCBpbiB0aGUgc3R5bGU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDY5NTkKICAgICBib29sIHByZXNlcnZlczNEID0gc3R5bGUudHJhbnNmb3JtU3R5 bGUzRCgpID09IFRyYW5zZm9ybVN0eWxlM0RQcmVzZXJ2ZTNEICYmICFyZW5kZXJlcigpLmhhc1Jl ZmxlY3Rpb24oKTsKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFByZXNlcnZlczNEKHByZXNlcnZl czNEKTsKQEAgLTk3MiwxNSArOTY1LDIyIEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRh dGVHZW9tZXRyeSgpCiAgICAgLy8gSWYgdGhpcyBsYXllciB3YXMgY3JlYXRlZCBqdXN0IGZvciBj bGlwcGluZyBvciB0byBhcHBseSBwZXJzcGVjdGl2ZSwgaXQgZG9lc24ndCBuZWVkIGl0cyBvd24g YmFja2luZyBzdG9yZS4KICAgICBzZXRSZXF1aXJlc093bkJhY2tpbmdTdG9yZShjb21wb3NpdG9y KCkucmVxdWlyZXNPd25CYWNraW5nU3RvcmUobV9vd25pbmdMYXllciwgY29tcEFuY2VzdG9yLCBl bmNsb3NpbmdSZWxhdGl2ZUNvbXBvc2l0aW5nQm91bmRzLCBhbmNlc3RvckNvbXBvc2l0aW5nQm91 bmRzKSk7CiAKKyAgICB1cGRhdGVBZnRlcldpZGdldFJlc2l6ZSgpOworCisgICAgY29tcG9zaXRv cigpLnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkU3RhdHVzKG1fb3duaW5nTGF5ZXIpOworfQorCit2 b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQWZ0ZXJEZXNjZW5kZW50cygpCit7CiAgICAg Ym9vbCBkaWRVcGRhdGVDb250ZW50c1JlY3QgPSBmYWxzZTsKKyAgICBib29sIGlzU2ltcGxlQ29u dGFpbmVyID0gaXNTaW1wbGVDb250YWluZXJDb21wb3NpdGluZ0xheWVyKCk7CiAgICAgdXBkYXRl RGlyZWN0bHlDb21wb3NpdGVkQ29udGVudHMoaXNTaW1wbGVDb250YWluZXIsIGRpZFVwZGF0ZUNv bnRlbnRzUmVjdCk7CiAgICAgaWYgKCFkaWRVcGRhdGVDb250ZW50c1JlY3QgJiYgbV9ncmFwaGlj c0xheWVyLT51c2VzQ29udGVudHNMYXllcigpKQogICAgICAgICByZXNldENvbnRlbnRzUmVjdCgp OwogCiAgICAgdXBkYXRlRHJhd3NDb250ZW50KGlzU2ltcGxlQ29udGFpbmVyKTsKLSAgICB1cGRh dGVBZnRlcldpZGdldFJlc2l6ZSgpOwogCi0gICAgY29tcG9zaXRvcigpLnVwZGF0ZVNjcm9sbENv b3JkaW5hdGVkU3RhdHVzKG1fb3duaW5nTGF5ZXIpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0 Q29udGVudHNWaXNpYmxlKG1fb3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBpc1Bh aW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKCkpOwogfQogCiB2b2lkIFJlbmRlckxh eWVyQmFja2luZzo6YWRqdXN0QW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kc0ZvckZsb3dUaHJlYWQo TGF5b3V0UmVjdCYgYW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kcywgY29uc3QgUmVuZGVyTGF5ZXIq IGNvbXBvc2l0aW5nQW5jZXN0b3IpIGNvbnN0CkBAIC0xNjgwLDcgKzE2ODAsNyBAQCBib29sIFJl bmRlckxheWVyQmFja2luZzo6cGFpbnRzQ2hpbGRyZW4oKSBjb25zdAogICAgIGlmIChtX293bmlu Z0xheWVyLmhhc1Zpc2libGVDb250ZW50KCkgJiYgbV9vd25pbmdMYXllci5oYXNOb25FbXB0eUNo aWxkUmVuZGVyZXJzKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgaWYgKGhhc1Zpc2li bGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnRMYXllcnMoKSkKKyAgICBpZiAoaXNQYWludERlc3Rp bmF0aW9uRm9yRGVzY2VuZGVudExheWVycygpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAg IHJldHVybiBmYWxzZTsKQEAgLTE3NDQsNyArMTc0NCwxMiBAQCBib29sIFJlbmRlckxheWVyQmFj a2luZzo6aXNTaW1wbGVDb250YWluZXJDb21wb3NpdGluZ0xheWVyKCkgY29uc3QKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2Vu ZGFudChSZW5kZXJMYXllciYgcGFyZW50KQorc3RhdGljIGJvb2wgY29tcG9zaXRlZFdpdGhPd25C YWNraW5nU3RvcmUoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyKQoreworICAgIHJldHVybiBsYXll ci0+aXNDb21wb3NpdGVkKCkgJiYgIWxheWVyLT5iYWNraW5nKCktPnBhaW50c0ludG9Db21wb3Np dGVkQW5jZXN0b3IoKTsKK30KKworc3RhdGljIGJvb2wgZGVzY2VuZGVudExheWVyUGFpbnRzSW50 b0FuY2VzdG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCiB7CiAgICAgLy8gRklYTUU6IFdlIHNob3Vs ZG4ndCBiZSBjYWxsZWQgd2l0aCBhIHN0YWxlIHotb3JkZXIgbGlzdHMuIFNlZSBidWcgODU1MTIu CiAgICAgcGFyZW50LnVwZGF0ZUxheWVyTGlzdHNJZk5lZWRlZCgpOwpAQCAtMTc1Nyw4ICsxNzYy LDggQEAgc3RhdGljIGJvb2wgaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2VuZGFudChSZW5k ZXJMYXllciYgcGFyZW50KQogICAgICAgICBzaXplX3QgbGlzdFNpemUgPSBub3JtYWxGbG93TGlz dC0+c2l6ZSgpOwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXplOyArK2kp IHsKICAgICAgICAgICAgIFJlbmRlckxheWVyKiBjdXJMYXllciA9IG5vcm1hbEZsb3dMaXN0LT5h dChpKTsKLSAgICAgICAgICAgIGlmICghY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgpCi0gICAgICAg ICAgICAgICAgJiYgKGN1ckxheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpIHx8IGhhc1Zpc2libGVO b25Db21wb3NpdGluZ0Rlc2NlbmRhbnQoKmN1ckxheWVyKSkpCisgICAgICAgICAgICBpZiAoIWNv bXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQorICAgICAgICAgICAgICAgICYm IChjdXJMYXllci0+aGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBkZXNjZW5kZW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IoKmN1ckxheWVyKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgICAgIH0KICAgICB9CkBAIC0xNzcyLDggKzE3NzcsOCBAQCBzdGF0aWMgYm9vbCBoYXNWaXNp YmxlTm9uQ29tcG9zaXRpbmdEZXNjZW5kYW50KFJlbmRlckxheWVyJiBwYXJlbnQpCiAgICAgICAg ICAgICBzaXplX3QgbGlzdFNpemUgPSBuZWdaT3JkZXJMaXN0LT5zaXplKCk7CiAgICAgICAgICAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXplOyArK2kpIHsKICAgICAgICAgICAgICAg ICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBuZWdaT3JkZXJMaXN0LT5hdChpKTsKLSAgICAgICAg ICAgICAgICBpZiAoIWN1ckxheWVyLT5pc0NvbXBvc2l0ZWQoKQotICAgICAgICAgICAgICAgICAg ICAmJiAoY3VyTGF5ZXItPmhhc1Zpc2libGVDb250ZW50KCkgfHwgaGFzVmlzaWJsZU5vbkNvbXBv c2l0aW5nRGVzY2VuZGFudCgqY3VyTGF5ZXIpKSkKKyAgICAgICAgICAgICAgICBpZiAoIWNvbXBv c2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQorICAgICAgICAgICAgICAgICAgICAm JiAoY3VyTGF5ZXItPmhhc1Zpc2libGVDb250ZW50KCkgfHwgZGVzY2VuZGVudExheWVyUGFpbnRz SW50b0FuY2VzdG9yKCpjdXJMYXllcikpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMTc4Miw4ICsxNzg3LDggQEAgc3RhdGlj IGJvb2wgaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2VuZGFudChSZW5kZXJMYXllciYgcGFy ZW50KQogICAgICAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gcG9zWk9yZGVyTGlzdC0+c2l6ZSgp OwogICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAg ICAgICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gcG9zWk9yZGVyTGlzdC0+YXQo aSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFjdXJMYXllci0+aXNDb21wb3NpdGVkKCkKLSAgICAg ICAgICAgICAgICAgICAgJiYgKGN1ckxheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpIHx8IGhhc1Zp c2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnQoKmN1ckxheWVyKSkpCisgICAgICAgICAgICAg ICAgaWYgKCFjb21wb3NpdGVkV2l0aE93bkJhY2tpbmdTdG9yZShjdXJMYXllcikKKyAgICAgICAg ICAgICAgICAgICAgJiYgKGN1ckxheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpIHx8IGRlc2NlbmRl bnRMYXllclBhaW50c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTE3OTMsOSArMTc5 OCw5IEBAIHN0YXRpYyBib29sIGhhc1Zpc2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnQoUmVu ZGVyTGF5ZXImIHBhcmVudCkKIH0KIAogLy8gQ29uc2VydmF0aXZlIHRlc3QgZm9yIGhhdmluZyBu byByZW5kZXJlZCBjaGlsZHJlbi4KLWJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpoYXNWaXNpYmxl Tm9uQ29tcG9zaXRpbmdEZXNjZW5kYW50TGF5ZXJzKCkgY29uc3QKK2Jvb2wgUmVuZGVyTGF5ZXJC YWNraW5nOjppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKCkgY29uc3QKIHsK LSAgICByZXR1cm4gaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2VuZGFudChtX293bmluZ0xh eWVyKTsKKyAgICByZXR1cm4gZGVzY2VuZGVudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKG1fb3du aW5nTGF5ZXIpOwogfQogCiBib29sIFJlbmRlckxheWVyQmFja2luZzo6Y29udGFpbnNQYWludGVk Q29udGVudChib29sIGlzU2ltcGxlQ29udGFpbmVyKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4IGE4YTZlYjRjZmZjOTkyMGQ4YmUz ZmY1ODdkZjA0NDU5OTFlMWM3ZDguLjA0MTI3YWZiMzg0Mzc2MmI1OGYzZGZhYzgzODUwZjRhNzNi NjZiYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmgKQEAgLTc1LDggKzc1LDEzIEBAIHB1YmxpYzoKICAgICAKICAgICAvLyBSZXR1cm5zIHRydWUg aWYgbGF5ZXIgY29uZmlndXJhdGlvbiBjaGFuZ2VkLgogICAgIGJvb2wgdXBkYXRlQ29uZmlndXJh dGlvbigpOworCiAgICAgLy8gVXBkYXRlIGdyYXBoaWNzIGxheWVyIHBvc2l0aW9uIGFuZCBib3Vu ZHMuCi0gICAgdm9pZCB1cGRhdGVHZW9tZXRyeSgpOyAvLyBtYWtlIHByaXZhdGUKKyAgICB2b2lk IHVwZGF0ZUdlb21ldHJ5KCk7CisKKyAgICAvLyBVcGRhdGUgc3RhdGUgdGhlIHJlcXVpcmVzIHRo YXQgZGVzY2VuZGFudCBsYXllcnMgaGF2ZSBiZWVuIHVwZGF0ZWQuCisgICAgdm9pZCB1cGRhdGVB ZnRlckRlc2NlbmRlbnRzKCk7CisKICAgICAvLyBVcGRhdGUgY29udGVudHMgYW5kIGNsaXBwaW5n IHN0cnVjdHVyZS4KICAgICB2b2lkIHVwZGF0ZURyYXdzQ29udGVudCgpOwogICAgIApAQCAtMjgy LDcgKzI4Nyw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHJlc2V0Q29udGVudHNSZWN0KCk7CiAK LSAgICBib29sIGhhc1Zpc2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnRMYXllcnMoKSBjb25z dDsKKyAgICBib29sIGlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2NlbmRlbnRMYXllcnMoKSBjb25z dDsKIAogICAgIGJvb2wgc2hvdWxkQ2xpcENvbXBvc2l0ZWRCb3VuZHMoKSBjb25zdDsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApp bmRleCA3ZGU2NjYyZjA4ZTA4NTc1ODQ4YThjNTM0YmY3Nzg3NmU2MGZhY2YzLi5iNDU3MTYwMjEz ZTNiYWFjZjM5OGMzNjgyOWVhZDlhOTJlMDQ1Y2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMTUxNyw2ICsxNTE3LDkg QEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRDb21wb3NpdGluZ0xheWVyVHJl ZShSZW5kZXJMYXllciYgbGF5ZXIsIFZlY3QKIAogICAgICAgICBjaGlsZExheWVyc09mRW5jbG9z aW5nTGF5ZXIuYXBwZW5kKGxheWVyQmFja2luZy0+Y2hpbGRGb3JTdXBlcmxheWVycygpKTsKICAg ICB9CisgICAgCisgICAgaWYgKFJlbmRlckxheWVyQmFja2luZyogbGF5ZXJCYWNraW5nID0gbGF5 ZXIuYmFja2luZygpKQorICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUFmdGVyRGVzY2VuZGVu dHMoKTsKIH0KIAogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRSZWdpb25Db21w b3NpdGluZ0xheWVyVHJlZShSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCogcmVnaW9uLCBWZWN0b3I8 R3JhcGhpY3NMYXllcio+JiBjaGlsZExpc3QsIGludCBkZXB0aCkKQEAgLTE3NTEsNiArMTc1NCw5 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllclRyZWVHZW9tZXRyeShS ZW5kZXJMYXllciYgbGF5ZXIsIGludCBkZXB0CiAgICAgICAgICAgICAgICAgdXBkYXRlTGF5ZXJU cmVlR2VvbWV0cnkoKnBvc1pPcmRlckxpc3QtPmF0KGkpLCBkZXB0aCArIDEpOwogICAgICAgICB9 CiAgICAgfQorCisgICAgaWYgKFJlbmRlckxheWVyQmFja2luZyogbGF5ZXJCYWNraW5nID0gbGF5 ZXIuYmFja2luZygpKQorICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUFmdGVyRGVzY2VuZGVu dHMoKTsKIH0KIAogLy8gUmVjdXJzIGRvd24gdGhlIFJlbmRlckxheWVyIHRyZWUgdW50aWwgaXRz IGZpbmRzIHRoZSBjb21wb3NpdGluZyBkZXNjZW5kYW50cyBvZiBjb21wb3NpdGluZ0FuY2VzdG9y IGFuZCB1cGRhdGVzIHRoZWlyIGdlb21ldHJ5LgpAQCAtMTc2Niw4ICsxNzcyLDEwIEBAIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0Rlc2NlbmRhbnRHZW9tZXRy eShSZW5kZXJMYXllciYgY29tCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGxheWVyQmFj a2luZy0+dXBkYXRlR2VvbWV0cnkoKTsKLSAgICAgICAgICAgIGlmIChjb21wb3NpdGVkQ2hpbGRy ZW5Pbmx5KQorICAgICAgICAgICAgaWYgKGNvbXBvc2l0ZWRDaGlsZHJlbk9ubHkpIHsKKyAgICAg ICAgICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUFmdGVyRGVzY2VuZGVudHMoKTsKICAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAKQEAg LTE4MDIsOSArMTgxMCwxMyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29t cG9zaXRpbmdEZXNjZW5kYW50R2VvbWV0cnkoUmVuZGVyTGF5ZXImIGNvbQogICAgICAgICAgICAg ICAgIHVwZGF0ZUNvbXBvc2l0aW5nRGVzY2VuZGFudEdlb21ldHJ5KGNvbXBvc2l0aW5nQW5jZXN0 b3IsICpwb3NaT3JkZXJMaXN0LT5hdChpKSwgY29tcG9zaXRlZENoaWxkcmVuT25seSk7CiAgICAg ICAgIH0KICAgICB9CisgICAgCisgICAgaWYgKCZsYXllciAhPSAmY29tcG9zaXRpbmdBbmNlc3Rv cikgeworICAgICAgICBpZiAoUmVuZGVyTGF5ZXJCYWNraW5nKiBsYXllckJhY2tpbmcgPSBsYXll ci5iYWNraW5nKCkpCisgICAgICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUFmdGVyRGVzY2Vu ZGVudHMoKTsKKyAgICB9CiB9CiAKLQogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcGFp bnRDb21wb3NpdGVkTGF5ZXJzKGNvbnN0IEludFJlY3QqIGFic1JlY3QpCiB7CiAgICAgcmVjdXJz aXZlUmVwYWludExheWVyKHJvb3RSZW5kZXJMYXllcigpLCBhYnNSZWN0KTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlZWY1 MGM2NzdiZGUzZGQ0MzE5NTU1YWUxNjdiODAyNDQ1YWYzODYyLi4yZGQ5ODk5YzE1MzgwN2Y2MzUx OWI3MWY2OTBmYTIxMmRjNTU4YTI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDUtMTgg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgSW1hZ2Vz IG1pc3Npbmcgc29tZXRpbWVzIHdpdGggY29tcG9zaXRlZCBjbGlwcGluZyBsYXllcnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzA2NQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTUyMjQ1NTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBjb21wb3NpdGluZy9iYWNraW5nL3NvbGlkLWNvbG9yLXdp dGgtcGFpbnRzLWludG8tYW5jZXN0b3ItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICog Y29tcG9zaXRpbmcvYmFja2luZy9zb2xpZC1jb2xvci13aXRoLXBhaW50cy1pbnRvLWFuY2VzdG9y Lmh0bWw6IEFkZGVkLgorCiAyMDE0LTA1LTE2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBhIHN0cmFnZ2xlci4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tpbmcvc29saWQtY29sb3Itd2l0aC1wYWludHMtaW50by1h bmNlc3Rvci1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2luZy9z b2xpZC1jb2xvci13aXRoLXBhaW50cy1pbnRvLWFuY2VzdG9yLWV4cGVjdGVkLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uZDVkOTRiNmVlOTc2OTRiZGFmYjhjMGQ2NTc4ZGNkZjNhNDU3YTYyNgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tpbmcvc29saWQtY29sb3Itd2l0 aC1wYWludHMtaW50by1hbmNlc3Rvci1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsNDggQEAKKzwh RE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgLmNv bnRhaW5lciB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAgICB3 aWR0aDogNDAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDQwMHB4OworICAgICAgICAgICAgYmFj a2dyb3VuZDogZ3JheTsKKyAgICAgICAgICAgIG92ZXJmbG93OiBoaWRkZW47CisgICAgICAgICAg ICB6LWluZGV4OiAxOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuY2xpcHBpbmcgewor ICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAgei1pbmRleDogMzsK KyAgICAgICAgICAgIGxlZnQ6IDUwcHg7CisgICAgICAgICAgICB0b3A6IDUwcHg7CisgICAgICAg ICAgICB3aWR0aDogMzAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDMwMHB4OworICAgICAgICAg ICAgYmFja2dyb3VuZDogdXJsKCcuLi9yZXNvdXJjZXMvc2ltcGxlX2ltYWdlLnBuZycpOworICAg ICAgICAgICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDEwMCU7CisgICAgICAgIH0KKyAgICAgICAg CisgICAgICAgIC5pbm5lciB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAg ICAgICAgICB0b3A6IDUwcHg7CisgICAgICAgICAgICBsZWZ0OiA1MHB4OworICAgICAgICAgICAg aGVpZ2h0OiAyMDBweDsKKyAgICAgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgICAgIGJh Y2tncm91bmQtY29sb3I6IGdyZWVuOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuY29t cG9zaXRlZCB7CisgICAgICAgICAgICAtd2Via2l0LXRyYW5zZm9ybTogdHJhbnNsYXRlWigwKTsK KyAgICAgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGNsYXNz PSJjb250YWluZXIiPgorICAgICAgICA8ZGl2IGNsYXNzPSJjbGlwcGluZyI+CisgICAgICAgICAg ICA8ZGl2IGNsYXNzPSJpbm5lciBjb21wb3NpdGVkIj48L2Rpdj4KKyAgICAgICAgPC9kaXY+Cisg ICAgPC9kaXY+Cis8cHJlIGlkPSJsYXllcnMiPkxheWVyIHRyZWUgZ29lcyBoZXJlIGluIERSVDwv cHJlPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRp bmcvYmFja2luZy9zb2xpZC1jb2xvci13aXRoLXBhaW50cy1pbnRvLWFuY2VzdG9yLmh0bWwgYi9M YXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL3NvbGlkLWNvbG9yLXdpdGgtcGFpbnRzLWlu dG8tYW5jZXN0b3IuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xMGY5NzYwZDA4ZDY5MDk0NTlmOWNjMzllYTJh Yjg0YTFhOWQ0NmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcv YmFja2luZy9zb2xpZC1jb2xvci13aXRoLXBhaW50cy1pbnRvLWFuY2VzdG9yLmh0bWwKQEAgLTAs MCArMSw0OSBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxl PgorICAgICAgICAuY29udGFpbmVyIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsK KyAgICAgICAgICAgIHdpZHRoOiA0MDBweDsKKyAgICAgICAgICAgIGhlaWdodDogNDAwcHg7Cisg ICAgICAgICAgICBiYWNrZ3JvdW5kOiBncmF5OworICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRl bjsKKyAgICAgICAgICAgIHotaW5kZXg6IDE7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAg IC5jbGlwcGluZyB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAg ICB6LWluZGV4OiAzOworICAgICAgICAgICAgbGVmdDogNTBweDsKKyAgICAgICAgICAgIHRvcDog NTBweDsKKyAgICAgICAgICAgIHdpZHRoOiAzMDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMzAw cHg7CisgICAgICAgICAgICBvdmVyZmxvdzogaGlkZGVuOworICAgICAgICAgICAgYmFja2dyb3Vu ZDogdXJsKCcuLi9yZXNvdXJjZXMvc2ltcGxlX2ltYWdlLnBuZycpOworICAgICAgICAgICAgYmFj a2dyb3VuZC1zaXplOiAxMDAlIDEwMCU7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5p bm5lciB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgICAgICB0b3A6 IDUwcHg7CisgICAgICAgICAgICBsZWZ0OiA1MHB4OworICAgICAgICAgICAgaGVpZ2h0OiAyMDBw eDsKKyAgICAgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29s b3I6IGdyZWVuOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuY29tcG9zaXRlZCB7Cisg ICAgICAgICAgICAtd2Via2l0LXRyYW5zZm9ybTogdHJhbnNsYXRlWigwKTsKKyAgICAgICAgfQor ICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGNsYXNzPSJjb250YWluZXIi PgorICAgICAgICA8ZGl2IGNsYXNzPSJjbGlwcGluZyI+CisgICAgICAgICAgICA8ZGl2IGNsYXNz PSJpbm5lciBjb21wb3NpdGVkIj48L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9kaXY+Cis8 cHJlIGlkPSJsYXllcnMiPkxheWVyIHRyZWUgZ29lcyBoZXJlIGluIERSVDwvcHJlPgorPC9ib2R5 PgorPC9odG1sPgo= 231692 2014-05-19 08:55:45 -0700 2014-05-19 11:03:53 -0700 Patch bug-133065-20140519085521.patch text/plain 15120 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MDQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE4Njg0MGQyOTZmZWE0 MzUzZTc0YmVmZTU0YjhhNjRkNmI4OTI5OS4uMDA1M2M2YTc0YjM1NzU1ODA1MDc4ODNiMzNkNmNk NjFmZWIxMGY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQzIEBACiAyMDE0LTA1LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEltYWdlcyBtaXNz aW5nIHNvbWV0aW1lcyB3aXRoIGNvbXBvc2l0ZWQgY2xpcHBpbmcgbGF5ZXJzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMwNjUKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzE1MjI0NTU5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorICAgICAgICAKKyAgICAgICAgV2hlbiBzdXBwb3J0IGZvciBzb2xpZCBjb2xvcnMgb24g bGF5ZXJzIHdhcyBhZGRlZCwgYSBsYXllciB3YXMgY29uc2lkZXJlZCBhIGNhbmRpZGF0ZQorICAg ICAgICBmb3IgdGhlIHNvbGlkIGNvbG9yIG9wdGltaXphdGlvbiB3aXRob3V0IHJlZ2FyZCB0byB3 aGV0aGVyIGl0IGhhZCBkZXNjZW5kZW50IGxheWVycworICAgICAgICB3aXRoICJwYWludHNJbnRv Q29tcG9zaXRlZEFuY2VzdG9yIiByZXF1aXJlbWVudHMuCisgICAgICAgIAorICAgICAgICBGaXgg aGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2VuZGFudExheWVycygpLCByZW5hbWluZyBpdCB0 byBpc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKCkKKyAgICAgICAgYW5kIGhh dmluZyBpdCB0YWtlIGludG8gYWNjb3VudCB3aGV0aGVyIGRlc2NlbmRlbnQgbGF5ZXJzIG5lZWQg dG8gcGFpbnQgaW50byBhbgorICAgICAgICBhbmNlc3Rvci4KKyAgICAgICAgCisgICAgICAgIEFs c28sIHRoaXMgdGVzdCBoYXMgdG8gaGFwcGVuIGFmdGVyIHRob3NlIGRlc2NlbmRlbnQgbGF5ZXJz IGhhdmUgaGFkIHRoZWlyCisgICAgICAgIGNvbXBvc2l0aW5nIHN0YXRlIHVwZGF0ZWQsIHNvIG1v dmUgdGhlIGlzU2ltcGxlQ29udGFpbmVyQ29tcG9zaXRpbmdMYXllcigpIHRvCisgICAgICAgIGEg bmV3IHVwZGF0ZUFmdGVyRGVzY2VuZGVudHMoKSBmdW5jdGlvbiB3aGljaCBpcyBjYWxsZWQgZnJv bSB0aGUgdmFyaW91cworICAgICAgICBwbGFjZXMgd2UgZG8gY29tcG9zaXRpbmctdWRwYXRlLXRy ZWUtd2Fsa3MuCisKKyAgICAgICAgVGVzdDogY29tcG9zaXRpbmcvYmFja2luZy9zb2xpZC1jb2xv ci13aXRoLXBhaW50cy1pbnRvLWFuY2VzdG9yLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNr aW5nOjp1cGRhdGVHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUFmdGVyRGVzY2VuZGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXJCYWNraW5nOjpwYWludHNDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpjb21wb3NpdGVk V2l0aE93bkJhY2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpkZXNjZW5kZW50TGF5ZXJQ YWludHNJbnRvQW5jZXN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5n Ojppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKToKKyAgICAgICAgKFdlYkNv cmU6Omhhc1Zpc2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnQpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpoYXNWaXNpYmxlTm9uQ29tcG9zaXRpbmdE ZXNjZW5kYW50TGF5ZXJzKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXJCYWNraW5nLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRDb21w b3NpdGluZ0xheWVyVHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZUxheWVyVHJlZUdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdEZXNjZW5kYW50R2VvbWV0cnkpOgorCisy MDE0LTA1LTE4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAg ICAgIFVzZSBSZW5kZXJTdHlsZSYgaW4gbW9yZSBwbGFjZXMgaW4gUmVuZGVyTGF5ZXJCYWNraW5n CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMwNjEK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApp bmRleCAyMWNlMjc4YmIwYWMwMWVhNmVmYzU0ZWZhNmQ1Y2U5NTBhZTcwNWFkLi4yOGJkMzQxMTc3 OWFkNTRhYWVhZDk1MWEwNjI5NTY4MTgxNjExMTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtNjcwLDE1ICs2NzAsOCBAQCB2b2lk IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR2VvbWV0cnkoKQogICAgIHVwZGF0ZUJsZW5kTW9k ZShzdHlsZSk7CiAjZW5kaWYKIAotICAgIGJvb2wgaXNTaW1wbGVDb250YWluZXIgPSBpc1NpbXBs ZUNvbnRhaW5lckNvbXBvc2l0aW5nTGF5ZXIoKTsKLSAgICAKICAgICBtX293bmluZ0xheWVyLnVw ZGF0ZURlc2NlbmRhbnREZXBlbmRlbnRGbGFncygpOwogCi0gICAgLy8gbV9ncmFwaGljc0xheWVy IGlzIHRoZSBjb3JyZXNwb25kaW5nIEdyYXBoaWNzTGF5ZXIgZm9yIHRoaXMgUmVuZGVyTGF5ZXIg YW5kIGl0cyBub24tY29tcG9zaXRpbmcKLSAgICAvLyBkZXNjZW5kYW50cy4gU28sIHRoZSB2aXNp YmlsaXR5IGZsYWcgZm9yIG1fZ3JhcGhpY3NMYXllciBzaG91bGQgYmUgdHJ1ZSBpZiB0aGVyZSBh cmUgYW55Ci0gICAgLy8gbm9uLWNvbXBvc2l0aW5nIHZpc2libGUgbGF5ZXJzLgotICAgIG1fZ3Jh cGhpY3NMYXllci0+c2V0Q29udGVudHNWaXNpYmxlKG1fb3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNv bnRlbnQoKSB8fCBoYXNWaXNpYmxlTm9uQ29tcG9zaXRpbmdEZXNjZW5kYW50TGF5ZXJzKCkpOwot CiAgICAgLy8gRklYTUU6IHJlZmxlY3Rpb25zIHNob3VsZCBmb3JjZSB0cmFuc2Zvcm0tc3R5bGUg dG8gYmUgZmxhdCBpbiB0aGUgc3R5bGU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDY5NTkKICAgICBib29sIHByZXNlcnZlczNEID0gc3R5bGUudHJhbnNmb3JtU3R5 bGUzRCgpID09IFRyYW5zZm9ybVN0eWxlM0RQcmVzZXJ2ZTNEICYmICFyZW5kZXJlcigpLmhhc1Jl ZmxlY3Rpb24oKTsKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFByZXNlcnZlczNEKHByZXNlcnZl czNEKTsKQEAgLTk3MiwxNSArOTY1LDIyIEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRh dGVHZW9tZXRyeSgpCiAgICAgLy8gSWYgdGhpcyBsYXllciB3YXMgY3JlYXRlZCBqdXN0IGZvciBj bGlwcGluZyBvciB0byBhcHBseSBwZXJzcGVjdGl2ZSwgaXQgZG9lc24ndCBuZWVkIGl0cyBvd24g YmFja2luZyBzdG9yZS4KICAgICBzZXRSZXF1aXJlc093bkJhY2tpbmdTdG9yZShjb21wb3NpdG9y KCkucmVxdWlyZXNPd25CYWNraW5nU3RvcmUobV9vd25pbmdMYXllciwgY29tcEFuY2VzdG9yLCBl bmNsb3NpbmdSZWxhdGl2ZUNvbXBvc2l0aW5nQm91bmRzLCBhbmNlc3RvckNvbXBvc2l0aW5nQm91 bmRzKSk7CiAKKyAgICB1cGRhdGVBZnRlcldpZGdldFJlc2l6ZSgpOworCisgICAgY29tcG9zaXRv cigpLnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkU3RhdHVzKG1fb3duaW5nTGF5ZXIpOworfQorCit2 b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQWZ0ZXJEZXNjZW5kZW50cygpCit7CiAgICAg Ym9vbCBkaWRVcGRhdGVDb250ZW50c1JlY3QgPSBmYWxzZTsKKyAgICBib29sIGlzU2ltcGxlQ29u dGFpbmVyID0gaXNTaW1wbGVDb250YWluZXJDb21wb3NpdGluZ0xheWVyKCk7CiAgICAgdXBkYXRl RGlyZWN0bHlDb21wb3NpdGVkQ29udGVudHMoaXNTaW1wbGVDb250YWluZXIsIGRpZFVwZGF0ZUNv bnRlbnRzUmVjdCk7CiAgICAgaWYgKCFkaWRVcGRhdGVDb250ZW50c1JlY3QgJiYgbV9ncmFwaGlj c0xheWVyLT51c2VzQ29udGVudHNMYXllcigpKQogICAgICAgICByZXNldENvbnRlbnRzUmVjdCgp OwogCiAgICAgdXBkYXRlRHJhd3NDb250ZW50KGlzU2ltcGxlQ29udGFpbmVyKTsKLSAgICB1cGRh dGVBZnRlcldpZGdldFJlc2l6ZSgpOwogCi0gICAgY29tcG9zaXRvcigpLnVwZGF0ZVNjcm9sbENv b3JkaW5hdGVkU3RhdHVzKG1fb3duaW5nTGF5ZXIpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0 Q29udGVudHNWaXNpYmxlKG1fb3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBpc1Bh aW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKCkpOwogfQogCiB2b2lkIFJlbmRlckxh eWVyQmFja2luZzo6YWRqdXN0QW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kc0ZvckZsb3dUaHJlYWQo TGF5b3V0UmVjdCYgYW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kcywgY29uc3QgUmVuZGVyTGF5ZXIq IGNvbXBvc2l0aW5nQW5jZXN0b3IpIGNvbnN0CkBAIC0xNjgwLDcgKzE2ODAsNyBAQCBib29sIFJl bmRlckxheWVyQmFja2luZzo6cGFpbnRzQ2hpbGRyZW4oKSBjb25zdAogICAgIGlmIChtX293bmlu Z0xheWVyLmhhc1Zpc2libGVDb250ZW50KCkgJiYgbV9vd25pbmdMYXllci5oYXNOb25FbXB0eUNo aWxkUmVuZGVyZXJzKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgaWYgKGhhc1Zpc2li bGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnRMYXllcnMoKSkKKyAgICBpZiAoaXNQYWludERlc3Rp bmF0aW9uRm9yRGVzY2VuZGVudExheWVycygpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAg IHJldHVybiBmYWxzZTsKQEAgLTE3NDQsNyArMTc0NCwxMiBAQCBib29sIFJlbmRlckxheWVyQmFj a2luZzo6aXNTaW1wbGVDb250YWluZXJDb21wb3NpdGluZ0xheWVyKCkgY29uc3QKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2Vu ZGFudChSZW5kZXJMYXllciYgcGFyZW50KQorc3RhdGljIGJvb2wgY29tcG9zaXRlZFdpdGhPd25C YWNraW5nU3RvcmUoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyKQoreworICAgIHJldHVybiBsYXll ci0+aXNDb21wb3NpdGVkKCkgJiYgIWxheWVyLT5iYWNraW5nKCktPnBhaW50c0ludG9Db21wb3Np dGVkQW5jZXN0b3IoKTsKK30KKworc3RhdGljIGJvb2wgZGVzY2VuZGVudExheWVyUGFpbnRzSW50 b0FuY2VzdG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCiB7CiAgICAgLy8gRklYTUU6IFdlIHNob3Vs ZG4ndCBiZSBjYWxsZWQgd2l0aCBhIHN0YWxlIHotb3JkZXIgbGlzdHMuIFNlZSBidWcgODU1MTIu CiAgICAgcGFyZW50LnVwZGF0ZUxheWVyTGlzdHNJZk5lZWRlZCgpOwpAQCAtMTc1Nyw4ICsxNzYy LDggQEAgc3RhdGljIGJvb2wgaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2VuZGFudChSZW5k ZXJMYXllciYgcGFyZW50KQogICAgICAgICBzaXplX3QgbGlzdFNpemUgPSBub3JtYWxGbG93TGlz dC0+c2l6ZSgpOwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXplOyArK2kp IHsKICAgICAgICAgICAgIFJlbmRlckxheWVyKiBjdXJMYXllciA9IG5vcm1hbEZsb3dMaXN0LT5h dChpKTsKLSAgICAgICAgICAgIGlmICghY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgpCi0gICAgICAg ICAgICAgICAgJiYgKGN1ckxheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpIHx8IGhhc1Zpc2libGVO b25Db21wb3NpdGluZ0Rlc2NlbmRhbnQoKmN1ckxheWVyKSkpCisgICAgICAgICAgICBpZiAoIWNv bXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQorICAgICAgICAgICAgICAgICYm IChjdXJMYXllci0+aGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBkZXNjZW5kZW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IoKmN1ckxheWVyKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgICAgIH0KICAgICB9CkBAIC0xNzcyLDggKzE3NzcsOCBAQCBzdGF0aWMgYm9vbCBoYXNWaXNp YmxlTm9uQ29tcG9zaXRpbmdEZXNjZW5kYW50KFJlbmRlckxheWVyJiBwYXJlbnQpCiAgICAgICAg ICAgICBzaXplX3QgbGlzdFNpemUgPSBuZWdaT3JkZXJMaXN0LT5zaXplKCk7CiAgICAgICAgICAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXplOyArK2kpIHsKICAgICAgICAgICAgICAg ICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBuZWdaT3JkZXJMaXN0LT5hdChpKTsKLSAgICAgICAg ICAgICAgICBpZiAoIWN1ckxheWVyLT5pc0NvbXBvc2l0ZWQoKQotICAgICAgICAgICAgICAgICAg ICAmJiAoY3VyTGF5ZXItPmhhc1Zpc2libGVDb250ZW50KCkgfHwgaGFzVmlzaWJsZU5vbkNvbXBv c2l0aW5nRGVzY2VuZGFudCgqY3VyTGF5ZXIpKSkKKyAgICAgICAgICAgICAgICBpZiAoIWNvbXBv c2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQorICAgICAgICAgICAgICAgICAgICAm JiAoY3VyTGF5ZXItPmhhc1Zpc2libGVDb250ZW50KCkgfHwgZGVzY2VuZGVudExheWVyUGFpbnRz SW50b0FuY2VzdG9yKCpjdXJMYXllcikpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMTc4Miw4ICsxNzg3LDggQEAgc3RhdGlj IGJvb2wgaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2VuZGFudChSZW5kZXJMYXllciYgcGFy ZW50KQogICAgICAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gcG9zWk9yZGVyTGlzdC0+c2l6ZSgp OwogICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAg ICAgICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gcG9zWk9yZGVyTGlzdC0+YXQo aSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFjdXJMYXllci0+aXNDb21wb3NpdGVkKCkKLSAgICAg ICAgICAgICAgICAgICAgJiYgKGN1ckxheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpIHx8IGhhc1Zp c2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnQoKmN1ckxheWVyKSkpCisgICAgICAgICAgICAg ICAgaWYgKCFjb21wb3NpdGVkV2l0aE93bkJhY2tpbmdTdG9yZShjdXJMYXllcikKKyAgICAgICAg ICAgICAgICAgICAgJiYgKGN1ckxheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpIHx8IGRlc2NlbmRl bnRMYXllclBhaW50c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKICAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTE3OTMsOSArMTc5 OCw5IEBAIHN0YXRpYyBib29sIGhhc1Zpc2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnQoUmVu ZGVyTGF5ZXImIHBhcmVudCkKIH0KIAogLy8gQ29uc2VydmF0aXZlIHRlc3QgZm9yIGhhdmluZyBu byByZW5kZXJlZCBjaGlsZHJlbi4KLWJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpoYXNWaXNpYmxl Tm9uQ29tcG9zaXRpbmdEZXNjZW5kYW50TGF5ZXJzKCkgY29uc3QKK2Jvb2wgUmVuZGVyTGF5ZXJC YWNraW5nOjppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKCkgY29uc3QKIHsK LSAgICByZXR1cm4gaGFzVmlzaWJsZU5vbkNvbXBvc2l0aW5nRGVzY2VuZGFudChtX293bmluZ0xh eWVyKTsKKyAgICByZXR1cm4gZGVzY2VuZGVudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKG1fb3du aW5nTGF5ZXIpOwogfQogCiBib29sIFJlbmRlckxheWVyQmFja2luZzo6Y29udGFpbnNQYWludGVk Q29udGVudChib29sIGlzU2ltcGxlQ29udGFpbmVyKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4IGE4YTZlYjRjZmZjOTkyMGQ4YmUz ZmY1ODdkZjA0NDU5OTFlMWM3ZDguLjA0MTI3YWZiMzg0Mzc2MmI1OGYzZGZhYzgzODUwZjRhNzNi NjZiYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmgKQEAgLTc1LDggKzc1LDEzIEBAIHB1YmxpYzoKICAgICAKICAgICAvLyBSZXR1cm5zIHRydWUg aWYgbGF5ZXIgY29uZmlndXJhdGlvbiBjaGFuZ2VkLgogICAgIGJvb2wgdXBkYXRlQ29uZmlndXJh dGlvbigpOworCiAgICAgLy8gVXBkYXRlIGdyYXBoaWNzIGxheWVyIHBvc2l0aW9uIGFuZCBib3Vu ZHMuCi0gICAgdm9pZCB1cGRhdGVHZW9tZXRyeSgpOyAvLyBtYWtlIHByaXZhdGUKKyAgICB2b2lk IHVwZGF0ZUdlb21ldHJ5KCk7CisKKyAgICAvLyBVcGRhdGUgc3RhdGUgdGhlIHJlcXVpcmVzIHRo YXQgZGVzY2VuZGFudCBsYXllcnMgaGF2ZSBiZWVuIHVwZGF0ZWQuCisgICAgdm9pZCB1cGRhdGVB ZnRlckRlc2NlbmRlbnRzKCk7CisKICAgICAvLyBVcGRhdGUgY29udGVudHMgYW5kIGNsaXBwaW5n IHN0cnVjdHVyZS4KICAgICB2b2lkIHVwZGF0ZURyYXdzQ29udGVudCgpOwogICAgIApAQCAtMjgy LDcgKzI4Nyw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHJlc2V0Q29udGVudHNSZWN0KCk7CiAK LSAgICBib29sIGhhc1Zpc2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnRMYXllcnMoKSBjb25z dDsKKyAgICBib29sIGlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2NlbmRlbnRMYXllcnMoKSBjb25z dDsKIAogICAgIGJvb2wgc2hvdWxkQ2xpcENvbXBvc2l0ZWRCb3VuZHMoKSBjb25zdDsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApp bmRleCA3ZGU2NjYyZjA4ZTA4NTc1ODQ4YThjNTM0YmY3Nzg3NmU2MGZhY2YzLi5iNDU3MTYwMjEz ZTNiYWFjZjM5OGMzNjgyOWVhZDlhOTJlMDQ1Y2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMTUxNyw2ICsxNTE3LDkg QEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRDb21wb3NpdGluZ0xheWVyVHJl ZShSZW5kZXJMYXllciYgbGF5ZXIsIFZlY3QKIAogICAgICAgICBjaGlsZExheWVyc09mRW5jbG9z aW5nTGF5ZXIuYXBwZW5kKGxheWVyQmFja2luZy0+Y2hpbGRGb3JTdXBlcmxheWVycygpKTsKICAg ICB9CisgICAgCisgICAgaWYgKFJlbmRlckxheWVyQmFja2luZyogbGF5ZXJCYWNraW5nID0gbGF5 ZXIuYmFja2luZygpKQorICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUFmdGVyRGVzY2VuZGVu dHMoKTsKIH0KIAogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRSZWdpb25Db21w b3NpdGluZ0xheWVyVHJlZShSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCogcmVnaW9uLCBWZWN0b3I8 R3JhcGhpY3NMYXllcio+JiBjaGlsZExpc3QsIGludCBkZXB0aCkKQEAgLTE3NTEsNiArMTc1NCw5 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllclRyZWVHZW9tZXRyeShS ZW5kZXJMYXllciYgbGF5ZXIsIGludCBkZXB0CiAgICAgICAgICAgICAgICAgdXBkYXRlTGF5ZXJU cmVlR2VvbWV0cnkoKnBvc1pPcmRlckxpc3QtPmF0KGkpLCBkZXB0aCArIDEpOwogICAgICAgICB9 CiAgICAgfQorCisgICAgaWYgKFJlbmRlckxheWVyQmFja2luZyogbGF5ZXJCYWNraW5nID0gbGF5 ZXIuYmFja2luZygpKQorICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUFmdGVyRGVzY2VuZGVu dHMoKTsKIH0KIAogLy8gUmVjdXJzIGRvd24gdGhlIFJlbmRlckxheWVyIHRyZWUgdW50aWwgaXRz IGZpbmRzIHRoZSBjb21wb3NpdGluZyBkZXNjZW5kYW50cyBvZiBjb21wb3NpdGluZ0FuY2VzdG9y IGFuZCB1cGRhdGVzIHRoZWlyIGdlb21ldHJ5LgpAQCAtMTc2Niw4ICsxNzcyLDEwIEBAIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0Rlc2NlbmRhbnRHZW9tZXRy eShSZW5kZXJMYXllciYgY29tCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGxheWVyQmFj a2luZy0+dXBkYXRlR2VvbWV0cnkoKTsKLSAgICAgICAgICAgIGlmIChjb21wb3NpdGVkQ2hpbGRy ZW5Pbmx5KQorICAgICAgICAgICAgaWYgKGNvbXBvc2l0ZWRDaGlsZHJlbk9ubHkpIHsKKyAgICAg ICAgICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUFmdGVyRGVzY2VuZGVudHMoKTsKICAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAKQEAg LTE4MDIsOSArMTgxMCwxMyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29t cG9zaXRpbmdEZXNjZW5kYW50R2VvbWV0cnkoUmVuZGVyTGF5ZXImIGNvbQogICAgICAgICAgICAg ICAgIHVwZGF0ZUNvbXBvc2l0aW5nRGVzY2VuZGFudEdlb21ldHJ5KGNvbXBvc2l0aW5nQW5jZXN0 b3IsICpwb3NaT3JkZXJMaXN0LT5hdChpKSwgY29tcG9zaXRlZENoaWxkcmVuT25seSk7CiAgICAg ICAgIH0KICAgICB9CisgICAgCisgICAgaWYgKCZsYXllciAhPSAmY29tcG9zaXRpbmdBbmNlc3Rv cikgeworICAgICAgICBpZiAoUmVuZGVyTGF5ZXJCYWNraW5nKiBsYXllckJhY2tpbmcgPSBsYXll ci5iYWNraW5nKCkpCisgICAgICAgICAgICBsYXllckJhY2tpbmctPnVwZGF0ZUFmdGVyRGVzY2Vu ZGVudHMoKTsKKyAgICB9CiB9CiAKLQogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlcGFp bnRDb21wb3NpdGVkTGF5ZXJzKGNvbnN0IEludFJlY3QqIGFic1JlY3QpCiB7CiAgICAgcmVjdXJz aXZlUmVwYWludExheWVyKHJvb3RSZW5kZXJMYXllcigpLCBhYnNSZWN0KTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNGUz NGNlMTc0MjQ3YWFlYWEwMzdmNGIyMWQ0ODhkNWY5YzNmM2UyLi5iZDI1Y2ZjNTJmZDU3NjZkYWMw N2RmMzJmOTQ3MzliYzRjNTVjNmMxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMDUtMTgg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgSW1hZ2Vz IG1pc3Npbmcgc29tZXRpbWVzIHdpdGggY29tcG9zaXRlZCBjbGlwcGluZyBsYXllcnMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzA2NQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTUyMjQ1NTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBjb21wb3NpdGluZy9iYWNraW5nL3NvbGlkLWNvbG9yLXdp dGgtcGFpbnRzLWludG8tYW5jZXN0b3ItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICog Y29tcG9zaXRpbmcvYmFja2luZy9zb2xpZC1jb2xvci13aXRoLXBhaW50cy1pbnRvLWFuY2VzdG9y Lmh0bWw6IEFkZGVkLgorCiAyMDE0LTA1LTE5ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdl YmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmcsIHRyeSB0byB1bmJyZWFr IE1hYyBidWlsZGJvdHMgYW5kIEVXUyBib3RzIGFmdGVyIHIxNjkwMjMuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL3NvbGlkLWNvbG9yLXdpdGgtcGFpbnRzLWlu dG8tYW5jZXN0b3ItZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2JhY2tp bmcvc29saWQtY29sb3Itd2l0aC1wYWludHMtaW50by1hbmNlc3Rvci1leHBlY3RlZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmQ1ZDk0YjZlZTk3Njk0YmRhZmI4YzBkNjU3OGRjZGYzYTQ1N2E2MjYKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9iYWNraW5nL3NvbGlkLWNvbG9y LXdpdGgtcGFpbnRzLWludG8tYW5jZXN0b3ItZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDQ4IEBA Cis8IURPQ1RZUEUgaHRtbD4KKworPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAg IC5jb250YWluZXIgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAg ICAgd2lkdGg6IDQwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiA0MDBweDsKKyAgICAgICAgICAg IGJhY2tncm91bmQ6IGdyYXk7CisgICAgICAgICAgICBvdmVyZmxvdzogaGlkZGVuOworICAgICAg ICAgICAgei1pbmRleDogMTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmNsaXBwaW5n IHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHotaW5kZXg6 IDM7CisgICAgICAgICAgICBsZWZ0OiA1MHB4OworICAgICAgICAgICAgdG9wOiA1MHB4OworICAg ICAgICAgICAgd2lkdGg6IDMwMHB4OworICAgICAgICAgICAgaGVpZ2h0OiAzMDBweDsKKyAgICAg ICAgICAgIGJhY2tncm91bmQ6IHVybCgnLi4vcmVzb3VyY2VzL3NpbXBsZV9pbWFnZS5wbmcnKTsK KyAgICAgICAgICAgIGJhY2tncm91bmQtc2l6ZTogMTAwJSAxMDAlOworICAgICAgICB9CisgICAg ICAgIAorICAgICAgICAuaW5uZXIgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOwor ICAgICAgICAgICAgdG9wOiA1MHB4OworICAgICAgICAgICAgbGVmdDogNTBweDsKKyAgICAgICAg ICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAg LmNvbXBvc2l0ZWQgeworICAgICAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVoo MCk7CisgICAgICAgIH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBj bGFzcz0iY29udGFpbmVyIj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY2xpcHBpbmciPgorICAgICAg ICAgICAgPGRpdiBjbGFzcz0iaW5uZXIgY29tcG9zaXRlZCI+PC9kaXY+CisgICAgICAgIDwvZGl2 PgorICAgIDwvZGl2PgorPHByZSBpZD0ibGF5ZXJzIj5MYXllciB0cmVlIGdvZXMgaGVyZSBpbiBE UlQ8L3ByZT4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBv c2l0aW5nL2JhY2tpbmcvc29saWQtY29sb3Itd2l0aC1wYWludHMtaW50by1hbmNlc3Rvci5odG1s IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvYmFja2luZy9zb2xpZC1jb2xvci13aXRoLXBhaW50 cy1pbnRvLWFuY2VzdG9yLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTBmOTc2MGQwOGQ2OTA5NDU5ZjljYzM5 ZWEyYWI4NGExYTlkNDZkYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0 aW5nL2JhY2tpbmcvc29saWQtY29sb3Itd2l0aC1wYWludHMtaW50by1hbmNlc3Rvci5odG1sCkBA IC0wLDAgKzEsNDkgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8aHRtbD4KKzxoZWFkPgorICAgIDxz dHlsZT4KKyAgICAgICAgLmNvbnRhaW5lciB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1 dGU7CisgICAgICAgICAgICB3aWR0aDogNDAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDQwMHB4 OworICAgICAgICAgICAgYmFja2dyb3VuZDogZ3JheTsKKyAgICAgICAgICAgIG92ZXJmbG93OiBo aWRkZW47CisgICAgICAgICAgICB6LWluZGV4OiAxOworICAgICAgICB9CisgICAgICAgIAorICAg ICAgICAuY2xpcHBpbmcgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAg ICAgICAgei1pbmRleDogMzsKKyAgICAgICAgICAgIGxlZnQ6IDUwcHg7CisgICAgICAgICAgICB0 b3A6IDUwcHg7CisgICAgICAgICAgICB3aWR0aDogMzAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6 IDMwMHB4OworICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICAgICAgICAgIGJhY2tn cm91bmQ6IHVybCgnLi4vcmVzb3VyY2VzL3NpbXBsZV9pbWFnZS5wbmcnKTsKKyAgICAgICAgICAg IGJhY2tncm91bmQtc2l6ZTogMTAwJSAxMDAlOworICAgICAgICB9CisgICAgICAgIAorICAgICAg ICAuaW5uZXIgeworICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAg dG9wOiA1MHB4OworICAgICAgICAgICAgbGVmdDogNTBweDsKKyAgICAgICAgICAgIGhlaWdodDog MjAwcHg7CisgICAgICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgICAgICBiYWNrZ3JvdW5k LWNvbG9yOiBncmVlbjsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmNvbXBvc2l0ZWQg eworICAgICAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgICAg IH0KKyAgICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBjbGFzcz0iY29udGFp bmVyIj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY2xpcHBpbmciPgorICAgICAgICAgICAgPGRpdiBj bGFzcz0iaW5uZXIgY29tcG9zaXRlZCI+PC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvZGl2 PgorPHByZSBpZD0ibGF5ZXJzIj5MYXllciB0cmVlIGdvZXMgaGVyZSBpbiBEUlQ8L3ByZT4KKzwv Ym9keT4KKzwvaHRtbD4K