179679 2017-11-14 11:13:50 -0800 [Cairo] Clean up CairoOperations, GradientCairo, GraphicsContextCairo implementation files 2017-11-15 09:31:40 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan bugs-noreply mcatanzaro webkit-bug-importer oldest_to_newest 1371464 0 zan 2017-11-14 11:13:50 -0800 [Cairo] Clean up CairoOperations, GradientCairo, GraphicsContextCairo implementation files 1371479 1 326896 zan 2017-11-14 11:18:21 -0800 Created attachment 326896 Patch 1371735 2 326896 zan 2017-11-14 22:05:13 -0800 Comment on attachment 326896 Patch Clearing flags on attachment: 326896 Committed r224869: <https://trac.webkit.org/changeset/224869> 1371736 3 zan 2017-11-14 22:05:17 -0800 All reviewed patches have been landed. Closing bug. 1371863 4 webkit-bug-importer 2017-11-15 09:31:40 -0800 <rdar://problem/35561863> 326896 2017-11-14 11:18:21 -0800 2017-11-14 22:05:13 -0800 Patch bug-179679-20171114201819.patch text/plain 9042 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzNlOGU5ZDc5NzcxYTVl NDQ4NWVkNjIwZGUwNTAwNTI1MTlkOGM5Mi4uNzNlMzIxYjMwOGUzNWJjYjIxMmU0YjYyNWNkNDgz OWQzOGUzYTI0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDE3LTExLTE0ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQ2Fpcm9dIENsZWFu IHVwIENhaXJvT3BlcmF0aW9ucywgR3JhZGllbnRDYWlybywgR3JhcGhpY3NDb250ZXh0Q2Fpcm8g aW1wbGVtZW50YXRpb24gZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3OTY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENsZWFuIHVwIHJhbmRvbSB0aWRiaXRzIGluIHRoZSBDYWlyb09wZXJhdGlv bnMsIEdyYWRpZW50Q2Fpcm8gYW5kCisgICAgICAgIEdyYXBoaWNzQ29udGV4dENhaXJvIGltcGxl bWVudGF0aW9uIGZpbGVzIHRoYXQgSSd2ZSBiZWVuIHJhdmFnaW5nCisgICAgICAgIHRocm91Z2gg b3ZlciB0aGUgbGFzdCBmZXcgZGF5cy4KKworICAgICAgICBObyBuZXcgdGVzdHMgLS0gbm8gY2hh bmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fp cm9PcGVyYXRpb25zLmNwcDoKKyAgICAgICAgQWRkIGEgbWlzc2luZyA8YWxnb3JpdGhtcz4gaW5j bHVkZSwgZHJvcCBhbiB1bm5lY2Vzc2FyeSBlbXB0eSBsaW5lLgorICAgICAgICAoV2ViQ29yZTo6 Q2Fpcm86OmRyYXdMaW5lKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFk aWVudENhaXJvLmNwcDoKKyAgICAgICAgQWRkIGEgbWlzc2luZyBDYWlyb09wZXJhdGlvbnMuaCBp bmNsdWRlLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4 dENhaXJvLmNwcDoKKyAgICAgICAgRHJvcCB1bm5lY2Vzc2FyeSBpbmNsdWRlcyBhbmQgYSBidW5j aCBvZiByZWR1bmRhbnQgaGVscGVyIGZ1bmN0aW9ucy4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KToKKyAgICAgICAgSW5saW5lIHRoZSBEYXNoQXJy YXkgb2JqZWN0IGNvbnN0cnVjdGlvbiBpbnRvIHRoZSByZWxheSBjYWxsLgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZXNGb3JUZXh0KToKKyAgICAgICAgc2l6ZV90 IGNhbid0IGJlIG5lZ2F0aXZlLCBzbyBqdXN0IGNoZWNrIGZvciBEYXNoQXJyYXkgYmVpbmcgZW1w dHkuCisgICAgICAgIChXZWJDb3JlOjpmaWxsUmVjdFdpdGhDb2xvcik6IERlbGV0ZWQuCisgICAg ICAgICgpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6ZHJhd1BhdGhTaGFkb3cpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6ZmlsbEN1cnJlbnRDYWlyb1BhdGgpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6c2hhZG93QW5kRmlsbEN1cnJlbnRDYWlyb1BhdGgpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6c2hhZG93QW5kU3Ryb2tlQ3VycmVudENhaXJvUGF0aCk6IERl bGV0ZWQuCisKKzIwMTctMTEtMTQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29t PgorCiAgICAgICAgIFtDYWlyb10gTW92ZSBkcmF3TGluZSBvcGVyYXRpb24gZnJvbSBHcmFwaGlj c0NvbnRleHRDYWlybyB0byBDYWlyb09wZXJhdGlvbnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTY2OQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcAppbmRl eCBiODJhM2QxOWZmZDY0MTNjNDUxZWUwMDhmNTE0OWM4NTMwOGI1YjBkLi44ZmFkOWQ5OTVkYTlm NjMzNzg1YzkzOGM1YmM2ZjZjYzJiNzRkNzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5jcHAKQEAgLTQ0 LDYgKzQ0LDcgQEAKICNpbmNsdWRlICJQYXRoLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1Db250ZXh0 Q2Fpcm8uaCIKICNpbmNsdWRlICJQbGF0Zm9ybVBhdGhDYWlyby5oIgorI2luY2x1ZGUgPGFsZ29y aXRobT4KICNpbmNsdWRlIDxjYWlyby5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC03NTQs NyArNzU1LDYgQEAgdm9pZCBkcmF3TGluZShQbGF0Zm9ybUNvbnRleHRDYWlybyYgcGxhdGZvcm1D b250ZXh0LCBjb25zdCBGbG9hdFBvaW50JiBwb2ludDEsIGMKICAgICAgICAgICAgIGNhaXJvX3Nl dF9saW5lX3dpZHRoKGNhaXJvQ29udGV4dCwgMSk7CiAgICAgfQogCi0KICAgICBhdXRvIGNlbnRl cmVkUG9pbnRzID0gY2VudGVyTGluZUFuZEN1dE9mZkNvcm5lcnMoaXNWZXJ0aWNhbExpbmUsIGNv cm5lcldpZHRoLCBwb2ludDEsIHBvaW50Mik7CiAgICAgYXV0byBwMSA9IGNlbnRlcmVkUG9pbnRz WzBdOwogICAgIGF1dG8gcDIgPSBjZW50ZXJlZFBvaW50c1sxXTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYWRpZW50Q2Fpcm8uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhZGllbnRDYWlyby5jcHAKaW5k ZXggYTMzYmMxMjMxMGYxNTBkY2E1MGUzY2RmNWMyOGI5ZDVhYjBlZDg5Mi4uZjJmZWQxMmI0NjNj NWMxMDZhYTY2NzFiN2MwM2ZlZTNjYTBiZmU0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhZGllbnRDYWlyby5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhZGllbnRDYWlyby5jcHAKQEAgLTI5LDYg KzI5LDcgQEAKIAogI2lmIFVTRShDQUlSTykKIAorI2luY2x1ZGUgIkNhaXJvT3BlcmF0aW9ucy5o IgogI2luY2x1ZGUgIkNhaXJvVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0 LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1Db250ZXh0Q2Fpcm8uaCIKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4 dENhaXJvLmNwcAppbmRleCAzNjViNWViMWQzNzM3ZDNhNmM0MmZkZjQzYzlmMzQwYTM2MDk5NDcw Li5hMDYzYmZmNzg0YjQwYmE5NGNlZGU5YWNiOGE2NGQwZWFhOWY5MGY1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWly by5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhp Y3NDb250ZXh0Q2Fpcm8uY3BwCkBAIC0zNiwyNyArMzYsMTUgQEAKICNpZiBVU0UoQ0FJUk8pCiAK ICNpbmNsdWRlICJBZmZpbmVUcmFuc2Zvcm0uaCIKLSNpbmNsdWRlICJDYWlyb1V0aWxpdGllcy5o IgotI2luY2x1ZGUgIkRpc3BsYXlMaXN0UmVjb3JkZXIuaCIKLSNpbmNsdWRlICJGbG9hdENvbnZl cnNpb24uaCIKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKICNpbmNsdWRlICJGbG9hdFJvdW5kZWRS ZWN0LmgiCi0jaW5jbHVkZSAiRm9udC5oIgorI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dEltcGwu aCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGVDYWlyby5oIgogI2lu Y2x1ZGUgIkltYWdlQnVmZmVyLmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1ZGUgIk5v dEltcGxlbWVudGVkLmgiCi0jaW5jbHVkZSAiUGF0aC5oIgotI2luY2x1ZGUgIlBhdHRlcm4uaCIK ICNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRDYWlyby5oIgotI2luY2x1ZGUgIlBsYXRmb3JtUGF0 aENhaXJvLmgiCiAjaW5jbHVkZSAiUmVmUHRyQ2Fpcm8uaCIKLSNpbmNsdWRlICJTaGFkb3dCbHVy LmgiCi0jaW5jbHVkZSAiVHJhbnNmb3JtYXRpb25NYXRyaXguaCIKLSNpbmNsdWRlIDxjYWlyby5o PgotI2luY2x1ZGUgPG1hdGguaD4KLSNpbmNsdWRlIDxzdGRpby5oPgotI2luY2x1ZGUgPHd0Zi9N YXRoRXh0cmFzLmg+CiAKICNpZiBQTEFURk9STShXSU4pCiAjaW5jbHVkZSA8Y2Fpcm8td2luMzIu aD4KQEAgLTY0LDEwOCArNTIsNiBAQAogCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKLXVzaW5nIG5h bWVzcGFjZSBzdGQ7Ci0KLS8vIEEgaGVscGVyIHdoaWNoIHF1aWNrbHkgZmlsbHMgYSByZWN0YW5n bGUgd2l0aCBhIHNpbXBsZSBjb2xvciBmaWxsLgotc3RhdGljIGlubGluZSB2b2lkIGZpbGxSZWN0 V2l0aENvbG9yKGNhaXJvX3QqIGNyLCBjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IENvbG9y JiBjb2xvcikKLXsKLSAgICBpZiAoIWNvbG9yLmlzVmlzaWJsZSgpICYmIGNhaXJvX2dldF9vcGVy YXRvcihjcikgPT0gQ0FJUk9fT1BFUkFUT1JfT1ZFUikKLSAgICAgICAgcmV0dXJuOwotCi0gICAg c2V0U291cmNlUkdCQUZyb21Db2xvcihjciwgY29sb3IpOwotICAgIGNhaXJvX3JlY3RhbmdsZShj ciwgcmVjdC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwotICAg IGNhaXJvX2ZpbGwoY3IpOwotfQotCi1lbnVtIFBhdGhEcmF3aW5nU3R5bGUgeyAKLSAgICBGaWxs ID0gMSwKLSAgICBTdHJva2UgPSAyLAotICAgIEZpbGxBbmRTdHJva2UgPSBGaWxsICsgU3Ryb2tl Ci19OwotCi1zdGF0aWMgaW5saW5lIHZvaWQgZHJhd1BhdGhTaGFkb3coR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBQYXRoRHJhd2luZ1N0eWxlIGRyYXdpbmdTdHlsZSkKLXsKLSAgICBTaGFkb3dC bHVyJiBzaGFkb3cgPSBjb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpLT5zaGFkb3dCbHVyKCk7Ci0g ICAgaWYgKHNoYWRvdy50eXBlKCkgPT0gU2hhZG93Qmx1cjo6Tm9TaGFkb3cpCi0gICAgICAgIHJl dHVybjsKLQotICAgIC8vIENhbGN1bGF0ZSB0aGUgZXh0ZW50cyBvZiB0aGUgcmVuZGVyZWQgc29s aWQgcGF0aHMuCi0gICAgY2Fpcm9fdCogY2Fpcm9Db250ZXh0ID0gY29udGV4dC5wbGF0Zm9ybUNv bnRleHQoKS0+Y3IoKTsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8Y2Fpcm9fcGF0aF90LCB2b2lkKCop KGNhaXJvX3BhdGhfdCopPiBwYXRoKGNhaXJvX2NvcHlfcGF0aChjYWlyb0NvbnRleHQpLCBbXShj YWlyb19wYXRoX3QqIHBhdGgpIHsKLSAgICAgICAgY2Fpcm9fcGF0aF9kZXN0cm95KHBhdGgpOwot ICAgIH0pOwotCi0gICAgRmxvYXRSZWN0IHNvbGlkRmlndXJlRXh0ZW50czsKLSAgICBkb3VibGUg eDAgPSAwOwotICAgIGRvdWJsZSB4MSA9IDA7Ci0gICAgZG91YmxlIHkwID0gMDsKLSAgICBkb3Vi bGUgeTEgPSAwOwotICAgIGlmIChkcmF3aW5nU3R5bGUgJiBTdHJva2UpIHsKLSAgICAgICAgY2Fp cm9fc3Ryb2tlX2V4dGVudHMoY2Fpcm9Db250ZXh0LCAmeDAsICZ5MCwgJngxLCAmeTEpOwotICAg ICAgICBzb2xpZEZpZ3VyZUV4dGVudHMgPSBGbG9hdFJlY3QoeDAsIHkwLCB4MSAtIHgwLCB5MSAt IHkwKTsKLSAgICB9Ci0gICAgaWYgKGRyYXdpbmdTdHlsZSAmIEZpbGwpIHsKLSAgICAgICAgY2Fp cm9fZmlsbF9leHRlbnRzKGNhaXJvQ29udGV4dCwgJngwLCAmeTAsICZ4MSwgJnkxKTsKLSAgICAg ICAgRmxvYXRSZWN0IGZpbGxFeHRlbnRzKHgwLCB5MCwgeDEgLSB4MCwgeTEgLSB5MCk7Ci0gICAg ICAgIHNvbGlkRmlndXJlRXh0ZW50cy51bml0ZShmaWxsRXh0ZW50cyk7Ci0gICAgfQotCi0gICAg R3JhcGhpY3NDb250ZXh0KiBzaGFkb3dDb250ZXh0ID0gc2hhZG93LmJlZ2luU2hhZG93TGF5ZXIo Y29udGV4dCwgc29saWRGaWd1cmVFeHRlbnRzKTsKLSAgICBpZiAoIXNoYWRvd0NvbnRleHQpCi0g ICAgICAgIHJldHVybjsKLQotICAgIGNhaXJvX3QqIGNhaXJvU2hhZG93Q29udGV4dCA9IHNoYWRv d0NvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5jcigpOwotCi0gICAgLy8gSXQncyBpbXBvcnRh bnQgdG8gY29weSB0aGUgY29udGV4dCBwcm9wZXJ0aWVzIHRvIHRoZSBuZXcgc2hhZG93Ci0gICAg Ly8gY29udGV4dCB0byBwcmVzZXJ2ZSB0aGluZ3Mgc3VjaCBhcyB0aGUgZmlsbCBydWxlIGFuZCBz dHJva2Ugd2lkdGguCi0gICAgY29weUNvbnRleHRQcm9wZXJ0aWVzKGNhaXJvQ29udGV4dCwgY2Fp cm9TaGFkb3dDb250ZXh0KTsKLQotICAgIGlmIChkcmF3aW5nU3R5bGUgJiBGaWxsKSB7Ci0gICAg ICAgIGNhaXJvX3NhdmUoY2Fpcm9TaGFkb3dDb250ZXh0KTsKLSAgICAgICAgY2Fpcm9fYXBwZW5k X3BhdGgoY2Fpcm9TaGFkb3dDb250ZXh0LCBwYXRoLmdldCgpKTsKLSAgICAgICAgc2hhZG93Q29u dGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPnByZXBhcmVGb3JGaWxsaW5nKGNvbnRleHQuc3RhdGUo KSwgUGxhdGZvcm1Db250ZXh0Q2Fpcm86Ok5vQWRqdXN0bWVudCk7Ci0gICAgICAgIGNhaXJvX2Zp bGwoY2Fpcm9TaGFkb3dDb250ZXh0KTsKLSAgICAgICAgY2Fpcm9fcmVzdG9yZShjYWlyb1NoYWRv d0NvbnRleHQpOwotICAgIH0KLQotICAgIGlmIChkcmF3aW5nU3R5bGUgJiBTdHJva2UpIHsKLSAg ICAgICAgY2Fpcm9fYXBwZW5kX3BhdGgoY2Fpcm9TaGFkb3dDb250ZXh0LCBwYXRoLmdldCgpKTsK LSAgICAgICAgc2hhZG93Q29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPnByZXBhcmVGb3JTdHJv a2luZyhjb250ZXh0LnN0YXRlKCksIFBsYXRmb3JtQ29udGV4dENhaXJvOjpEb05vdFByZXNlcnZl QWxwaGEpOwotICAgICAgICBjYWlyb19zdHJva2UoY2Fpcm9TaGFkb3dDb250ZXh0KTsKLSAgICB9 Ci0KLSAgICAvLyBUaGUgb3JpZ2luYWwgcGF0aCBtYXkgc3RpbGwgYmUgaGFuZ2luZyBhcm91bmQg b24gdGhlIGNvbnRleHQgYW5kIGVuZFNoYWRvd0xheWVyCi0gICAgLy8gd2lsbCB0YWtlIGNhcmUg b2YgcHJvcGVybHkgY3JlYXRpbmcgYSBwYXRoIHRvIGRyYXcgdGhlIHJlc3VsdCBzaGFkb3cuIFdl IHJlbW92ZSB0aGUgcGF0aAotICAgIC8vIHRlbXBvcmFyaWx5IGFuZCB0aGVuIHJlc3RvcmUgaXQu Ci0gICAgLy8gU2VlOiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4 ODk3Ci0gICAgY2Fpcm9fbmV3X3BhdGgoY2Fpcm9Db250ZXh0KTsKLSAgICBzaGFkb3cuZW5kU2hh ZG93TGF5ZXIoY29udGV4dCk7Ci0gICAgY2Fpcm9fYXBwZW5kX3BhdGgoY2Fpcm9Db250ZXh0LCBw YXRoLmdldCgpKTsKLX0KLQotc3RhdGljIGlubGluZSB2b2lkIGZpbGxDdXJyZW50Q2Fpcm9QYXRo KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKLXsKLSAgICBjYWlyb190KiBjciA9IGNvbnRleHQu cGxhdGZvcm1Db250ZXh0KCktPmNyKCk7Ci0gICAgY2Fpcm9fc2F2ZShjcik7Ci0KLSAgICBjb250 ZXh0LnBsYXRmb3JtQ29udGV4dCgpLT5wcmVwYXJlRm9yRmlsbGluZyhjb250ZXh0LnN0YXRlKCks IFBsYXRmb3JtQ29udGV4dENhaXJvOjpBZGp1c3RQYXR0ZXJuRm9yR2xvYmFsQWxwaGEpOwotICAg IGNhaXJvX2ZpbGwoY3IpOwotCi0gICAgY2Fpcm9fcmVzdG9yZShjcik7Ci19Ci0KLXN0YXRpYyBp bmxpbmUgdm9pZCBzaGFkb3dBbmRGaWxsQ3VycmVudENhaXJvUGF0aChHcmFwaGljc0NvbnRleHQm IGNvbnRleHQpCi17Ci0gICAgZHJhd1BhdGhTaGFkb3coY29udGV4dCwgRmlsbCk7Ci0gICAgZmls bEN1cnJlbnRDYWlyb1BhdGgoY29udGV4dCk7Ci19Ci0KLXN0YXRpYyBpbmxpbmUgdm9pZCBzaGFk b3dBbmRTdHJva2VDdXJyZW50Q2Fpcm9QYXRoKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkKLXsK LSAgICBkcmF3UGF0aFNoYWRvdyhjb250ZXh0LCBTdHJva2UpOwotICAgIGNvbnRleHQucGxhdGZv cm1Db250ZXh0KCktPnByZXBhcmVGb3JTdHJva2luZyhjb250ZXh0LnN0YXRlKCkpOwotICAgIGNh aXJvX3N0cm9rZShjb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpLT5jcigpKTsKLX0KIAogR3JhcGhp Y3NDb250ZXh0OjpHcmFwaGljc0NvbnRleHQoY2Fpcm9fdCogY3IpCiB7CkBAIC00MzAsMTAgKzMx Niw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFZlY3RvcjxG bG9hdFJlY3Q+JiByZWN0cywgZmxvYXQgd2lkdGgsCiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRQb2ludCYgb3JpZ2luLCBmbG9hdCB3aWR0aCwgYm9v bCBwcmludGluZywgYm9vbCBkb3VibGVVbmRlcmxpbmVzLCBTdHJva2VTdHlsZSkKIHsKLSAgICBE YXNoQXJyYXkgd2lkdGhzOwotICAgIHdpZHRocy5hcHBlbmQod2lkdGgpOwotICAgIHdpZHRocy5h cHBlbmQoMCk7Ci0gICAgZHJhd0xpbmVzRm9yVGV4dChvcmlnaW4sIHdpZHRocywgcHJpbnRpbmcs IGRvdWJsZVVuZGVybGluZXMpOworICAgIGRyYXdMaW5lc0ZvclRleHQob3JpZ2luLCBEYXNoQXJy YXkgeyB3aWR0aCwgMCB9LCBwcmludGluZywgZG91YmxlVW5kZXJsaW5lcyk7CiB9CiAKIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZXNGb3JUZXh0KGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50 LCBjb25zdCBEYXNoQXJyYXkmIHdpZHRocywgYm9vbCBwcmludGluZywgYm9vbCBkb3VibGVVbmRl cmxpbmVzLCBTdHJva2VTdHlsZSkKQEAgLTQ0MSw3ICszMjQsNyBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6ZHJhd0xpbmVzRm9yVGV4dChjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgY29uc3QgRGFz aEFycmF5JgogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGlmICh3aWR0aHMuc2l6ZSgpIDw9IDApCisgICAgaWYgKHdpZHRocy5pc0VtcHR5KCkpCiAg ICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX2ltcGwpIHsK