43133 2010-07-28 11:47:57 -0700 [GTK] Style cleanup for CairoPath.h 2010-08-02 14:01:47 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned oldest_to_newest 257275 0 mrobinson 2010-07-28 11:47:57 -0700 CairoPath.h should be a class as it has a constructor / destructor and uses the m_member naming scheme. 257305 1 62865 mrobinson 2010-07-28 12:52:40 -0700 Created attachment 62865 Style cleanup 258769 2 62865 xan.lopez 2010-08-02 03:57:59 -0700 Comment on attachment 62865 Style cleanup OK. 259095 3 mrobinson 2010-08-02 14:01:47 -0700 Committed r64490: <http://trac.webkit.org/changeset/64490> 62865 2010-07-28 12:52:40 -0700 2010-08-02 03:57:58 -0700 Style cleanup bug-43133-20100728125239.patch text/plain 12515 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzJlNTVjMDQ0ODZiZjdlNTY2NTMwMmVmYTQwYzczM2QwODRjNjM4ZS4uMTc1ZWJhN2YzMmYxNzgw MWNjYjcxYjM4MWVmYzJjMDQ3NmVmYjI4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NiBAQAorMjAxMC0wNy0yOCAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gU3R5bGUgY2xlYW51cCBmb3IgQ2Fp cm9QYXRoLmgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQzMTMzCisKKyAgICAgICAgVHVybiBDYWlyb1BhdGggaW50byBhIGNsYXNzLCBhcyBpdCBoYXMg YSBjb25zdHJ1Y3RvciBhbmQgZGVzdHJ1Y3Rvci4KKyAgICAgICAgQ2hhbmdlIHJhdyBtZW1iZXIg YWNjZXNzIHRvIHVzZSB0aGUgbmV3IGFjY2Vzc29yLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBh cyBmdW5jdGlvbmFsaXR5IGhhcyBub3QgY2hhbmdlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0NhaXJvUGF0aC5oOiBDbGVhbnVwIGFuZCBpbmRlbnRhdGlvbiBmaXguCisg ICAgICAgIChXZWJDb3JlOjpDYWlyb1BhdGg6OkNhaXJvUGF0aCk6CisgICAgICAgIChXZWJDb3Jl OjpDYWlyb1BhdGg6On5DYWlyb1BhdGgpOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm9QYXRoOjpj b250ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRl eHRDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmFkZFBhdGgp OiBDb252ZXJ0IHJhdyBtZW1iZXIgYWNjZXNzIHRvIGFjY2Vzc29yIGFjY2Vzcy4KKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Y2xpcCk6IERpdHRvLgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL1BhdGhDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXRo OjpQYXRoKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjpvcGVyYXRvcj0pOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmNsZWFyKTogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpQYXRoOjppc0VtcHR5KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjpjdXJy ZW50UG9pbnQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OnRyYW5zbGF0ZSk6IERp dHRvLgorICAgICAgICAoV2ViQ29yZTo6UGF0aDo6bW92ZVRvKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpQYXRoOjphZGRMaW5lVG8pOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6 OmFkZFJlY3QpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmFkZFF1YWRDdXJ2ZVRv KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjphZGRCZXppZXJDdXJ2ZVRvKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjphZGRBcmMpOiBEaXR0by4KKyAgICAgICAgKFdl YkNvcmU6OlBhdGg6OmFkZEFyY1RvKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjph ZGRFbGxpcHNlKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjpjbG9zZVN1YnBhdGgp OiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmJvdW5kaW5nUmVjdCk6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6UGF0aDo6c3Ryb2tlQm91bmRpbmdSZWN0KTogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpQYXRoOjpjb250YWlucyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6 UGF0aDo6c3Ryb2tlQ29udGFpbnMpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmFw cGx5KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjp0cmFuc2Zvcm0pOiBEaXR0by4K KyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmRlYnVnU3RyaW5nKTogRGl0dG8uCisKIDIwMTAtMDct MjggIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9DYWlyb1BhdGguaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v Q2Fpcm9QYXRoLmgKaW5kZXggYjc2MWNlNjQwMWQ5OTQzNTYyOGM5OTg2NTRhNjQ3OWYwZDQ4MWE4 MS4uZGE3YWZmYjNmYmEwMGY5NmI3NGEwNWFlZGY1NTM3YmRiNjUzN2NjNSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb1BhdGguaAorKysgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvUGF0aC5oCkBAIC0xLDUgKzEsNiBAQAogLyoK ICAgICBDb3B5cmlnaHQgKEMpIDIwMDcgQWxwIFRva2VyIDxhbHAudG9rZXJAY29sbGFib3JhLmNv LnVrPgorICAgIENvcHlyaWdodCAoQykgMjAxMCBJZ2FsaWEgUy5MLgogCiAgICAgVGhpcyBsaWJy YXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICAg IG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVi bGljCkBAIC0yNCwyMSArMjUsMjUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgLy8g VGhpcyBpcyBuZWNlc3Nhcnkgc2luY2UgY2Fpcm9fcGF0aF9maXhlZF90IGlzbid0IGV4cG9zZWQg aW4gQ2Fpcm8ncyBwdWJsaWMgQVBJLgotICAgIHN0cnVjdCBDYWlyb1BhdGggewotICAgICAgICBj YWlyb190KiBtX2NyOwotCi0gICAgICAgIENhaXJvUGF0aCgpCi0gICAgICAgIHsKLSAgICAgICAg ICAgIHN0YXRpYyBjYWlyb19zdXJmYWNlX3QqIHBhdGhTdXJmYWNlID0gY2Fpcm9faW1hZ2Vfc3Vy ZmFjZV9jcmVhdGUoQ0FJUk9fRk9STUFUX0E4LCAxLCAxKTsKLSAgICAgICAgICAgIG1fY3IgPSBj YWlyb19jcmVhdGUocGF0aFN1cmZhY2UpOwotICAgICAgICB9Ci0KLSAgICAgICAgfkNhaXJvUGF0 aCgpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGNhaXJvX2Rlc3Ryb3kobV9jcik7Ci0gICAgICAg IH0KLSAgICB9OworLy8gVGhpcyBpcyBuZWNlc3Nhcnkgc2luY2UgY2Fpcm9fcGF0aF9maXhlZF90 IGlzbid0IGV4cG9zZWQgaW4gQ2Fpcm8ncyBwdWJsaWMgQVBJLgorY2xhc3MgQ2Fpcm9QYXRoIHsK K3B1YmxpYzoKKyAgICBDYWlyb1BhdGgoKQorICAgIHsKKyAgICAgICAgc3RhdGljIGNhaXJvX3N1 cmZhY2VfdCogcGF0aFN1cmZhY2UgPSBjYWlyb19pbWFnZV9zdXJmYWNlX2NyZWF0ZShDQUlST19G T1JNQVRfQTgsIDEsIDEpOworICAgICAgICBtX2NyID0gY2Fpcm9fY3JlYXRlKHBhdGhTdXJmYWNl KTsKKyAgICB9CisKKyAgICB+Q2Fpcm9QYXRoKCkKKyAgICB7CisgICAgICAgIGNhaXJvX2Rlc3Ry b3kobV9jcik7CisgICAgfQorCisgICAgY2Fpcm9fdCogY29udGV4dCgpIHsgcmV0dXJuIG1fY3I7 IH0KKworcHJpdmF0ZToKKyAgICBjYWlyb190KiBtX2NyOworfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dy YXBoaWNzQ29udGV4dENhaXJvLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v R3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCmluZGV4IDk2Y2Q0ZWVjMmY4OThmOTE3MGUwYWQwY2Iw ZmVhOTQ5NDg4OWU5ODEuLjcyYWZmNzY5ZjBjOGZjMWQ1NTQ5NTNmMGRlOThhZjFmYjViNmU5N2Yg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250 ZXh0Q2Fpcm8uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhp Y3NDb250ZXh0Q2Fpcm8uY3BwCkBAIC0xMDk1LDcgKzEwOTUsNyBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6YWRkUGF0aChjb25zdCBQYXRoJiBwYXRoKQogICAgICAgICByZXR1cm47CiAKICAgICBj YWlyb190KiBjciA9IG1fZGF0YS0+Y3I7Ci0gICAgY2Fpcm9fcGF0aF90KiBwID0gY2Fpcm9fY29w eV9wYXRoKHBhdGgucGxhdGZvcm1QYXRoKCktPm1fY3IpOworICAgIGNhaXJvX3BhdGhfdCogcCA9 IGNhaXJvX2NvcHlfcGF0aChwYXRoLnBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCkpOwogICAgIGNh aXJvX2FwcGVuZF9wYXRoKGNyLCBwKTsKICAgICBjYWlyb19wYXRoX2Rlc3Ryb3kocCk7CiB9CkBA IC0xMTA2LDcgKzExMDYsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcChjb25zdCBQYXRo JiBwYXRoKQogICAgICAgICByZXR1cm47CiAKICAgICBjYWlyb190KiBjciA9IG1fZGF0YS0+Y3I7 Ci0gICAgY2Fpcm9fcGF0aF90KiBwID0gY2Fpcm9fY29weV9wYXRoKHBhdGgucGxhdGZvcm1QYXRo KCktPm1fY3IpOworICAgIGNhaXJvX3BhdGhfdCogcCA9IGNhaXJvX2NvcHlfcGF0aChwYXRoLnBs YXRmb3JtUGF0aCgpLT5jb250ZXh0KCkpOwogICAgIGNhaXJvX2FwcGVuZF9wYXRoKGNyLCBwKTsK ICAgICBjYWlyb19wYXRoX2Rlc3Ryb3kocCk7CiAgICAgY2Fpcm9fZmlsbF9ydWxlX3Qgc2F2ZWRG aWxsUnVsZSA9IGNhaXJvX2dldF9maWxsX3J1bGUoY3IpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9QYXRoQ2Fpcm8uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9QYXRoQ2Fpcm8uY3BwCmluZGV4IGQ4ODA2MjZkZDk1Y2JhMDJmOGE1MmM5 MGQ4YTk4ZmMzMTAxMTUwYTQuLjdlNTY0ZGNjMTExYmVhNjE0ZTUyZDUzN2Y4YWRmYjdlNTVmMjA5 ZTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUGF0aENhaXJv LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL1BhdGhDYWlyby5jcHAK QEAgLTUsNiArNSw3IEBACiAgICAgICAgICAgICAgICAgICAyMDA1LCAyMDA3IEFwcGxlIEluYy4g QWxsIFJpZ2h0cyByZXNlcnZlZC4KICAgICAgICAgICAgICAgICAgIDIwMDcgQWxwIFRva2VyIDxh bHBAYXRva2VyLmNvbT4KICAgICAgICAgICAgICAgICAgIDIwMDggRGlyayBTY2h1bHplIDxrcml0 QHdlYmtpdC5vcmc+CisgICAgICAgICAgICAgICAgICAyMDEwIElnYWxpYSBTLkwuCiAKICAgICBU aGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5k L29yCiAgICAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2Vu ZXJhbCBQdWJsaWMKQEAgLTUxLDkgKzUyLDggQEAgUGF0aDo6flBhdGgoKQogUGF0aDo6UGF0aChj b25zdCBQYXRoJiBvdGhlcikKICAgICA6IG1fcGF0aChuZXcgQ2Fpcm9QYXRoKCkpCiB7Ci0gICAg Y2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+bV9jcjsKLSAgICBjYWlyb19wYXRoX3QqIHAg PSBjYWlyb19jb3B5X3BhdGgob3RoZXIucGxhdGZvcm1QYXRoKCktPm1fY3IpOwotICAgIGNhaXJv X2FwcGVuZF9wYXRoKGNyLCBwKTsKKyAgICBjYWlyb19wYXRoX3QqIHAgPSBjYWlyb19jb3B5X3Bh dGgob3RoZXIucGxhdGZvcm1QYXRoKCktPmNvbnRleHQoKSk7CisgICAgY2Fpcm9fYXBwZW5kX3Bh dGgocGxhdGZvcm1QYXRoKCktPmNvbnRleHQoKSwgcCk7CiAgICAgY2Fpcm9fcGF0aF9kZXN0cm95 KHApOwogfQogCkBAIC02MywyMiArNjMsMjAgQEAgUGF0aCYgUGF0aDo6b3BlcmF0b3I9KGNvbnN0 IFBhdGgmIG90aGVyKQogICAgICAgICByZXR1cm4gKnRoaXM7CiAKICAgICBjbGVhcigpOwotICAg IGNhaXJvX3QqIGNyID0gcGxhdGZvcm1QYXRoKCktPm1fY3I7Ci0gICAgY2Fpcm9fcGF0aF90KiBw ID0gY2Fpcm9fY29weV9wYXRoKG90aGVyLnBsYXRmb3JtUGF0aCgpLT5tX2NyKTsKLSAgICBjYWly b19hcHBlbmRfcGF0aChjciwgcCk7CisgICAgY2Fpcm9fcGF0aF90KiBwID0gY2Fpcm9fY29weV9w YXRoKG90aGVyLnBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCkpOworICAgIGNhaXJvX2FwcGVuZF9w YXRoKHBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCksIHApOwogICAgIGNhaXJvX3BhdGhfZGVzdHJv eShwKTsKICAgICByZXR1cm4gKnRoaXM7CiB9CiAKIHZvaWQgUGF0aDo6Y2xlYXIoKQogewotICAg IGNhaXJvX3QqIGNyID0gcGxhdGZvcm1QYXRoKCktPm1fY3I7Ci0gICAgY2Fpcm9fbmV3X3BhdGgo Y3IpOworICAgIGNhaXJvX25ld19wYXRoKHBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCkpOwogfQog CiBib29sIFBhdGg6OmlzRW1wdHkoKSBjb25zdAogewotICAgIHJldHVybiAhY2Fpcm9faGFzX2N1 cnJlbnRfcG9pbnQocGxhdGZvcm1QYXRoKCktPm1fY3IpOworICAgIHJldHVybiAhY2Fpcm9faGFz X2N1cnJlbnRfcG9pbnQocGxhdGZvcm1QYXRoKCktPmNvbnRleHQoKSk7CiB9CiAKIGJvb2wgUGF0 aDo6aGFzQ3VycmVudFBvaW50KCkgY29uc3QKQEAgLTg5LDM0ICs4NywyOSBAQCBib29sIFBhdGg6 Omhhc0N1cnJlbnRQb2ludCgpIGNvbnN0CiBGbG9hdFBvaW50IFBhdGg6OmN1cnJlbnRQb2ludCgp IGNvbnN0IAogewogICAgIC8vIEZJWE1FOiBJcyB0aGlzIHRoZSBjb3JyZWN0IHdheT8KLSAgICBk b3VibGUgeDsKLSAgICBkb3VibGUgeTsKLSAgICBjYWlyb19nZXRfY3VycmVudF9wb2ludChwbGF0 Zm9ybVBhdGgoKS0+bV9jciwgJngsICZ5KTsKKyAgICBkb3VibGUgeCwgeTsKKyAgICBjYWlyb19n ZXRfY3VycmVudF9wb2ludChwbGF0Zm9ybVBhdGgoKS0+Y29udGV4dCgpLCAmeCwgJnkpOwogICAg IHJldHVybiBGbG9hdFBvaW50KHgsIHkpOwogfQogCiB2b2lkIFBhdGg6OnRyYW5zbGF0ZShjb25z dCBGbG9hdFNpemUmIHApCiB7Ci0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+bV9j cjsKLSAgICBjYWlyb190cmFuc2xhdGUoY3IsIC1wLndpZHRoKCksIC1wLmhlaWdodCgpKTsKKyAg ICBjYWlyb190cmFuc2xhdGUocGxhdGZvcm1QYXRoKCktPmNvbnRleHQoKSwgLXAud2lkdGgoKSwg LXAuaGVpZ2h0KCkpOwogfQogCiB2b2lkIFBhdGg6Om1vdmVUbyhjb25zdCBGbG9hdFBvaW50JiBw KQogewotICAgIGNhaXJvX3QqIGNyID0gcGxhdGZvcm1QYXRoKCktPm1fY3I7Ci0gICAgY2Fpcm9f bW92ZV90byhjciwgcC54KCksIHAueSgpKTsKKyAgICBjYWlyb19tb3ZlX3RvKHBsYXRmb3JtUGF0 aCgpLT5jb250ZXh0KCksIHAueCgpLCBwLnkoKSk7CiB9CiAKIHZvaWQgUGF0aDo6YWRkTGluZVRv KGNvbnN0IEZsb2F0UG9pbnQmIHApCiB7Ci0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgo KS0+bV9jcjsKLSAgICBjYWlyb19saW5lX3RvKGNyLCBwLngoKSwgcC55KCkpOworICAgIGNhaXJv X2xpbmVfdG8ocGxhdGZvcm1QYXRoKCktPmNvbnRleHQoKSwgcC54KCksIHAueSgpKTsKIH0KIAog dm9pZCBQYXRoOjphZGRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIHsKLSAgICBjYWlyb190 KiBjciA9IHBsYXRmb3JtUGF0aCgpLT5tX2NyOwotICAgIGNhaXJvX3JlY3RhbmdsZShjciwgcmVj dC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGNhaXJv X3JlY3RhbmdsZShwbGF0Zm9ybVBhdGgoKS0+Y29udGV4dCgpLCByZWN0LngoKSwgcmVjdC55KCks IHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CiB9CiAKIC8qCkBAIC0xMjQsNyArMTE3LDcg QEAgdm9pZCBQYXRoOjphZGRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAqLwogdm9pZCBQ YXRoOjphZGRRdWFkQ3VydmVUbyhjb25zdCBGbG9hdFBvaW50JiBjb250cm9sUG9pbnQsIGNvbnN0 IEZsb2F0UG9pbnQmIHBvaW50KQogewotICAgIGNhaXJvX3QqIGNyID0gcGxhdGZvcm1QYXRoKCkt Pm1fY3I7CisgICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+Y29udGV4dCgpOwogICAg IGRvdWJsZSB4LCB5OwogICAgIGRvdWJsZSB4MSA9IGNvbnRyb2xQb2ludC54KCk7CiAgICAgZG91 YmxlIHkxID0gY29udHJvbFBvaW50LnkoKTsKQEAgLTEzOSw4ICsxMzIsNyBAQCB2b2lkIFBhdGg6 OmFkZFF1YWRDdXJ2ZVRvKGNvbnN0IEZsb2F0UG9pbnQmIGNvbnRyb2xQb2ludCwgY29uc3QgRmxv YXRQb2ludCYgcG9pbgogCiB2b2lkIFBhdGg6OmFkZEJlemllckN1cnZlVG8oY29uc3QgRmxvYXRQ b2ludCYgY29udHJvbFBvaW50MSwgY29uc3QgRmxvYXRQb2ludCYgY29udHJvbFBvaW50MiwgY29u c3QgRmxvYXRQb2ludCYgY29udHJvbFBvaW50MykKIHsKLSAgICBjYWlyb190KiBjciA9IHBsYXRm b3JtUGF0aCgpLT5tX2NyOwotICAgIGNhaXJvX2N1cnZlX3RvKGNyLCBjb250cm9sUG9pbnQxLngo KSwgY29udHJvbFBvaW50MS55KCksCisgICAgY2Fpcm9fY3VydmVfdG8ocGxhdGZvcm1QYXRoKCkt PmNvbnRleHQoKSwgY29udHJvbFBvaW50MS54KCksIGNvbnRyb2xQb2ludDEueSgpLAogICAgICAg ICAgICAgICAgICAgIGNvbnRyb2xQb2ludDIueCgpLCBjb250cm9sUG9pbnQyLnkoKSwKICAgICAg ICAgICAgICAgICAgICBjb250cm9sUG9pbnQzLngoKSwgY29udHJvbFBvaW50My55KCkpOwogfQpA QCAtMTUyLDExICsxNDQsMTAgQEAgdm9pZCBQYXRoOjphZGRBcmMoY29uc3QgRmxvYXRQb2ludCYg cCwgZmxvYXQgciwgZmxvYXQgc2EsIGZsb2F0IGVhLCBib29sIGFudGljbG8KICAgICBpZiAoIWlz ZmluaXRlKHIpIHx8ICFpc2Zpbml0ZShzYSkgfHwgIWlzZmluaXRlKGVhKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+bV9jcjsKICAgICBpZiAo YW50aWNsb2Nrd2lzZSkKLSAgICAgICAgY2Fpcm9fYXJjX25lZ2F0aXZlKGNyLCBwLngoKSwgcC55 KCksIHIsIHNhLCBlYSk7CisgICAgICAgIGNhaXJvX2FyY19uZWdhdGl2ZShwbGF0Zm9ybVBhdGgo KS0+Y29udGV4dCgpLCBwLngoKSwgcC55KCksIHIsIHNhLCBlYSk7CiAgICAgZWxzZQotICAgICAg ICBjYWlyb19hcmMoY3IsIHAueCgpLCBwLnkoKSwgciwgc2EsIGVhKTsKKyAgICAgICAgY2Fpcm9f YXJjKHBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCksIHAueCgpLCBwLnkoKSwgciwgc2EsIGVhKTsK IH0KIAogdm9pZCBQYXRoOjphZGRBcmNUbyhjb25zdCBGbG9hdFBvaW50JiBwMSwgY29uc3QgRmxv YXRQb2ludCYgcDIsIGZsb2F0IHJhZGl1cykKQEAgLTE2NCw3ICsxNTUsNyBAQCB2b2lkIFBhdGg6 OmFkZEFyY1RvKGNvbnN0IEZsb2F0UG9pbnQmIHAxLCBjb25zdCBGbG9hdFBvaW50JiBwMiwgZmxv YXQgcmFkaXVzKQogICAgIGlmIChpc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNh aXJvX3QqIGNyID0gcGxhdGZvcm1QYXRoKCktPm1fY3I7CisgICAgY2Fpcm9fdCogY3IgPSBwbGF0 Zm9ybVBhdGgoKS0+Y29udGV4dCgpOwogCiAgICAgZG91YmxlIHgwLCB5MDsKICAgICBjYWlyb19n ZXRfY3VycmVudF9wb2ludChjciwgJngwLCAmeTApOwpAQCAtMjM3LDcgKzIyOCw3IEBAIHZvaWQg UGF0aDo6YWRkQXJjVG8oY29uc3QgRmxvYXRQb2ludCYgcDEsIGNvbnN0IEZsb2F0UG9pbnQmIHAy LCBmbG9hdCByYWRpdXMpCiAKIHZvaWQgUGF0aDo6YWRkRWxsaXBzZShjb25zdCBGbG9hdFJlY3Qm IHJlY3QpCiB7Ci0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+bV9jcjsKKyAgICBj YWlyb190KiBjciA9IHBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCk7CiAgICAgY2Fpcm9fc2F2ZShj cik7CiAgICAgZmxvYXQgeVJhZGl1cyA9IC41ICogcmVjdC5oZWlnaHQoKTsKICAgICBmbG9hdCB4 UmFkaXVzID0gLjUgKiByZWN0LndpZHRoKCk7CkBAIC0yNDksMjEgKzI0MCwxOSBAQCB2b2lkIFBh dGg6OmFkZEVsbGlwc2UoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogCiB2b2lkIFBhdGg6OmNsb3Nl U3VicGF0aCgpCiB7Ci0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+bV9jcjsKLSAg ICBjYWlyb19jbG9zZV9wYXRoKGNyKTsKKyAgICBjYWlyb19jbG9zZV9wYXRoKHBsYXRmb3JtUGF0 aCgpLT5jb250ZXh0KCkpOwogfQogCiBGbG9hdFJlY3QgUGF0aDo6Ym91bmRpbmdSZWN0KCkgY29u c3QKIHsKLSAgICBjYWlyb190KiBjciA9IHBsYXRmb3JtUGF0aCgpLT5tX2NyOwogICAgIGRvdWJs ZSB4MCwgeDEsIHkwLCB5MTsKLSAgICBjYWlyb19wYXRoX2V4dGVudHMoY3IsICZ4MCwgJnkwLCAm eDEsICZ5MSk7CisgICAgY2Fpcm9fcGF0aF9leHRlbnRzKHBsYXRmb3JtUGF0aCgpLT5jb250ZXh0 KCksICZ4MCwgJnkwLCAmeDEsICZ5MSk7CiAgICAgcmV0dXJuIEZsb2F0UmVjdCh4MCwgeTAsIHgx IC0geDAsIHkxIC0geTApOwogfQogCiBGbG9hdFJlY3QgUGF0aDo6c3Ryb2tlQm91bmRpbmdSZWN0 KFN0cm9rZVN0eWxlQXBwbGllciogYXBwbGllcikKIHsKLSAgICBjYWlyb190KiBjciA9IHBsYXRm b3JtUGF0aCgpLT5tX2NyOworICAgIGNhaXJvX3QqIGNyID0gcGxhdGZvcm1QYXRoKCktPmNvbnRl eHQoKTsKICAgICBpZiAoYXBwbGllcikgewogICAgICAgICBHcmFwaGljc0NvbnRleHQgZ2MoY3Ip OwogICAgICAgICBhcHBsaWVyLT5zdHJva2VTdHlsZSgmZ2MpOwpAQCAtMjc2LDcgKzI2NSw3IEBA IEZsb2F0UmVjdCBQYXRoOjpzdHJva2VCb3VuZGluZ1JlY3QoU3Ryb2tlU3R5bGVBcHBsaWVyKiBh cHBsaWVyKQogCiBib29sIFBhdGg6OmNvbnRhaW5zKGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBX aW5kUnVsZSBydWxlKSBjb25zdAogewotICAgIGNhaXJvX3QqIGNyID0gcGxhdGZvcm1QYXRoKCkt Pm1fY3I7CisgICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+Y29udGV4dCgpOwogICAg IGNhaXJvX2ZpbGxfcnVsZV90IGN1ciA9IGNhaXJvX2dldF9maWxsX3J1bGUoY3IpOwogICAgIGNh aXJvX3NldF9maWxsX3J1bGUoY3IsIHJ1bGUgPT0gUlVMRV9FVkVOT0REID8gQ0FJUk9fRklMTF9S VUxFX0VWRU5fT0REIDogQ0FJUk9fRklMTF9SVUxFX1dJTkRJTkcpOwogICAgIGJvb2wgY29udGFp bnMgPSBjYWlyb19pbl9maWxsKGNyLCBwb2ludC54KCksIHBvaW50LnkoKSk7CkBAIC0yODcsNyAr Mjc2LDcgQEAgYm9vbCBQYXRoOjpjb250YWlucyhjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgV2lu ZFJ1bGUgcnVsZSkgY29uc3QKIGJvb2wgUGF0aDo6c3Ryb2tlQ29udGFpbnMoU3Ryb2tlU3R5bGVB cHBsaWVyKiBhcHBsaWVyLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCkgY29uc3QKIHsKICAgICBB U1NFUlQoYXBwbGllcik7Ci0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+bV9jcjsK KyAgICBjYWlyb190KiBjciA9IHBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCk7CiAgICAgR3JhcGhp Y3NDb250ZXh0IGdjKGNyKTsKICAgICBhcHBsaWVyLT5zdHJva2VTdHlsZSgmZ2MpOwogCkBAIC0y OTYsOCArMjg1LDcgQEAgYm9vbCBQYXRoOjpzdHJva2VDb250YWlucyhTdHJva2VTdHlsZUFwcGxp ZXIqIGFwcGxpZXIsIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KQogCiB2b2lkIFBhdGg6OmFwcGx5 KHZvaWQqIGluZm8sIFBhdGhBcHBsaWVyRnVuY3Rpb24gZnVuY3Rpb24pIGNvbnN0CiB7Ci0gICAg Y2Fpcm9fdCogY3IgPSBwbGF0Zm9ybVBhdGgoKS0+bV9jcjsKLSAgICBjYWlyb19wYXRoX3QqIHBh dGggPSBjYWlyb19jb3B5X3BhdGgoY3IpOworICAgIGNhaXJvX3BhdGhfdCogcGF0aCA9IGNhaXJv X2NvcHlfcGF0aChwbGF0Zm9ybVBhdGgoKS0+Y29udGV4dCgpKTsKICAgICBjYWlyb19wYXRoX2Rh dGFfdCogZGF0YTsKICAgICBQYXRoRWxlbWVudCBwZWxlbWVudDsKICAgICBGbG9hdFBvaW50IHBv aW50c1szXTsKQEAgLTMzNCwxMCArMzIyLDkgQEAgdm9pZCBQYXRoOjphcHBseSh2b2lkKiBpbmZv LCBQYXRoQXBwbGllckZ1bmN0aW9uIGZ1bmN0aW9uKSBjb25zdAogCiB2b2lkIFBhdGg6OnRyYW5z Zm9ybShjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zKQogewotICAgIGNhaXJvX3QqIG1fY3Ig PSBwbGF0Zm9ybVBhdGgoKS0+bV9jcjsKICAgICBjYWlyb19tYXRyaXhfdCBjX21hdHJpeCA9IGNh aXJvX21hdHJpeF90KHRyYW5zKTsKICAgICBjYWlyb19tYXRyaXhfaW52ZXJ0KCZjX21hdHJpeCk7 Ci0gICAgY2Fpcm9fdHJhbnNmb3JtKG1fY3IsICZjX21hdHJpeCk7CisgICAgY2Fpcm9fdHJhbnNm b3JtKHBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCksICZjX21hdHJpeCk7CiB9CiAKIFN0cmluZyBQ YXRoOjpkZWJ1Z1N0cmluZygpIGNvbnN0CkBAIC0zNDYsNyArMzMzLDcgQEAgU3RyaW5nIFBhdGg6 OmRlYnVnU3RyaW5nKCkgY29uc3QKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogCiAgICAgU3Ry aW5nIHBhdGhTdHJpbmc7Ci0gICAgY2Fpcm9fcGF0aF90KiBwYXRoID0gY2Fpcm9fY29weV9wYXRo KHBsYXRmb3JtUGF0aCgpLT5tX2NyKTsKKyAgICBjYWlyb19wYXRoX3QqIHBhdGggPSBjYWlyb19j b3B5X3BhdGgocGxhdGZvcm1QYXRoKCktPmNvbnRleHQoKSk7CiAgICAgY2Fpcm9fcGF0aF9kYXRh X3QqIGRhdGE7CiAKICAgICBmb3IgKGludCBpID0gMDsgaSA8IHBhdGgtPm51bV9kYXRhOyBpICs9 IHBhdGgtPmRhdGFbaV0uaGVhZGVyLmxlbmd0aCkgewo=