116005 2013-05-12 21:01:02 -0700 [Mac] Move getData from ClipboardMac to PasteboardMac 2013-05-12 21:44:06 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 115980 1 darin darin commit-queue esprehn+autocc oldest_to_newest 888077 0 darin 2013-05-12 21:01:02 -0700 [Mac] Move getData from ClipboardMac to PasteboardMac 888080 1 201524 darin 2013-05-12 21:32:53 -0700 Created attachment 201524 Patch 888084 2 darin 2013-05-12 21:44:06 -0700 Committed r149981: <http://trac.webkit.org/changeset/149981> 201524 2013-05-12 21:32:53 -0700 2013-05-12 21:42:42 -0700 Patch bug-116005-20130512213152.patch text/plain 15373 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5OTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWViMWNlYzEyMWJhZmZl OWQyMDZhOGQ2NmI1MGQyOWJiNDUzOThiOS4uZWZmYjFhZDkzMDI0YTZiNDczN2Q4YTZjMjQ0MjU4 ZTk0MWExZmUyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDEzLTA1LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFjXSBNb3ZlIGdldERhdGEg ZnJvbSBDbGlwYm9hcmRNYWMgdG8gUGFzdGVib2FyZE1hYworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MDA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vQ2xpcGJvYXJkLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNsaXBib2FyZDo6Q2xpcGJvYXJkKTogQWRkZWQgYSBuZXcgYm9vbGVhbiBhcmd1 bWVudCwgZm9yRmlsZURyYWcsCisgICAgICAgIHRvIHRoZSBjb25zdHJ1Y3Rvci4gTWF5YmUgd2Ug Y2FuIGZpbmQgYSBiZXR0ZXIgd2F5IHRvIGRvIHRoaXMgb25jZSB3ZSBtb3ZlCisgICAgICAgIGFs bCB0aGUgcGxhdGZvcm1zIG92ZXIsIGJ1dCB0aGlzIGJvb2xlYW4gc2VlbXMgYSBnb29kIHdheSB0 byBkbyBpdCBmb3Igbm93LgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkOjpnZXREYXRhKTog QWRkZWQuIENhbGxzIHRocm91Z2ggdG8gUGFzdGVib2FyZCBhZnRlcgorICAgICAgICBkb2luZyB0 aGUgY2FuUmVhZERhdGEgY2hlY2ssIHdoaWNoIGlzIHBhcnQgb2YgRE9NIHJ1bGVzLCBub3QgdGhl IHBsYXRmb3JtLgorICAgICAgICBBbHNvIGNoZWNrcyBmb3IgdGhlIGZpbGUgZHJhZyBjYXNlIGxp a2UgdGhlIG9sZCBDbGlwYm9hcmRNYWMgY29kZSBkaWQuCisKKyAgICAgICAgKiBkb20vQ2xpcGJv YXJkLmg6IE1hZGUgZ2V0RGF0YSBub24tdmlydHVhbCBpbiBub24tbGVnYWN5IGNhc2UuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9QYXN0ZWJvYXJkLmg6IEFkZGVkIGEgc3RhdGljIG1lbWJlciBmdW5j dGlvbiBuYW1lZAorICAgICAgICBhYnNvbHV0ZVVSTHNGcm9tUGFzdGVib2FyZEZpbGVuYW1lcywg dGVtcG9yYXJ5IHNvIGl0IGNhbiBiZSBzaGFyZWQgYmV0d2VlbgorICAgICAgICBDbGlwYm9hcmRN YWMgYW5kIFBhc3RlYm9hcmRNYWMuIEFkZGVkIGEgcmVhZFN0cmluZyBwdWJsaWMgZnVuY3Rpb24g bWVtYmVyLAorICAgICAgICBhbmQgYSBtX2NoYW5nZUNvdW50IGRhdGEgbWVtYmVyLiBUaGUgdHlw ZSBvZiBtX2NoYW5nZUNvdW50IGlzIGxvbmcgc2luY2UKKyAgICAgICAgdGhhdCBjYW4gYWx3YXlz IGhvbGQgYW4gTlNJbnRlZ2VyIGJ1dCB5ZXQgaXMgYSB0eXBlIHdlIGNhbiBjb21waWxlIHdpdGhv dXQKKyAgICAgICAgaW5jbHVkaW5nIHRoZSBoZWFkZXIgZmlsZSB0aGF0IGRlZmluZXMgTlNJbnRl Z2VyLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oOiBSZW1vdmVkIGdl dERhdGEuCisgICAgICAgICogcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5tbTogUmVtb3ZlZCBn ZXREYXRhLgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkTWFjOjpDbGlwYm9hcmRNYWMpOiBB ZGRlZCBjb2RlIHRvIHBhc3MgaW4gdGhlIG5ldworICAgICAgICBmb3JGaWxlRHJhZyBib29sZWFu LgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkTWFjOjpmaWxlcyk6IENhbGwgYWJzb2x1dGVV UkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMKKyAgICAgICAgYXMgYSBzdGF0aWMgbWVtYmVyIGZ1 bmN0aW9uIGluIFBhc3RlYm9hcmQgc2luY2Ugd2UgbW92ZWQgaXQgdGhlcmUuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3Rl Ym9hcmQ6OlBhc3RlYm9hcmQpOiBJbml0aWFsaXplIHRoZSBjaGFuZ2UgY291bnQsIHNvIGxhdGVy CisgICAgICAgIHBhc3RlYm9hcmQgb3BlcmF0aW9ucyBjYW4gY2hlY2sgaXQuCisgICAgICAgIChX ZWJDb3JlOjpQYXN0ZWJvYXJkOjphYnNvbHV0ZVVSTHNGcm9tUGFzdGVib2FyZEZpbGVuYW1lcyk6 IEFkZGVkLiBNb3ZlZAorICAgICAgICBoZXJlIGZyb20gQ2xpcGJvYXJkTWFjLgorICAgICAgICAo V2ViQ29yZTo6YWJzb2x1dGVVUkxzRnJvbVBhc3RlYm9hcmQpOiBEaXR0by4KKyAgICAgICAgKFdl YkNvcmU6OlBhc3RlYm9hcmQ6OnJlYWRTdHJpbmcpOiBBZGRlZC4gTW92ZWQgaGVyZSBmcm9tIENs aXBib2FyZE1hYy4KKworMjAxMy0wNS0xMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+ CisKICAgICAgICAgW01hY10gTW92ZSBjbGVhckFsbERhdGEgZnJvbSBDbGlwYm9hcmRNYWMgdG8g UGFzdGVib2FyZE1hYwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE2MDAxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKaW5kZXggMDQ2NDAyZDJkMmE1 YzczMjM4ZTk1YjUxM2NiNmFiMjExNTEzZTQ0Ni4uMTMzZmU2ZGFmMzE2ZGNmNjVmNTM2NDU4N2Zk NGQwNzBhMTcyYTNmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKQEAgLTM2LDcgKzM2LDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBDbGlwYm9hcmQ6OkNsaXBib2FyZChDbGlwYm9hcmRB Y2Nlc3NQb2xpY3kgcG9saWN5LCBDbGlwYm9hcmRUeXBlIGNsaXBib2FyZFR5cGUKICNpZiAhVVNF KExFR0FDWV9TVFlMRV9BQlNUUkFDVF9DTElQQk9BUkRfQ0xBU1MpCi0gICAgLCBQYXNzT3duUHRy PFBhc3RlYm9hcmQ+IHBhc3RlYm9hcmQKKyAgICAsIFBhc3NPd25QdHI8UGFzdGVib2FyZD4gcGFz dGVib2FyZCwgYm9vbCBmb3JGaWxlRHJhZwogI2VuZGlmCiApCiAgICAgOiBtX3BvbGljeShwb2xp Y3kpCkBAIC00Niw2ICs0Niw3IEBAIENsaXBib2FyZDo6Q2xpcGJvYXJkKENsaXBib2FyZEFjY2Vz c1BvbGljeSBwb2xpY3ksIENsaXBib2FyZFR5cGUgY2xpcGJvYXJkVHlwZQogICAgICwgbV9jbGlw Ym9hcmRUeXBlKGNsaXBib2FyZFR5cGUpCiAjaWYgIVVTRShMRUdBQ1lfU1RZTEVfQUJTVFJBQ1Rf Q0xJUEJPQVJEX0NMQVNTKQogICAgICwgbV9wYXN0ZWJvYXJkKHBhc3RlYm9hcmQpCisgICAgLCBt X2ZvckZpbGVEcmFnKGZvckZpbGVEcmFnKQogI2VuZGlmCiB7CiB9CkBAIC0yNzQsNiArMjc1LDE0 IEBAIHZvaWQgQ2xpcGJvYXJkOjpjbGVhckFsbERhdGEoKQogICAgIG1fcGFzdGVib2FyZC0+Y2xl YXIoKTsKIH0KIAorU3RyaW5nIENsaXBib2FyZDo6Z2V0RGF0YShjb25zdCBTdHJpbmcmIHR5cGUp IGNvbnN0Cit7CisgICAgaWYgKCFjYW5SZWFkRGF0YSgpIHx8IG1fZm9yRmlsZURyYWcpCisgICAg ICAgIHJldHVybiBTdHJpbmcoKTsKKworICAgIHJldHVybiBtX3Bhc3RlYm9hcmQtPnJlYWRTdHJp bmcodHlwZSk7Cit9CisKICNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v Q2xpcGJvYXJkLmgKaW5kZXggMGNmNjBjNTcyM2IxYWZlYjI5MmIxYWU2M2U5ODBlMjNkMTY4YzQy NC4uYjJkZDNhZGQ5NWFiYzRkNjY5M2FmMWE2ZWM0YmI5Nzk1MDA2NzRhMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9D bGlwYm9hcmQuaApAQCAtODEsNyArODEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgCiAg ICAgICAgIExFR0FDWV9WSVJUVUFMIHZvaWQgY2xlYXJEYXRhKGNvbnN0IFN0cmluZyYgdHlwZSkg TEVHQUNZX1BVUkU7CiAgICAgICAgIExFR0FDWV9WSVJUVUFMIHZvaWQgY2xlYXJBbGxEYXRhKCkg TEVHQUNZX1BVUkU7Ci0gICAgICAgIHZpcnR1YWwgU3RyaW5nIGdldERhdGEoY29uc3QgU3RyaW5n JiB0eXBlKSBjb25zdCA9IDA7CisgICAgICAgIExFR0FDWV9WSVJUVUFMIFN0cmluZyBnZXREYXRh KGNvbnN0IFN0cmluZyYgdHlwZSkgY29uc3QgTEVHQUNZX1BVUkU7CiAgICAgICAgIHZpcnR1YWwg Ym9vbCBzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBkYXRhKSA9IDA7 CiAgICAgCiAgICAgICAgIC8vIGV4dGVuc2lvbnMgYmV5b25kIElFJ3MgQVBJCkBAIC0xMjksNyAr MTI5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAKICAgICBwcm90ZWN0ZWQ6CiAj aWYgIVVTRShMRUdBQ1lfU1RZTEVfQUJTVFJBQ1RfQ0xJUEJPQVJEX0NMQVNTKQotICAgICAgICBD bGlwYm9hcmQoQ2xpcGJvYXJkQWNjZXNzUG9saWN5LCBDbGlwYm9hcmRUeXBlLCBQYXNzT3duUHRy PFBhc3RlYm9hcmQ+KTsKKyAgICAgICAgQ2xpcGJvYXJkKENsaXBib2FyZEFjY2Vzc1BvbGljeSwg Q2xpcGJvYXJkVHlwZSwgUGFzc093blB0cjxQYXN0ZWJvYXJkPiwgYm9vbCBmb3JGaWxlRHJhZyk7 CiAjZWxzZQogICAgICAgICBDbGlwYm9hcmQoQ2xpcGJvYXJkQWNjZXNzUG9saWN5LCBDbGlwYm9h cmRUeXBlKTsKICNlbmRpZgpAQCAtMTU1LDYgKzE1NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICNpZiAhVVNFKExFR0FDWV9TVFlMRV9BQlNUUkFDVF9DTElQQk9BUkRfQ0xBU1MpCiAgICAgcHJp dmF0ZToKICAgICAgICAgT3duUHRyPFBhc3RlYm9hcmQ+IG1fcGFzdGVib2FyZDsKKyAgICAgICAg Ym9vbCBtX2ZvckZpbGVEcmFnOwogI2VuZGlmCiAgICAgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v UGFzdGVib2FyZC5oCmluZGV4IDkxZWE3YTA0ZWViYmIxZjNkNDYzYTIwNmNiZDVjNTM2MWY1ZWM5 NDQuLjk2YjE1ZTEyYWExMTVkMzc1YzNkZThjMjIxNWI1ZDAyNTE1Y2MwMWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKQEAgLTk0LDEyICs5NCwxNSBAQCBwdWJsaWM6CiAKICAg ICAvLyBGdW5jdGlvbnMgbmVlZGVkIHRlbXBvcmFyaWx5IHVudGlsIGFsbCBjb2RlIGZyb20gQ2xp cGJvYXJkTWFjIGlzIG1vdmVkIHRvIFBhc3RlYm9hcmRNYWMuCiAgICAgc3RhdGljIFN0cmluZyBj b2NvYVR5cGVGcm9tSFRNTENsaXBib2FyZFR5cGUoY29uc3QgU3RyaW5nJiB0eXBlKTsKKyAgICBz dGF0aWMgVmVjdG9yPFN0cmluZz4gYWJzb2x1dGVVUkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMo Y29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgYm9vbCBvbmx5Rmlyc3RVUkwgPSBmYWxzZSk7 CiAjZW5kaWYKICAgICAKICAgICBzdGF0aWMgUGFzdGVib2FyZCogZ2VuZXJhbFBhc3RlYm9hcmQo KTsKIAogICAgIGJvb2wgaGFzRGF0YSgpOwogCisgICAgU3RyaW5nIHJlYWRTdHJpbmcoY29uc3Qg U3RyaW5nJiB0eXBlKTsKKwogICAgIHZvaWQgd3JpdGVTZWxlY3Rpb24oUmFuZ2UqLCBib29sIGNh blNtYXJ0Q29weU9yRGVsZXRlLCBGcmFtZSosIFNob3VsZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZv ckNsaXBib2FyZCA9IERlZmF1bHRTZWxlY3RlZFRleHRUeXBlKTsKICAgICB2b2lkIHdyaXRlUGxh aW5UZXh0KGNvbnN0IFN0cmluZyYsIFNtYXJ0UmVwbGFjZU9wdGlvbik7CiAgICAgdm9pZCB3cml0 ZVVSTChjb25zdCBLVVJMJiwgY29uc3QgU3RyaW5nJiwgRnJhbWUqID0gMCk7CkBAIC0xMzMsNiAr MTM2LDcgQEAgcHJpdmF0ZToKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBTdHJpbmcgbV9wYXN0 ZWJvYXJkTmFtZTsKKyAgICBsb25nIG1fY2hhbmdlQ291bnQ7CiAjZW5kaWYKIAogI2lmIFBMQVRG T1JNKFdJTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9h cmRNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMuaAppbmRl eCAzMzM2NmEyMWQ1OTNjNDAwZDZkYzA3NmViMzQ3OGI2ODEyM2FmOWMyLi41MTNjNmJlMTllYjQ2 NjA4YjI0MGQ2ODQ5ZmRlZDM4YWNkMmY5NjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL0NsaXBib2FyZE1hYy5oCkBAIC01Myw3ICs1Myw2IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1 YWwgfkNsaXBib2FyZE1hYygpOwogICAgIAotICAgIFN0cmluZyBnZXREYXRhKGNvbnN0IFN0cmlu ZyYgdHlwZSkgY29uc3Q7CiAgICAgYm9vbCBzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29u c3QgU3RyaW5nJiBkYXRhKTsKICAgICAKICAgICAvLyBleHRlbnNpb25zIGJleW9uZCBJRSdzIEFQ SQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5t bSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW0KaW5kZXggZmRh MGQyMTU3YmQ0Zjg3ZTY0MTE5NTZiNWM2NjA1ZjllYzlhMDg5Zi4uOGI1OGVlN2MxNWQxMWViNTVl YjQ2YmUwNDUwNjA1NWQzNzBkMjNkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL0NsaXBib2FyZE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv Q2xpcGJvYXJkTWFjLm1tCkBAIC01Niw3ICs1Niw3IEBAIFBhc3NSZWZQdHI8Q2xpcGJvYXJkPiBD bGlwYm9hcmQ6OmNyZWF0ZShDbGlwYm9hcmRBY2Nlc3NQb2xpY3kgcG9saWN5LCBEcmFnRGF0YSoK ICNlbmRpZgogCiBDbGlwYm9hcmRNYWM6OkNsaXBib2FyZE1hYyhDbGlwYm9hcmRUeXBlIGNsaXBi b2FyZFR5cGUsIGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUsIENsaXBib2FyZEFjY2Vzc1Bv bGljeSBwb2xpY3ksIENsaXBib2FyZENvbnRlbnRzIGNsaXBib2FyZENvbnRlbnRzLCBGcmFtZSAq ZnJhbWUpCi0gICAgOiBDbGlwYm9hcmQocG9saWN5LCBjbGlwYm9hcmRUeXBlLCBQYXN0ZWJvYXJk OjpjcmVhdGUocGFzdGVib2FyZE5hbWUpKQorICAgIDogQ2xpcGJvYXJkKHBvbGljeSwgY2xpcGJv YXJkVHlwZSwgUGFzdGVib2FyZDo6Y3JlYXRlKHBhc3RlYm9hcmROYW1lKSwgY2xpcGJvYXJkQ29u dGVudHMgPT0gRHJhZ0FuZERyb3BGaWxlcykKICAgICAsIG1fcGFzdGVib2FyZE5hbWUocGFzdGVi b2FyZE5hbWUpCiAgICAgLCBtX2NsaXBib2FyZENvbnRlbnRzKGNsaXBib2FyZENvbnRlbnRzKQog ICAgICwgbV9mcmFtZShmcmFtZSkKQEAgLTExMyw3NyArMTEzLDYgQEAgc3RhdGljIHZvaWQgYWRk SFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlKExpc3RIYXNoU2V0PFN0cmluZz4mIHJlc3Vs dFR5cGVzLAogICAgIHJlc3VsdFR5cGVzLmFkZChjb2NvYVR5cGUpOwogfQogCi1zdGF0aWMgVmVj dG9yPFN0cmluZz4gYWJzb2x1dGVVUkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMoY29uc3QgU3Ry aW5nJiBwYXN0ZWJvYXJkTmFtZSwgYm9vbCBvbmx5Rmlyc3RVUkwgPSBmYWxzZSkKLXsKLSAgICBW ZWN0b3I8U3RyaW5nPiBmaWxlTGlzdDsKLSAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVi b2FyZFN0cmF0ZWd5KCktPmdldFBhdGhuYW1lc0ZvclR5cGUoZmlsZUxpc3QsIFN0cmluZyhOU0Zp bGVuYW1lc1Bib2FyZFR5cGUpLCBwYXN0ZWJvYXJkTmFtZSk7Ci0KLSAgICBpZiAoZmlsZUxpc3Qu aXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmlsZUxpc3Q7Ci0KLSAgICBzaXplX3QgY291bnQg PSBvbmx5Rmlyc3RVUkwgPyAxIDogZmlsZUxpc3Quc2l6ZSgpOwotICAgIFZlY3RvcjxTdHJpbmc+ IHVybHM7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb3VudDsgaSsrKSB7Ci0gICAgICAg IE5TVVJMICp1cmwgPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOmZpbGVMaXN0W2ldXTsKLSAgICAg ICAgdXJscy5hcHBlbmQoU3RyaW5nKFt1cmwgYWJzb2x1dGVTdHJpbmddKSk7Ci0gICAgfQotICAg IHJldHVybiB1cmxzOwotfQotCi1zdGF0aWMgVmVjdG9yPFN0cmluZz4gYWJzb2x1dGVVUkxzRnJv bVBhc3RlYm9hcmQoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgYm9vbCBvbmx5Rmlyc3RV UkwgPSBmYWxzZSkKLXsKLSAgICAvLyBOT1RFOiBXZSBtdXN0IGFsd2F5cyBjaGVjayBbYXZhaWxh YmxlVHlwZXMgY29udGFpbnNPYmplY3Q6XSBiZWZvcmUgYWNjZXNzaW5nIHBhc3RlYm9hcmQgZGF0 YQotICAgIC8vIG9yIENvcmVGb3VuZGF0aW9uIHdpbGwgcHJpbnRmIHdoZW4gdGhlcmUgaXMgbm90 IGRhdGEgb2YgdGhlIGNvcnJlc3BvbmRpbmcgdHlwZS4KLSAgICBWZWN0b3I8U3RyaW5nPiBhdmFp bGFibGVUeXBlczsKLSAgICBWZWN0b3I8U3RyaW5nPiBhYnNvbHV0ZVVSTHM7Ci0gICAgcGxhdGZv cm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5nZXRUeXBlcyhhdmFpbGFibGVU eXBlcywgcGFzdGVib2FyZE5hbWUpOwotCi0gICAgLy8gVHJ5IE5TRmlsZW5hbWVzUGJvYXJkVHlw ZSBiZWNhdXNlIGl0IGNvbnRhaW5zIGEgbGlzdAotICAgIGlmIChhdmFpbGFibGVUeXBlcy5jb250 YWlucyhTdHJpbmcoTlNGaWxlbmFtZXNQYm9hcmRUeXBlKSkpIHsKLSAgICAgICAgYWJzb2x1dGVV UkxzID0gYWJzb2x1dGVVUkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMocGFzdGVib2FyZE5hbWUs IG9ubHlGaXJzdFVSTCk7Ci0gICAgICAgIGlmICghYWJzb2x1dGVVUkxzLmlzRW1wdHkoKSkKLSAg ICAgICAgICAgIHJldHVybiBhYnNvbHV0ZVVSTHM7Ci0gICAgfQotCi0gICAgLy8gRmFsbGJhY2sg dG8gTlNVUkxQYm9hcmRUeXBlICh3aGljaCBpcyBhIHNpbmdsZSBVUkwpCi0gICAgaWYgKGF2YWls YWJsZVR5cGVzLmNvbnRhaW5zKFN0cmluZyhOU1VSTFBib2FyZFR5cGUpKSkgewotICAgICAgICBh YnNvbHV0ZVVSTHMuYXBwZW5kKHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRl Z3koKS0+c3RyaW5nRm9yVHlwZShTdHJpbmcoTlNVUkxQYm9hcmRUeXBlKSwgcGFzdGVib2FyZE5h bWUpKTsKLSAgICAgICAgcmV0dXJuIGFic29sdXRlVVJMczsKLSAgICB9Ci0KLSAgICAvLyBObyBm aWxlIHBhdGhzIG9uIHRoZSBwYXN0ZWJvYXJkLCByZXR1cm4gbmlsCi0gICAgcmV0dXJuIFZlY3Rv cjxTdHJpbmc+KCk7Ci19Ci0KLVN0cmluZyBDbGlwYm9hcmRNYWM6OmdldERhdGEoY29uc3QgU3Ry aW5nJiB0eXBlKSBjb25zdAotewotICAgIGlmICghY2FuUmVhZERhdGEoKSB8fCBtX2NsaXBib2Fy ZENvbnRlbnRzID09IERyYWdBbmREcm9wRmlsZXMpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsK LQotICAgIGNvbnN0IFN0cmluZyYgY29jb2FUeXBlID0gUGFzdGVib2FyZDo6Y29jb2FUeXBlRnJv bUhUTUxDbGlwYm9hcmRUeXBlKHR5cGUpOwotICAgIFN0cmluZyBjb2NvYVZhbHVlOwotCi0gICAg Ly8gR3JhYiB0aGUgdmFsdWUgb2ZmIHRoZSBwYXN0ZWJvYXJkIGNvcnJlc3BvbmRpbmcgdG8gdGhl IGNvY29hVHlwZQotICAgIGlmIChjb2NvYVR5cGUgPT0gU3RyaW5nKE5TVVJMUGJvYXJkVHlwZSkp IHsKLSAgICAgICAgLy8gInVybCIgYW5kICJ0ZXh0L3VybC1saXN0IiBib3RoIG1hcCB0byBOU1VS TFBib2FyZFR5cGUgaW4gY29jb2FUeXBlRnJvbUhUTUxDbGlwYm9hcmRUeXBlKCksICJ1cmwiIG9u bHkgd2FudHMgdGhlIGZpcnN0IFVSTAotICAgICAgICBib29sIG9ubHlGaXJzdFVSTCA9IChlcXVh bElnbm9yaW5nQ2FzZSh0eXBlLCAidXJsIikpOwotICAgICAgICBWZWN0b3I8U3RyaW5nPiBhYnNv bHV0ZVVSTHMgPSBhYnNvbHV0ZVVSTHNGcm9tUGFzdGVib2FyZChtX3Bhc3RlYm9hcmROYW1lLCBv bmx5Rmlyc3RVUkwpOwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFic29sdXRlVVJM cy5zaXplKCk7IGkrKykKLSAgICAgICAgICAgIGNvY29hVmFsdWUgPSBpID8gIlxuIiArIGFic29s dXRlVVJMc1tpXTogYWJzb2x1dGVVUkxzW2ldOwotICAgIH0gZWxzZSBpZiAoY29jb2FUeXBlID09 IFN0cmluZyhOU1N0cmluZ1Bib2FyZFR5cGUpKQotICAgICAgICBjb2NvYVZhbHVlID0gW3BsYXRm b3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+c3RyaW5nRm9yVHlwZShjb2Nv YVR5cGUsIG1fcGFzdGVib2FyZE5hbWUpIHByZWNvbXBvc2VkU3RyaW5nV2l0aENhbm9uaWNhbE1h cHBpbmddOwotICAgIGVsc2UgaWYgKCFjb2NvYVR5cGUuaXNFbXB0eSgpKQotICAgICAgICBjb2Nv YVZhbHVlID0gcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5zdHJp bmdGb3JUeXBlKGNvY29hVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSk7Ci0KLSAgICAvLyBFbmZvcmNl IGNoYW5nZUNvdW50IG91cnNlbHZlcyBmb3Igc2VjdXJpdHkuICBXZSBjaGVjayBhZnRlciByZWFk aW5nIGluc3RlYWQgb2YgYmVmb3JlIHRvIGJlCi0gICAgLy8gc3VyZSBpdCBkb2Vzbid0IGNoYW5n ZSBiZXR3ZWVuIG91ciB0ZXN0aW5nIHRoZSBjaGFuZ2UgY291bnQgYW5kIGFjY2Vzc2luZyB0aGUg ZGF0YS4KLSAgICBpZiAoIWNvY29hVmFsdWUuaXNFbXB0eSgpICYmIG1fY2hhbmdlQ291bnQgPT0g cGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5jaGFuZ2VDb3VudCht X3Bhc3RlYm9hcmROYW1lKSkgewotICAgICAgICByZXR1cm4gY29jb2FWYWx1ZTsKLSAgICB9Ci0K LSAgICByZXR1cm4gU3RyaW5nKCk7Ci19Ci0KIGJvb2wgQ2xpcGJvYXJkTWFjOjpzZXREYXRhKGNv bnN0IFN0cmluZyAmdHlwZSwgY29uc3QgU3RyaW5nICZkYXRhKQogewogICAgIGlmICghY2FuV3Jp dGVEYXRhKCkgfHwgbV9jbGlwYm9hcmRDb250ZW50cyA9PSBEcmFnQW5kRHJvcEZpbGVzKQpAQCAt MjUyLDcgKzE4MSw3IEBAIFBhc3NSZWZQdHI8RmlsZUxpc3Q+IENsaXBib2FyZE1hYzo6ZmlsZXMo KSBjb25zdAogICAgIGlmICghY2FuUmVhZERhdGEoKSB8fCBtX2NsaXBib2FyZENvbnRlbnRzID09 IERyYWdBbmREcm9wRGF0YSkKICAgICAgICAgcmV0dXJuIEZpbGVMaXN0OjpjcmVhdGUoKTsKIAot ICAgIFZlY3RvcjxTdHJpbmc+IGFic29sdXRlVVJMcyA9IGFic29sdXRlVVJMc0Zyb21QYXN0ZWJv YXJkRmlsZW5hbWVzKG1fcGFzdGVib2FyZE5hbWUpOworICAgIFZlY3RvcjxTdHJpbmc+IGFic29s dXRlVVJMcyA9IFBhc3RlYm9hcmQ6OmFic29sdXRlVVJMc0Zyb21QYXN0ZWJvYXJkRmlsZW5hbWVz KG1fcGFzdGVib2FyZE5hbWUpOwogCiAgICAgUmVmUHRyPEZpbGVMaXN0PiBmaWxlTGlzdCA9IEZp bGVMaXN0OjpjcmVhdGUoKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFic29sdXRlVVJM cy5zaXplKCk7IGkrKykgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1Bhc3RlYm9hcmRNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2Fy ZE1hYy5tbQppbmRleCA5MDRhNWZhNGEwZDhmYWUwYzE4Yzk0NWY3YWJkNDU2OWFmYjI1Mjg4Li43 ZDVmOWFjNTgzNTFhMThhZTIwMTU2MzJmY2VjYTA2NGIyNDFkOTg4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQpAQCAtMTI2LDYgKzEyNiw3IEBAIFBh c3RlYm9hcmQqIFBhc3RlYm9hcmQ6OmdlbmVyYWxQYXN0ZWJvYXJkKCkKIAogUGFzdGVib2FyZDo6 UGFzdGVib2FyZChjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKQogICAgIDogbV9wYXN0ZWJv YXJkTmFtZShwYXN0ZWJvYXJkTmFtZSkKKyAgICAsIG1fY2hhbmdlQ291bnQocGxhdGZvcm1TdHJh dGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5jaGFuZ2VDb3VudChtX3Bhc3RlYm9hcmRO YW1lKSkKIHsKICAgICBBU1NFUlQocGFzdGVib2FyZE5hbWUpOwogfQpAQCAtNjM2LDQgKzYzNyw3 MSBAQCB2b2lkIFBhc3RlYm9hcmQ6OmNsZWFyKGNvbnN0IFN0cmluZyYgdHlwZSkKICAgICAgICAg cGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5zZXRTdHJpbmdGb3JU eXBlKCIiLCBjb2NvYVR5cGUsIG1fcGFzdGVib2FyZE5hbWUpOwogfQogCitWZWN0b3I8U3RyaW5n PiBQYXN0ZWJvYXJkOjphYnNvbHV0ZVVSTHNGcm9tUGFzdGVib2FyZEZpbGVuYW1lcyhjb25zdCBT dHJpbmcmIHBhc3RlYm9hcmROYW1lLCBib29sIG9ubHlGaXJzdFVSTCkKK3sKKyAgICBWZWN0b3I8 U3RyaW5nPiBmaWxlTGlzdDsKKyAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0 cmF0ZWd5KCktPmdldFBhdGhuYW1lc0ZvclR5cGUoZmlsZUxpc3QsIFN0cmluZyhOU0ZpbGVuYW1l c1Bib2FyZFR5cGUpLCBwYXN0ZWJvYXJkTmFtZSk7CisKKyAgICBpZiAoZmlsZUxpc3QuaXNFbXB0 eSgpKQorICAgICAgICByZXR1cm4gZmlsZUxpc3Q7CisKKyAgICBzaXplX3QgY291bnQgPSBvbmx5 Rmlyc3RVUkwgPyAxIDogZmlsZUxpc3Quc2l6ZSgpOworICAgIFZlY3RvcjxTdHJpbmc+IHVybHM7 CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb3VudDsgaSsrKSB7CisgICAgICAgIE5TVVJM ICp1cmwgPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOmZpbGVMaXN0W2ldXTsKKyAgICAgICAgdXJs cy5hcHBlbmQoU3RyaW5nKFt1cmwgYWJzb2x1dGVTdHJpbmddKSk7CisgICAgfQorICAgIHJldHVy biB1cmxzOworfQorCitzdGF0aWMgVmVjdG9yPFN0cmluZz4gYWJzb2x1dGVVUkxzRnJvbVBhc3Rl Ym9hcmQoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgYm9vbCBvbmx5Rmlyc3RVUkwgPSBm YWxzZSkKK3sKKyAgICAvLyBOT1RFOiBXZSBtdXN0IGFsd2F5cyBjaGVjayBbYXZhaWxhYmxlVHlw ZXMgY29udGFpbnNPYmplY3Q6XSBiZWZvcmUgYWNjZXNzaW5nIHBhc3RlYm9hcmQgZGF0YQorICAg IC8vIG9yIENvcmVGb3VuZGF0aW9uIHdpbGwgcHJpbnRmIHdoZW4gdGhlcmUgaXMgbm90IGRhdGEg b2YgdGhlIGNvcnJlc3BvbmRpbmcgdHlwZS4KKyAgICBWZWN0b3I8U3RyaW5nPiBhdmFpbGFibGVU eXBlczsKKyAgICBWZWN0b3I8U3RyaW5nPiBhYnNvbHV0ZVVSTHM7CisgICAgcGxhdGZvcm1TdHJh dGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5nZXRUeXBlcyhhdmFpbGFibGVUeXBlcywg cGFzdGVib2FyZE5hbWUpOworCisgICAgLy8gVHJ5IE5TRmlsZW5hbWVzUGJvYXJkVHlwZSBiZWNh dXNlIGl0IGNvbnRhaW5zIGEgbGlzdAorICAgIGlmIChhdmFpbGFibGVUeXBlcy5jb250YWlucyhT dHJpbmcoTlNGaWxlbmFtZXNQYm9hcmRUeXBlKSkpIHsKKyAgICAgICAgYWJzb2x1dGVVUkxzID0g UGFzdGVib2FyZDo6YWJzb2x1dGVVUkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMocGFzdGVib2Fy ZE5hbWUsIG9ubHlGaXJzdFVSTCk7CisgICAgICAgIGlmICghYWJzb2x1dGVVUkxzLmlzRW1wdHko KSkKKyAgICAgICAgICAgIHJldHVybiBhYnNvbHV0ZVVSTHM7CisgICAgfQorCisgICAgLy8gRmFs bGJhY2sgdG8gTlNVUkxQYm9hcmRUeXBlICh3aGljaCBpcyBhIHNpbmdsZSBVUkwpCisgICAgaWYg KGF2YWlsYWJsZVR5cGVzLmNvbnRhaW5zKFN0cmluZyhOU1VSTFBib2FyZFR5cGUpKSkgeworICAg ICAgICBhYnNvbHV0ZVVSTHMuYXBwZW5kKHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJk U3RyYXRlZ3koKS0+c3RyaW5nRm9yVHlwZShTdHJpbmcoTlNVUkxQYm9hcmRUeXBlKSwgcGFzdGVi b2FyZE5hbWUpKTsKKyAgICAgICAgcmV0dXJuIGFic29sdXRlVVJMczsKKyAgICB9CisKKyAgICAv LyBObyBmaWxlIHBhdGhzIG9uIHRoZSBwYXN0ZWJvYXJkLCByZXR1cm4gbmlsCisgICAgcmV0dXJu IFZlY3RvcjxTdHJpbmc+KCk7Cit9CisKK1N0cmluZyBQYXN0ZWJvYXJkOjpyZWFkU3RyaW5nKGNv bnN0IFN0cmluZyYgdHlwZSkKK3sKKyAgICBjb25zdCBTdHJpbmcmIGNvY29hVHlwZSA9IFBhc3Rl Ym9hcmQ6OmNvY29hVHlwZUZyb21IVE1MQ2xpcGJvYXJkVHlwZSh0eXBlKTsKKyAgICBTdHJpbmcg Y29jb2FWYWx1ZTsKKworICAgIC8vIEdyYWIgdGhlIHZhbHVlIG9mZiB0aGUgcGFzdGVib2FyZCBj b3JyZXNwb25kaW5nIHRvIHRoZSBjb2NvYVR5cGUKKyAgICBpZiAoY29jb2FUeXBlID09IFN0cmlu ZyhOU1VSTFBib2FyZFR5cGUpKSB7CisgICAgICAgIC8vICJ1cmwiIGFuZCAidGV4dC91cmwtbGlz dCIgYm90aCBtYXAgdG8gTlNVUkxQYm9hcmRUeXBlIGluIGNvY29hVHlwZUZyb21IVE1MQ2xpcGJv YXJkVHlwZSgpLCAidXJsIiBvbmx5IHdhbnRzIHRoZSBmaXJzdCBVUkwKKyAgICAgICAgYm9vbCBv bmx5Rmlyc3RVUkwgPSAoZXF1YWxJZ25vcmluZ0Nhc2UodHlwZSwgInVybCIpKTsKKyAgICAgICAg VmVjdG9yPFN0cmluZz4gYWJzb2x1dGVVUkxzID0gYWJzb2x1dGVVUkxzRnJvbVBhc3RlYm9hcmQo bV9wYXN0ZWJvYXJkTmFtZSwgb25seUZpcnN0VVJMKTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBhYnNvbHV0ZVVSTHMuc2l6ZSgpOyBpKyspCisgICAgICAgICAgICBjb2NvYVZhbHVl ID0gaSA/ICJcbiIgKyBhYnNvbHV0ZVVSTHNbaV06IGFic29sdXRlVVJMc1tpXTsKKyAgICB9IGVs c2UgaWYgKGNvY29hVHlwZSA9PSBTdHJpbmcoTlNTdHJpbmdQYm9hcmRUeXBlKSkKKyAgICAgICAg Y29jb2FWYWx1ZSA9IFtwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCkt PnN0cmluZ0ZvclR5cGUoY29jb2FUeXBlLCBtX3Bhc3RlYm9hcmROYW1lKSBwcmVjb21wb3NlZFN0 cmluZ1dpdGhDYW5vbmljYWxNYXBwaW5nXTsKKyAgICBlbHNlIGlmICghY29jb2FUeXBlLmlzRW1w dHkoKSkKKyAgICAgICAgY29jb2FWYWx1ZSA9IHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJv YXJkU3RyYXRlZ3koKS0+c3RyaW5nRm9yVHlwZShjb2NvYVR5cGUsIG1fcGFzdGVib2FyZE5hbWUp OworCisgICAgLy8gRW5mb3JjZSBjaGFuZ2VDb3VudCBvdXJzZWx2ZXMgZm9yIHNlY3VyaXR5LiAg V2UgY2hlY2sgYWZ0ZXIgcmVhZGluZyBpbnN0ZWFkIG9mIGJlZm9yZSB0byBiZQorICAgIC8vIHN1 cmUgaXQgZG9lc24ndCBjaGFuZ2UgYmV0d2VlbiBvdXIgdGVzdGluZyB0aGUgY2hhbmdlIGNvdW50 IGFuZCBhY2Nlc3NpbmcgdGhlIGRhdGEuCisgICAgaWYgKCFjb2NvYVZhbHVlLmlzRW1wdHkoKSAm JiBtX2NoYW5nZUNvdW50ID09IHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRl Z3koKS0+Y2hhbmdlQ291bnQobV9wYXN0ZWJvYXJkTmFtZSkpCisgICAgICAgIHJldHVybiBjb2Nv YVZhbHVlOworCisgICAgcmV0dXJuIFN0cmluZygpOworfQorCiB9Cg==