116008 2013-05-12 22:27:30 -0700 [Mac] Moved files function from ClipboardMac to PasteboardMac 2013-05-12 22:34:42 -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 888097 0 darin 2013-05-12 22:27:30 -0700 [Mac] Moved files function from ClipboardMac to PasteboardMac 888100 1 201528 darin 2013-05-12 22:31:51 -0700 Created attachment 201528 Patch 888101 2 darin 2013-05-12 22:34:42 -0700 Committed r149985: <http://trac.webkit.org/changeset/149985> 201528 2013-05-12 22:31:51 -0700 2013-05-12 22:33:50 -0700 Patch bug-116008-20130512223050.patch text/plain 9666 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5OTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDA1MDM1Y2ExYmNhYTM5 ZjA0OGJiMjBjOTUyM2E1NDQ5ZGU4MTI3MC4uYWYzY2Q0NzNjN2NiMzM0ZDVlZGUwZjI4MTg0OGY3 NjY2NTE3YzY1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDEzLTA1LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFjXSBNb3ZlZCBmaWxlcyBm dW5jdGlvbiBmcm9tIENsaXBib2FyZE1hYyB0byBQYXN0ZWJvYXJkTWFjCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYwMDgKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9DbGlwYm9hcmQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkOjpmaWxlcyk6IEFkZGVkLiBNb3ZlZCB0aGUgRE9N LWRlcGRlbmRlbnQgYW5kCisgICAgICAgIHBsYXRmb3JtLWluZGVwZW5kZW50IHBhcnQgb2YgdGhl IGZpbGVzIGZ1bmN0aW9uIGluIENsaXBib2FyZE1hYyBoZXJlLgorCisgICAgICAgICogZG9tL0Ns aXBib2FyZC5oOiBNYWRlIGZpbGVzIGZ1bmN0aW9uIG5vbi12aXJ0dWFsIGluIG5vbi1sZWdhY3kg Y2FzZS4KKworICAgICAgICAqIHBsYXRmb3JtL1Bhc3RlYm9hcmQuaDogUmVtb3ZlZCBzdGF0aWMg bWVtYmVyIGZ1bmN0aW9uCisgICAgICAgIGFic29sdXRlVVJMc0Zyb21QYXN0ZWJvYXJkRmlsZW5h bWVzIHNpbmNlIGl0IGNhbiBub3cgYmUgcHJpdmF0ZSB0bworICAgICAgICBQYXN0ZWJvYXJkTWFj LiBBZGRlZCBtZW1iZXIgZnVuY3Rpb24gcmVhZEZpbGVuYW1lcy4KKworICAgICAgICAqIHBsYXRm b3JtL21hYy9DbGlwYm9hcmRNYWMuaDogUmVtb3ZlZCBmdW5jdGlvbiBtZW1iZXIgZmlsZXMgYW5k IGFsc28KKyAgICAgICAgbm93LXVudXNlZCBkYXRhIG1lbWJlciBtX2NsaXBib2FyZENvbnRlbnRz LgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5tbTogUmVtb3ZlZCBmaWxl cyBmdW5jdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OkNsaXBib2FyZE1hYzo6Q2xpcGJvYXJkTWFj KTogUmVtb3ZlZCBjb2RlIHRvIGluaXRpYWxpemUKKyAgICAgICAgbV9jbGlwYm9hcmRDb250ZW50 cy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAgICAo V2ViQ29yZTo6YWJzb2x1dGVVUkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMpOiBDaGFuZ2VkIGZy b20gYSBzdGF0aWMKKyAgICAgICAgbWVtYmVyIGZ1bmN0aW9uIHRvIGEgZmlsZS1sb2NhbCBmdW5j dGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OmFic29sdXRlVVJMc0Zyb21QYXN0ZWJvYXJkKTogQ2hh bmdlZCB0byBjYWxsIHRoZSBmdW5jdGlvbgorICAgICAgICBhYm92ZSBpbiBpdHMgbmV3IGxvY2F0 aW9uLgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6cmVhZEZpbGVuYW1lcyk6IEFkZGVk LiBDb2RlIGZyb20gQ2xpcGJvYXJkTWFjLAorICAgICAgICBtaW51cyB0aGUgRE9NLXNwZWNpZmlj IHBhcnRzLiBBZGRlZCBhIEZJWE1FIGFib3V0IHRoZSBwZWN1bGlhciByb3VuZAorICAgICAgICB0 cmlwIHRocm91Z2ggTlNVUkwgdGhpcyBjb2RlIHRha2VzLgorCisyMDEzLTA1LTEyICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKwogICAgICAgICBbTWFjXSBNb3ZlIHR5cGVzIGZ1bmN0 aW9uIGZyb20gQ2xpcGJvYXJkTWFjIHRvIFBhc3RlYm9hcmRNYWMKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjAwNwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9h cmQuY3BwCmluZGV4IGY0NTZkM2UzMjEzMjhmOWE3YTc3NTc1ZWIyOGVlYmNkMGMwMmUxOTguLjli ZmIyZTBmYWI0NzFmMGQyNzQxYTQxM2ZhMTMyOWRmNzIxMDgyMzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlw Ym9hcmQuY3BwCkBAIC0yOTksNiArMjk5LDIxIEBAIExpc3RIYXNoU2V0PFN0cmluZz4gQ2xpcGJv YXJkOjp0eXBlcygpIGNvbnN0CiAgICAgcmV0dXJuIG1fcGFzdGVib2FyZC0+dHlwZXMoKTsKIH0K IAorLy8gRklYTUU6IFdlIGNvdWxkIGNhY2hlIHRoZSBjb21wdXRlZCBmaWxlTGlzdCBpZiBuZWNl c3NhcnkKKy8vIEN1cnJlbnRseSBlYWNoIGFjY2VzcyBnZXRzIGEgbmV3IGNvcHksIHNldERhdGEo KSBtb2RpZmljYXRpb25zIHRvIHRoZQorLy8gY2xpcGJvYXJkIGFyZSBub3QgcmVmbGVjdGVkIGlu IGFueSBGaWxlTGlzdCBvYmplY3RzIHRoZSBwYWdlIGhhcyBhY2Nlc3NlZCBhbmQgc3RvcmVkCitQ YXNzUmVmUHRyPEZpbGVMaXN0PiBDbGlwYm9hcmQ6OmZpbGVzKCkgY29uc3QKK3sKKyAgICBpZiAo IWNhblJlYWREYXRhKCkgfHwgKG1fY2xpcGJvYXJkVHlwZSA9PSBEcmFnQW5kRHJvcCAmJiAhbV9m b3JGaWxlRHJhZykpCisgICAgICAgIHJldHVybiBGaWxlTGlzdDo6Y3JlYXRlKCk7CisKKyAgICBW ZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXMgPSBtX3Bhc3RlYm9hcmQtPnJlYWRGaWxlbmFtZXMoKTsK KyAgICBSZWZQdHI8RmlsZUxpc3Q+IGZpbGVMaXN0ID0gRmlsZUxpc3Q6OmNyZWF0ZSgpOworICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZmlsZW5hbWVzLnNpemUoKTsgKytpKQorICAgICAgICBm aWxlTGlzdC0+YXBwZW5kKEZpbGU6OmNyZWF0ZShmaWxlbmFtZXNbaV0sIEZpbGU6OkFsbENvbnRl bnRUeXBlcykpOworICAgIHJldHVybiBmaWxlTGlzdC5yZWxlYXNlKCk7Cit9CisKICNlbmRpZgog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v Q2xpcGJvYXJkLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmgKaW5kZXggMjUwMjFl NThmMTgxYjYxYmFhMDkxOWQ1NTA0MDA1YjUxODU4ZTEwNS4uN2Q3NmNmOGNkYjZhNzk3NDg1NjJi MTJiOGVmNmIyYjRjZTQwYjQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBi b2FyZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuaApAQCAtODUsNyArODUs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIExFR0FDWV9WSVJUVUFMIGJvb2wgc2V0 RGF0YShjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0cmluZyYgZGF0YSkgTEVHQUNZX1BVUkU7 CiAgICAgCiAgICAgICAgIExFR0FDWV9WSVJUVUFMIExpc3RIYXNoU2V0PFN0cmluZz4gdHlwZXMo KSBjb25zdCBMRUdBQ1lfUFVSRTsKLSAgICAgICAgdmlydHVhbCBQYXNzUmVmUHRyPEZpbGVMaXN0 PiBmaWxlcygpIGNvbnN0ID0gMDsKKyAgICAgICAgTEVHQUNZX1ZJUlRVQUwgUGFzc1JlZlB0cjxG aWxlTGlzdD4gZmlsZXMoKSBjb25zdCBMRUdBQ1lfUFVSRTsKIAogICAgICAgICBJbnRQb2ludCBk cmFnTG9jYXRpb24oKSBjb25zdCB7IHJldHVybiBtX2RyYWdMb2M7IH0KICAgICAgICAgQ2FjaGVk SW1hZ2UqIGRyYWdJbWFnZSgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhZ0ltYWdlLmdldCgpOyB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKaW5kZXggZDdjMTA1ZjA2NjJhMWQxODYxYjIx MTA2MTU1MjEyYzQzZmI1MjVmZi4uNjk2NTE0MDA5YThhYjgzN2QzNDEyNGE0ODUzYmRlNzgxYzEz MDM2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuaApAQCAtODcsOSArODcsNiBA QCBwdWJsaWM6CiAgICAgZXhwbGljaXQgUGFzdGVib2FyZChjb25zdCBTdHJpbmcmIHBhc3RlYm9h cmROYW1lKTsKICAgICBzdGF0aWMgU3RyaW5nIGdldFN0cmluZ1NlbGVjdGlvbihGcmFtZSosIFNo b3VsZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCk7CiAgICAgc3RhdGljIFBhc3NS ZWZQdHI8U2hhcmVkQnVmZmVyPiBnZXREYXRhU2VsZWN0aW9uKEZyYW1lKiwgY29uc3QgU3RyaW5n JiBwYXN0ZWJvYXJkVHlwZSk7Ci0KLSAgICAvLyBGdW5jdGlvbnMgbmVlZGVkIHRlbXBvcmFyaWx5 IHVudGlsIGFsbCBjb2RlIGZyb20gQ2xpcGJvYXJkTWFjIGlzIG1vdmVkIHRvIFBhc3RlYm9hcmRN YWMuCi0gICAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IGFic29sdXRlVVJMc0Zyb21QYXN0ZWJvYXJk RmlsZW5hbWVzKGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUsIGJvb2wgb25seUZpcnN0VVJM ID0gZmFsc2UpOwogI2VuZGlmCiAgICAgCiAgICAgc3RhdGljIFBhc3RlYm9hcmQqIGdlbmVyYWxQ YXN0ZWJvYXJkKCk7CkBAIC05OCw2ICs5NSw3IEBAIHB1YmxpYzoKICAgICBMaXN0SGFzaFNldDxT dHJpbmc+IHR5cGVzKCk7CiAKICAgICBTdHJpbmcgcmVhZFN0cmluZyhjb25zdCBTdHJpbmcmIHR5 cGUpOworICAgIFZlY3RvcjxTdHJpbmc+IHJlYWRGaWxlbmFtZXMoKTsKIAogICAgIGJvb2wgd3Jp dGVTdHJpbmcoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGRhdGEpOwogICAgIHZv aWQgd3JpdGVTZWxlY3Rpb24oUmFuZ2UqLCBib29sIGNhblNtYXJ0Q29weU9yRGVsZXRlLCBGcmFt ZSosIFNob3VsZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCA9IERlZmF1bHRTZWxl Y3RlZFRleHRUeXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9D bGlwYm9hcmRNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMu aAppbmRleCAxZTQ2NjA0YjYwOWUxMzFlOTRiYWI5YmZiYzFhZWMwMTE1YmNjNjNhLi4yODQxNjZj MGU1YmU3MmFkMDEyNTQ5Nzk2NGIxOTRiMzNlN2Q0MDA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oCkBAIC01Miw4ICs1Miw2IEBAIHB1YmxpYzoKICAgICB9 CiAKICAgICB2aXJ0dWFsIH5DbGlwYm9hcmRNYWMoKTsKLSAgICAKLSAgICB2aXJ0dWFsIFBhc3NS ZWZQdHI8RmlsZUxpc3Q+IGZpbGVzKCkgY29uc3Q7CiAKICAgICB2b2lkIHNldERyYWdJbWFnZShD YWNoZWRJbWFnZSosIGNvbnN0IEludFBvaW50Jik7CiAgICAgdm9pZCBzZXREcmFnSW1hZ2VFbGVt ZW50KE5vZGUgKiwgY29uc3QgSW50UG9pbnQmKTsKQEAgLTc3LDcgKzc1LDYgQEAgcHJpdmF0ZToK IAogICAgIFN0cmluZyBtX3Bhc3RlYm9hcmROYW1lOwogICAgIGludCBtX2NoYW5nZUNvdW50Owot ICAgIENsaXBib2FyZENvbnRlbnRzIG1fY2xpcGJvYXJkQ29udGVudHM7CiAgICAgRnJhbWUqIG1f ZnJhbWU7IC8vIHVzZWQgb24gdGhlIHNvdXJjZSBzaWRlIHRvIGdlbmVyYXRlIGRyYWdnaW5nIGlt YWdlcwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBi b2FyZE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW0K aW5kZXggYzY2ZDlhYTllZDgyOTVkMGJlYmYyODQ2OGJlYTg0Mjc2NzdjOTAyNi4uY2MwNTgxMGNl MThjMWIyMTc3ZDA3Mzc3M2MzYWRlMzNkOWIwYzNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tCkBAIC01OCw3ICs1OCw2IEBAIFBhc3NSZWZQdHI8Q2xp cGJvYXJkPiBDbGlwYm9hcmQ6OmNyZWF0ZShDbGlwYm9hcmRBY2Nlc3NQb2xpY3kgcG9saWN5LCBE cmFnRGF0YSoKIENsaXBib2FyZE1hYzo6Q2xpcGJvYXJkTWFjKENsaXBib2FyZFR5cGUgY2xpcGJv YXJkVHlwZSwgY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgQ2xpcGJvYXJkQWNjZXNzUG9s aWN5IHBvbGljeSwgQ2xpcGJvYXJkQ29udGVudHMgY2xpcGJvYXJkQ29udGVudHMsIEZyYW1lICpm cmFtZSkKICAgICA6IENsaXBib2FyZChwb2xpY3ksIGNsaXBib2FyZFR5cGUsIFBhc3RlYm9hcmQ6 OmNyZWF0ZShwYXN0ZWJvYXJkTmFtZSksIGNsaXBib2FyZENvbnRlbnRzID09IERyYWdBbmREcm9w RmlsZXMpCiAgICAgLCBtX3Bhc3RlYm9hcmROYW1lKHBhc3RlYm9hcmROYW1lKQotICAgICwgbV9j bGlwYm9hcmRDb250ZW50cyhjbGlwYm9hcmRDb250ZW50cykKICAgICAsIG1fZnJhbWUoZnJhbWUp CiB7CiAgICAgbV9jaGFuZ2VDb3VudCA9IHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJk U3RyYXRlZ3koKS0+Y2hhbmdlQ291bnQobV9wYXN0ZWJvYXJkTmFtZSk7CkBAIC03MCwyNSArNjks NiBAQCBDbGlwYm9hcmRNYWM6On5DbGlwYm9hcmRNYWMoKQogICAgICAgICBtX2RyYWdJbWFnZS0+ cmVtb3ZlQ2xpZW50KHRoaXMpOwogfQogCi0vLyBGSVhNRTogV2UgY291bGQgY2FjaGUgdGhlIGNv bXB1dGVkIGZpbGVMaXN0IGlmIG5lY2Vzc2FyeQotLy8gQ3VycmVudGx5IGVhY2ggYWNjZXNzIGdl dHMgYSBuZXcgY29weSwgc2V0RGF0YSgpIG1vZGlmaWNhdGlvbnMgdG8gdGhlCi0vLyBjbGlwYm9h cmQgYXJlIG5vdCByZWZsZWN0ZWQgaW4gYW55IEZpbGVMaXN0IG9iamVjdHMgdGhlIHBhZ2UgaGFz IGFjY2Vzc2VkIGFuZCBzdG9yZWQKLVBhc3NSZWZQdHI8RmlsZUxpc3Q+IENsaXBib2FyZE1hYzo6 ZmlsZXMoKSBjb25zdAotewotICAgIGlmICghY2FuUmVhZERhdGEoKSB8fCBtX2NsaXBib2FyZENv bnRlbnRzID09IERyYWdBbmREcm9wRGF0YSkKLSAgICAgICAgcmV0dXJuIEZpbGVMaXN0OjpjcmVh dGUoKTsKLQotICAgIFZlY3RvcjxTdHJpbmc+IGFic29sdXRlVVJMcyA9IFBhc3RlYm9hcmQ6OmFi c29sdXRlVVJMc0Zyb21QYXN0ZWJvYXJkRmlsZW5hbWVzKG1fcGFzdGVib2FyZE5hbWUpOwotCi0g ICAgUmVmUHRyPEZpbGVMaXN0PiBmaWxlTGlzdCA9IEZpbGVMaXN0OjpjcmVhdGUoKTsKLSAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGFic29sdXRlVVJMcy5zaXplKCk7IGkrKykgewotICAgICAg ICBOU1VSTCAqYWJzb2x1dGVVUkwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzphYnNvbHV0ZVVSTHNb aV1dOwotICAgICAgICBBU1NFUlQoW2Fic29sdXRlVVJMIGlzRmlsZVVSTF0pOwotICAgICAgICBm aWxlTGlzdC0+YXBwZW5kKEZpbGU6OmNyZWF0ZShbYWJzb2x1dGVVUkwgcGF0aF0sIEZpbGU6OkFs bENvbnRlbnRUeXBlcykpOwotICAgIH0KLSAgICByZXR1cm4gZmlsZUxpc3QucmVsZWFzZSgpOyAv LyBXZSB3aWxsIGFsd2F5cyByZXR1cm4gYSBGaWxlTGlzdCwgc29tZXRpbWVzIGVtcHR5Ci19Ci0K IC8vIFRoZSByZXN0IG9mIHRoZXNlIGdldHRlcnMgZG9uJ3QgcmVhbGx5IGhhdmUgYW55IGltcGFj dCBvbiBzZWN1cml0eSwgc28gZm9yIG5vdyBtYWtlIG5vIGNoZWNrcwogCiB2b2lkIENsaXBib2Fy ZE1hYzo6c2V0RHJhZ0ltYWdlKENhY2hlZEltYWdlKiBpbWcsIGNvbnN0IEludFBvaW50ICZsb2Mp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5t bSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCmluZGV4IDA1 MGRjZWQ1NjhjNjgxYmJlNjQzOWEyOTNmMzQwZjc5NjhmMzM3YTUuLjMxOTE1MzdjYzI2OWU2NWVm ZWQ1MmVjM2VmYmIyNzkxYjY3ZmRlZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9QYXN0ZWJvYXJkTWFjLm1tCkBAIC02MzUsNyArNjM1LDcgQEAgdm9pZCBQYXN0ZWJvYXJkOjpj bGVhcihjb25zdCBTdHJpbmcmIHR5cGUpCiAgICAgICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5w YXN0ZWJvYXJkU3RyYXRlZ3koKS0+c2V0U3RyaW5nRm9yVHlwZSgiIiwgY29jb2FUeXBlLCBtX3Bh c3RlYm9hcmROYW1lKTsKIH0KIAotVmVjdG9yPFN0cmluZz4gUGFzdGVib2FyZDo6YWJzb2x1dGVV UkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwg Ym9vbCBvbmx5Rmlyc3RVUkwpCitzdGF0aWMgVmVjdG9yPFN0cmluZz4gYWJzb2x1dGVVUkxzRnJv bVBhc3RlYm9hcmRGaWxlbmFtZXMoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgYm9vbCBv bmx5Rmlyc3RVUkwgPSBmYWxzZSkKIHsKICAgICBWZWN0b3I8U3RyaW5nPiBmaWxlTGlzdDsKICAg ICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPmdldFBhdGhuYW1l c0ZvclR5cGUoZmlsZUxpc3QsIFN0cmluZyhOU0ZpbGVuYW1lc1Bib2FyZFR5cGUpLCBwYXN0ZWJv YXJkTmFtZSk7CkBAIC02NjIsNyArNjYyLDcgQEAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IGFic29s dXRlVVJMc0Zyb21QYXN0ZWJvYXJkKGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUsIGIKIAog ICAgIC8vIFRyeSBOU0ZpbGVuYW1lc1Bib2FyZFR5cGUgYmVjYXVzZSBpdCBjb250YWlucyBhIGxp c3QKICAgICBpZiAoYXZhaWxhYmxlVHlwZXMuY29udGFpbnMoU3RyaW5nKE5TRmlsZW5hbWVzUGJv YXJkVHlwZSkpKSB7Ci0gICAgICAgIGFic29sdXRlVVJMcyA9IFBhc3RlYm9hcmQ6OmFic29sdXRl VVJMc0Zyb21QYXN0ZWJvYXJkRmlsZW5hbWVzKHBhc3RlYm9hcmROYW1lLCBvbmx5Rmlyc3RVUkwp OworICAgICAgICBhYnNvbHV0ZVVSTHMgPSBhYnNvbHV0ZVVSTHNGcm9tUGFzdGVib2FyZEZpbGVu YW1lcyhwYXN0ZWJvYXJkTmFtZSwgb25seUZpcnN0VVJMKTsKICAgICAgICAgaWYgKCFhYnNvbHV0 ZVVSTHMuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuIGFic29sdXRlVVJMczsKICAgICB9 CkBAIC03OTgsNCArNzk4LDE4IEBAIExpc3RIYXNoU2V0PFN0cmluZz4gUGFzdGVib2FyZDo6dHlw ZXMoKQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK1ZlY3RvcjxTdHJpbmc+IFBhc3RlYm9hcmQ6 OnJlYWRGaWxlbmFtZXMoKQoreworICAgIC8vIEZJWE1FOiBTZWVtcyBzaWxseSB0byBjb252ZXJ0 IHBhdGhzIHRvIFVSTHMgYW5kIHRoZW4gYmFjayB0byBwYXRocy4gRG9lcyB0aGF0IGRvIGFueXRo aW5nIGhlbHBmdWw/CisgICAgVmVjdG9yPFN0cmluZz4gYWJzb2x1dGVVUkxzID0gYWJzb2x1dGVV UkxzRnJvbVBhc3RlYm9hcmRGaWxlbmFtZXMobV9wYXN0ZWJvYXJkTmFtZSk7CisgICAgVmVjdG9y PFN0cmluZz4gcGF0aHM7CisgICAgcGF0aHMucmVzZXJ2ZUNhcGFjaXR5KGFic29sdXRlVVJMcy5z aXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYWJzb2x1dGVVUkxzLnNpemUoKTsg aSsrKSB7CisgICAgICAgIE5TVVJMICphYnNvbHV0ZVVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5n OmFic29sdXRlVVJMc1tpXV07CisgICAgICAgIEFTU0VSVChbYWJzb2x1dGVVUkwgaXNGaWxlVVJM XSk7CisgICAgICAgIHBhdGhzLnVuY2hlY2tlZEFwcGVuZChbYWJzb2x1dGVVUkwgcGF0aF0pOwor ICAgIH0KKyAgICByZXR1cm4gcGF0aHM7Cit9CisKIH0K