116000 2013-05-12 19:29:50 -0700 [Mac] Move clearData from ClipboardMac to PasteboardMac 2013-05-12 22:04:29 -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 888061 0 darin 2013-05-12 19:29:50 -0700 [Mac] Move clearData from ClipboardMac to PasteboardMac 888062 1 201520 darin 2013-05-12 19:33:48 -0700 Created attachment 201520 Patch 888063 2 201520 kling 2013-05-12 19:39:52 -0700 Comment on attachment 201520 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201520&action=review r=me > Source/WebCore/platform/mac/PasteboardMac.mm:606 > + if (qType == "url") else if (I know you're just moving this.) 888064 3 darin 2013-05-12 19:40:56 -0700 Committed r149977: <http://trac.webkit.org/changeset/149977> 888078 4 darin 2013-05-12 21:03:17 -0700 (In reply to comment #2) > > Source/WebCore/platform/mac/PasteboardMac.mm:606 > > + if (qType == "url") > > else if I’ll do that in a separate patch. 888087 5 darin 2013-05-12 22:04:29 -0700 (In reply to comment #4) > (In reply to comment #2) > > > Source/WebCore/platform/mac/PasteboardMac.mm:606 > > > + if (qType == "url") > > > > else if > > I’ll do that in a separate patch. Nah, on second thought I prefer not to try to improve the style on this old code right now. It needs a lot of work, and the else is the least of it. 201520 2013-05-12 19:33:48 -0700 2013-05-12 19:39:51 -0700 Patch bug-116000-20130512193247.patch text/plain 10015 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5OTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGVkYzhiNjA5Y2I3NzQ2 Yjk5OWMyMTlkNjRmMDkyNjViOWIwMTNmMC4uNjA1NDkyMTJiZDI2N2E5Y2FhMjRlZWNmMGJlNjJl NTdmN2IwOTBjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDEzLTA1LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFjXSBNb3ZlIGNsZWFyRGF0 YSBmcm9tIENsaXBib2FyZE1hYyB0byBQYXN0ZWJvYXJkTWFjCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYwMDAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9DbGlwYm9hcmQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2xpcGJvYXJkOjpjbGVhckRhdGEpOiBBZGRlZC4gQ2FsbHMgdGhyb3VnaCB0 byBQYXN0ZWJvYXJkIGFmdGVyCisgICAgICAgIGRvaW5nIHRoZSBjYW5Xcml0ZURhdGEgY2hlY2ss IHdoaWNoIGlzIHBhcnQgb2YgRE9NIHJ1bGVzLCBub3QgdGhlIHBsYXRmb3JtLgorCisgICAgICAg ICogZG9tL0NsaXBib2FyZC5oOiBNYWRlIGNsZWFyRGF0YSBub24tdmlydHVhbCBpbiBub24tbGVn YWN5IGNhc2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9QYXN0ZWJvYXJkLmg6IEFkZGVkIGFuIG92 ZXJsb2FkIG9mIHRoZSBjbGVhciBmdW5jdGlvbiB0aGF0IHRha2VzCisgICAgICAgIGEgc2luZ2xl IHR5cGUgYW5kIGNsZWFycyBvbmx5IHRoYXQgdHlwZS4gQWxzbyB0ZW1wb3JhcmlseSBleHBvcnRl ZCB0aGUKKyAgICAgICAgY29jb2FUeXBlRnJvbUhUTUxDbGlwYm9hcmRUeXBlIGZ1bmN0aW9uIGFz IGEgc3RhdGljIG1lbWJlciBzbyBpdCBjYW4gYmUgdXNlZAorICAgICAgICBpbiBib3RoIENsaXBi b2FyZE1hYyBhbmQgUGFzdGVib2FyZE1hYyBkdXJpbmcgdGhlIHRyYW5zaXRpb24uCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLmg6IFJlbW92ZWQgY2xlYXJEYXRhLgorICAg ICAgICAqIHBsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW06IFJlbW92ZWQgY2xlYXJEYXRhLgor ICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkTWFjOjpnZXREYXRhKTogQ2hhbmdlZCB0byBjYWxs IGNvY29hVHlwZUZyb21IVE1MQ2xpcGJvYXJkVHlwZQorICAgICAgICBhcyBhIFBhc3RlYm9hcmQg Y2xhc3Mgc3RhdGljIG1lbWJlciBmdW5jdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OkNsaXBib2Fy ZE1hYzo6c2V0RGF0YSk6IERpdHRvLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Bhc3RlYm9h cmRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpjb2NvYVR5cGVGcm9tSFRN TENsaXBib2FyZFR5cGUpOiBNb3ZlZCBoZXJlIGZyb20KKyAgICAgICAgQ2xpcGJvYXJkTWFjLgor ICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6Y2xlYXIpOiBBZGRlZC4gTW92ZWQgaGVyZSBm cm9tIENsaXBib2FyZE1hYy4KKworMjAxMy0wNS0xMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBs ZS5jb20+CisKICAgICAgICAgW01hY10gTW92ZSBoYXNEYXRhIGZyb20gQ2xpcGJvYXJkTWFjIHRv IFBhc3RlYm9hcmRNYWMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNTk5OQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJk LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuY3BwCmluZGV4IDNjMjNmZDlmYzJl ZjM3ODZiZGZmYzNhOGYzZmE0YjVjM2VhYWMxNzUuLjgzZDA4YjUxYjI4MWEyYTBjOWQzMjBjZmM4 ODJhMTc0NWFiZjQyNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuY3BwCkBAIC0yNTgsNiArMjU4 LDE0IEBAIGJvb2wgQ2xpcGJvYXJkOjpoYXNEYXRhKCkKICAgICByZXR1cm4gbV9wYXN0ZWJvYXJk LT5oYXNEYXRhKCk7CiB9CiAKK3ZvaWQgQ2xpcGJvYXJkOjpjbGVhckRhdGEoY29uc3QgU3RyaW5n JiB0eXBlKQoreworICAgIGlmICghY2FuV3JpdGVEYXRhKCkpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fcGFzdGVib2FyZC0+Y2xlYXIodHlwZSk7Cit9CisKICNlbmRpZgogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmgg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmgKaW5kZXggOTRkZDllMmFmM2Q0ZDdjNzdm NzQ1MzUwNjU4MjliODMyYzAxYmIyZC4uZjI1ZGMzZjAyYTg1ZDBjOGQ2YjNkYzViYjZmZWVlMTg0 ZDNkMmZmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuaApAQCAtNzksNyArNzksNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIFN0cmluZyBlZmZlY3RBbGxvd2VkKCkgY29uc3QgeyByZXR1 cm4gbV9lZmZlY3RBbGxvd2VkOyB9CiAgICAgICAgIHZvaWQgc2V0RWZmZWN0QWxsb3dlZChjb25z dCBTdHJpbmcmKTsKICAgICAKLSAgICAgICAgdmlydHVhbCB2b2lkIGNsZWFyRGF0YShjb25zdCBT dHJpbmcmIHR5cGUpID0gMDsKKyAgICAgICAgTEVHQUNZX1ZJUlRVQUwgdm9pZCBjbGVhckRhdGEo Y29uc3QgU3RyaW5nJiB0eXBlKSBMRUdBQ1lfUFVSRTsKICAgICAgICAgdmlydHVhbCB2b2lkIGNs ZWFyQWxsRGF0YSgpID0gMDsKICAgICAgICAgdmlydHVhbCBTdHJpbmcgZ2V0RGF0YShjb25zdCBT dHJpbmcmIHR5cGUpIGNvbnN0ID0gMDsKICAgICAgICAgdmlydHVhbCBib29sIHNldERhdGEoY29u c3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGRhdGEpID0gMDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Bhc3RlYm9hcmQuaAppbmRleCBjOWEzNzQ4YTAzYjA5MzliYmY4ZGI4ZjM3NDg2NzM0YTIw M2VmNTU1Li45MWVhN2EwNGVlYmJiMWYzZDQ2M2EyMDZjYmQ1YzUzNjFmNWVjOTQ0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCkBAIC05MSw2ICs5MSw5IEBAIHB1YmxpYzoKICAg ICBleHBsaWNpdCBQYXN0ZWJvYXJkKGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUpOwogICAg IHN0YXRpYyBTdHJpbmcgZ2V0U3RyaW5nU2VsZWN0aW9uKEZyYW1lKiwgU2hvdWxkU2VyaWFsaXpl U2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkKTsKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTaGFyZWRC dWZmZXI+IGdldERhdGFTZWxlY3Rpb24oRnJhbWUqLCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmRU eXBlKTsKKworICAgIC8vIEZ1bmN0aW9ucyBuZWVkZWQgdGVtcG9yYXJpbHkgdW50aWwgYWxsIGNv ZGUgZnJvbSBDbGlwYm9hcmRNYWMgaXMgbW92ZWQgdG8gUGFzdGVib2FyZE1hYy4KKyAgICBzdGF0 aWMgU3RyaW5nIGNvY29hVHlwZUZyb21IVE1MQ2xpcGJvYXJkVHlwZShjb25zdCBTdHJpbmcmIHR5 cGUpOwogI2VuZGlmCiAgICAgCiAgICAgc3RhdGljIFBhc3RlYm9hcmQqIGdlbmVyYWxQYXN0ZWJv YXJkKCk7CkBAIC0xMDQsNiArMTA3LDcgQEAgcHVibGljOgogICAgIHZvaWQgd3JpdGVDbGlwYm9h cmQoQ2xpcGJvYXJkKik7CiAKICAgICB2b2lkIGNsZWFyKCk7CisgICAgdm9pZCBjbGVhcihjb25z dCBTdHJpbmcmIHR5cGUpOwogCiAgICAgYm9vbCBjYW5TbWFydFJlcGxhY2UoKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oCmluZGV4IDlmYmJmYTg5YTc4NDA1 OTUwZDA2ZWNhOWQxODRiNDgyMzQ4YTlhMWEuLjE1YTJlODM0MTEwZjBlM2QyOTYwY2Q3OWE2MTM0 MjI3YWY3NWU3N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlw Ym9hcmRNYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFj LmgKQEAgLTUzLDcgKzUzLDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB+Q2xpcGJvYXJkTWFj KCk7CiAgICAgCi0gICAgdm9pZCBjbGVhckRhdGEoY29uc3QgU3RyaW5nJiB0eXBlKTsKICAgICB2 b2lkIGNsZWFyQWxsRGF0YSgpOwogICAgIFN0cmluZyBnZXREYXRhKGNvbnN0IFN0cmluZyYgdHlw ZSkgY29uc3Q7CiAgICAgYm9vbCBzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3Ry aW5nJiBkYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlw Ym9hcmRNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1t CmluZGV4IDQ0ZDExOGIzNjczNTZlNDIzZDBkOWRjNTQxOTJlMjI2NTBkMDgzNTIuLmY4ZTExMWQ5 ZjI0MTAwYmViMTg4YjM2ZTZiMThiYzM1NzEzNzEwYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL0NsaXBib2FyZE1hYy5tbQpAQCAtNzAsMzkgKzcwLDYgQEAgQ2xpcGJvYXJkTWFj Ojp+Q2xpcGJvYXJkTWFjKCkKICAgICAgICAgbV9kcmFnSW1hZ2UtPnJlbW92ZUNsaWVudCh0aGlz KTsKIH0KIAotc3RhdGljIFN0cmluZyBjb2NvYVR5cGVGcm9tSFRNTENsaXBib2FyZFR5cGUoY29u c3QgU3RyaW5nJiB0eXBlKQotewotICAgIC8vIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93 ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdlL2RuZC5odG1sI2RvbS1kYXRhdHJhbnNmZXIt c2V0ZGF0YQotICAgIFN0cmluZyBxVHlwZSA9IHR5cGUubG93ZXIoKTsKLQotICAgIGlmIChxVHlw ZSA9PSAidGV4dCIpCi0gICAgICAgIHFUeXBlID0gInRleHQvcGxhaW4iOwotICAgIGlmIChxVHlw ZSA9PSAidXJsIikKLSAgICAgICAgcVR5cGUgPSAidGV4dC91cmktbGlzdCI7Ci0KLSAgICAvLyBJ Z25vcmUgYW55IHRyYWlsaW5nIGNoYXJzZXQgLSBKUyBzdHJpbmdzIGFyZSBVbmljb2RlLCB3aGlj aCBlbmNhcHN1bGF0ZXMgdGhlIGNoYXJzZXQgaXNzdWUKLSAgICBpZiAocVR5cGUgPT0gInRleHQv cGxhaW4iIHx8IHFUeXBlLnN0YXJ0c1dpdGgoInRleHQvcGxhaW47IikpCi0gICAgICAgIHJldHVy biBTdHJpbmcoTlNTdHJpbmdQYm9hcmRUeXBlKTsKLSAgICBpZiAocVR5cGUgPT0gInRleHQvdXJp LWxpc3QiKQotICAgICAgICAvLyBzcGVjaWFsIGNhc2UgYmVjYXVzZSBVVEkgZG9lc24ndCB3b3Jr IHdpdGggQ29jb2EncyBVUkwgdHlwZQotICAgICAgICByZXR1cm4gU3RyaW5nKE5TVVJMUGJvYXJk VHlwZSk7IC8vIG5vdGUgc3BlY2lhbCBjYXNlIGluIGdldERhdGEgdG8gcmVhZCBOU0ZpbGVuYW1l c1R5cGUKLQotICAgIC8vIEJsYWNrbGlzdCB0eXBlcyB0aGF0IG1pZ2h0IGNvbnRhaW4gc3ViZnJh bWUgaW5mb3JtYXRpb24KLSAgICBpZiAocVR5cGUgPT0gInRleHQvcnRmIiB8fCBxVHlwZSA9PSAi cHVibGljLnJ0ZiIgfHwgcVR5cGUgPT0gImNvbS5hcHBsZS50cmFkaXRpb25hbC1tYWMtcGxhaW4t dGV4dCIpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLQotICAgIC8vIFRyeSBVVEkgbm93Ci0g ICAgU3RyaW5nIG1pbWVUeXBlID0gcVR5cGU7Ci0gICAgaWYgKFJldGFpblB0cjxDRlN0cmluZ1Jl Zj4gdXRpVHlwZSA9IGFkb3B0Q0YoVVRUeXBlQ3JlYXRlUHJlZmVycmVkSWRlbnRpZmllckZvclRh ZyhrVVRUYWdDbGFzc01JTUVUeXBlLCBtaW1lVHlwZS5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBO VUxMKSkpIHsKLSAgICAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBwYlR5cGUgPSBhZG9wdENG KFVUVHlwZUNvcHlQcmVmZXJyZWRUYWdXaXRoQ2xhc3ModXRpVHlwZS5nZXQoKSwga1VUVGFnQ2xh c3NOU1Bib2FyZFR5cGUpKTsKLSAgICAgICAgaWYgKHBiVHlwZSkKLSAgICAgICAgICAgIHJldHVy biBwYlR5cGUuZ2V0KCk7Ci0gICAgfQotCi0gICAgLy8gTm8gbWFwcGluZywganVzdCBwYXNzIHRo ZSB3aG9sZSBzdHJpbmcgdGhvdWdoCi0gICAgcmV0dXJuIHFUeXBlOwotfQotCiBzdGF0aWMgU3Ry aW5nIHV0aVR5cGVGcm9tQ29jb2FUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkKIHsKICAgICBpZiAo UmV0YWluUHRyPENGU3RyaW5nUmVmPiB1dGlUeXBlID0gYWRvcHRDRihVVFR5cGVDcmVhdGVQcmVm ZXJyZWRJZGVudGlmaWVyRm9yVGFnKGtVVFRhZ0NsYXNzTlNQYm9hcmRUeXBlLCB0eXBlLmNyZWF0 ZUNGU3RyaW5nKCkuZ2V0KCksIDApKSkgewpAQCAtMTQ2LDE4ICsxMTMsNiBAQCBzdGF0aWMgdm9p ZCBhZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2NvYVR5cGUoTGlzdEhhc2hTZXQ8U3RyaW5nPiYg cmVzdWx0VHlwZXMsCiAgICAgcmVzdWx0VHlwZXMuYWRkKGNvY29hVHlwZSk7CiB9CiAKLXZvaWQg Q2xpcGJvYXJkTWFjOjpjbGVhckRhdGEoY29uc3QgU3RyaW5nJiB0eXBlKQotewotICAgIGlmICgh Y2FuV3JpdGVEYXRhKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIC8vIG5vdGUgTlNQYXN0ZWJv YXJkIGVuZm9yY2VzIGNoYW5nZUNvdW50IGl0c2VsZiBvbiB3cml0aW5nIC0gY2FuJ3Qgd3JpdGUg aWYgbm90IHRoZSBvd25lcgotCi0gICAgU3RyaW5nIGNvY29hVHlwZSA9IGNvY29hVHlwZUZyb21I VE1MQ2xpcGJvYXJkVHlwZSh0eXBlKTsKLSAgICBpZiAoIWNvY29hVHlwZS5pc0VtcHR5KCkpCi0g ICAgICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+c2V0U3Ry aW5nRm9yVHlwZSgiIiwgY29jb2FUeXBlLCBtX3Bhc3RlYm9hcmROYW1lKTsKLX0KLQogdm9pZCBD bGlwYm9hcmRNYWM6OmNsZWFyQWxsRGF0YSgpCiB7CiAgICAgaWYgKCFjYW5Xcml0ZURhdGEoKSkK QEAgLTIxNiw3ICsxNzEsNyBAQCBTdHJpbmcgQ2xpcGJvYXJkTWFjOjpnZXREYXRhKGNvbnN0IFN0 cmluZyYgdHlwZSkgY29uc3QKICAgICBpZiAoIWNhblJlYWREYXRhKCkgfHwgbV9jbGlwYm9hcmRD b250ZW50cyA9PSBEcmFnQW5kRHJvcEZpbGVzKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAK LSAgICBjb25zdCBTdHJpbmcmIGNvY29hVHlwZSA9IGNvY29hVHlwZUZyb21IVE1MQ2xpcGJvYXJk VHlwZSh0eXBlKTsKKyAgICBjb25zdCBTdHJpbmcmIGNvY29hVHlwZSA9IFBhc3RlYm9hcmQ6OmNv Y29hVHlwZUZyb21IVE1MQ2xpcGJvYXJkVHlwZSh0eXBlKTsKICAgICBTdHJpbmcgY29jb2FWYWx1 ZTsKIAogICAgIC8vIEdyYWIgdGhlIHZhbHVlIG9mZiB0aGUgcGFzdGVib2FyZCBjb3JyZXNwb25k aW5nIHRvIHRoZSBjb2NvYVR5cGUKQEAgLTI0Niw3ICsyMDEsNyBAQCBib29sIENsaXBib2FyZE1h Yzo6c2V0RGF0YShjb25zdCBTdHJpbmcgJnR5cGUsIGNvbnN0IFN0cmluZyAmZGF0YSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIC8vIG5vdGUgTlNQYXN0ZWJvYXJkIGVuZm9yY2VzIGNoYW5n ZUNvdW50IGl0c2VsZiBvbiB3cml0aW5nIC0gY2FuJ3Qgd3JpdGUgaWYgbm90IHRoZSBvd25lcgog Ci0gICAgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUgPSBjb2NvYVR5cGVGcm9tSFRNTENsaXBib2Fy ZFR5cGUodHlwZSk7CisgICAgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUgPSBQYXN0ZWJvYXJkOjpj b2NvYVR5cGVGcm9tSFRNTENsaXBib2FyZFR5cGUodHlwZSk7CiAgICAgU3RyaW5nIGNvY29hRGF0 YSA9IGRhdGE7CiAKICAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhOU1VSTFBib2FyZFR5cGUp IHx8IGNvY29hVHlwZSA9PSBTdHJpbmcoa1VUVHlwZUZpbGVVUkwpKSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCmluZGV4IDEzYTg0ZTZkMjI1ZTY1Y2Ex YWMzY2ZhM2IwMjQ0MGE0OWRkYTlkYTQuLjkwNGE1ZmE0YTBkOGZhZTBjMThjOTQ1ZjdhYmQ0NTY5 YWZiMjUyODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJv YXJkTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFj Lm1tCkBAIC01OTYsNCArNTk2LDQ0IEBAIGJvb2wgUGFzdGVib2FyZDo6aGFzRGF0YSgpCiAgICAg cmV0dXJuICF0eXBlcy5pc0VtcHR5KCk7CiB9CiAKK1N0cmluZyBQYXN0ZWJvYXJkOjpjb2NvYVR5 cGVGcm9tSFRNTENsaXBib2FyZFR5cGUoY29uc3QgU3RyaW5nJiB0eXBlKQoreworICAgIC8vIGh0 dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVsdGlwYWdl L2RuZC5odG1sI2RvbS1kYXRhdHJhbnNmZXItc2V0ZGF0YQorICAgIFN0cmluZyBxVHlwZSA9IHR5 cGUubG93ZXIoKTsKKworICAgIGlmIChxVHlwZSA9PSAidGV4dCIpCisgICAgICAgIHFUeXBlID0g InRleHQvcGxhaW4iOworICAgIGlmIChxVHlwZSA9PSAidXJsIikKKyAgICAgICAgcVR5cGUgPSAi dGV4dC91cmktbGlzdCI7CisKKyAgICAvLyBJZ25vcmUgYW55IHRyYWlsaW5nIGNoYXJzZXQgLSBK UyBzdHJpbmdzIGFyZSBVbmljb2RlLCB3aGljaCBlbmNhcHN1bGF0ZXMgdGhlIGNoYXJzZXQgaXNz dWUKKyAgICBpZiAocVR5cGUgPT0gInRleHQvcGxhaW4iIHx8IHFUeXBlLnN0YXJ0c1dpdGgoInRl eHQvcGxhaW47IikpCisgICAgICAgIHJldHVybiBTdHJpbmcoTlNTdHJpbmdQYm9hcmRUeXBlKTsK KyAgICBpZiAocVR5cGUgPT0gInRleHQvdXJpLWxpc3QiKQorICAgICAgICAvLyBzcGVjaWFsIGNh c2UgYmVjYXVzZSBVVEkgZG9lc24ndCB3b3JrIHdpdGggQ29jb2EncyBVUkwgdHlwZQorICAgICAg ICByZXR1cm4gU3RyaW5nKE5TVVJMUGJvYXJkVHlwZSk7IC8vIG5vdGUgc3BlY2lhbCBjYXNlIGlu IGdldERhdGEgdG8gcmVhZCBOU0ZpbGVuYW1lc1R5cGUKKworICAgIC8vIEJsYWNrbGlzdCB0eXBl cyB0aGF0IG1pZ2h0IGNvbnRhaW4gc3ViZnJhbWUgaW5mb3JtYXRpb24KKyAgICBpZiAocVR5cGUg PT0gInRleHQvcnRmIiB8fCBxVHlwZSA9PSAicHVibGljLnJ0ZiIgfHwgcVR5cGUgPT0gImNvbS5h cHBsZS50cmFkaXRpb25hbC1tYWMtcGxhaW4tdGV4dCIpCisgICAgICAgIHJldHVybiBTdHJpbmco KTsKKworICAgIC8vIFRyeSBVVEkgbm93CisgICAgU3RyaW5nIG1pbWVUeXBlID0gcVR5cGU7Cisg ICAgaWYgKFJldGFpblB0cjxDRlN0cmluZ1JlZj4gdXRpVHlwZSA9IGFkb3B0Q0YoVVRUeXBlQ3Jl YXRlUHJlZmVycmVkSWRlbnRpZmllckZvclRhZyhrVVRUYWdDbGFzc01JTUVUeXBlLCBtaW1lVHlw ZS5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBOVUxMKSkpIHsKKyAgICAgICAgUmV0YWluUHRyPENG U3RyaW5nUmVmPiBwYlR5cGUgPSBhZG9wdENGKFVUVHlwZUNvcHlQcmVmZXJyZWRUYWdXaXRoQ2xh c3ModXRpVHlwZS5nZXQoKSwga1VUVGFnQ2xhc3NOU1Bib2FyZFR5cGUpKTsKKyAgICAgICAgaWYg KHBiVHlwZSkKKyAgICAgICAgICAgIHJldHVybiBwYlR5cGUuZ2V0KCk7CisgICAgfQorCisgICAg Ly8gTm8gbWFwcGluZywganVzdCBwYXNzIHRoZSB3aG9sZSBzdHJpbmcgdGhvdWdoCisgICAgcmV0 dXJuIHFUeXBlOworfQorCit2b2lkIFBhc3RlYm9hcmQ6OmNsZWFyKGNvbnN0IFN0cmluZyYgdHlw ZSkKK3sKKyAgICBTdHJpbmcgY29jb2FUeXBlID0gY29jb2FUeXBlRnJvbUhUTUxDbGlwYm9hcmRU eXBlKHR5cGUpOworICAgIGlmICghY29jb2FUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAgcGxhdGZv cm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5zZXRTdHJpbmdGb3JUeXBlKCIi LCBjb2NvYVR5cGUsIG1fcGFzdGVib2FyZE5hbWUpOworfQorCiB9Cg==