142449 2015-03-07 21:48:14 -0800 In RenderLayerCompositor, track layer bounds and the haveComputedBounds flag together in a struct 2015-03-08 10:02:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1075343 0 simon.fraser 2015-03-07 21:48:14 -0800 In RenderLayerCompositor, track layer bounds and the haveComputedBounds flag together in a struct 1075344 1 248178 simon.fraser 2015-03-07 21:51:26 -0800 Created attachment 248178 Patch 1075345 2 248179 simon.fraser 2015-03-07 21:52:10 -0800 Created attachment 248179 Patch 1075346 3 248179 bfulgham 2015-03-07 21:59:27 -0800 Comment on attachment 248179 Patch r=me 1075373 4 248179 commit-queue 2015-03-08 10:02:44 -0700 Comment on attachment 248179 Patch Clearing flags on attachment: 248179 Committed r181245: <http://trac.webkit.org/changeset/181245> 1075374 5 commit-queue 2015-03-08 10:02:50 -0700 All reviewed patches have been landed. Closing bug. 248178 2015-03-07 21:51:26 -0800 2015-03-07 21:52:06 -0800 Patch bug-142449-20150307215104.patch text/plain 8612 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxMjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg5MTRlNmRjNTIyN2Q1 M2ZiZDg4YzI3Yjk2MTE0MzhiODA4OTYwMy4uNzJmYzFlYjk0NDQ3MGE0ZTAxMjkzZGJmMTZiNjE1 MDgxYzljZTI3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE1LTAzLTA3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEluIFJlbmRlckxh eWVyQ29tcG9zaXRvciwgdHJhY2sgbGF5ZXIgYm91bmRzIGFuZCB0aGUgaGF2ZUNvbXB1dGVkQm91 bmRzIGZsYWcgdG9nZXRoZXIgaW4gYSBzdHJ1Y3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjQ0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgUmF0aGVyIHRoYW4gdHJhY2tpbmcgJ2xheWVy Qm91bmRzJyBhbmQgJ2hhdmVDb21wdXRlZEJvdW5kcycgc2VwYXJhdGVseSwgZ3JvdXAgdGhlbSB0 b2dldGhlcgorICAgICAgICBpbiBhbiBPdmVybGFwRXh0ZW50IHN0cnVjdCBhbmQgYWRkIGEgZnVu Y3Rpb24gdG8gY29tcHV0ZSB0aGUgYm91bmRzLCB3aGljaCByZW1vdmVzCisgICAgICAgIGEgY29w eSBvZiB0aGlzIGNvZGUuIE92ZXJsYXBFeHRlbnQgd2lsbCBiZSBleHRlbmRlZCBpbiBhIGZ1dHVy ZSBwYXRjaC4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6T3ZlcmxhcE1hcDo6Z2VvbWV0cnlNYXApOiBBbGxvdyBjb25zdCBh Y2Nlc3MgdG8KKyAgICAgICAgdGhlIGdlb21ldHJ5TWFwLCB1c2VkIGJ5IGNvbXB1dGVFeHRlbnQo KS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUV4dGVu dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3Zlcmxh cE1hcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3Zl cmxhcE1hcFJlY3Vyc2l2ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgorCisyMDE1LTAzLTA3ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFRpZHkgdXAgUmVuZGVyTGF5ZXJDb21w b3NpdG9yJ3MgQ29tcG9zaXRpbmdTdGF0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNDQ1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggZTljYTMxODZkYTY4MTIxY2ZhMjVk Nzc2MGVmYTllZTkzMmQ4ZTEwMy4uZDY2ODQ0YzUyOTNhMzhjMTY3NzU5YTI1M2VmYWI4YmJiMjRl YjEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKQEAgLTE4MCw2ICsxODAsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fb3Zlcmxh cFN0YWNrLnJlbW92ZUxhc3QoKTsKICAgICB9CiAKKyAgICBjb25zdCBSZW5kZXJHZW9tZXRyeU1h cCYgZ2VvbWV0cnlNYXAoKSBjb25zdCB7IHJldHVybiBtX2dlb21ldHJ5TWFwOyB9CiAgICAgUmVu ZGVyR2VvbWV0cnlNYXAmIGdlb21ldHJ5TWFwKCkgeyByZXR1cm4gbV9nZW9tZXRyeU1hcDsgfQog CiBwcml2YXRlOgpAQCAtMjU1LDYgKzI1NiwxMiBAQCBzdHJ1Y3QgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpDb21wb3NpdGluZ1N0YXRlIHsKICNlbmRpZgogfTsKIAorCitzdHJ1Y3QgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjpPdmVybGFwRXh0ZW50IHsKKyAgICBMYXlvdXRSZWN0IGJvdW5kczsKKyAg ICBib29sIGV4dGVudENvbXB1dGVkIHsgZmFsc2UgfTsKK307CisKICNpZiAhTE9HX0RJU0FCTEVE CiBzdGF0aWMgaW5saW5lIGJvb2wgY29tcG9zaXRpbmdMb2dFbmFibGVkKCkKIHsKQEAgLTExMTcs MjAgKzExMjQsMjcgQEAgUmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZW5jbG9z aW5nTm9uU3RhY2tpbmdDbGlwcGluZ0xheWVyKGNvbnN0IFJlbmQKICAgICByZXR1cm4gbnVsbHB0 cjsKIH0KIAotdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1hcChPdmVy bGFwTWFwJiBvdmVybGFwTWFwLCBSZW5kZXJMYXllciYgbGF5ZXIsIExheW91dFJlY3QmIGxheWVy Qm91bmRzLCBib29sJiBib3VuZHNDb21wdXRlZCkKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9y Ojpjb21wdXRlRXh0ZW50KGNvbnN0IE92ZXJsYXBNYXAmIG92ZXJsYXBNYXAsIFJlbmRlckxheWVy JiBsYXllciwgT3ZlcmxhcEV4dGVudCYgZXh0ZW50KSBjb25zdAoreworICAgIGlmIChleHRlbnQu ZXh0ZW50Q29tcHV0ZWQpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIEZJWE1FOiBJZiB0aGlz IGxheWVyJ3Mgb3ZlcmxhcCBib3VuZHMgaW5jbHVkZSBpdHMgY2hpbGRyZW4sIHdlIGRvbid0IG5l ZWQgdG8gYWRkIGl0cworICAgIC8vIGNoaWxkcmVuJ3MgYm91bmRzIHRvIHRoZSBvdmVybGFwIG1h cC4KKyAgICBleHRlbnQuYm91bmRzID0gZW5jbG9zaW5nTGF5b3V0UmVjdChvdmVybGFwTWFwLmdl b21ldHJ5TWFwKCkuYWJzb2x1dGVSZWN0KGxheWVyLm92ZXJsYXBCb3VuZHMoKSkpOworICAgIC8v IEVtcHR5IHJlY3RzIG5ldmVyIGludGVyc2VjdCwgYnV0IHdlIG5lZWQgdGhlbSB0byBmb3IgdGhl IHB1cnBvc2VzIG9mIG92ZXJsYXAgdGVzdGluZy4KKyAgICBpZiAoZXh0ZW50LmJvdW5kcy5pc0Vt cHR5KCkpCisgICAgICAgIGV4dGVudC5ib3VuZHMuc2V0U2l6ZShMYXlvdXRTaXplKDEsIDEpKTsK KworICAgIGV4dGVudC5leHRlbnRDb21wdXRlZCA9IHRydWU7Cit9CisKK3ZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXAoT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgUmVu ZGVyTGF5ZXImIGxheWVyLCBPdmVybGFwRXh0ZW50JiBleHRlbnQpCiB7CiAgICAgaWYgKGxheWVy LmlzUm9vdExheWVyKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICghYm91bmRzQ29tcHV0 ZWQpIHsKLSAgICAgICAgLy8gRklYTUU6IElmIHRoaXMgbGF5ZXIncyBvdmVybGFwIGJvdW5kcyBp bmNsdWRlIGl0cyBjaGlsZHJlbiwgd2UgZG9uJ3QgbmVlZCB0byBhZGQgaXRzCi0gICAgICAgIC8v IGNoaWxkcmVuJ3MgYm91bmRzIHRvIHRoZSBvdmVybGFwIG1hcC4KLSAgICAgICAgbGF5ZXJCb3Vu ZHMgPSBlbmNsb3NpbmdMYXlvdXRSZWN0KG92ZXJsYXBNYXAuZ2VvbWV0cnlNYXAoKS5hYnNvbHV0 ZVJlY3QobGF5ZXIub3ZlcmxhcEJvdW5kcygpKSk7Ci0gICAgICAgIC8vIEVtcHR5IHJlY3RzIG5l dmVyIGludGVyc2VjdCwgYnV0IHdlIG5lZWQgdGhlbSB0byBmb3IgdGhlIHB1cnBvc2VzIG9mIG92 ZXJsYXAgdGVzdGluZy4KLSAgICAgICAgaWYgKGxheWVyQm91bmRzLmlzRW1wdHkoKSkKLSAgICAg ICAgICAgIGxheWVyQm91bmRzLnNldFNpemUoTGF5b3V0U2l6ZSgxLCAxKSk7Ci0gICAgICAgIGJv dW5kc0NvbXB1dGVkID0gdHJ1ZTsKLSAgICB9CisgICAgY29tcHV0ZUV4dGVudChvdmVybGFwTWFw LCBsYXllciwgZXh0ZW50KTsKIAogICAgIExheW91dFJlY3QgY2xpcFJlY3QgPSBsYXllci5iYWNr Z3JvdW5kQ2xpcFJlY3QoUmVuZGVyTGF5ZXI6OkNsaXBSZWN0c0NvbnRleHQoJnJvb3RSZW5kZXJM YXllcigpLCBBYnNvbHV0ZUNsaXBSZWN0cykpLnJlY3QoKTsgLy8gRklYTUU6IEluY29ycmVjdCBm b3IgQ1NTIHJlZ2lvbnMuCiAKQEAgLTExNDEsNyArMTE1NSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXAoT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgUmVuZGVy TGF5ZXImCiAgICAgaWYgKCFzZXR0aW5ncy5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQogICAgICAg ICBjbGlwUmVjdC5zY2FsZShwYWdlU2NhbGVGYWN0b3IoKSk7CiAjZW5kaWYKLSAgICBjbGlwUmVj dC5pbnRlcnNlY3QobGF5ZXJCb3VuZHMpOworICAgIGNsaXBSZWN0LmludGVyc2VjdChleHRlbnQu Ym91bmRzKTsKICAgICBvdmVybGFwTWFwLmFkZCgmbGF5ZXIsIGNsaXBSZWN0KTsKIH0KIApAQCAt MTE1NCw5ICsxMTY4LDggQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3Zlcmxh cE1hcFJlY3Vyc2l2ZShPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBSZW4KICAgICBpZiAoYW5jZXN0 b3JMYXllcikKICAgICAgICAgb3ZlcmxhcE1hcC5nZW9tZXRyeU1hcCgpLnB1c2hNYXBwaW5nc1Rv QW5jZXN0b3IoJmxheWVyLCBhbmNlc3RvckxheWVyKTsKICAgICAKLSAgICBMYXlvdXRSZWN0IGJv dW5kczsKLSAgICBib29sIGhhdmVDb21wdXRlZEJvdW5kcyA9IGZhbHNlOwotICAgIGFkZFRvT3Zl cmxhcE1hcChvdmVybGFwTWFwLCBsYXllciwgYm91bmRzLCBoYXZlQ29tcHV0ZWRCb3VuZHMpOwor ICAgIE92ZXJsYXBFeHRlbnQgbGF5ZXJFeHRlbnQ7CisgICAgYWRkVG9PdmVybGFwTWFwKG92ZXJs YXBNYXAsIGxheWVyLCBsYXllckV4dGVudCk7CiAKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAg TGF5ZXJMaXN0TXV0YXRpb25EZXRlY3RvciBtdXRhdGlvbkNoZWNrZXIoJmxheWVyKTsKQEAgLTEy MjIsNyArMTIzNSw2IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9z aXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAgICAgICAgIC8vIGlmIHRo aXMgZmxvdyB0aHJlYWQgd2lsbCBub3QgYmUgcGFpbnRlZCAoZm9yIGluc3RhbmNlIGJlY2F1c2Ug b2YgaGF2aW5nIG5vIHJlZ2lvbnMsIG9yIG9ubHkgaW52YWxpZCByZWdpb25zKSwKICAgICAgICAg Ly8gdGhlIGNoaWxkIGxheWVycyB3aWxsIG5ldmVyIGhhdmUgdGhlaXIgbGlzdHMgdXBkYXRlZCAo d2hpY2ggd291bGQgbm9ybWFsbHkgaGFwcGVuIGR1cmluZyBwYWludGluZykuCiAgICAgICAgIGxh eWVyLnVwZGF0ZURlc2NlbmRhbnRzTGF5ZXJMaXN0c0lmTmVlZGVkKHRydWUpOwotCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKQEAgLTEyMzgsMTkgKzEyNTAsMTQgQEAgdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciog YW5jZXN0b3IKICAgICBib29sIHdpbGxCZUNvbXBvc2l0ZWQgPSBuZWVkc1RvQmVDb21wb3NpdGVk KGxheWVyKTsKIAogICAgIFJlbmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uIGNv bXBvc2l0aW5nUmVhc29uID0gY29tcG9zaXRpbmdTdGF0ZS5zdWJ0cmVlSXNDb21wb3NpdGluZyA/ IFJlbmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpTdGFja2luZyA6IFJlbmRl ckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpOb25lOwotICAgIGJvb2wgaGF2ZUNv bXB1dGVkQm91bmRzID0gZmFsc2U7Ci0gICAgTGF5b3V0UmVjdCBhYnNCb3VuZHM7CisKKyAgICBP dmVybGFwRXh0ZW50IGxheWVyRXh0ZW50OwogCiAgICAgLy8gSWYgd2Uga25vdyBmb3Igc3VyZSB0 aGUgbGF5ZXIgaXMgZ29pbmcgdG8gYmUgY29tcG9zaXRlZCwgZG9uJ3QgYm90aGVyIGxvb2tpbmcg aXQgdXAgaW4gdGhlIG92ZXJsYXAgbWFwCiAgICAgaWYgKCF3aWxsQmVDb21wb3NpdGVkICYmICFv dmVybGFwTWFwLmlzRW1wdHkoKSAmJiBjb21wb3NpdGluZ1N0YXRlLnRlc3RpbmdPdmVybGFwKSB7 CisgICAgICAgIGNvbXB1dGVFeHRlbnQob3ZlcmxhcE1hcCwgbGF5ZXIsIGxheWVyRXh0ZW50KTsK ICAgICAgICAgLy8gSWYgd2UncmUgdGVzdGluZyBmb3Igb3ZlcmxhcCwgd2Ugb25seSBuZWVkIHRv IGNvbXBvc2l0ZSBpZiB3ZSBvdmVybGFwIHNvbWV0aGluZyB0aGF0IGlzIGFscmVhZHkgY29tcG9z aXRlZC4KLSAgICAgICAgYWJzQm91bmRzID0gZW5jbG9zaW5nTGF5b3V0UmVjdChvdmVybGFwTWFw Lmdlb21ldHJ5TWFwKCkuYWJzb2x1dGVSZWN0KGxheWVyLm92ZXJsYXBCb3VuZHMoKSkpOwotCi0g ICAgICAgIC8vIEVtcHR5IHJlY3RzIG5ldmVyIGludGVyc2VjdCwgYnV0IHdlIG5lZWQgdGhlbSB0 byBmb3IgdGhlIHB1cnBvc2VzIG9mIG92ZXJsYXAgdGVzdGluZy4KLSAgICAgICAgaWYgKGFic0Jv dW5kcy5pc0VtcHR5KCkpCi0gICAgICAgICAgICBhYnNCb3VuZHMuc2V0U2l6ZShMYXlvdXRTaXpl KDEsIDEpKTsKLSAgICAgICAgaGF2ZUNvbXB1dGVkQm91bmRzID0gdHJ1ZTsKLSAgICAgICAgY29t cG9zaXRpbmdSZWFzb24gPSBvdmVybGFwTWFwLm92ZXJsYXBzTGF5ZXJzKGFic0JvdW5kcykgPyBS ZW5kZXJMYXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6T3ZlcmxhcCA6IFJlbmRlckxh eWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpOb25lOworICAgICAgICBjb21wb3NpdGlu Z1JlYXNvbiA9IG92ZXJsYXBNYXAub3ZlcmxhcHNMYXllcnMobGF5ZXJFeHRlbnQuYm91bmRzKSA/ IFJlbmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpPdmVybGFwIDogUmVuZGVy TGF5ZXI6OkluZGlyZWN0Q29tcG9zaXRpbmdSZWFzb246Ok5vbmU7CiAgICAgfQogCiAjaWYgRU5B QkxFKFZJREVPKQpAQCAtMTM1Myw3ICsxMzYwLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3IK ICAgICAvLyB0aGUgb3ZlcmxhcCBtYXAuIExheWVycyB0aGF0IGRvIG5vdCBjb21wb3NpdGUgd2ls bCBkcmF3IGludG8gdGhlaXIKICAgICAvLyBjb21wb3NpdGluZyBhbmNlc3RvcidzIGJhY2tpbmcs IGFuZCBzbyBhcmUgc3RpbGwgY29uc2lkZXJlZCBmb3Igb3ZlcmxhcC4KICAgICBpZiAoY2hpbGRT dGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9yICYmICFjaGlsZFN0YXRlLmNvbXBvc2l0aW5nQW5jZXN0 b3ItPmlzUm9vdExheWVyKCkpCi0gICAgICAgIGFkZFRvT3ZlcmxhcE1hcChvdmVybGFwTWFwLCBs YXllciwgYWJzQm91bmRzLCBoYXZlQ29tcHV0ZWRCb3VuZHMpOworICAgICAgICBhZGRUb092ZXJs YXBNYXAob3ZlcmxhcE1hcCwgbGF5ZXIsIGxheWVyRXh0ZW50KTsKIAogI2lmIEVOQUJMRShDU1Nf Q09NUE9TSVRJTkcpCiAgICAgbGF5ZXIuc2V0SGFzTm90SXNvbGF0ZWRDb21wb3NpdGVkQmxlbmRp bmdEZXNjZW5kYW50cyhjaGlsZFN0YXRlLmhhc05vdElzb2xhdGVkQ29tcG9zaXRlZEJsZW5kaW5n RGVzY2VuZGFudHMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5oCmluZGV4IGVkMjc1NDJjNGI3ODhhZWFhMzhmYmI2OWE1MzJiNTkwZjY3MDdk MGEuLmMyMzNhY2Y1Y2NiMGM5NjlkOTMxOTJmYzlkOTVmNWZmYmNiOTk4NGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAgLTMxMCw2 ICszMTAsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGNsYXNzIE92ZXJsYXBNYXA7CiAgICAg c3RydWN0IENvbXBvc2l0aW5nU3RhdGU7CisgICAgc3RydWN0IE92ZXJsYXBFeHRlbnQ7CiAKICAg ICAvLyBHcmFwaGljc0xheWVyQ2xpZW50IGltcGxlbWVudGF0aW9uCiAgICAgdmlydHVhbCB2b2lk IG5vdGlmeUZsdXNoUmVxdWlyZWQoY29uc3QgR3JhcGhpY3NMYXllciopIG92ZXJyaWRlOwpAQCAt MzM2LDcgKzMzNyw4IEBAIHByaXZhdGU6CiAgICAgLy8gUmVwYWludCB0aGlzIGFuZCBpdHMgY2hp bGQgbGF5ZXJzLgogICAgIHZvaWQgcmVjdXJzaXZlUmVwYWludExheWVyKFJlbmRlckxheWVyJik7 CiAKLSAgICB2b2lkIGFkZFRvT3ZlcmxhcE1hcChPdmVybGFwTWFwJiwgUmVuZGVyTGF5ZXImLCBM YXlvdXRSZWN0JiBsYXllckJvdW5kcywgYm9vbCYgYm91bmRzQ29tcHV0ZWQpOworICAgIHZvaWQg Y29tcHV0ZUV4dGVudChjb25zdCBPdmVybGFwTWFwJiwgUmVuZGVyTGF5ZXImLCBPdmVybGFwRXh0 ZW50JikgY29uc3Q7CisgICAgdm9pZCBhZGRUb092ZXJsYXBNYXAoT3ZlcmxhcE1hcCYsIFJlbmRl ckxheWVyJiwgT3ZlcmxhcEV4dGVudCYpOwogICAgIHZvaWQgYWRkVG9PdmVybGFwTWFwUmVjdXJz aXZlKE92ZXJsYXBNYXAmLCBSZW5kZXJMYXllciYsIFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVy ID0gbnVsbHB0cik7CiAKICAgICB2b2lkIHVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzVGltZXJGaXJl ZCgpOwo= 248179 2015-03-07 21:52:10 -0800 2015-03-08 10:02:44 -0700 Patch bug-142449-20150307215148.patch text/plain 8610 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxMjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg5MTRlNmRjNTIyN2Q1 M2ZiZDg4YzI3Yjk2MTE0MzhiODA4OTYwMy4uNzJmYzFlYjk0NDQ3MGE0ZTAxMjkzZGJmMTZiNjE1 MDgxYzljZTI3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE1LTAzLTA3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEluIFJlbmRlckxh eWVyQ29tcG9zaXRvciwgdHJhY2sgbGF5ZXIgYm91bmRzIGFuZCB0aGUgaGF2ZUNvbXB1dGVkQm91 bmRzIGZsYWcgdG9nZXRoZXIgaW4gYSBzdHJ1Y3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjQ0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgUmF0aGVyIHRoYW4gdHJhY2tpbmcgJ2xheWVy Qm91bmRzJyBhbmQgJ2hhdmVDb21wdXRlZEJvdW5kcycgc2VwYXJhdGVseSwgZ3JvdXAgdGhlbSB0 b2dldGhlcgorICAgICAgICBpbiBhbiBPdmVybGFwRXh0ZW50IHN0cnVjdCBhbmQgYWRkIGEgZnVu Y3Rpb24gdG8gY29tcHV0ZSB0aGUgYm91bmRzLCB3aGljaCByZW1vdmVzCisgICAgICAgIGEgY29w eSBvZiB0aGlzIGNvZGUuIE92ZXJsYXBFeHRlbnQgd2lsbCBiZSBleHRlbmRlZCBpbiBhIGZ1dHVy ZSBwYXRjaC4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6T3ZlcmxhcE1hcDo6Z2VvbWV0cnlNYXApOiBBbGxvdyBjb25zdCBh Y2Nlc3MgdG8KKyAgICAgICAgdGhlIGdlb21ldHJ5TWFwLCB1c2VkIGJ5IGNvbXB1dGVFeHRlbnQo KS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUV4dGVu dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3Zlcmxh cE1hcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3Zl cmxhcE1hcFJlY3Vyc2l2ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgorCisyMDE1LTAzLTA3ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFRpZHkgdXAgUmVuZGVyTGF5ZXJDb21w b3NpdG9yJ3MgQ29tcG9zaXRpbmdTdGF0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNDQ1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggZTljYTMxODZkYTY4MTIxY2ZhMjVk Nzc2MGVmYTllZTkzMmQ4ZTEwMy4uYTIxMGYzMWMwNDIzM2EzZGEyZTEyOTNhNmIwN2IxNWRmZjBi OGM2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKQEAgLTE4MCw2ICsxODAsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fb3Zlcmxh cFN0YWNrLnJlbW92ZUxhc3QoKTsKICAgICB9CiAKKyAgICBjb25zdCBSZW5kZXJHZW9tZXRyeU1h cCYgZ2VvbWV0cnlNYXAoKSBjb25zdCB7IHJldHVybiBtX2dlb21ldHJ5TWFwOyB9CiAgICAgUmVu ZGVyR2VvbWV0cnlNYXAmIGdlb21ldHJ5TWFwKCkgeyByZXR1cm4gbV9nZW9tZXRyeU1hcDsgfQog CiBwcml2YXRlOgpAQCAtMjU1LDYgKzI1NiwxMSBAQCBzdHJ1Y3QgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpDb21wb3NpdGluZ1N0YXRlIHsKICNlbmRpZgogfTsKIAorc3RydWN0IFJlbmRlckxheWVy Q29tcG9zaXRvcjo6T3ZlcmxhcEV4dGVudCB7CisgICAgTGF5b3V0UmVjdCBib3VuZHM7CisgICAg Ym9vbCBleHRlbnRDb21wdXRlZCB7IGZhbHNlIH07Cit9OworCiAjaWYgIUxPR19ESVNBQkxFRAog c3RhdGljIGlubGluZSBib29sIGNvbXBvc2l0aW5nTG9nRW5hYmxlZCgpCiB7CkBAIC0xMTE3LDIw ICsxMTIzLDI3IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmVuY2xvc2lu Z05vblN0YWNraW5nQ2xpcHBpbmdMYXllcihjb25zdCBSZW5kCiAgICAgcmV0dXJuIG51bGxwdHI7 CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXAoT3Zlcmxh cE1hcCYgb3ZlcmxhcE1hcCwgUmVuZGVyTGF5ZXImIGxheWVyLCBMYXlvdXRSZWN0JiBsYXllckJv dW5kcywgYm9vbCYgYm91bmRzQ29tcHV0ZWQpCit2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 Y29tcHV0ZUV4dGVudChjb25zdCBPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBSZW5kZXJMYXllciYg bGF5ZXIsIE92ZXJsYXBFeHRlbnQmIGV4dGVudCkgY29uc3QKK3sKKyAgICBpZiAoZXh0ZW50LmV4 dGVudENvbXB1dGVkKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBGSVhNRTogSWYgdGhpcyBs YXllcidzIG92ZXJsYXAgYm91bmRzIGluY2x1ZGUgaXRzIGNoaWxkcmVuLCB3ZSBkb24ndCBuZWVk IHRvIGFkZCBpdHMKKyAgICAvLyBjaGlsZHJlbidzIGJvdW5kcyB0byB0aGUgb3ZlcmxhcCBtYXAu CisgICAgZXh0ZW50LmJvdW5kcyA9IGVuY2xvc2luZ0xheW91dFJlY3Qob3ZlcmxhcE1hcC5nZW9t ZXRyeU1hcCgpLmFic29sdXRlUmVjdChsYXllci5vdmVybGFwQm91bmRzKCkpKTsKKyAgICAvLyBF bXB0eSByZWN0cyBuZXZlciBpbnRlcnNlY3QsIGJ1dCB3ZSBuZWVkIHRoZW0gdG8gZm9yIHRoZSBw dXJwb3NlcyBvZiBvdmVybGFwIHRlc3RpbmcuCisgICAgaWYgKGV4dGVudC5ib3VuZHMuaXNFbXB0 eSgpKQorICAgICAgICBleHRlbnQuYm91bmRzLnNldFNpemUoTGF5b3V0U2l6ZSgxLCAxKSk7CisK KyAgICBleHRlbnQuZXh0ZW50Q29tcHV0ZWQgPSB0cnVlOworfQorCit2b2lkIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6YWRkVG9PdmVybGFwTWFwKE92ZXJsYXBNYXAmIG92ZXJsYXBNYXAsIFJlbmRl ckxheWVyJiBsYXllciwgT3ZlcmxhcEV4dGVudCYgZXh0ZW50KQogewogICAgIGlmIChsYXllci5p c1Jvb3RMYXllcigpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIWJvdW5kc0NvbXB1dGVk KSB7Ci0gICAgICAgIC8vIEZJWE1FOiBJZiB0aGlzIGxheWVyJ3Mgb3ZlcmxhcCBib3VuZHMgaW5j bHVkZSBpdHMgY2hpbGRyZW4sIHdlIGRvbid0IG5lZWQgdG8gYWRkIGl0cwotICAgICAgICAvLyBj aGlsZHJlbidzIGJvdW5kcyB0byB0aGUgb3ZlcmxhcCBtYXAuCi0gICAgICAgIGxheWVyQm91bmRz ID0gZW5jbG9zaW5nTGF5b3V0UmVjdChvdmVybGFwTWFwLmdlb21ldHJ5TWFwKCkuYWJzb2x1dGVS ZWN0KGxheWVyLm92ZXJsYXBCb3VuZHMoKSkpOwotICAgICAgICAvLyBFbXB0eSByZWN0cyBuZXZl ciBpbnRlcnNlY3QsIGJ1dCB3ZSBuZWVkIHRoZW0gdG8gZm9yIHRoZSBwdXJwb3NlcyBvZiBvdmVy bGFwIHRlc3RpbmcuCi0gICAgICAgIGlmIChsYXllckJvdW5kcy5pc0VtcHR5KCkpCi0gICAgICAg ICAgICBsYXllckJvdW5kcy5zZXRTaXplKExheW91dFNpemUoMSwgMSkpOwotICAgICAgICBib3Vu ZHNDb21wdXRlZCA9IHRydWU7Ci0gICAgfQorICAgIGNvbXB1dGVFeHRlbnQob3ZlcmxhcE1hcCwg bGF5ZXIsIGV4dGVudCk7CiAKICAgICBMYXlvdXRSZWN0IGNsaXBSZWN0ID0gbGF5ZXIuYmFja2dy b3VuZENsaXBSZWN0KFJlbmRlckxheWVyOjpDbGlwUmVjdHNDb250ZXh0KCZyb290UmVuZGVyTGF5 ZXIoKSwgQWJzb2x1dGVDbGlwUmVjdHMpKS5yZWN0KCk7IC8vIEZJWE1FOiBJbmNvcnJlY3QgZm9y IENTUyByZWdpb25zLgogCkBAIC0xMTQxLDcgKzExNTQsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6YWRkVG9PdmVybGFwTWFwKE92ZXJsYXBNYXAmIG92ZXJsYXBNYXAsIFJlbmRlckxh eWVyJgogICAgIGlmICghc2V0dGluZ3MuZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSkKICAgICAgICAg Y2xpcFJlY3Quc2NhbGUocGFnZVNjYWxlRmFjdG9yKCkpOwogI2VuZGlmCi0gICAgY2xpcFJlY3Qu aW50ZXJzZWN0KGxheWVyQm91bmRzKTsKKyAgICBjbGlwUmVjdC5pbnRlcnNlY3QoZXh0ZW50LmJv dW5kcyk7CiAgICAgb3ZlcmxhcE1hcC5hZGQoJmxheWVyLCBjbGlwUmVjdCk7CiB9CiAKQEAgLTEx NTQsOSArMTE2Nyw4IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBN YXBSZWN1cnNpdmUoT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgUmVuCiAgICAgaWYgKGFuY2VzdG9y TGF5ZXIpCiAgICAgICAgIG92ZXJsYXBNYXAuZ2VvbWV0cnlNYXAoKS5wdXNoTWFwcGluZ3NUb0Fu Y2VzdG9yKCZsYXllciwgYW5jZXN0b3JMYXllcik7CiAgICAgCi0gICAgTGF5b3V0UmVjdCBib3Vu ZHM7Ci0gICAgYm9vbCBoYXZlQ29tcHV0ZWRCb3VuZHMgPSBmYWxzZTsKLSAgICBhZGRUb092ZXJs YXBNYXAob3ZlcmxhcE1hcCwgbGF5ZXIsIGJvdW5kcywgaGF2ZUNvbXB1dGVkQm91bmRzKTsKKyAg ICBPdmVybGFwRXh0ZW50IGxheWVyRXh0ZW50OworICAgIGFkZFRvT3ZlcmxhcE1hcChvdmVybGFw TWFwLCBsYXllciwgbGF5ZXJFeHRlbnQpOwogCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIExh eWVyTGlzdE11dGF0aW9uRGV0ZWN0b3IgbXV0YXRpb25DaGVja2VyKCZsYXllcik7CkBAIC0xMjIy LDcgKzEyMzQsNiBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0 aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvcgogICAgICAgICAvLyBpZiB0aGlz IGZsb3cgdGhyZWFkIHdpbGwgbm90IGJlIHBhaW50ZWQgKGZvciBpbnN0YW5jZSBiZWNhdXNlIG9m IGhhdmluZyBubyByZWdpb25zLCBvciBvbmx5IGludmFsaWQgcmVnaW9ucyksCiAgICAgICAgIC8v IHRoZSBjaGlsZCBsYXllcnMgd2lsbCBuZXZlciBoYXZlIHRoZWlyIGxpc3RzIHVwZGF0ZWQgKHdo aWNoIHdvdWxkIG5vcm1hbGx5IGhhcHBlbiBkdXJpbmcgcGFpbnRpbmcpLgogICAgICAgICBsYXll ci51cGRhdGVEZXNjZW5kYW50c0xheWVyTGlzdHNJZk5lZWRlZCh0cnVlKTsKLQogICAgICAgICBy ZXR1cm47CiAgICAgfQogCkBAIC0xMjM4LDE5ICsxMjQ5LDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFu Y2VzdG9yCiAgICAgYm9vbCB3aWxsQmVDb21wb3NpdGVkID0gbmVlZHNUb0JlQ29tcG9zaXRlZChs YXllcik7CiAKICAgICBSZW5kZXJMYXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbiBjb21w b3NpdGluZ1JlYXNvbiA9IGNvbXBvc2l0aW5nU3RhdGUuc3VidHJlZUlzQ29tcG9zaXRpbmcgPyBS ZW5kZXJMYXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6U3RhY2tpbmcgOiBSZW5kZXJM YXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6Tm9uZTsKLSAgICBib29sIGhhdmVDb21w dXRlZEJvdW5kcyA9IGZhbHNlOwotICAgIExheW91dFJlY3QgYWJzQm91bmRzOworCisgICAgT3Zl cmxhcEV4dGVudCBsYXllckV4dGVudDsKIAogICAgIC8vIElmIHdlIGtub3cgZm9yIHN1cmUgdGhl IGxheWVyIGlzIGdvaW5nIHRvIGJlIGNvbXBvc2l0ZWQsIGRvbid0IGJvdGhlciBsb29raW5nIGl0 IHVwIGluIHRoZSBvdmVybGFwIG1hcAogICAgIGlmICghd2lsbEJlQ29tcG9zaXRlZCAmJiAhb3Zl cmxhcE1hcC5pc0VtcHR5KCkgJiYgY29tcG9zaXRpbmdTdGF0ZS50ZXN0aW5nT3ZlcmxhcCkgewor ICAgICAgICBjb21wdXRlRXh0ZW50KG92ZXJsYXBNYXAsIGxheWVyLCBsYXllckV4dGVudCk7CiAg ICAgICAgIC8vIElmIHdlJ3JlIHRlc3RpbmcgZm9yIG92ZXJsYXAsIHdlIG9ubHkgbmVlZCB0byBj b21wb3NpdGUgaWYgd2Ugb3ZlcmxhcCBzb21ldGhpbmcgdGhhdCBpcyBhbHJlYWR5IGNvbXBvc2l0 ZWQuCi0gICAgICAgIGFic0JvdW5kcyA9IGVuY2xvc2luZ0xheW91dFJlY3Qob3ZlcmxhcE1hcC5n ZW9tZXRyeU1hcCgpLmFic29sdXRlUmVjdChsYXllci5vdmVybGFwQm91bmRzKCkpKTsKLQotICAg ICAgICAvLyBFbXB0eSByZWN0cyBuZXZlciBpbnRlcnNlY3QsIGJ1dCB3ZSBuZWVkIHRoZW0gdG8g Zm9yIHRoZSBwdXJwb3NlcyBvZiBvdmVybGFwIHRlc3RpbmcuCi0gICAgICAgIGlmIChhYnNCb3Vu ZHMuaXNFbXB0eSgpKQotICAgICAgICAgICAgYWJzQm91bmRzLnNldFNpemUoTGF5b3V0U2l6ZSgx LCAxKSk7Ci0gICAgICAgIGhhdmVDb21wdXRlZEJvdW5kcyA9IHRydWU7Ci0gICAgICAgIGNvbXBv c2l0aW5nUmVhc29uID0gb3ZlcmxhcE1hcC5vdmVybGFwc0xheWVycyhhYnNCb3VuZHMpID8gUmVu ZGVyTGF5ZXI6OkluZGlyZWN0Q29tcG9zaXRpbmdSZWFzb246Ok92ZXJsYXAgOiBSZW5kZXJMYXll cjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6Tm9uZTsKKyAgICAgICAgY29tcG9zaXRpbmdS ZWFzb24gPSBvdmVybGFwTWFwLm92ZXJsYXBzTGF5ZXJzKGxheWVyRXh0ZW50LmJvdW5kcykgPyBS ZW5kZXJMYXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6T3ZlcmxhcCA6IFJlbmRlckxh eWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpOb25lOwogICAgIH0KIAogI2lmIEVOQUJM RShWSURFTykKQEAgLTEzNTMsNyArMTM1OSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9y Ojpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAg ICAgLy8gdGhlIG92ZXJsYXAgbWFwLiBMYXllcnMgdGhhdCBkbyBub3QgY29tcG9zaXRlIHdpbGwg ZHJhdyBpbnRvIHRoZWlyCiAgICAgLy8gY29tcG9zaXRpbmcgYW5jZXN0b3IncyBiYWNraW5nLCBh bmQgc28gYXJlIHN0aWxsIGNvbnNpZGVyZWQgZm9yIG92ZXJsYXAuCiAgICAgaWYgKGNoaWxkU3Rh dGUuY29tcG9zaXRpbmdBbmNlc3RvciAmJiAhY2hpbGRTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9y LT5pc1Jvb3RMYXllcigpKQotICAgICAgICBhZGRUb092ZXJsYXBNYXAob3ZlcmxhcE1hcCwgbGF5 ZXIsIGFic0JvdW5kcywgaGF2ZUNvbXB1dGVkQm91bmRzKTsKKyAgICAgICAgYWRkVG9PdmVybGFw TWFwKG92ZXJsYXBNYXAsIGxheWVyLCBsYXllckV4dGVudCk7CiAKICNpZiBFTkFCTEUoQ1NTX0NP TVBPU0lUSU5HKQogICAgIGxheWVyLnNldEhhc05vdElzb2xhdGVkQ29tcG9zaXRlZEJsZW5kaW5n RGVzY2VuZGFudHMoY2hpbGRTdGF0ZS5oYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rl c2NlbmRhbnRzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuaAppbmRleCBlZDI3NTQyYzRiNzg4YWVhYTM4ZmJiNjlhNTMyYjU5MGY2NzA3ZDBh Li5jMjMzYWNmNWNjYjBjOTY5ZDkzMTkyZmM5ZDk1ZjVmZmJjYjk5ODRkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC0zMTAsNiAr MzEwLDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBjbGFzcyBPdmVybGFwTWFwOwogICAgIHN0 cnVjdCBDb21wb3NpdGluZ1N0YXRlOworICAgIHN0cnVjdCBPdmVybGFwRXh0ZW50OwogCiAgICAg Ly8gR3JhcGhpY3NMYXllckNsaWVudCBpbXBsZW1lbnRhdGlvbgogICAgIHZpcnR1YWwgdm9pZCBu b3RpZnlGbHVzaFJlcXVpcmVkKGNvbnN0IEdyYXBoaWNzTGF5ZXIqKSBvdmVycmlkZTsKQEAgLTMz Niw3ICszMzcsOCBAQCBwcml2YXRlOgogICAgIC8vIFJlcGFpbnQgdGhpcyBhbmQgaXRzIGNoaWxk IGxheWVycy4KICAgICB2b2lkIHJlY3Vyc2l2ZVJlcGFpbnRMYXllcihSZW5kZXJMYXllciYpOwog Ci0gICAgdm9pZCBhZGRUb092ZXJsYXBNYXAoT3ZlcmxhcE1hcCYsIFJlbmRlckxheWVyJiwgTGF5 b3V0UmVjdCYgbGF5ZXJCb3VuZHMsIGJvb2wmIGJvdW5kc0NvbXB1dGVkKTsKKyAgICB2b2lkIGNv bXB1dGVFeHRlbnQoY29uc3QgT3ZlcmxhcE1hcCYsIFJlbmRlckxheWVyJiwgT3ZlcmxhcEV4dGVu dCYpIGNvbnN0OworICAgIHZvaWQgYWRkVG9PdmVybGFwTWFwKE92ZXJsYXBNYXAmLCBSZW5kZXJM YXllciYsIE92ZXJsYXBFeHRlbnQmKTsKICAgICB2b2lkIGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2 ZShPdmVybGFwTWFwJiwgUmVuZGVyTGF5ZXImLCBSZW5kZXJMYXllciogYW5jZXN0b3JMYXllciA9 IG51bGxwdHIpOwogCiAgICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ0xheWVyc1RpbWVyRmlyZWQo KTsK