150584 2015-10-26 17:39:50 -0700 Remove redundant GraphicsContext::clip(const Path&, WindRule) 2015-10-26 21:04:28 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue dbarton esprehn+autocc fred.wang glenn kondapallykalyan mmaxfield mrobinson simon.fraser thorton oldest_to_newest 1136725 0 simon.fraser 2015-10-26 17:39:50 -0700 Remove redundant GraphicsContext::clip(const Path&, WindRule) 1136729 1 264109 simon.fraser 2015-10-26 17:48:07 -0700 Created attachment 264109 Patch 1136742 2 264114 simon.fraser 2015-10-26 18:09:49 -0700 Created attachment 264114 Patch 1136756 3 264114 commit-queue 2015-10-26 21:04:25 -0700 Comment on attachment 264114 Patch Clearing flags on attachment: 264114 Committed r191617: <http://trac.webkit.org/changeset/191617> 1136757 4 commit-queue 2015-10-26 21:04:28 -0700 All reviewed patches have been landed. Closing bug. 264109 2015-10-26 17:48:07 -0700 2015-10-26 18:09:44 -0700 Patch bug-150584-20151026174718.patch text/plain 10063 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlmZTc3OTg5ODkzMzll YWJmYzIzMjdjOWRhYWQ2OTExN2ZlNmExNS4uYmQ0MmFkZWU2NDFjNmUyZjdkYjEwNDdiZTY4ZjEx NWE1NzZjMTgzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTEwLTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSByZWR1 bmRhbnQgR3JhcGhpY3NDb250ZXh0OjpjbGlwKGNvbnN0IFBhdGgmLCBXaW5kUnVsZSkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDU4NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNzQ29udGV4 dCBoYWQgYm90aCBjbGlwUGF0aChjb25zdCBQYXRoJiwgV2luZFJ1bGUpIGFuZCBjbGlwKGNvbnN0 IFBhdGgmLCBXaW5kUnVsZSksCisgICAgICAgIHdoaWNoIHdlcmUgbW9zdGx5IHRoZSBzYW1lIG90 aGVyIHRoYW4gR3JhcGhpY3NDb250ZXh0OjpjbGlwUGF0aCgpIG5vdCBjbGlwcGluZyBpZiB0aGUg cGF0aAorICAgICAgICB3YXMgZW1wdHkgKGFkZGVkLCBJIHRoaW5rIGJ5IG1pc3Rha2UsIGluIHI3 MjkyNiksIGFuZCBub3QgY2FsbGluZyBtX2RhdGEtPmNsaXAoKS4KKworICAgICAgICBNYWtlIGNs aXBQYXRoKCkgYmUgdGhlIHdpbm5lciwgYW5kIGhhdmUgaXQgYmVoYXZlIGxpa2UgY2xpcCgpIHdp dGggZW1wdHkgcGF0aHMsIGFuZCBjYWxsIG1fZGF0YS0+Y2xpcCgpLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6Y2xpcFJvdW5kZWRSZWN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWly by9HcmFwaGljc0NvbnRleHRDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OmNsaXBQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Y2xp cCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250 ZXh0Q0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwUGF0aCk6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNhbnZhc0NsaXApOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwKTogRGVsZXRlZC4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm94U2hhZG93KTogTWFraW5nIGEgcGF0aCwgY2FsbGlu ZyBhZGRSb3VuZGVkUmVjdCgpIGFuZCB0aGVuIGNsaXBwaW5nCisgICAgICAgIHRvIHRoZSBwYXRo IGlzIHRoZSBzYW1lIGFzIGNvbnRleHQuY2xpcFJvdW5kZWRSZWN0KCkuCisgICAgICAgICogcmVu ZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxSYWRpY2FsT3BlcmF0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTWF0aE1MUmFkaWNhbE9wZXJhdG9yOjpwYWludCk6CisKIDIwMTUtMTAt MjYgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBOdWxsIGRl cmVmZXJlbmNlIGxvYWRpbmcgQmxpbmsgbGF5b3V0IHRlc3QgZWRpdGluZy9leGVjQ29tbWFuZC9p bmRlbnQtaW5saW5lLWJveC1jcmFzaC5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAppbmRleCAzMjI2Y2EyNGM1YWJiMzQ5 NWViMmI5NmM3MTBhZDUyNmU3OGVkZGE0Li4yMzA5ZjVkZDVkZDU2ZjY4ZjFlMWVlNDZlNWNlMTdh NDcxNjY3NzFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5jcHAKQEAgLTQ2MSw3ICs0NjEsNyBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6Y2xpcFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmIHJlY3QpCiAKICAg ICBQYXRoIHBhdGg7CiAgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChyZWN0KTsKLSAgICBjbGlwKHBh dGgpOworICAgIGNsaXBQYXRoKHBhdGgpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xp cE91dFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmIHJlY3QpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IDQx ZWY1YzhiNmM4Y2NlNmUyZWE3NDhlZjY4NTdkN2UyZGQyZmI4MzguLmI5ZGMwMjMwOWY2YzM2NjFm YjI2ZDY3MmMyNWYzZTMyNjkxOTU0MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC0zMzEsNyArMzMxLDcgQEAgcHVibGlj OgogCiAgICAgdm9pZCBjbGlwT3V0KGNvbnN0IEZsb2F0UmVjdCYpOwogICAgIHZvaWQgY2xpcE91 dFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmKTsKLSAgICB2b2lkIGNsaXBQYXRo KGNvbnN0IFBhdGgmLCBXaW5kUnVsZSk7CisgICAgdm9pZCBjbGlwUGF0aChjb25zdCBQYXRoJiwg V2luZFJ1bGUgPSBSVUxFX0VWRU5PREQpOwogICAgIHZvaWQgY2xpcENvbnZleFBvbHlnb24oc2l6 ZV90IG51bVBvaW50cywgY29uc3QgRmxvYXRQb2ludCosIGJvb2wgYW50aWFsaWFzID0gdHJ1ZSk7 CiAgICAgdm9pZCBjbGlwVG9JbWFnZUJ1ZmZlcihJbWFnZUJ1ZmZlciYsIGNvbnN0IEZsb2F0UmVj dCYpOwogICAgIApAQCAtNDEzLDggKzQxMyw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldERyYXdM dW1pbmFuY2VNYXNrKGJvb2wgZHJhd0x1bWluYW5jZU1hc2spIHsgbV9zdGF0ZS5kcmF3THVtaW5h bmNlTWFzayA9IGRyYXdMdW1pbmFuY2VNYXNrOyB9CiAgICAgYm9vbCBkcmF3THVtaW5hbmNlTWFz aygpIGNvbnN0IHsgcmV0dXJuIG1fc3RhdGUuZHJhd0x1bWluYW5jZU1hc2s7IH0KIAotICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgY2xpcChjb25zdCBQYXRoJiwgV2luZFJ1bGUgPSBSVUxFX0VWRU5P REQpOwotCiAgICAgLy8gVGhpcyBjbGlwIGZ1bmN0aW9uIGlzIHVzZWQgb25seSBieSA8Y2FudmFz PiBjb2RlLiBJdCBhbGxvd3MKICAgICAvLyBpbXBsZW1lbnRhdGlvbnMgdG8gaGFuZGxlIGNsaXBw aW5nIG9uIHRoZSBjYW52YXMgZGlmZmVyZW50bHkgc2luY2UKICAgICAvLyB0aGUgZGlzY2lwbGlu ZSBpcyBkaWZmZXJlbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKaW5kZXggOGQ4ZmI1 N2Q1ZjJkODEwYjliZjliZTQwOWZhNDc0N2RmZjUxMTYzZS4uOTcwZWJiZWFkMjA2MDZkNWNhODlh NGYwMmYzZjk3MDQ0ODVhNmZlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcApAQCAt NDk0LDggKzQ5NCwxMyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcFBhdGgoY29uc3QgUGF0 aCYgcGF0aCwgV2luZFJ1bGUgY2xpcFJ1bGUpCiAgICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybUNv bnRleHQoKS0+Y3IoKTsKICAgICBpZiAoIXBhdGguaXNOdWxsKCkpCiAgICAgICAgIHNldFBhdGhP bkNhaXJvQ29udGV4dChjciwgcGF0aC5wbGF0Zm9ybVBhdGgoKS0+Y29udGV4dCgpKTsKKworICAg IGNhaXJvX2ZpbGxfcnVsZV90IHNhdmVkRmlsbFJ1bGUgPSBjYWlyb19nZXRfZmlsbF9ydWxlKGNy KTsKICAgICBjYWlyb19zZXRfZmlsbF9ydWxlKGNyLCBjbGlwUnVsZSA9PSBSVUxFX0VWRU5PREQg PyBDQUlST19GSUxMX1JVTEVfRVZFTl9PREQgOiBDQUlST19GSUxMX1JVTEVfV0lORElORyk7CiAg ICAgY2Fpcm9fY2xpcChjcik7CisgICAgY2Fpcm9fc2V0X2ZpbGxfcnVsZShjciwgc2F2ZWRGaWxs UnVsZSk7CisKKyAgICBtX2RhdGEtPmNsaXAocGF0aCk7CiB9CiAKIEludFJlY3QgR3JhcGhpY3ND b250ZXh0OjpjbGlwQm91bmRzKCkgY29uc3QKQEAgLTk2MCwyNyArOTY1LDYgQEAgdm9pZCBHcmFw aGljc0NvbnRleHQ6OnNldFBsYXRmb3JtQ29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0ZU9wZXJh dG9yIG9wLCBCbGVuZE0KICAgICBjYWlyb19zZXRfb3BlcmF0b3IocGxhdGZvcm1Db250ZXh0KCkt PmNyKCksIGNhaXJvX29wKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXAoY29uc3Qg UGF0aCYgcGF0aCwgV2luZFJ1bGUgd2luZFJ1bGUpCi17Ci0gICAgaWYgKHBhaW50aW5nRGlzYWJs ZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybUNvbnRl eHQoKS0+Y3IoKTsKLSAgICBpZiAoIXBhdGguaXNOdWxsKCkpIHsKLSAgICAgICAgY2Fpcm9fcGF0 aF90KiBwYXRoQ29weSA9IGNhaXJvX2NvcHlfcGF0aChwYXRoLnBsYXRmb3JtUGF0aCgpLT5jb250 ZXh0KCkpOwotICAgICAgICBjYWlyb19hcHBlbmRfcGF0aChjciwgcGF0aENvcHkpOwotICAgICAg ICBjYWlyb19wYXRoX2Rlc3Ryb3kocGF0aENvcHkpOwotICAgIH0KLSAgICBjYWlyb19maWxsX3J1 bGVfdCBzYXZlZEZpbGxSdWxlID0gY2Fpcm9fZ2V0X2ZpbGxfcnVsZShjcik7Ci0gICAgaWYgKHdp bmRSdWxlID09IFJVTEVfTk9OWkVSTykKLSAgICAgICAgY2Fpcm9fc2V0X2ZpbGxfcnVsZShjciwg Q0FJUk9fRklMTF9SVUxFX1dJTkRJTkcpOwotICAgIGVsc2UKLSAgICAgICAgY2Fpcm9fc2V0X2Zp bGxfcnVsZShjciwgQ0FJUk9fRklMTF9SVUxFX0VWRU5fT0REKTsKLSAgICBjYWlyb19jbGlwKGNy KTsKLSAgICBjYWlyb19zZXRfZmlsbF9ydWxlKGNyLCBzYXZlZEZpbGxSdWxlKTsKLSAgICBtX2Rh dGEtPmNsaXAocGF0aCk7Ci19Ci0KIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjYW52YXNDbGlwKGNv bnN0IFBhdGgmIHBhdGgsIFdpbmRSdWxlIHdpbmRSdWxlKQogewogICAgIGNsaXAocGF0aCwgd2lu ZFJ1bGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cv R3JhcGhpY3NDb250ZXh0Q0cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCmluZGV4IDc5OTA1MDQ3ZTk0YjVlODE1MzM4MmQ4Yjc3 ODZlMTQ4MTBjMGQ4MzcuLjM2MGUzODdjYzgzMWE2MzA3NzY0MzNiZjYxNWNjOGJjYzgzZThkNWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNz Q29udGV4dENHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9H cmFwaGljc0NvbnRleHRDRy5jcHAKQEAgLTk4MiwyMCArOTgyLDIwIEBAIHZvaWQgR3JhcGhpY3ND b250ZXh0OjpjbGlwUGF0aChjb25zdCBQYXRoJiBwYXRoLCBXaW5kUnVsZSBjbGlwUnVsZSkKICAg ICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBXaHkg ZG9lcyBjbGlwcGluZyB0byBhbiBlbXB0eSBwYXRoIGRvIG5vdGhpbmc/Ci0gICAgLy8gV2h5IGlz IHRoaXMgZGlmZmVyZW50IGZyb20gR3JhcGhpY3NDb250ZXh0OjpjbGlwKGNvbnN0IFBhdGgmKS4K LSAgICBpZiAocGF0aC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIENHQ29udGV4 dFJlZiBjb250ZXh0ID0gcGxhdGZvcm1Db250ZXh0KCk7CisgICAgaWYgKHBhdGguaXNFbXB0eSgp KQorICAgICAgICBDR0NvbnRleHRDbGlwVG9SZWN0KGNvbnRleHQsIENHUmVjdFplcm8pOworICAg IGVsc2UgeworICAgICAgICBDR0NvbnRleHRCZWdpblBhdGgocGxhdGZvcm1Db250ZXh0KCkpOwor ICAgICAgICBDR0NvbnRleHRBZGRQYXRoKHBsYXRmb3JtQ29udGV4dCgpLCBwYXRoLnBsYXRmb3Jt UGF0aCgpKTsKIAotICAgIENHQ29udGV4dEJlZ2luUGF0aChwbGF0Zm9ybUNvbnRleHQoKSk7Ci0g ICAgQ0dDb250ZXh0QWRkUGF0aChwbGF0Zm9ybUNvbnRleHQoKSwgcGF0aC5wbGF0Zm9ybVBhdGgo KSk7Ci0KLSAgICBpZiAoY2xpcFJ1bGUgPT0gUlVMRV9FVkVOT0REKQotICAgICAgICBDR0NvbnRl eHRFT0NsaXAoY29udGV4dCk7Ci0gICAgZWxzZQotICAgICAgICBDR0NvbnRleHRDbGlwKGNvbnRl eHQpOworICAgICAgICBpZiAoY2xpcFJ1bGUgPT0gUlVMRV9FVkVOT0REKQorICAgICAgICAgICAg Q0dDb250ZXh0RU9DbGlwKGNvbnRleHQpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBDR0Nv bnRleHRDbGlwKGNvbnRleHQpOworICAgIH0KKyAgICAKKyAgICBtX2RhdGEtPmNsaXAocGF0aCk7 CiB9CiAKIEludFJlY3QgR3JhcGhpY3NDb250ZXh0OjpjbGlwQm91bmRzKCkgY29uc3QKQEAgLTEy MzQsMzEgKzEyMzQsOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0TGluZUpvaW4oTGluZUpv aW4gam9pbikKICAgICB9CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGlwKGNvbnN0IFBh dGgmIHBhdGgsIFdpbmRSdWxlIGZpbGxSdWxlKQotewotICAgIGlmIChwYWludGluZ0Rpc2FibGVk KCkpCi0gICAgICAgIHJldHVybjsKLSAgICBDR0NvbnRleHRSZWYgY29udGV4dCA9IHBsYXRmb3Jt Q29udGV4dCgpOwotCi0gICAgLy8gQ0dDb250ZXh0Q2xpcCBkb2VzIG5vdGhpbmcgaWYgdGhlIHBh dGggaXMgZW1wdHksIHNvIGluIHRoaXMgY2FzZSwgd2UKLSAgICAvLyBpbnN0ZWFkIGNsaXAgYWdh aW5zdCBhIHplcm8gcmVjdCB0byByZWR1Y2UgdGhlIGNsaXBwaW5nIHJlZ2lvbiB0bwotICAgIC8v IG5vdGhpbmcgLSB3aGljaCBpcyB0aGUgaW50ZW5kZWQgYmVoYXZpb3Igb2YgY2xpcCgpIGlmIHRo ZSBwYXRoIGlzIGVtcHR5LiAgICAKLSAgICBpZiAocGF0aC5pc0VtcHR5KCkpCi0gICAgICAgIENH Q29udGV4dENsaXBUb1JlY3QoY29udGV4dCwgQ0dSZWN0WmVybyk7Ci0gICAgZWxzZSB7Ci0gICAg ICAgIENHQ29udGV4dEJlZ2luUGF0aChjb250ZXh0KTsKLSAgICAgICAgQ0dDb250ZXh0QWRkUGF0 aChjb250ZXh0LCBwYXRoLnBsYXRmb3JtUGF0aCgpKTsKLSAgICAgICAgaWYgKGZpbGxSdWxlID09 IFJVTEVfTk9OWkVSTykKLSAgICAgICAgICAgIENHQ29udGV4dENsaXAoY29udGV4dCk7Ci0gICAg ICAgIGVsc2UKLSAgICAgICAgICAgIENHQ29udGV4dEVPQ2xpcChjb250ZXh0KTsKLSAgICB9Ci0g ICAgbV9kYXRhLT5jbGlwKHBhdGgpOwotfQotCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2FudmFz Q2xpcChjb25zdCBQYXRoJiBwYXRoLCBXaW5kUnVsZSBmaWxsUnVsZSkKIHsKLSAgICBjbGlwKHBh dGgsIGZpbGxSdWxlKTsKKyAgICBjbGlwUGF0aChwYXRoLCBmaWxsUnVsZSk7CiB9CiAKIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpjbGlwT3V0KGNvbnN0IFBhdGgmIHBhdGgpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCBkMmFkZTA5 MDgwYWRlNGExYjJlNWM0MDNmZWZhOTI1ZGNhZTlmZWVlLi5kNjljMjdiNDI0NzJjODQ5ZDE4YjVm YmY0MDliOTI3NWYxZGI2ZmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKQEAgLTIzNDYsOSArMjM0Niw3IEBAIHZvaWQgUmVuZGVy Qm94TW9kZWxPYmplY3Q6OnBhaW50Qm94U2hhZG93KGNvbnN0IFBhaW50SW5mbyYgaW5mbywgY29u c3QgTGF5b3V0UmVjCiAKICAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3Rh dGVTYXZlcihjb250ZXh0KTsKICAgICAgICAgICAgIGlmIChoYXNCb3JkZXJSYWRpdXMpIHsKLSAg ICAgICAgICAgICAgICBQYXRoIHBhdGg7Ci0gICAgICAgICAgICAgICAgcGF0aC5hZGRSb3VuZGVk UmVjdChwaXhlbFNuYXBwZWRCb3JkZXJSZWN0KTsKLSAgICAgICAgICAgICAgICBjb250ZXh0LmNs aXAocGF0aCk7CisgICAgICAgICAgICAgICAgY29udGV4dC5jbGlwUm91bmRlZFJlY3QocGl4ZWxT bmFwcGVkQm9yZGVyUmVjdCk7CiAgICAgICAgICAgICAgICAgcGl4ZWxTbmFwcGVkUm91bmRlZEhv bGUuc2hyaW5rUmFkaWkoc2hhZG93U3ByZWFkKTsKICAgICAgICAgICAgIH0gZWxzZQogICAgICAg ICAgICAgICAgIGNvbnRleHQuY2xpcChwaXhlbFNuYXBwZWRCb3JkZXJSZWN0LnJlY3QoKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFJh ZGljYWxPcGVyYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRl ck1hdGhNTFJhZGljYWxPcGVyYXRvci5jcHAKaW5kZXggYjY5MmY3NDY5ZWY2NjM5MzlhYTM2Mjg5 NGM4NjU2M2VhMDBiNDlkNy4uNjkyNWE3OWQ1NTlkNjFiZWRkOTRjYzg1ZDdkMDdlNzQyMzRlOWJi NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRo TUxSYWRpY2FsT3BlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRo bWwvUmVuZGVyTWF0aE1MUmFkaWNhbE9wZXJhdG9yLmNwcApAQCAtMTUyLDE0ICsxNTIsMTQgQEAg dm9pZCBSZW5kZXJNYXRoTUxSYWRpY2FsT3BlcmF0b3I6OnBhaW50KFBhaW50SW5mbyYgaW5mbywg Y29uc3QgTGF5b3V0UG9pbnQmIHBhaW4KICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIG1h c2tTdGF0ZVNhdmVyKGluZm8uY29udGV4dCgpKTsKIAogICAgIC8vIEJ1aWxkIGEgbWFzayB0byBk cmF3IHRoZSB0aGljayBwYXJ0IG9mIHRoZSByb290LgotICAgIFBhdGggbWFzazsKKyAgICBQYXRo IG1hc2tQYXRoOwogCi0gICAgbWFzay5tb3ZlVG8ob3ZlcmJhckxlZnRQb2ludCk7Ci0gICAgbWFz ay5hZGRMaW5lVG8oYm90dG9tUG9pbnQpOwotICAgIG1hc2suYWRkTGluZVRvKGRpcExlZnRQb2lu dCk7Ci0gICAgbWFzay5hZGRMaW5lVG8oRmxvYXRQb2ludCgyICogZGlwTGVmdFBvaW50LngoKSAt IGxlZnRFbmQueCgpLCAyICogZGlwTGVmdFBvaW50LnkoKSAtIGxlZnRFbmQueSgpKSk7CisgICAg bWFza1BhdGgubW92ZVRvKG92ZXJiYXJMZWZ0UG9pbnQpOworICAgIG1hc2tQYXRoLmFkZExpbmVU byhib3R0b21Qb2ludCk7CisgICAgbWFza1BhdGguYWRkTGluZVRvKGRpcExlZnRQb2ludCk7Cisg ICAgbWFza1BhdGguYWRkTGluZVRvKEZsb2F0UG9pbnQoMiAqIGRpcExlZnRQb2ludC54KCkgLSBs ZWZ0RW5kLngoKSwgMiAqIGRpcExlZnRQb2ludC55KCkgLSBsZWZ0RW5kLnkoKSkpOwogCi0gICAg aW5mby5jb250ZXh0KCkuY2xpcChtYXNrKTsKKyAgICBpbmZvLmNvbnRleHQoKS5jbGlwUGF0aCht YXNrUGF0aCk7CiAKICAgICAvLyBEcmF3IHRoZSB0aGljayBwYXJ0IG9mIHRoZSByb290LgogICAg IGluZm8uY29udGV4dCgpLnNldFN0cm9rZVRoaWNrbmVzcyhnUmFkaWNhbFRoaWNrTGluZVRoaWNr bmVzc0VtcyAqIHN0eWxlKCkuZm9udFNpemUoKSk7Cg== 264114 2015-10-26 18:09:49 -0700 2015-10-26 21:04:25 -0700 Patch bug-150584-20151026180900.patch text/plain 10148 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlmZTc3OTg5ODkzMzll YWJmYzIzMjdjOWRhYWQ2OTExN2ZlNmExNS4uYmQ0MmFkZWU2NDFjNmUyZjdkYjEwNDdiZTY4ZjEx NWE1NzZjMTgzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTEwLTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSByZWR1 bmRhbnQgR3JhcGhpY3NDb250ZXh0OjpjbGlwKGNvbnN0IFBhdGgmLCBXaW5kUnVsZSkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDU4NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNzQ29udGV4 dCBoYWQgYm90aCBjbGlwUGF0aChjb25zdCBQYXRoJiwgV2luZFJ1bGUpIGFuZCBjbGlwKGNvbnN0 IFBhdGgmLCBXaW5kUnVsZSksCisgICAgICAgIHdoaWNoIHdlcmUgbW9zdGx5IHRoZSBzYW1lIG90 aGVyIHRoYW4gR3JhcGhpY3NDb250ZXh0OjpjbGlwUGF0aCgpIG5vdCBjbGlwcGluZyBpZiB0aGUg cGF0aAorICAgICAgICB3YXMgZW1wdHkgKGFkZGVkLCBJIHRoaW5rIGJ5IG1pc3Rha2UsIGluIHI3 MjkyNiksIGFuZCBub3QgY2FsbGluZyBtX2RhdGEtPmNsaXAoKS4KKworICAgICAgICBNYWtlIGNs aXBQYXRoKCkgYmUgdGhlIHdpbm5lciwgYW5kIGhhdmUgaXQgYmVoYXZlIGxpa2UgY2xpcCgpIHdp dGggZW1wdHkgcGF0aHMsIGFuZCBjYWxsIG1fZGF0YS0+Y2xpcCgpLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6Y2xpcFJvdW5kZWRSZWN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWly by9HcmFwaGljc0NvbnRleHRDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OmNsaXBQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Y2xp cCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250 ZXh0Q0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwUGF0aCk6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNhbnZhc0NsaXApOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwKTogRGVsZXRlZC4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50Qm94U2hhZG93KTogTWFraW5nIGEgcGF0aCwgY2FsbGlu ZyBhZGRSb3VuZGVkUmVjdCgpIGFuZCB0aGVuIGNsaXBwaW5nCisgICAgICAgIHRvIHRoZSBwYXRo IGlzIHRoZSBzYW1lIGFzIGNvbnRleHQuY2xpcFJvdW5kZWRSZWN0KCkuCisgICAgICAgICogcmVu ZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxSYWRpY2FsT3BlcmF0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTWF0aE1MUmFkaWNhbE9wZXJhdG9yOjpwYWludCk6CisKIDIwMTUtMTAt MjYgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBOdWxsIGRl cmVmZXJlbmNlIGxvYWRpbmcgQmxpbmsgbGF5b3V0IHRlc3QgZWRpdGluZy9leGVjQ29tbWFuZC9p bmRlbnQtaW5saW5lLWJveC1jcmFzaC5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAppbmRleCAzMjI2Y2EyNGM1YWJiMzQ5 NWViMmI5NmM3MTBhZDUyNmU3OGVkZGE0Li4yMzA5ZjVkZDVkZDU2ZjY4ZjFlMWVlNDZlNWNlMTdh NDcxNjY3NzFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5jcHAKQEAgLTQ2MSw3ICs0NjEsNyBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6Y2xpcFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmIHJlY3QpCiAKICAg ICBQYXRoIHBhdGg7CiAgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChyZWN0KTsKLSAgICBjbGlwKHBh dGgpOworICAgIGNsaXBQYXRoKHBhdGgpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xp cE91dFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmIHJlY3QpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IDQx ZWY1YzhiNmM4Y2NlNmUyZWE3NDhlZjY4NTdkN2UyZGQyZmI4MzguLmI5ZGMwMjMwOWY2YzM2NjFm YjI2ZDY3MmMyNWYzZTMyNjkxOTU0MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC0zMzEsNyArMzMxLDcgQEAgcHVibGlj OgogCiAgICAgdm9pZCBjbGlwT3V0KGNvbnN0IEZsb2F0UmVjdCYpOwogICAgIHZvaWQgY2xpcE91 dFJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0Um91bmRlZFJlY3QmKTsKLSAgICB2b2lkIGNsaXBQYXRo KGNvbnN0IFBhdGgmLCBXaW5kUnVsZSk7CisgICAgdm9pZCBjbGlwUGF0aChjb25zdCBQYXRoJiwg V2luZFJ1bGUgPSBSVUxFX0VWRU5PREQpOwogICAgIHZvaWQgY2xpcENvbnZleFBvbHlnb24oc2l6 ZV90IG51bVBvaW50cywgY29uc3QgRmxvYXRQb2ludCosIGJvb2wgYW50aWFsaWFzID0gdHJ1ZSk7 CiAgICAgdm9pZCBjbGlwVG9JbWFnZUJ1ZmZlcihJbWFnZUJ1ZmZlciYsIGNvbnN0IEZsb2F0UmVj dCYpOwogICAgIApAQCAtNDEzLDggKzQxMyw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldERyYXdM dW1pbmFuY2VNYXNrKGJvb2wgZHJhd0x1bWluYW5jZU1hc2spIHsgbV9zdGF0ZS5kcmF3THVtaW5h bmNlTWFzayA9IGRyYXdMdW1pbmFuY2VNYXNrOyB9CiAgICAgYm9vbCBkcmF3THVtaW5hbmNlTWFz aygpIGNvbnN0IHsgcmV0dXJuIG1fc3RhdGUuZHJhd0x1bWluYW5jZU1hc2s7IH0KIAotICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgY2xpcChjb25zdCBQYXRoJiwgV2luZFJ1bGUgPSBSVUxFX0VWRU5P REQpOwotCiAgICAgLy8gVGhpcyBjbGlwIGZ1bmN0aW9uIGlzIHVzZWQgb25seSBieSA8Y2FudmFz PiBjb2RlLiBJdCBhbGxvd3MKICAgICAvLyBpbXBsZW1lbnRhdGlvbnMgdG8gaGFuZGxlIGNsaXBw aW5nIG9uIHRoZSBjYW52YXMgZGlmZmVyZW50bHkgc2luY2UKICAgICAvLyB0aGUgZGlzY2lwbGlu ZSBpcyBkaWZmZXJlbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKaW5kZXggOGQ4ZmI1 N2Q1ZjJkODEwYjliZjliZTQwOWZhNDc0N2RmZjUxMTYzZS4uYjNkNjhiZTg0ODRiMWFmY2U2YTIw MzBmNmY2ZmFhODM1MWYyODg5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcApAQCAt NDk0LDggKzQ5NCwxMyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcFBhdGgoY29uc3QgUGF0 aCYgcGF0aCwgV2luZFJ1bGUgY2xpcFJ1bGUpCiAgICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybUNv bnRleHQoKS0+Y3IoKTsKICAgICBpZiAoIXBhdGguaXNOdWxsKCkpCiAgICAgICAgIHNldFBhdGhP bkNhaXJvQ29udGV4dChjciwgcGF0aC5wbGF0Zm9ybVBhdGgoKS0+Y29udGV4dCgpKTsKKworICAg IGNhaXJvX2ZpbGxfcnVsZV90IHNhdmVkRmlsbFJ1bGUgPSBjYWlyb19nZXRfZmlsbF9ydWxlKGNy KTsKICAgICBjYWlyb19zZXRfZmlsbF9ydWxlKGNyLCBjbGlwUnVsZSA9PSBSVUxFX0VWRU5PREQg PyBDQUlST19GSUxMX1JVTEVfRVZFTl9PREQgOiBDQUlST19GSUxMX1JVTEVfV0lORElORyk7CiAg ICAgY2Fpcm9fY2xpcChjcik7CisgICAgY2Fpcm9fc2V0X2ZpbGxfcnVsZShjciwgc2F2ZWRGaWxs UnVsZSk7CisKKyAgICBtX2RhdGEtPmNsaXAocGF0aCk7CiB9CiAKIEludFJlY3QgR3JhcGhpY3ND b250ZXh0OjpjbGlwQm91bmRzKCkgY29uc3QKQEAgLTk2MCwzMCArOTY1LDkgQEAgdm9pZCBHcmFw aGljc0NvbnRleHQ6OnNldFBsYXRmb3JtQ29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0ZU9wZXJh dG9yIG9wLCBCbGVuZE0KICAgICBjYWlyb19zZXRfb3BlcmF0b3IocGxhdGZvcm1Db250ZXh0KCkt PmNyKCksIGNhaXJvX29wKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXAoY29uc3Qg UGF0aCYgcGF0aCwgV2luZFJ1bGUgd2luZFJ1bGUpCi17Ci0gICAgaWYgKHBhaW50aW5nRGlzYWJs ZWQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybUNvbnRl eHQoKS0+Y3IoKTsKLSAgICBpZiAoIXBhdGguaXNOdWxsKCkpIHsKLSAgICAgICAgY2Fpcm9fcGF0 aF90KiBwYXRoQ29weSA9IGNhaXJvX2NvcHlfcGF0aChwYXRoLnBsYXRmb3JtUGF0aCgpLT5jb250 ZXh0KCkpOwotICAgICAgICBjYWlyb19hcHBlbmRfcGF0aChjciwgcGF0aENvcHkpOwotICAgICAg ICBjYWlyb19wYXRoX2Rlc3Ryb3kocGF0aENvcHkpOwotICAgIH0KLSAgICBjYWlyb19maWxsX3J1 bGVfdCBzYXZlZEZpbGxSdWxlID0gY2Fpcm9fZ2V0X2ZpbGxfcnVsZShjcik7Ci0gICAgaWYgKHdp bmRSdWxlID09IFJVTEVfTk9OWkVSTykKLSAgICAgICAgY2Fpcm9fc2V0X2ZpbGxfcnVsZShjciwg Q0FJUk9fRklMTF9SVUxFX1dJTkRJTkcpOwotICAgIGVsc2UKLSAgICAgICAgY2Fpcm9fc2V0X2Zp bGxfcnVsZShjciwgQ0FJUk9fRklMTF9SVUxFX0VWRU5fT0REKTsKLSAgICBjYWlyb19jbGlwKGNy KTsKLSAgICBjYWlyb19zZXRfZmlsbF9ydWxlKGNyLCBzYXZlZEZpbGxSdWxlKTsKLSAgICBtX2Rh dGEtPmNsaXAocGF0aCk7Ci19Ci0KIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjYW52YXNDbGlwKGNv bnN0IFBhdGgmIHBhdGgsIFdpbmRSdWxlIHdpbmRSdWxlKQogewotICAgIGNsaXAocGF0aCwgd2lu ZFJ1bGUpOworICAgIGNsaXBQYXRoKHBhdGgsIHdpbmRSdWxlKTsKIH0KIAogdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmNsaXBPdXQoY29uc3QgUGF0aCYgcGF0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcAppbmRl eCA3OTkwNTA0N2U5NGI1ZTgxNTMzODJkOGI3Nzg2ZTE0ODEwYzBkODM3Li4zNjBlMzg3Y2M4MzFh NjMwNzc2NDMzYmY2MTVjYzhiY2M4M2U4ZDVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCkBAIC05ODIs MjAgKzk4MiwyMCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcFBhdGgoY29uc3QgUGF0aCYg cGF0aCwgV2luZFJ1bGUgY2xpcFJ1bGUpCiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgLy8gV2h5IGRvZXMgY2xpcHBpbmcgdG8gYW4gZW1wdHkgcGF0 aCBkbyBub3RoaW5nPwotICAgIC8vIFdoeSBpcyB0aGlzIGRpZmZlcmVudCBmcm9tIEdyYXBoaWNz Q29udGV4dDo6Y2xpcChjb25zdCBQYXRoJikuCi0gICAgaWYgKHBhdGguaXNFbXB0eSgpKQotICAg ICAgICByZXR1cm47Ci0KICAgICBDR0NvbnRleHRSZWYgY29udGV4dCA9IHBsYXRmb3JtQ29udGV4 dCgpOworICAgIGlmIChwYXRoLmlzRW1wdHkoKSkKKyAgICAgICAgQ0dDb250ZXh0Q2xpcFRvUmVj dChjb250ZXh0LCBDR1JlY3RaZXJvKTsKKyAgICBlbHNlIHsKKyAgICAgICAgQ0dDb250ZXh0QmVn aW5QYXRoKHBsYXRmb3JtQ29udGV4dCgpKTsKKyAgICAgICAgQ0dDb250ZXh0QWRkUGF0aChwbGF0 Zm9ybUNvbnRleHQoKSwgcGF0aC5wbGF0Zm9ybVBhdGgoKSk7CiAKLSAgICBDR0NvbnRleHRCZWdp blBhdGgocGxhdGZvcm1Db250ZXh0KCkpOwotICAgIENHQ29udGV4dEFkZFBhdGgocGxhdGZvcm1D b250ZXh0KCksIHBhdGgucGxhdGZvcm1QYXRoKCkpOwotCi0gICAgaWYgKGNsaXBSdWxlID09IFJV TEVfRVZFTk9ERCkKLSAgICAgICAgQ0dDb250ZXh0RU9DbGlwKGNvbnRleHQpOwotICAgIGVsc2UK LSAgICAgICAgQ0dDb250ZXh0Q2xpcChjb250ZXh0KTsKKyAgICAgICAgaWYgKGNsaXBSdWxlID09 IFJVTEVfRVZFTk9ERCkKKyAgICAgICAgICAgIENHQ29udGV4dEVPQ2xpcChjb250ZXh0KTsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgQ0dDb250ZXh0Q2xpcChjb250ZXh0KTsKKyAgICB9Cisg ICAgCisgICAgbV9kYXRhLT5jbGlwKHBhdGgpOwogfQogCiBJbnRSZWN0IEdyYXBoaWNzQ29udGV4 dDo6Y2xpcEJvdW5kcygpIGNvbnN0CkBAIC0xMjM0LDMxICsxMjM0LDkgQEAgdm9pZCBHcmFwaGlj c0NvbnRleHQ6OnNldExpbmVKb2luKExpbmVKb2luIGpvaW4pCiAgICAgfQogfQogCi12b2lkIEdy YXBoaWNzQ29udGV4dDo6Y2xpcChjb25zdCBQYXRoJiBwYXRoLCBXaW5kUnVsZSBmaWxsUnVsZSkK LXsKLSAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQotICAgICAgICByZXR1cm47Ci0gICAgQ0dD b250ZXh0UmVmIGNvbnRleHQgPSBwbGF0Zm9ybUNvbnRleHQoKTsKLQotICAgIC8vIENHQ29udGV4 dENsaXAgZG9lcyBub3RoaW5nIGlmIHRoZSBwYXRoIGlzIGVtcHR5LCBzbyBpbiB0aGlzIGNhc2Us IHdlCi0gICAgLy8gaW5zdGVhZCBjbGlwIGFnYWluc3QgYSB6ZXJvIHJlY3QgdG8gcmVkdWNlIHRo ZSBjbGlwcGluZyByZWdpb24gdG8KLSAgICAvLyBub3RoaW5nIC0gd2hpY2ggaXMgdGhlIGludGVu ZGVkIGJlaGF2aW9yIG9mIGNsaXAoKSBpZiB0aGUgcGF0aCBpcyBlbXB0eS4gICAgCi0gICAgaWYg KHBhdGguaXNFbXB0eSgpKQotICAgICAgICBDR0NvbnRleHRDbGlwVG9SZWN0KGNvbnRleHQsIENH UmVjdFplcm8pOwotICAgIGVsc2UgewotICAgICAgICBDR0NvbnRleHRCZWdpblBhdGgoY29udGV4 dCk7Ci0gICAgICAgIENHQ29udGV4dEFkZFBhdGgoY29udGV4dCwgcGF0aC5wbGF0Zm9ybVBhdGgo KSk7Ci0gICAgICAgIGlmIChmaWxsUnVsZSA9PSBSVUxFX05PTlpFUk8pCi0gICAgICAgICAgICBD R0NvbnRleHRDbGlwKGNvbnRleHQpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBDR0NvbnRl eHRFT0NsaXAoY29udGV4dCk7Ci0gICAgfQotICAgIG1fZGF0YS0+Y2xpcChwYXRoKTsKLX0KLQog dm9pZCBHcmFwaGljc0NvbnRleHQ6OmNhbnZhc0NsaXAoY29uc3QgUGF0aCYgcGF0aCwgV2luZFJ1 bGUgZmlsbFJ1bGUpCiB7Ci0gICAgY2xpcChwYXRoLCBmaWxsUnVsZSk7CisgICAgY2xpcFBhdGgo cGF0aCwgZmlsbFJ1bGUpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dChjb25z dCBQYXRoJiBwYXRoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5jcHAKaW5kZXggZDJhZGUwOTA4MGFkZTRhMWIyZTVjNDAzZmVmYTkyNWRjYWU5 ZmVlZS4uZDY5YzI3YjQyNDcyYzg0OWQxOGI1ZmJmNDA5YjkyNzVmMWRiNmZmMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC0y MzQ2LDkgKzIzNDYsNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludEJveFNoYWRv dyhjb25zdCBQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFJlYwogCiAgICAgICAgICAgICBH cmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoY29udGV4dCk7CiAgICAgICAgICAg ICBpZiAoaGFzQm9yZGVyUmFkaXVzKSB7Ci0gICAgICAgICAgICAgICAgUGF0aCBwYXRoOwotICAg ICAgICAgICAgICAgIHBhdGguYWRkUm91bmRlZFJlY3QocGl4ZWxTbmFwcGVkQm9yZGVyUmVjdCk7 Ci0gICAgICAgICAgICAgICAgY29udGV4dC5jbGlwKHBhdGgpOworICAgICAgICAgICAgICAgIGNv bnRleHQuY2xpcFJvdW5kZWRSZWN0KHBpeGVsU25hcHBlZEJvcmRlclJlY3QpOwogICAgICAgICAg ICAgICAgIHBpeGVsU25hcHBlZFJvdW5kZWRIb2xlLnNocmlua1JhZGlpKHNoYWRvd1NwcmVhZCk7 CiAgICAgICAgICAgICB9IGVsc2UKICAgICAgICAgICAgICAgICBjb250ZXh0LmNsaXAocGl4ZWxT bmFwcGVkQm9yZGVyUmVjdC5yZWN0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxSYWRpY2FsT3BlcmF0b3IuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxSYWRpY2FsT3BlcmF0b3IuY3BwCmlu ZGV4IGI2OTJmNzQ2OWVmNjYzOTM5YWEzNjI4OTRjODY1NjNlYTAwYjQ5ZDcuLjY5MjVhNzlkNTU5 ZDYxYmVkZDk0Y2M4NWQ3ZDA3ZTc0MjM0ZTliYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MUmFkaWNhbE9wZXJhdG9yLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFJhZGljYWxPcGVyYXRv ci5jcHAKQEAgLTE1MiwxNCArMTUyLDE0IEBAIHZvaWQgUmVuZGVyTWF0aE1MUmFkaWNhbE9wZXJh dG9yOjpwYWludChQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWluCiAgICAg R3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBtYXNrU3RhdGVTYXZlcihpbmZvLmNvbnRleHQoKSk7 CiAKICAgICAvLyBCdWlsZCBhIG1hc2sgdG8gZHJhdyB0aGUgdGhpY2sgcGFydCBvZiB0aGUgcm9v dC4KLSAgICBQYXRoIG1hc2s7CisgICAgUGF0aCBtYXNrUGF0aDsKIAotICAgIG1hc2subW92ZVRv KG92ZXJiYXJMZWZ0UG9pbnQpOwotICAgIG1hc2suYWRkTGluZVRvKGJvdHRvbVBvaW50KTsKLSAg ICBtYXNrLmFkZExpbmVUbyhkaXBMZWZ0UG9pbnQpOwotICAgIG1hc2suYWRkTGluZVRvKEZsb2F0 UG9pbnQoMiAqIGRpcExlZnRQb2ludC54KCkgLSBsZWZ0RW5kLngoKSwgMiAqIGRpcExlZnRQb2lu dC55KCkgLSBsZWZ0RW5kLnkoKSkpOworICAgIG1hc2tQYXRoLm1vdmVUbyhvdmVyYmFyTGVmdFBv aW50KTsKKyAgICBtYXNrUGF0aC5hZGRMaW5lVG8oYm90dG9tUG9pbnQpOworICAgIG1hc2tQYXRo LmFkZExpbmVUbyhkaXBMZWZ0UG9pbnQpOworICAgIG1hc2tQYXRoLmFkZExpbmVUbyhGbG9hdFBv aW50KDIgKiBkaXBMZWZ0UG9pbnQueCgpIC0gbGVmdEVuZC54KCksIDIgKiBkaXBMZWZ0UG9pbnQu eSgpIC0gbGVmdEVuZC55KCkpKTsKIAotICAgIGluZm8uY29udGV4dCgpLmNsaXAobWFzayk7Cisg ICAgaW5mby5jb250ZXh0KCkuY2xpcFBhdGgobWFza1BhdGgpOwogCiAgICAgLy8gRHJhdyB0aGUg dGhpY2sgcGFydCBvZiB0aGUgcm9vdC4KICAgICBpbmZvLmNvbnRleHQoKS5zZXRTdHJva2VUaGlj a25lc3MoZ1JhZGljYWxUaGlja0xpbmVUaGlja25lc3NFbXMgKiBzdHlsZSgpLmZvbnRTaXplKCkp Owo=