57878 2011-04-05 13:20:03 -0700 [Cairo] Hide the details of image masking in PlatformContextCairo 2011-04-06 07:36:36 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned abarth eric rniwa webkit.review.bot oldest_to_newest 379829 0 mrobinson 2011-04-05 13:20:03 -0700 Now that we have have PlatformContextCairo, we can better encapsulate the logic in PlatformContextCairo. This removes the need to expose private Cairo details via the platform-independent GraphicsContext. 379839 1 88304 mrobinson 2011-04-05 13:40:15 -0700 Created attachment 88304 Patch 379980 2 88304 xan.lopez 2011-04-05 17:08:36 -0700 Comment on attachment 88304 Patch r=me 380337 3 88304 mrobinson 2011-04-06 07:16:11 -0700 Comment on attachment 88304 Patch Clearing flags on attachment: 88304 Committed r83044: <http://trac.webkit.org/changeset/83044> 380338 4 mrobinson 2011-04-06 07:16:18 -0700 All reviewed patches have been landed. Closing bug. 380351 5 webkit.review.bot 2011-04-06 07:34:21 -0700 http://trac.webkit.org/changeset/83044 might have broken GTK Linux 64-bit Debug 380353 6 rniwa 2011-04-06 07:36:36 -0700 I think this patch broke WinCairo: http://build.webkit.org/builders/GTK%20Linux%2064-bit%20Debug/builds/21161/steps/compile-webkit/logs/stdio 88304 2011-04-05 13:40:15 -0700 2011-04-06 07:16:10 -0700 Patch bug-57878-20110405134017.patch text/plain 11797 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODI5NjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0ZWUwYzI1NzBiZDY3NjNi YjJmN2I2NmM3MzY5OGE5MjdmYmJhMDQxLi4yZDI0OTg5YmQzMWJmNWI3OTE0MjY3ODUzNDFkMzQ2 Y2M4N2M2MmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDQtMDUgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDYWlyb10gSGlkZSB0aGUgZGV0YWlscyBvZiBp bWFnZSBtYXNraW5nIGluIFBsYXRmb3JtQ29udGV4dENhaXJvCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzg3OAorCisgICAgICAgIE5vIG5ldyB0ZXN0 cy4gVGhpcyBpcyBqdXN0IGEgcmVmYWN0b3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9H cmFwaGljc0NvbnRleHRDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OnNhdmVQbGF0Zm9ybVN0YXRlKTogQ2FsbCBpbnRvIFBsYXRmb3JtQ29udGV4dENhaXJvIG5v dyB0bworICAgICAgICBkbyB0aGUgYWN0dWFsIGNhaXJvX3NhdmUuIFJlbW92ZSBpbmZvcm1hdGlv biBhYm91dCBpbWFnZSBtYXNraW5nLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 OjpyZXN0b3JlUGxhdGZvcm1TdGF0ZSk6IENhbGwgaW50byBQbGF0Zm9ybUNvbnRleHRDYWlybyBu b3cgdG8KKyAgICAgICAgZG8gdGhlIGFjdHVhbCBjYWlyb19yZXN0b3JlLiBSZW1vdmUgaW5mb3Jt YXRpb24gYWJvdXQgaW1hZ2UgbWFza2luZy4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9HcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGVDYWlyby5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ltYWdlQnVmZmVyQ2Fpcm8uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW1hZ2VCdWZmZXI6OmNsaXApOiBVc2UgUGxhdGZvcm1Db250ZXh0Q2Fpcm8gaGVyZSBu b3cuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUGxhdGZvcm1Db250ZXh0Q2Fp cm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0Q2Fpcm86OnJlc3RvcmUp OiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dENhaXJvOjpzYXZlKTog QWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRDYWlybzo6cHVzaEltYWdl TWFzayk6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL1BsYXRmb3Jt Q29udGV4dENhaXJvLmg6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZU1hc2tJbmZvcm1hdGlvbjo6 dXBkYXRlKTogTW92ZWQgZnJvbSBHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGVDYWlyby5o LgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VNYXNrSW5mb3JtYXRpb246OmlzVmFsaWQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTWFza0luZm9ybWF0aW9uOjptYXNrU3VyZmFjZSk6 IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VNYXNrSW5mb3JtYXRpb246Om1hc2tSZWN0 KTogRGl0dG8uCisKIDIwMTEtMDQtMDUgIENocmlzIFJvZ2VycyAgPGNyb2dlcnNAZ29vZ2xlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCmluZGV4IDllN2E1 M2NmMDBjODY5MjA0YTMxNDM4MDlhZTQ5ZjhhODc2OWYzYjIuLjk5MWQwNDczYWE5YWU3NWJmYTE3 YmQzZTAxOWUzNzY4MTFmYmY0YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC00OTIsNyArNDkyLDYgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiAjaWYgUExBVEZPUk0oQ0FJUk8pCiAgICAgICAgIEdyYXBoaWNzQ29udGV4 dChjYWlyb190Kik7Ci0gICAgICAgIHZvaWQgcHVzaEltYWdlTWFzayhjYWlyb19zdXJmYWNlX3Qq LCBjb25zdCBGbG9hdFJlY3QmKTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oR1RLKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250 ZXh0Q2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3Jh cGhpY3NDb250ZXh0Q2Fpcm8uY3BwCmluZGV4IDkwMDA4MjJmMjM3ZGQ2NTgxNzQxN2UxZDU2ZjVi NDdiODU2N2I4ODMuLjc1N2U0NzdlZGMzNWI2ODJmM2FlMWIxNGFmM2JlNDk3YjgwZWUwMGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNz Q29udGV4dENhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKQEAgLTIzNSwyNCArMjM1LDEzIEBAIFBsYXRm b3JtQ29udGV4dENhaXJvKiBHcmFwaGljc0NvbnRleHQ6OnBsYXRmb3JtQ29udGV4dCgpIGNvbnN0 CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzYXZlUGxhdGZvcm1TdGF0ZSgpCiB7Ci0gICAgY2Fp cm9fc2F2ZShwbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKSk7CisgICAgcGxhdGZvcm1Db250ZXh0KCkt PnNhdmUoKTsKICAgICBtX2RhdGEtPnNhdmUoKTsKICAgICBtX2RhdGEtPnNoYWRvd1N0YWNrLmFw cGVuZChtX2RhdGEtPnNoYWRvdyk7Ci0gICAgbV9kYXRhLT5tYXNrSW1hZ2VTdGFjay5hcHBlbmQo SW1hZ2VNYXNrSW5mb3JtYXRpb24oKSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpyZXN0 b3JlUGxhdGZvcm1TdGF0ZSgpCiB7Ci0gICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybUNvbnRleHQo KS0+Y3IoKTsKLQotICAgIGNvbnN0IEltYWdlTWFza0luZm9ybWF0aW9uJiBtYXNrSW5mb3JtYXRp b24gPSBtX2RhdGEtPm1hc2tJbWFnZVN0YWNrLmxhc3QoKTsKLSAgICBpZiAobWFza0luZm9ybWF0 aW9uLmlzVmFsaWQoKSkgewotICAgICAgICBjb25zdCBGbG9hdFJlY3QmIG1hc2tSZWN0ID0gbWFz a0luZm9ybWF0aW9uLm1hc2tSZWN0KCk7Ci0gICAgICAgIGNhaXJvX3BvcF9ncm91cF90b19zb3Vy Y2UoY3IpOwotICAgICAgICBjYWlyb19tYXNrX3N1cmZhY2UoY3IsIG1hc2tJbmZvcm1hdGlvbi5t YXNrU3VyZmFjZSgpLCBtYXNrUmVjdC54KCksIG1hc2tSZWN0LnkoKSk7Ci0gICAgfQotICAgIG1f ZGF0YS0+bWFza0ltYWdlU3RhY2sucmVtb3ZlTGFzdCgpOwotCiAgICAgaWYgKG1fZGF0YS0+c2hh ZG93U3RhY2suaXNFbXB0eSgpKQogICAgICAgICBtX2RhdGEtPnNoYWRvdyA9IENvbnRleHRTaGFk b3coKTsKICAgICBlbHNlIHsKQEAgLTI2MCw3ICsyNDksNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6cmVzdG9yZVBsYXRmb3JtU3RhdGUoKQogICAgICAgICBtX2RhdGEtPnNoYWRvd1N0YWNrLnJl bW92ZUxhc3QoKTsKICAgICB9CiAKLSAgICBjYWlyb19yZXN0b3JlKGNyKTsKKyAgICBwbGF0Zm9y bUNvbnRleHQoKS0+cmVzdG9yZSgpOwogICAgIG1fZGF0YS0+cmVzdG9yZSgpOwogfQogCkBAIC0x MTkxLDMzICsxMTgwLDYgQEAgSW50ZXJwb2xhdGlvblF1YWxpdHkgR3JhcGhpY3NDb250ZXh0Ojpp bWFnZUludGVycG9sYXRpb25RdWFsaXR5KCkgY29uc3QKICAgICByZXR1cm4gSW50ZXJwb2xhdGlv bkRlZmF1bHQ7CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpwdXNoSW1hZ2VNYXNrKGNhaXJv X3N1cmZhY2VfdCogc3VyZmFjZSwgY29uc3QgRmxvYXRSZWN0JiByZWN0KQotewotICAgIC8vIFdl IG11c3QgY2FsbCBzYXZlUGxhdGZvcm1TdGF0ZSBhdCBsZWFzdCBvbmNlIGJlZm9yZSB3ZSBjYW4g dXNlIGltYWdlIG1hc2tpbmcsCi0gICAgLy8gc2luY2Ugd2UgYWN0dWFsbHkgYXBwbHkgdGhlIG1h c2sgaW4gcmVzdG9yZVBsYXRmb3JtU3RhdGUuCi0gICAgQVNTRVJUKCFtX2RhdGEtPm1hc2tJbWFn ZVN0YWNrLmlzRW1wdHkoKSk7Ci0gICAgbV9kYXRhLT5tYXNrSW1hZ2VTdGFjay5sYXN0KCkudXBk YXRlKHN1cmZhY2UsIHJlY3QpOwotCi0gICAgLy8gQ2Fpcm8gZG9lc24ndCBzdXBwb3J0IHRoZSBu b3Rpb24gb2YgYW4gaW1hZ2UgY2xpcCwgc28gd2UgcHVzaCBhIGdyb3VwIGhlcmUKLSAgICAvLyBh bmQgdGhlbiBwYWludCBpdCB0byB0aGUgc3VyZmFjZSB3aXRoIGFuIGltYWdlIG1hc2sgKHdoaWNo IGlzIGFuIGltbWVkaWF0ZQotICAgIC8vIG9wZXJhdGlvbikgZHVyaW5nIHJlc3RvcmVQbGF0Zm9y bVN0YXRlLgotCi0gICAgLy8gV2Ugd2FudCB0byBhbGxvdyB0aGUgY2xpcHBlZCBlbGVtZW50cyB0 byBjb21wb3NpdGUgd2l0aCB0aGUgc3VyZmFjZSBhcyBpdAotICAgIC8vIGlzIG5vdywgYnV0IHRo ZXkgYXJlIGlzb2xhdGVkIGluIGFub3RoZXIgZ3JvdXAuIFRvIG1ha2UgdGhpcyB3b3JrLCB3ZSdy ZQotICAgIC8vIGdvaW5nIHRvIGJsaXQgdGhlIGN1cnJlbnQgc3VyZmFjZSBjb250ZW50cyBvbnRv IHRoZSBuZXcgZ3JvdXAgb25jZSB3ZSBwdXNoIGl0LgotICAgIGNhaXJvX3QqIGNyID0gcGxhdGZv cm1Db250ZXh0KCktPmNyKCk7Ci0gICAgY2Fpcm9fc3VyZmFjZV90KiBjdXJyZW50VGFyZ2V0ID0g Y2Fpcm9fZ2V0X3RhcmdldChjcik7Ci0gICAgY2Fpcm9fc3VyZmFjZV9mbHVzaChjdXJyZW50VGFy Z2V0KTsKLQotICAgIC8vIFB1c2hpbmcgYSBuZXcgZ3JvdXAgZW5zdXJlcyB0aGF0IG9ubHkgdGhp bmdzIHBhaW50ZWQgYWZ0ZXIgdGhpcyBwb2ludCBhcmUgY2xpcHBlZC4KLSAgICBjYWlyb19wdXNo X2dyb3VwKGNyKTsKLSAgICBjYWlyb19zZXRfb3BlcmF0b3IoY3IsIENBSVJPX09QRVJBVE9SX1NP VVJDRSk7Ci0KLSAgICBjYWlyb19zZXRfc291cmNlX3N1cmZhY2UoY3IsIGN1cnJlbnRUYXJnZXQs IDAsIDApOwotICAgIGNhaXJvX3JlY3RhbmdsZShjciwgcmVjdC54KCksIHJlY3QueSgpLCByZWN0 LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwotICAgIGNhaXJvX2ZpbGwoY3IpOwotfQotCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBQTEFURk9STShDQUlSTykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4 dFBsYXRmb3JtUHJpdmF0ZUNhaXJvLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYWlyby9HcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGVDYWlyby5oCmluZGV4IDljZWVi Y2RmZjhhODZlMTVlYTZhYmJhNWZkODEyMTg3ZWMwN2JiYTguLjhmZDA1NmQzNGUyMDNhOTY5NGQ0 NzdkZWQ0MzI0ZTVjMjJmMDBkOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZUNhaXJvLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0 UGxhdGZvcm1Qcml2YXRlQ2Fpcm8uaApAQCAtNDcsMjUgKzQ3LDYgQEAgdHlwZWRlZiBzdHJ1Y3Qg X0dka0V4cG9zZUV2ZW50IEdka0V4cG9zZUV2ZW50OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LS8vIEluIENhaXJvIGltYWdlIG1hc2tpbmcgaXMgaW1tZWRpYXRlLCBzbyB0byBlbXVsYXRlIGlt YWdlIGNsaXBwaW5nIHdlIG11c3Qgc2F2ZSBtYXNraW5nCi0vLyBkZXRhaWxzIGFzIHBhcnQgb2Yg dGhlIGNvbnRleHQgc3RhdGUgYW5kIGFwcGx5IGl0IGR1cmluZyBwbGF0Zm9ybSByZXN0b3JlLgot Y2xhc3MgSW1hZ2VNYXNrSW5mb3JtYXRpb24gewotcHVibGljOgotICAgIHZvaWQgdXBkYXRlKGNh aXJvX3N1cmZhY2VfdCogbWFza1N1cmZhY2UsIGNvbnN0IEZsb2F0UmVjdCYgbWFza1JlY3QpCi0g ICAgewotICAgICAgICBtX21hc2tTdXJmYWNlID0gbWFza1N1cmZhY2U7Ci0gICAgICAgIG1fbWFz a1JlY3QgPSBtYXNrUmVjdDsKLSAgICB9Ci0KLSAgICBib29sIGlzVmFsaWQoKSBjb25zdCB7IHJl dHVybiBtX21hc2tTdXJmYWNlOyB9Ci0gICAgY2Fpcm9fc3VyZmFjZV90KiBtYXNrU3VyZmFjZSgp IGNvbnN0IHsgcmV0dXJuIG1fbWFza1N1cmZhY2UuZ2V0KCk7IH0KLSAgICBjb25zdCBGbG9hdFJl Y3QmIG1hc2tSZWN0KCkgY29uc3QgeyByZXR1cm4gbV9tYXNrUmVjdDsgfQotCi1wcml2YXRlOgot ICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IG1fbWFza1N1cmZhY2U7Ci0gICAgRmxvYXRSZWN0 IG1fbWFza1JlY3Q7Ci19OwotCiBjbGFzcyBHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGUg ewogcHVibGljOgogICAgIEdyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZShQbGF0Zm9ybUNv bnRleHRDYWlybyogbmV3UGxhdGZvcm1Db250ZXh0KQpAQCAtMTIxLDcgKzEwMiw2IEBAIHB1Ymxp YzoKICAgICBWZWN0b3I8ZmxvYXQ+IGxheWVyczsKICAgICBDb250ZXh0U2hhZG93IHNoYWRvdzsK ICAgICBWZWN0b3I8Q29udGV4dFNoYWRvdz4gc2hhZG93U3RhY2s7Ci0gICAgVmVjdG9yPEltYWdl TWFza0luZm9ybWF0aW9uPiBtYXNrSW1hZ2VTdGFjazsKIAogI2lmIFBMQVRGT1JNKEdUSykKICAg ICBHZGtFdmVudEV4cG9zZSogZXhwb3NlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckNhaXJvLmNwcAppbmRleCAxZDVk NDkyMTg1YTg0MzYwMTAwOTU2NWM2Nzg2YzVlZjc1ZWY3YjM1Li40ZjRiMmI1YjBhNjJlNzQ3OTA4 M2Q0YTg5ODA2OWVmM2ZhNzczOTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckNhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFnZUJ1ZmZlckNhaXJvLmNwcApAQCAtMTE3LDcg KzExNyw3IEBAIFBhc3NSZWZQdHI8SW1hZ2U+IEltYWdlQnVmZmVyOjpjb3B5SW1hZ2UoKSBjb25z dAogCiB2b2lkIEltYWdlQnVmZmVyOjpjbGlwKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29u c3QgRmxvYXRSZWN0JiBtYXNrUmVjdCkgY29uc3QKIHsKLSAgICBjb250ZXh0LT5wdXNoSW1hZ2VN YXNrKG1fZGF0YS5tX3N1cmZhY2UsIG1hc2tSZWN0KTsKKyAgICBjb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKS0+cHVzaEltYWdlTWFzayhtX2RhdGEubV9zdXJmYWNlLCBtYXNrUmVjdCk7CiB9CiAK IHZvaWQgSW1hZ2VCdWZmZXI6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBDb2xvclNw YWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxv YXRSZWN0JiBzcmNSZWN0LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vUGxhdGZvcm1Db250ZXh0Q2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUGxhdGZvcm1Db250ZXh0Q2Fpcm8uY3BwCmluZGV4IGJhNzUx NjJkNzUyYjUzMGMzZjIyZjNkOGJiNTY0OTI3OGU4NjMzNDIuLjQwYTNhZjcwNzE2ZWQzZTY0ZDVk MDA4MzlkM2Q2NjBhZTk2YzZhMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL1BsYXRmb3JtQ29udGV4dENhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9QbGF0Zm9ybUNvbnRleHRDYWlyby5jcHAKQEAg LTM1LDQgKzM1LDUxIEBAIFBsYXRmb3JtQ29udGV4dENhaXJvOjpQbGF0Zm9ybUNvbnRleHRDYWly byhjYWlyb190KiBjcikKIHsKIH0KIAordm9pZCBQbGF0Zm9ybUNvbnRleHRDYWlybzo6cmVzdG9y ZSgpCit7CisgICAgY29uc3QgSW1hZ2VNYXNrSW5mb3JtYXRpb24mIG1hc2tJbmZvcm1hdGlvbiA9 IG1fbWFza0ltYWdlU3RhY2subGFzdCgpOworICAgIGlmIChtYXNrSW5mb3JtYXRpb24uaXNWYWxp ZCgpKSB7CisgICAgICAgIGNvbnN0IEZsb2F0UmVjdCYgbWFza1JlY3QgPSBtYXNrSW5mb3JtYXRp b24ubWFza1JlY3QoKTsKKyAgICAgICAgY2Fpcm9fcG9wX2dyb3VwX3RvX3NvdXJjZShtX2NyLmdl dCgpKTsKKyAgICAgICAgY2Fpcm9fbWFza19zdXJmYWNlKG1fY3IuZ2V0KCksIG1hc2tJbmZvcm1h dGlvbi5tYXNrU3VyZmFjZSgpLCBtYXNrUmVjdC54KCksIG1hc2tSZWN0LnkoKSk7CisgICAgfQor ICAgIG1fbWFza0ltYWdlU3RhY2sucmVtb3ZlTGFzdCgpOworCisgICAgY2Fpcm9fcmVzdG9yZSht X2NyLmdldCgpKTsKK30KKwordm9pZCBQbGF0Zm9ybUNvbnRleHRDYWlybzo6c2F2ZSgpCit7Cisg ICAgbV9tYXNrSW1hZ2VTdGFjay5hcHBlbmQoSW1hZ2VNYXNrSW5mb3JtYXRpb24oKSk7CisKKyAg ICBjYWlyb19zYXZlKG1fY3IuZ2V0KCkpOworfQorCit2b2lkIFBsYXRmb3JtQ29udGV4dENhaXJv OjpwdXNoSW1hZ2VNYXNrKGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSwgY29uc3QgRmxvYXRSZWN0 JiByZWN0KQoreworICAgIC8vIFdlIG11c3QgY2FsbCBzYXZlUGxhdGZvcm1TdGF0ZSBhdCBsZWFz dCBvbmNlIGJlZm9yZSB3ZSBjYW4gdXNlIGltYWdlIG1hc2tpbmcsCisgICAgLy8gc2luY2Ugd2Ug YWN0dWFsbHkgYXBwbHkgdGhlIG1hc2sgaW4gcmVzdG9yZVBsYXRmb3JtU3RhdGUuCisgICAgQVNT RVJUKCFtX2RhdGEtPm1hc2tJbWFnZVN0YWNrLmlzRW1wdHkoKSk7CisgICAgbV9tYXNrSW1hZ2VT dGFjay5sYXN0KCkudXBkYXRlKHN1cmZhY2UsIHJlY3QpOworCisgICAgLy8gQ2Fpcm8gZG9lc24n dCBzdXBwb3J0IHRoZSBub3Rpb24gb2YgYW4gaW1hZ2UgY2xpcCwgc28gd2UgcHVzaCBhIGdyb3Vw IGhlcmUKKyAgICAvLyBhbmQgdGhlbiBwYWludCBpdCB0byB0aGUgc3VyZmFjZSB3aXRoIGFuIGlt YWdlIG1hc2sgKHdoaWNoIGlzIGFuIGltbWVkaWF0ZQorICAgIC8vIG9wZXJhdGlvbikgZHVyaW5n IHJlc3RvcmVQbGF0Zm9ybVN0YXRlLgorCisgICAgLy8gV2Ugd2FudCB0byBhbGxvdyB0aGUgY2xp cHBlZCBlbGVtZW50cyB0byBjb21wb3NpdGUgd2l0aCB0aGUgc3VyZmFjZSBhcyBpdAorICAgIC8v IGlzIG5vdywgYnV0IHRoZXkgYXJlIGlzb2xhdGVkIGluIGFub3RoZXIgZ3JvdXAuIFRvIG1ha2Ug dGhpcyB3b3JrLCB3ZSdyZQorICAgIC8vIGdvaW5nIHRvIGJsaXQgdGhlIGN1cnJlbnQgc3VyZmFj ZSBjb250ZW50cyBvbnRvIHRoZSBuZXcgZ3JvdXAgb25jZSB3ZSBwdXNoIGl0LgorICAgIGNhaXJv X3N1cmZhY2VfdCogY3VycmVudFRhcmdldCA9IGNhaXJvX2dldF90YXJnZXQobV9jci5nZXQoKSk7 CisgICAgY2Fpcm9fc3VyZmFjZV9mbHVzaChjdXJyZW50VGFyZ2V0KTsKKworICAgIC8vIFB1c2hp bmcgYSBuZXcgZ3JvdXAgZW5zdXJlcyB0aGF0IG9ubHkgdGhpbmdzIHBhaW50ZWQgYWZ0ZXIgdGhp cyBwb2ludCBhcmUgY2xpcHBlZC4KKyAgICBjYWlyb19wdXNoX2dyb3VwKG1fY3IuZ2V0KCkpOwor ICAgIGNhaXJvX3NldF9vcGVyYXRvcihtX2NyLmdldCgpLCBDQUlST19PUEVSQVRPUl9TT1VSQ0Up OworCisgICAgY2Fpcm9fc2V0X3NvdXJjZV9zdXJmYWNlKG1fY3IuZ2V0KCksIGN1cnJlbnRUYXJn ZXQsIDAsIDApOworICAgIGNhaXJvX3JlY3RhbmdsZShtX2NyLmdldCgpLCByZWN0LngoKSwgcmVj dC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisgICAgY2Fpcm9fZmlsbChtX2Ny LmdldCgpKTsKK30KKworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9QbGF0Zm9ybUNvbnRleHRDYWlyby5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUGxhdGZvcm1Db250ZXh0 Q2Fpcm8uaAppbmRleCBjNmNjZWRhYjIzNGUyZWY1MjY1MGJhZWYzM2U3OWExY2RmMThhYWY0Li45 Mzc0MTdhYzA5MDBkZjI3MjA2ZjU3MjAxMmE0NjExNmE3NGRhMDIxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9QbGF0Zm9ybUNvbnRleHRDYWlyby5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL1BsYXRmb3JtQ29u dGV4dENhaXJvLmgKQEAgLTMxLDYgKzMxLDI1IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAor Ly8gSW4gQ2Fpcm8gaW1hZ2UgbWFza2luZyBpcyBpbW1lZGlhdGUsIHNvIHRvIGVtdWxhdGUgaW1h Z2UgY2xpcHBpbmcgd2UgbXVzdCBzYXZlIG1hc2tpbmcKKy8vIGRldGFpbHMgYXMgcGFydCBvZiB0 aGUgY29udGV4dCBzdGF0ZSBhbmQgYXBwbHkgdGhlbSBkdXJpbmcgcGxhdGZvcm0gcmVzdG9yZS4K K2NsYXNzIEltYWdlTWFza0luZm9ybWF0aW9uIHsKK3B1YmxpYzoKKyAgICB2b2lkIHVwZGF0ZShj YWlyb19zdXJmYWNlX3QqIG1hc2tTdXJmYWNlLCBjb25zdCBGbG9hdFJlY3QmIG1hc2tSZWN0KQor ICAgIHsKKyAgICAgICAgbV9tYXNrU3VyZmFjZSA9IG1hc2tTdXJmYWNlOworICAgICAgICBtX21h c2tSZWN0ID0gbWFza1JlY3Q7CisgICAgfQorCisgICAgYm9vbCBpc1ZhbGlkKCkgY29uc3QgeyBy ZXR1cm4gbV9tYXNrU3VyZmFjZTsgfQorICAgIGNhaXJvX3N1cmZhY2VfdCogbWFza1N1cmZhY2Uo KSBjb25zdCB7IHJldHVybiBtX21hc2tTdXJmYWNlLmdldCgpOyB9CisgICAgY29uc3QgRmxvYXRS ZWN0JiBtYXNrUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fbWFza1JlY3Q7IH0KKworcHJpdmF0ZToK KyAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBtX21hc2tTdXJmYWNlOworICAgIEZsb2F0UmVj dCBtX21hc2tSZWN0OworfTsKKwogLy8gTXVjaCBsaWtlIFBsYXRmb3JtQ29udGV4dFNraWEgaW4g dGhlIFNraWEgcG9ydCwgdGhpcyBjbGFzcyBob2xkcyBpbmZvcm1hdGlvbiB0aGF0CiAvLyB3b3Vs ZCBub3JtYWxseSBiZSBwcml2YXRlIHRvIEdyYXBoaWNzQ29udGV4dCwgZXhjZXB0IHRoYXQgd2Ug d2FudCB0byBhbGxvdyBhY2Nlc3MKIC8vIHRvIGl0IGluIEZvbnQgYW5kIEltYWdlIGNvZGUuIFRo aXMgYWxsb3dzIHVzIHRvIHNlcGFyYXRlIHRoZSBjb25jZXJucyBvZiBDYWlyby1zcGVjaWZpYwpA QCAtNDAsMTEgKzU5LDE3IEBAIGNsYXNzIFBsYXRmb3JtQ29udGV4dENhaXJvIHsKICAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShQbGF0Zm9ybUNvbnRleHRDYWlybyk7CiBwdWJsaWM6CiAgICAgUGxh dGZvcm1Db250ZXh0Q2Fpcm8oY2Fpcm9fdCopOworCiAgICAgY2Fpcm9fdCogY3IoKSB7IHJldHVy biBtX2NyLmdldCgpOyB9CiAgICAgdm9pZCBzZXRDcihjYWlyb190KiBjcikgeyBtX2NyID0gY3I7 IH0KIAorICAgIHZvaWQgc2F2ZSgpOworICAgIHZvaWQgcmVzdG9yZSgpOworICAgIHZvaWQgcHVz aEltYWdlTWFzayhjYWlyb19zdXJmYWNlX3QqLCBjb25zdCBGbG9hdFJlY3QmKTsKKwogcHJpdmF0 ZToKICAgICBSZWZQdHI8Y2Fpcm9fdD4gbV9jcjsKKyAgICBWZWN0b3I8SW1hZ2VNYXNrSW5mb3Jt YXRpb24+IG1fbWFza0ltYWdlU3RhY2s7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==