116007 2013-05-12 22:20:21 -0700 [Mac] Move types function from ClipboardMac to PasteboardMac 2013-05-12 22:26:02 -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 888093 0 darin 2013-05-12 22:20:21 -0700 [Mac] Move types function from ClipboardMac to PasteboardMac 888095 1 201526 darin 2013-05-12 22:23:26 -0700 Created attachment 201526 Patch 888096 2 darin 2013-05-12 22:26:02 -0700 Committed r149983: <http://trac.webkit.org/changeset/149983> 201526 2013-05-12 22:23:26 -0700 2013-05-12 22:25:30 -0700 Patch bug-116007-20130512222225.patch text/plain 9044 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5OTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjlmMzFmOGMwYzVjYjY3 NjViNmZhMDFhYmIwODA2NGNiNWE0M2Q5MC4uNDIwMzk2MDgwOGFmM2QxYzcxNDJmMmEwMTExMWFh NTY5ZmIxMDE4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEzLTA1LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFjXSBNb3ZlIHR5cGVzIGZ1 bmN0aW9uIGZyb20gQ2xpcGJvYXJkTWFjIHRvIFBhc3RlYm9hcmRNYWMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjAwNworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0NsaXBib2FyZC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmQ6OnR5cGVzKTogQWRkZWQuIENhbGxzIHRocm91Z2gg dG8gUGFzdGVib2FyZAorICAgICAgICBhZnRlciBkb2luZyBjaGVja3MgbmVlZGVkIGF0IHRoaXMg bGV2ZWwuCisKKyAgICAgICAgKiBkb20vQ2xpcGJvYXJkLmg6IE1hZGUgdHlwZXMgZnVuY3Rpb24g bm9uLXZpcnR1YWwgaW4gbm9uLWxlZ2FjeSBjYXNlLAorICAgICAgICBhbmQgcmVtb3ZlZCBub24t aGVscGZ1bCBjb21tZW50LgorCisgICAgICAgICogcGxhdGZvcm0vUGFzdGVib2FyZC5oOiBVcGRh dGVkIGluY2x1ZGVzIGFuZCBjb21tZW50cyBhdCB0aGUgdG9wIG9mCisgICAgICAgIHRoZSBmaWxl IGEgYml0LiBSZW1vdmVkIHN0YXRpYyBtZW1iZXIgZnVuY3Rpb24gYWRkSFRNTENsaXBib2FyZFR5 cGVzRm9yQ29jb2FUeXBlLAorICAgICAgICBzaW5jZSBpdCBjYW4gbm93IGJlIHByaXZhdGUgdG8g UGFzdGVib2FyZE1hYy4gQWRkZWQgbWVtYmVyIGZ1bmN0aW9uIHR5cGVzLgorCisgICAgICAgICog cGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oOiBSZW1vdmVkIHR5cGVzIGZ1bmN0aW9uLgorICAg ICAgICAqIHBsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW06IERpdHRvLgorCisgICAgICAgICog cGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjphZGRIVE1M Q2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUpOiBNYWRlIHRoaXMgYSBmaWxlLWxvY2FsCisgICAg ICAgIGZ1bmN0aW9uIGluc3RlYWQgb2YgYSBzdGF0aWMgbWVtYmVyIGZ1bmN0aW9uLgorICAgICAg ICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6dHlwZXMpOiBBZGRlZC4gTW92ZWQgZnJvbSBDbGlwYm9h cmRNYWMuCisKKzIwMTMtMDUtMTIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCiAg ICAgICAgIFtNYWNdIE1vdmUgc2V0RGF0YSBmcm9tIENsaXBib2FyZE1hYyB0byBQYXN0ZWJvYXJk TWFjCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYw MDYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmNwcAppbmRleCAxY2ZiN2U1ZmRiNDA1ODNlM2VmYTRi YjZlMzRmNjk5MGE3OWVkOTFiLi5mNDU2ZDNlMzIxMzI4ZjlhN2E3NzU3NWViMjhlZWJjZDBjMDJl MTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmNwcApAQCAtMjkxLDYgKzI5MSwxNCBAQCBib29s IENsaXBib2FyZDo6c2V0RGF0YShjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0cmluZyYgZGF0 YSkKICAgICByZXR1cm4gbV9wYXN0ZWJvYXJkLT53cml0ZVN0cmluZyh0eXBlLCBkYXRhKTsKIH0K IAorTGlzdEhhc2hTZXQ8U3RyaW5nPiBDbGlwYm9hcmQ6OnR5cGVzKCkgY29uc3QKK3sKKyAgICBp ZiAoIWNhblJlYWRUeXBlcygpKQorICAgICAgICByZXR1cm4gTGlzdEhhc2hTZXQ8U3RyaW5nPigp OworCisgICAgcmV0dXJuIG1fcGFzdGVib2FyZC0+dHlwZXMoKTsKK30KKwogI2VuZGlmCiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlw Ym9hcmQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuaAppbmRleCA1MzEyYzQ4MDE2 ODQyOTI4ODM0OTgwMTI1YjBmZWYyMjczOGExMWY1Li4yNTAyMWU1OGYxODFiNjFiYWEwOTE5ZDU1 MDQwMDViNTE4NThlMTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJk LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5oCkBAIC04NCw4ICs4NCw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgTEVHQUNZX1ZJUlRVQUwgU3RyaW5nIGdldERh dGEoY29uc3QgU3RyaW5nJiB0eXBlKSBjb25zdCBMRUdBQ1lfUFVSRTsKICAgICAgICAgTEVHQUNZ X1ZJUlRVQUwgYm9vbCBzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBk YXRhKSBMRUdBQ1lfUFVSRTsKICAgICAKLSAgICAgICAgLy8gZXh0ZW5zaW9ucyBiZXlvbmQgSUUn cyBBUEkKLSAgICAgICAgdmlydHVhbCBMaXN0SGFzaFNldDxTdHJpbmc+IHR5cGVzKCkgY29uc3Qg PSAwOworICAgICAgICBMRUdBQ1lfVklSVFVBTCBMaXN0SGFzaFNldDxTdHJpbmc+IHR5cGVzKCkg Y29uc3QgTEVHQUNZX1BVUkU7CiAgICAgICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxGaWxlTGlzdD4g ZmlsZXMoKSBjb25zdCA9IDA7CiAKICAgICAgICAgSW50UG9pbnQgZHJhZ0xvY2F0aW9uKCkgY29u c3QgeyByZXR1cm4gbV9kcmFnTG9jOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9QYXN0ZWJvYXJkLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgK aW5kZXggN2JiZDg1MzQzNWQ3MDU1ZWEzYzQwNzY5YjU2NThjYmRiYzk0NTJmMC4uZDdjMTA1ZjA2 NjJhMWQxODYxYjIxMTA2MTU1MjEyYzQzZmI1MjVmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bh c3RlYm9hcmQuaApAQCAtMjcsMjkgKzI3LDI5IEBACiAjZGVmaW5lIFBhc3RlYm9hcmRfaAogCiAj aW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KLSNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgorI2luY2x1 ZGUgPHd0Zi9MaXN0SGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2lu Y2x1ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAog I2lmIFBMQVRGT1JNKE1BQykKLSNpbmNsdWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KICNpbmNsdWRl IDx3dGYvUmV0YWluUHRyLmg+CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKEdUSykKKy8vIEZJWE1F OiBXaHkgZG9lcyB0aGlzIGluY2x1ZGUgbmVlZCB0byBiZSBpbiB0aGUgaGVhZGVyPwogI2luY2x1 ZGUgPFBhc3RlYm9hcmRIZWxwZXIuaD4KICNlbmRpZgogCi0vLyBGSVhNRTogVGhpcyBjbGFzcyBp cyB0b28gaGlnaC1sZXZlbCB0byBiZSBpbiB0aGUgcGxhdGZvcm0gZGlyZWN0b3J5LCBzaW5jZSBp dAotLy8gdXNlcyB0aGUgRE9NIGFuZCBtYWtlcyBjYWxscyB0byBFZGl0b3IuIEl0IHNob3VsZCBl aXRoZXIgYmUgZGl2ZXN0ZWQgb2YgaXRzCi0vLyBrbm93bGVkZ2Ugb2YgdGhlIGZyYW1lIGFuZCBl ZGl0b3Igb3IgbW92ZWQgaW50byB0aGUgZWRpdGluZyBkaXJlY3RvcnkuCi0KICNpZiBQTEFURk9S TShXSU4pCiAjaW5jbHVkZSA8d2luZG93cy5oPgogdHlwZWRlZiBzdHJ1Y3QgSFdORF9fKiBIV05E OwogI2VuZGlmCiAKKy8vIEZJWE1FOiBUaGlzIGNsYXNzIGlzIHRvbyBoaWdoLWxldmVsIHRvIGJl IGluIHRoZSBwbGF0Zm9ybSBkaXJlY3RvcnksIHNpbmNlIGl0CisvLyB1c2VzIHRoZSBET00gYW5k IG1ha2VzIGNhbGxzIHRvIEVkaXRvci4gSXQgc2hvdWxkIGVpdGhlciBiZSBkaXZlc3RlZCBvZiBp dHMKKy8vIGtub3dsZWRnZSBvZiB0aGUgZnJhbWUgYW5kIGVkaXRvciBvciBtb3ZlZCBpbnRvIHRo ZSBlZGl0aW5nIGRpcmVjdG9yeS4KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWYgUExBVEZP Uk0oTUFDKQpAQCAtOTAsMTIgKzkwLDEyIEBAIHB1YmxpYzoKIAogICAgIC8vIEZ1bmN0aW9ucyBu ZWVkZWQgdGVtcG9yYXJpbHkgdW50aWwgYWxsIGNvZGUgZnJvbSBDbGlwYm9hcmRNYWMgaXMgbW92 ZWQgdG8gUGFzdGVib2FyZE1hYy4KICAgICBzdGF0aWMgVmVjdG9yPFN0cmluZz4gYWJzb2x1dGVV UkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwg Ym9vbCBvbmx5Rmlyc3RVUkwgPSBmYWxzZSk7Ci0gICAgc3RhdGljIHZvaWQgYWRkSFRNTENsaXBi b2FyZFR5cGVzRm9yQ29jb2FUeXBlKExpc3RIYXNoU2V0PFN0cmluZz4mIHJlc3VsdFR5cGVzLCBj b25zdCBTdHJpbmcmIGNvY29hVHlwZSwgY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSk7CiAj ZW5kaWYKICAgICAKICAgICBzdGF0aWMgUGFzdGVib2FyZCogZ2VuZXJhbFBhc3RlYm9hcmQoKTsK IAogICAgIGJvb2wgaGFzRGF0YSgpOworICAgIExpc3RIYXNoU2V0PFN0cmluZz4gdHlwZXMoKTsK IAogICAgIFN0cmluZyByZWFkU3RyaW5nKGNvbnN0IFN0cmluZyYgdHlwZSk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMuaAppbmRleCAwYTA3NjUxYjkyZjNjNmE0 YWRhOWI3YjlmYmJhZGFiNDJiMTIwNGFlLi4xZTQ2NjA0YjYwOWUxMzFlOTRiYWI5YmZiYzFhZWMw MTE1YmNjNjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJv YXJkTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5o CkBAIC01Miw5ICs1Miw3IEBAIHB1YmxpYzoKICAgICB9CiAKICAgICB2aXJ0dWFsIH5DbGlwYm9h cmRNYWMoKTsKLQotICAgIC8vIGV4dGVuc2lvbnMgYmV5b25kIElFJ3MgQVBJCi0gICAgdmlydHVh bCBMaXN0SGFzaFNldDxTdHJpbmc+IHR5cGVzKCkgY29uc3Q7CisgICAgCiAgICAgdmlydHVhbCBQ YXNzUmVmUHRyPEZpbGVMaXN0PiBmaWxlcygpIGNvbnN0OwogCiAgICAgdm9pZCBzZXREcmFnSW1h Z2UoQ2FjaGVkSW1hZ2UqLCBjb25zdCBJbnRQb2ludCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9DbGlwYm9hcmRNYWMubW0KaW5kZXggYTcxM2E0ZGEyOWQyNjJkZjFkYzk5YTM4Zjdm ZjdjMjFiZmRhZmZlYy4uYzY2ZDlhYTllZDgyOTVkMGJlYmYyODQ2OGJlYTg0Mjc2NzdjOTAyNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tCkBAIC03MCwz MiArNzAsNiBAQCBDbGlwYm9hcmRNYWM6On5DbGlwYm9hcmRNYWMoKQogICAgICAgICBtX2RyYWdJ bWFnZS0+cmVtb3ZlQ2xpZW50KHRoaXMpOwogfQogCi1MaXN0SGFzaFNldDxTdHJpbmc+IENsaXBi b2FyZE1hYzo6dHlwZXMoKSBjb25zdAotewotICAgIGlmICghY2FuUmVhZFR5cGVzKCkpCi0gICAg ICAgIHJldHVybiBMaXN0SGFzaFNldDxTdHJpbmc+KCk7Ci0KLSAgICBWZWN0b3I8U3RyaW5nPiB0 eXBlczsKLSAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPmdl dFR5cGVzKHR5cGVzLCBtX3Bhc3RlYm9hcmROYW1lKTsKLQotICAgIC8vIEVuZm9yY2UgY2hhbmdl Q291bnQgb3Vyc2VsdmVzIGZvciBzZWN1cml0eS4gIFdlIGNoZWNrIGFmdGVyIHJlYWRpbmcgaW5z dGVhZCBvZiBiZWZvcmUgdG8gYmUKLSAgICAvLyBzdXJlIGl0IGRvZXNuJ3QgY2hhbmdlIGJldHdl ZW4gb3VyIHRlc3RpbmcgdGhlIGNoYW5nZSBjb3VudCBhbmQgYWNjZXNzaW5nIHRoZSBkYXRhLgot ICAgIGlmIChtX2NoYW5nZUNvdW50ICE9IHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJk U3RyYXRlZ3koKS0+Y2hhbmdlQ291bnQobV9wYXN0ZWJvYXJkTmFtZSkpCi0gICAgICAgIHJldHVy biBMaXN0SGFzaFNldDxTdHJpbmc+KCk7Ci0KLSAgICBMaXN0SGFzaFNldDxTdHJpbmc+IHJlc3Vs dDsKLSAgICAvLyBGSVhNRTogVGhpcyBsb29wIGNvdWxkIGJlIHNwbGl0IGludG8gdHdvIHN0YWdl cy4gT25lIHdoaWNoIGFkZHMgYWxsIHRoZSBIVE1MNSBzcGVjaWZpZWQgdHlwZXMKLSAgICAvLyBh bmQgYSBzZWNvbmQgd2hpY2ggYWRkcyBhbGwgdGhlIGV4dHJhIHR5cGVzIGZyb20gdGhlIGNvY29h IGNsaXBib2FyZCAod2hpY2ggaXMgTWFjLW9ubHkgYmVoYXZpb3IpLgotICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgdHlwZXMuc2l6ZSgpOyBpKyspIHsKLSAgICAgICAgaWYgKHR5cGVzW2ldID09 ICJOZVhUIHBsYWluIGFzY2lpIHBhc3RlYm9hcmQgdHlwZSIpCi0gICAgICAgICAgICBjb250aW51 ZTsgICAvLyBza2lwIHRoaXMgYW5jaWVudCB0eXBlIHRoYXQgZ2V0cyBhdXRvLXN1cHBsaWVkIGJ5 IHNvbWUgc3lzdGVtIGNvbnZlcnNpb24KLQotICAgICAgICBQYXN0ZWJvYXJkOjphZGRIVE1MQ2xp cGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUocmVzdWx0LCB0eXBlc1tpXSwgbV9wYXN0ZWJvYXJkTmFt ZSk7Ci0gICAgfQotCi0gICAgcmV0dXJuIHJlc3VsdDsKLX0KLQogLy8gRklYTUU6IFdlIGNvdWxk IGNhY2hlIHRoZSBjb21wdXRlZCBmaWxlTGlzdCBpZiBuZWNlc3NhcnkKIC8vIEN1cnJlbnRseSBl YWNoIGFjY2VzcyBnZXRzIGEgbmV3IGNvcHksIHNldERhdGEoKSBtb2RpZmljYXRpb25zIHRvIHRo ZQogLy8gY2xpcGJvYXJkIGFyZSBub3QgcmVmbGVjdGVkIGluIGFueSBGaWxlTGlzdCBvYmplY3Rz IHRoZSBwYWdlIGhhcyBhY2Nlc3NlZCBhbmQgc3RvcmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCmluZGV4IDQ5MzVhYjU0M2E5NWU1YzdkOTVlY2UzN2Nj ZWU2ZjlhYmIzZjA5YmIuLjA1MGRjZWQ1NjhjNjgxYmJlNjQzOWEyOTNmMzQwZjc5NjhmMzM3YTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCkBAIC03 MTEsNyArNzExLDcgQEAgc3RhdGljIFN0cmluZyB1dGlUeXBlRnJvbUNvY29hVHlwZShjb25zdCBT dHJpbmcmIHR5cGUpCiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi12b2lkIFBhc3RlYm9hcmQ6 OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZShMaXN0SGFzaFNldDxTdHJpbmc+JiBy ZXN1bHRUeXBlcywgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUsIGNvbnN0IFN0cmluZyYgcGFzdGVi b2FyZE5hbWUpCitzdGF0aWMgdm9pZCBhZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUo TGlzdEhhc2hTZXQ8U3RyaW5nPiYgcmVzdWx0VHlwZXMsIGNvbnN0IFN0cmluZyYgY29jb2FUeXBl LCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKQogewogICAgIC8vIFVUSSBtYXkgbm90IGRv IHRoZXNlIHJpZ2h0LCBzbyBtYWtlIHN1cmUgd2UgZ2V0IHRoZSByaWdodCwgcHJlZGljdGFibGUg cmVzdWx0CiAgICAgaWYgKGNvY29hVHlwZSA9PSBTdHJpbmcoTlNTdHJpbmdQYm9hcmRUeXBlKSkg ewpAQCAtNzc1LDQgKzc3NSwyNyBAQCBib29sIFBhc3RlYm9hcmQ6OndyaXRlU3RyaW5nKGNvbnN0 IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBkYXRhKQogICAgIHJldHVybiBmYWxzZTsKIH0K IAorTGlzdEhhc2hTZXQ8U3RyaW5nPiBQYXN0ZWJvYXJkOjp0eXBlcygpCit7CisgICAgVmVjdG9y PFN0cmluZz4gdHlwZXM7CisgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJh dGVneSgpLT5nZXRUeXBlcyh0eXBlcywgbV9wYXN0ZWJvYXJkTmFtZSk7CisKKyAgICAvLyBFbmZv cmNlIGNoYW5nZUNvdW50IG91cnNlbHZlcyBmb3Igc2VjdXJpdHkuIFdlIGNoZWNrIGFmdGVyIHJl YWRpbmcgaW5zdGVhZCBvZiBiZWZvcmUgdG8gYmUKKyAgICAvLyBzdXJlIGl0IGRvZXNuJ3QgY2hh bmdlIGJldHdlZW4gb3VyIHRlc3RpbmcgdGhlIGNoYW5nZSBjb3VudCBhbmQgYWNjZXNzaW5nIHRo ZSBkYXRhLgorICAgIGlmIChtX2NoYW5nZUNvdW50ICE9IHBsYXRmb3JtU3RyYXRlZ2llcygpLT5w YXN0ZWJvYXJkU3RyYXRlZ3koKS0+Y2hhbmdlQ291bnQobV9wYXN0ZWJvYXJkTmFtZSkpCisgICAg ICAgIHJldHVybiBMaXN0SGFzaFNldDxTdHJpbmc+KCk7CisKKyAgICBMaXN0SGFzaFNldDxTdHJp bmc+IHJlc3VsdDsKKyAgICAvLyBGSVhNRTogVGhpcyBsb29wIGNvdWxkIGJlIHNwbGl0IGludG8g dHdvIHN0YWdlcy4gT25lIHdoaWNoIGFkZHMgYWxsIHRoZSBIVE1MNSBzcGVjaWZpZWQgdHlwZXMK KyAgICAvLyBhbmQgYSBzZWNvbmQgd2hpY2ggYWRkcyBhbGwgdGhlIGV4dHJhIHR5cGVzIGZyb20g dGhlIGNvY29hIGNsaXBib2FyZCAod2hpY2ggaXMgTWFjLW9ubHkgYmVoYXZpb3IpLgorICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgdHlwZXMuc2l6ZSgpOyBpKyspIHsKKyAgICAgICAgaWYgKHR5 cGVzW2ldID09ICJOZVhUIHBsYWluIGFzY2lpIHBhc3RlYm9hcmQgdHlwZSIpCisgICAgICAgICAg ICBjb250aW51ZTsgICAvLyBza2lwIHRoaXMgYW5jaWVudCB0eXBlIHRoYXQgZ2V0cyBhdXRvLXN1 cHBsaWVkIGJ5IHNvbWUgc3lzdGVtIGNvbnZlcnNpb24KKworICAgICAgICBhZGRIVE1MQ2xpcGJv YXJkVHlwZXNGb3JDb2NvYVR5cGUocmVzdWx0LCB0eXBlc1tpXSwgbV9wYXN0ZWJvYXJkTmFtZSk7 CisgICAgfQorCisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwogfQo=