116006 2013-05-12 22:09:13 -0700 [Mac] Move setData from ClipboardMac to PasteboardMac 2013-05-12 22:18:53 -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 888090 0 darin 2013-05-12 22:09:13 -0700 [Mac] Move setData from ClipboardMac to PasteboardMac 888091 1 201525 darin 2013-05-12 22:15:37 -0700 Created attachment 201525 Patch 888092 2 darin 2013-05-12 22:18:53 -0700 Committed r149982: <http://trac.webkit.org/changeset/149982> 201525 2013-05-12 22:15:37 -0700 2013-05-12 22:18:21 -0700 Patch bug-116006-20130512221436.patch text/plain 14818 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5OTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjk3NzAzOTA3NWMwMTk1 YmRlNWY2NjBlOWZiNjQ0NGE4OGY2Zjc3Zi4uOTQ1NWY5M2M4MjZiN2MzZmNhZTdjN2VlMWU5NTNj ZmNjY2QxOGMxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDEzLTA1LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFjXSBNb3ZlIHNldERhdGEg ZnJvbSBDbGlwYm9hcmRNYWMgdG8gUGFzdGVib2FyZE1hYworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MDA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vQ2xpcGJvYXJkLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNsaXBib2FyZDo6c2V0RGF0YSk6IEFkZGVkLiBDYWxscyB0aHJvdWdoIHRvIFBh c3RlYm9hcmQKKyAgICAgICAgYWZ0ZXIgZG9pbmcgY2hlY2tzIG5lZWRlZCBhdCB0aGlzIGxldmVs LgorCisgICAgICAgICogZG9tL0NsaXBib2FyZC5oOiBNYWRlIHNldERhdGEgbm9uLXZpcnR1YWwg aW4gbm9uLWxlZ2FjeSBjYXNlLgorCisgICAgICAgICogcGxhdGZvcm0vUGFzdGVib2FyZC5oOiBV cGRhdGVkIGluY2x1ZGVzIGFuZCBmb3J3YXJkIGRlY2xhcmF0aW9ucy4KKyAgICAgICAgUmVtb3Zl ZCBzdGF0aWMgbWVtYmVyIGZ1bmN0aW9uIGNvY29hVHlwZUZyb21IVE1MQ2xpcGJvYXJkVHlwZSwg c2luY2UKKyAgICAgICAgaXQgY2FuIG5vdyBiZSBwcml2YXRlIHRvIFBhc3RlYm9hcmRNYWMuIEFk ZGVkIHN0YXRpYyBtZW1iZXIgZnVuY3Rpb24KKyAgICAgICAgYWRkSFRNTENsaXBib2FyZFR5cGVz Rm9yQ29jb2FUeXBlLCB3aGljaCBpcyBzaGFyZWQgYmV0d2VlbiB0aGUKKyAgICAgICAgQ2xpcGJv YXJkTWFjIGFuZCBQYXN0ZWJvYXJkTWFjIGZpbGVzIGZvciBub3cuIEFkZGVkIHdyaXRlU3RyaW5n LgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oOiBSZW1vdmVkIHNldERh dGEuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tOiBSZW1vdmVkIHV0 aVR5cGVGcm9tQ29jb2FUeXBlLAorICAgICAgICBhZGRIVE1MQ2xpcGJvYXJkVHlwZXNGb3JDb2Nv YVR5cGUsIGFuZCBzZXREYXRhLgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkTWFjOjp0eXBl cyk6IENhbGwgYWRkSFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlCisgICAgICAgIGFzIGEg UGFzdGVib2FyZCBzdGF0aWMgbWVtYmVyIGZ1bmN0aW9uLCBmb3Igbm93LgorCisgICAgICAgICog cGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpjb2NvYVR5 cGVGcm9tSFRNTENsaXBib2FyZFR5cGUpOiBBZGRlZC4gTW92ZWQgZnJvbSBDbGlwYm9hcmRNYWMu CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpyZWFkU3RyaW5nKTogQ2hhbmdlZCB0byBj YWxsCisgICAgICAgIGNvY29hVHlwZUZyb21IVE1MQ2xpcGJvYXJkVHlwZSBhcyBhIGZpbGUtbG9j YWwgZnVuY3Rpb24sIG5vdCBhIG1lbWJlcgorICAgICAgICBmdW5jdGlvbiAoaW4gZmFjdCwgd2Ug ZGlkbid0IG5lZWQgdG8gcmVwZWF0IHRoZSBjbGFzcyBuYW1lIGJlZm9yZSwgZWl0aGVyLAorICAg ICAgICBzbyB0aGlzIGlzIGp1c3QgcmVtb3Zpbmcgc29tZXRoaW5nIHdlIGRpZG4ndCBuZWVkKS4K KyAgICAgICAgKFdlYkNvcmU6OnV0aVR5cGVGcm9tQ29jb2FUeXBlKTogQWRkZWQuIE1vdmVkIGZy b20gQ2xpcGJvYXJkTWFjLgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6YWRkSFRNTENs aXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQYXN0 ZWJvYXJkOjp3cml0ZVN0cmluZyk6IERpdHRvLgorCisyMDEzLTA1LTEyICBEYXJpbiBBZGxlciAg PGRhcmluQGFwcGxlLmNvbT4KKwogICAgICAgICBbTWFjXSBNb3ZlIGdldERhdGEgZnJvbSBDbGlw Ym9hcmRNYWMgdG8gUGFzdGVib2FyZE1hYwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MDA1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9DbGlwYm9hcmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKaW5kZXgg MTMzZmU2ZGFmMzE2ZGNmNjVmNTM2NDU4N2ZkNGQwNzBhMTcyYTNmMi4uMWNmYjdlNWZkYjQwNTgz ZTNlZmE0YmI2ZTM0ZjY5OTBhNzllZDkxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L0NsaXBib2FyZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NsaXBib2FyZC5jcHAKQEAg LTI4Myw2ICsyODMsMTQgQEAgU3RyaW5nIENsaXBib2FyZDo6Z2V0RGF0YShjb25zdCBTdHJpbmcm IHR5cGUpIGNvbnN0CiAgICAgcmV0dXJuIG1fcGFzdGVib2FyZC0+cmVhZFN0cmluZyh0eXBlKTsK IH0KIAorYm9vbCBDbGlwYm9hcmQ6OnNldERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBT dHJpbmcmIGRhdGEpCit7CisgICAgaWYgKCFjYW5Xcml0ZURhdGEoKSB8fCBtX2ZvckZpbGVEcmFn KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gbV9wYXN0ZWJvYXJkLT53cml0 ZVN0cmluZyh0eXBlLCBkYXRhKTsKK30KKwogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9DbGlwYm9hcmQuaCBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9DbGlwYm9hcmQuaAppbmRleCBiMmRkM2FkZDk1YWJjNGQ2NjkzYWYxYTZlYzRi Yjk3OTUwMDY3NGEwLi41MzEyYzQ4MDE2ODQyOTI4ODM0OTgwMTI1YjBmZWYyMjczOGExMWY1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ2xpcGJvYXJkLmgKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL0NsaXBib2FyZC5oCkBAIC04Miw3ICs4Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgTEVHQUNZX1ZJUlRVQUwgdm9pZCBjbGVhckRhdGEoY29uc3QgU3RyaW5nJiB0 eXBlKSBMRUdBQ1lfUFVSRTsKICAgICAgICAgTEVHQUNZX1ZJUlRVQUwgdm9pZCBjbGVhckFsbERh dGEoKSBMRUdBQ1lfUFVSRTsKICAgICAgICAgTEVHQUNZX1ZJUlRVQUwgU3RyaW5nIGdldERhdGEo Y29uc3QgU3RyaW5nJiB0eXBlKSBjb25zdCBMRUdBQ1lfUFVSRTsKLSAgICAgICAgdmlydHVhbCBi b29sIHNldERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGRhdGEpID0gMDsK KyAgICAgICAgTEVHQUNZX1ZJUlRVQUwgYm9vbCBzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwg Y29uc3QgU3RyaW5nJiBkYXRhKSBMRUdBQ1lfUFVSRTsKICAgICAKICAgICAgICAgLy8gZXh0ZW5z aW9ucyBiZXlvbmQgSUUncyBBUEkKICAgICAgICAgdmlydHVhbCBMaXN0SGFzaFNldDxTdHJpbmc+ IHR5cGVzKCkgY29uc3QgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v UGFzdGVib2FyZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCmluZGV4 IDk2YjE1ZTEyYWExMTVkMzc1YzNkZThjMjIxNWI1ZDAyNTE1Y2MwMWIuLjdiYmQ4NTM0MzVkNzA1 NWVhM2M0MDc2OWI1NjU4Y2JkYmM5NDUyZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Bhc3RlYm9hcmQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJv YXJkLmgKQEAgLTI5LDI1ICsyOSwyMiBAQAogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAjaW5j bHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KKyNpbmNs dWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CisKICNp ZiBQTEFURk9STShNQUMpCisjaW5jbHVkZSA8d3RmL0xpc3RIYXNoU2V0Lmg+CiAjaW5jbHVkZSA8 d3RmL1JldGFpblB0ci5oPgogI2VuZGlmCisKICNpZiBQTEFURk9STShHVEspCiAjaW5jbHVkZSA8 UGFzdGVib2FyZEhlbHBlci5oPgogI2VuZGlmCi0jaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiAv LyBGSVhNRTogVGhpcyBjbGFzcyBpcyB0b28gaGlnaC1sZXZlbCB0byBiZSBpbiB0aGUgcGxhdGZv cm0gZGlyZWN0b3J5LCBzaW5jZSBpdAogLy8gdXNlcyB0aGUgRE9NIGFuZCBtYWtlcyBjYWxscyB0 byBFZGl0b3IuIEl0IHNob3VsZCBlaXRoZXIgYmUgZGl2ZXN0ZWQgb2YgaXRzCiAvLyBrbm93bGVk Z2Ugb2YgdGhlIGZyYW1lIGFuZCBlZGl0b3Igb3IgbW92ZWQgaW50byB0aGUgZWRpdGluZyBkaXJl Y3RvcnkuCiAKLSNpZiBQTEFURk9STShNQUMpCi1PQkpDX0NMQVNTIE5TQXR0cmlidXRlZFN0cmlu ZzsKLU9CSkNfQ0xBU1MgTlNGaWxlV3JhcHBlcjsKLU9CSkNfQ0xBU1MgTlNBcnJheTsKLSNlbmRp ZgotCiAjaWYgUExBVEZPUk0oV0lOKQogI2luY2x1ZGUgPHdpbmRvd3MuaD4KIHR5cGVkZWYgc3Ry dWN0IEhXTkRfXyogSFdORDsKQEAgLTYzLDcgKzYwLDYgQEAgZXh0ZXJuIGNvbnN0IGNoYXIqIFdl YlVSTFBib2FyZFR5cGU7CiBleHRlcm4gY29uc3QgY2hhciogV2ViVVJMc1dpdGhUaXRsZXNQYm9h cmRUeXBlOwogI2VuZGlmCiAKLWNsYXNzIEFyY2hpdmVSZXNvdXJjZTsKIGNsYXNzIENsaXBib2Fy ZDsKIGNsYXNzIERvY3VtZW50RnJhZ21lbnQ7CiBjbGFzcyBGcmFtZTsKQEAgLTkzLDggKzg5LDgg QEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gZ2V0RGF0YVNl bGVjdGlvbihGcmFtZSosIGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZFR5cGUpOwogCiAgICAgLy8g RnVuY3Rpb25zIG5lZWRlZCB0ZW1wb3JhcmlseSB1bnRpbCBhbGwgY29kZSBmcm9tIENsaXBib2Fy ZE1hYyBpcyBtb3ZlZCB0byBQYXN0ZWJvYXJkTWFjLgotICAgIHN0YXRpYyBTdHJpbmcgY29jb2FU eXBlRnJvbUhUTUxDbGlwYm9hcmRUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSk7CiAgICAgc3RhdGlj IFZlY3RvcjxTdHJpbmc+IGFic29sdXRlVVJMc0Zyb21QYXN0ZWJvYXJkRmlsZW5hbWVzKGNvbnN0 IFN0cmluZyYgcGFzdGVib2FyZE5hbWUsIGJvb2wgb25seUZpcnN0VVJMID0gZmFsc2UpOworICAg IHN0YXRpYyB2b2lkIGFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZShMaXN0SGFzaFNl dDxTdHJpbmc+JiByZXN1bHRUeXBlcywgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUsIGNvbnN0IFN0 cmluZyYgcGFzdGVib2FyZE5hbWUpOwogI2VuZGlmCiAgICAgCiAgICAgc3RhdGljIFBhc3RlYm9h cmQqIGdlbmVyYWxQYXN0ZWJvYXJkKCk7CkBAIC0xMDMsNiArOTksNyBAQCBwdWJsaWM6CiAKICAg ICBTdHJpbmcgcmVhZFN0cmluZyhjb25zdCBTdHJpbmcmIHR5cGUpOwogCisgICAgYm9vbCB3cml0 ZVN0cmluZyhjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0cmluZyYgZGF0YSk7CiAgICAgdm9p ZCB3cml0ZVNlbGVjdGlvbihSYW5nZSosIGJvb2wgY2FuU21hcnRDb3B5T3JEZWxldGUsIEZyYW1l KiwgU2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkID0gRGVmYXVsdFNlbGVj dGVkVGV4dFR5cGUpOwogICAgIHZvaWQgd3JpdGVQbGFpblRleHQoY29uc3QgU3RyaW5nJiwgU21h cnRSZXBsYWNlT3B0aW9uKTsKICAgICB2b2lkIHdyaXRlVVJMKGNvbnN0IEtVUkwmLCBjb25zdCBT dHJpbmcmLCBGcmFtZSogPSAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9DbGlwYm9hcmRNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9DbGlwYm9h cmRNYWMuaAppbmRleCA1MTNjNmJlMTllYjQ2NjA4YjI0MGQ2ODQ5ZmRlZDM4YWNkMmY5NjllLi4w YTA3NjUxYjkyZjNjNmE0YWRhOWI3YjlmYmJhZGFiNDJiMTIwNGFlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1hYy5oCkBAIC01Miw5ICs1Miw3IEBAIHB1YmxpYzoK ICAgICB9CiAKICAgICB2aXJ0dWFsIH5DbGlwYm9hcmRNYWMoKTsKLSAgICAKLSAgICBib29sIHNl dERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGRhdGEpOwotICAgIAorCiAg ICAgLy8gZXh0ZW5zaW9ucyBiZXlvbmQgSUUncyBBUEkKICAgICB2aXJ0dWFsIExpc3RIYXNoU2V0 PFN0cmluZz4gdHlwZXMoKSBjb25zdDsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8RmlsZUxpc3Q+ IGZpbGVzKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv Q2xpcGJvYXJkTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NsaXBib2FyZE1h Yy5tbQppbmRleCA4YjU4ZWU3YzE1ZDExZWI1NWViNDZiZTA0NTA2MDU1ZDM3MGQyM2QxLi5hNzEz YTRkYTI5ZDI2MmRmMWRjOTlhMzhmN2ZmN2MyMWJmZGFmZmVjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9DbGlwYm9hcmRNYWMubW0KQEAgLTcwLDgzICs3MCw2IEBAIENsaXBib2Fy ZE1hYzo6fkNsaXBib2FyZE1hYygpCiAgICAgICAgIG1fZHJhZ0ltYWdlLT5yZW1vdmVDbGllbnQo dGhpcyk7CiB9CiAKLXN0YXRpYyBTdHJpbmcgdXRpVHlwZUZyb21Db2NvYVR5cGUoY29uc3QgU3Ry aW5nJiB0eXBlKQotewotICAgIGlmIChSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHV0aVR5cGUgPSBh ZG9wdENGKFVUVHlwZUNyZWF0ZVByZWZlcnJlZElkZW50aWZpZXJGb3JUYWcoa1VUVGFnQ2xhc3NO U1Bib2FyZFR5cGUsIHR5cGUuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgMCkpKSB7Ci0gICAgICAg IGlmIChSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IG1pbWVUeXBlID0gYWRvcHRDRihVVFR5cGVDb3B5 UHJlZmVycmVkVGFnV2l0aENsYXNzKHV0aVR5cGUuZ2V0KCksIGtVVFRhZ0NsYXNzTUlNRVR5cGUp KSkKLSAgICAgICAgICAgIHJldHVybiBTdHJpbmcobWltZVR5cGUuZ2V0KCkpOwotICAgIH0KLSAg ICByZXR1cm4gU3RyaW5nKCk7Ci19Ci0KLXN0YXRpYyB2b2lkIGFkZEhUTUxDbGlwYm9hcmRUeXBl c0ZvckNvY29hVHlwZShMaXN0SGFzaFNldDxTdHJpbmc+JiByZXN1bHRUeXBlcywgY29uc3QgU3Ry aW5nJiBjb2NvYVR5cGUsIGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUpCi17Ci0gICAgLy8g VVRJIG1heSBub3QgZG8gdGhlc2UgcmlnaHQsIHNvIG1ha2Ugc3VyZSB3ZSBnZXQgdGhlIHJpZ2h0 LCBwcmVkaWN0YWJsZSByZXN1bHQKLSAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhOU1N0cmlu Z1Bib2FyZFR5cGUpKSB7Ci0gICAgICAgIHJlc3VsdFR5cGVzLmFkZCgidGV4dC9wbGFpbiIpOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIGlmIChjb2NvYVR5cGUgPT0gU3RyaW5nKE5TVVJM UGJvYXJkVHlwZSkpIHsKLSAgICAgICAgcmVzdWx0VHlwZXMuYWRkKCJ0ZXh0L3VyaS1saXN0Iik7 Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgaWYgKGNvY29hVHlwZSA9PSBTdHJpbmcoTlNG aWxlbmFtZXNQYm9hcmRUeXBlKSkgewotICAgICAgICAvLyBJZiBmaWxlIGxpc3QgaXMgZW1wdHks IGFkZCBub3RoaW5nLgotICAgICAgICAvLyBOb3RlIHRoYXQgdGhlcmUgaXMgYSBjaGFuY2UgdGhh dCB0aGUgZmlsZSBsaXN0IGNvdW50IGNvdWxkIGhhdmUgY2hhbmdlZCBzaW5jZSB3ZSBncmFiYmVk IHRoZSB0eXBlcyBhcnJheS4KLSAgICAgICAgLy8gSG93ZXZlciwgdGhpcyBpcyBub3QgcmVhbGx5 IGFuIGlzc3VlIGZvciB1cyBkb2luZyBhIHNhbml0eSBjaGVjayBoZXJlLgotICAgICAgICBWZWN0 b3I8U3RyaW5nPiBmaWxlTGlzdDsKLSAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3Rl Ym9hcmRTdHJhdGVneSgpLT5nZXRQYXRobmFtZXNGb3JUeXBlKGZpbGVMaXN0LCBTdHJpbmcoTlNG aWxlbmFtZXNQYm9hcmRUeXBlKSwgcGFzdGVib2FyZE5hbWUpOwotICAgICAgICBpZiAoIWZpbGVM aXN0LmlzRW1wdHkoKSkgewotICAgICAgICAgICAgLy8gSXQgaXMgdW5rbm93biBpZiBOU0ZpbGVu YW1lc1Bib2FyZFR5cGUgYWx3YXlzIGltcGxpZXMgTlNVUkxQYm9hcmRUeXBlIGluIENvY29hLAot ICAgICAgICAgICAgLy8gYnV0IE5TRmlsZW5hbWVzUGJvYXJkVHlwZSBzaG91bGQgaW1wbHkgYm90 aCAndGV4dC91cmktbGlzdCcgYW5kICdGaWxlcycKLSAgICAgICAgICAgIHJlc3VsdFR5cGVzLmFk ZCgidGV4dC91cmktbGlzdCIpOwotICAgICAgICAgICAgcmVzdWx0VHlwZXMuYWRkKCJGaWxlcyIp OwotICAgICAgICB9Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgU3RyaW5nIHV0aVR5cGUg PSB1dGlUeXBlRnJvbUNvY29hVHlwZShjb2NvYVR5cGUpOwotICAgIGlmICghdXRpVHlwZS5pc0Vt cHR5KCkpIHsKLSAgICAgICAgcmVzdWx0VHlwZXMuYWRkKHV0aVR5cGUpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotICAgIC8vIE5vIG1hcHBpbmcsIGp1c3QgcGFzcyB0aGUgd2hvbGUgc3RyaW5n IHRob3VnaAotICAgIHJlc3VsdFR5cGVzLmFkZChjb2NvYVR5cGUpOwotfQotCi1ib29sIENsaXBi b2FyZE1hYzo6c2V0RGF0YShjb25zdCBTdHJpbmcgJnR5cGUsIGNvbnN0IFN0cmluZyAmZGF0YSkK LXsKLSAgICBpZiAoIWNhbldyaXRlRGF0YSgpIHx8IG1fY2xpcGJvYXJkQ29udGVudHMgPT0gRHJh Z0FuZERyb3BGaWxlcykKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIC8vIG5vdGUgTlNQYXN0 ZWJvYXJkIGVuZm9yY2VzIGNoYW5nZUNvdW50IGl0c2VsZiBvbiB3cml0aW5nIC0gY2FuJ3Qgd3Jp dGUgaWYgbm90IHRoZSBvd25lcgotCi0gICAgY29uc3QgU3RyaW5nJiBjb2NvYVR5cGUgPSBQYXN0 ZWJvYXJkOjpjb2NvYVR5cGVGcm9tSFRNTENsaXBib2FyZFR5cGUodHlwZSk7Ci0gICAgU3RyaW5n IGNvY29hRGF0YSA9IGRhdGE7Ci0KLSAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhOU1VSTFBi b2FyZFR5cGUpIHx8IGNvY29hVHlwZSA9PSBTdHJpbmcoa1VUVHlwZUZpbGVVUkwpKSB7Ci0gICAg ICAgIE5TVVJMICp1cmwgPSBbTlNVUkwgVVJMV2l0aFN0cmluZzpjb2NvYURhdGFdOwotICAgICAg ICBpZiAoW3VybCBpc0ZpbGVVUkxdKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAg ICAgIFZlY3RvcjxTdHJpbmc+IHR5cGVzOwotICAgICAgICB0eXBlcy5hcHBlbmQoY29jb2FUeXBl KTsKLSAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5z ZXRUeXBlcyh0eXBlcywgbV9wYXN0ZWJvYXJkTmFtZSk7Ci0gICAgICAgIHBsYXRmb3JtU3RyYXRl Z2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+c2V0U3RyaW5nRm9yVHlwZShjb2NvYURhdGEs IGNvY29hVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSk7Ci0KLSAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgfQotCi0gICAgaWYgKCFjb2NvYVR5cGUuaXNFbXB0eSgpKSB7Ci0gICAgICAgIC8vIGV2ZXJ5 dGhpbmcgZWxzZSB3ZSBrbm93IG9mIGdvZXMgb24gdGhlIHBib2FyZCBhcyBhIHN0cmluZwotICAg ICAgICBWZWN0b3I8U3RyaW5nPiB0eXBlczsKLSAgICAgICAgdHlwZXMuYXBwZW5kKGNvY29hVHlw ZSk7Ci0gICAgICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+ YWRkVHlwZXModHlwZXMsIG1fcGFzdGVib2FyZE5hbWUpOwotICAgICAgICBwbGF0Zm9ybVN0cmF0 ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPnNldFN0cmluZ0ZvclR5cGUoY29jb2FEYXRh LCBjb2NvYVR5cGUsIG1fcGFzdGVib2FyZE5hbWUpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAg ICB9Ci0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KIExpc3RIYXNoU2V0PFN0cmluZz4gQ2xpcGJv YXJkTWFjOjp0eXBlcygpIGNvbnN0CiB7CiAgICAgaWYgKCFjYW5SZWFkVHlwZXMoKSkKQEAgLTE2 Nyw3ICs5MCw3IEBAIExpc3RIYXNoU2V0PFN0cmluZz4gQ2xpcGJvYXJkTWFjOjp0eXBlcygpIGNv bnN0CiAgICAgICAgIGlmICh0eXBlc1tpXSA9PSAiTmVYVCBwbGFpbiBhc2NpaSBwYXN0ZWJvYXJk IHR5cGUiKQogICAgICAgICAgICAgY29udGludWU7ICAgLy8gc2tpcCB0aGlzIGFuY2llbnQgdHlw ZSB0aGF0IGdldHMgYXV0by1zdXBwbGllZCBieSBzb21lIHN5c3RlbSBjb252ZXJzaW9uCiAKLSAg ICAgICAgYWRkSFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlKHJlc3VsdCwgdHlwZXNbaV0s IG1fcGFzdGVib2FyZE5hbWUpOworICAgICAgICBQYXN0ZWJvYXJkOjphZGRIVE1MQ2xpcGJvYXJk VHlwZXNGb3JDb2NvYVR5cGUocmVzdWx0LCB0eXBlc1tpXSwgbV9wYXN0ZWJvYXJkTmFtZSk7CiAg ICAgfQogCiAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1Bhc3RlYm9hcmRNYWMubW0KaW5kZXggOWU1OTk5NzI2ZjE5MzUwMGYwNDNjMmI2ODA1YzhmODc5 NzM1YTg4Zi4uNDkzNWFiNTQzYTk1ZTVjN2Q5NWVjZTM3Y2NlZTZmOWFiYjNmMDliYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0KQEAgLTI3LDcgKzI3 LDYgQEAKICNpbXBvcnQgIlBhc3RlYm9hcmQuaCIKIAogI2ltcG9ydCAiQ2FjaGVkSW1hZ2UuaCIK LSNpbXBvcnQgIkNsaXBib2FyZE1hYy5oIgogI2ltcG9ydCAiRE9NUmFuZ2VJbnRlcm5hbC5oIgog I2ltcG9ydCAiRG9jdW1lbnQuaCIKICNpbXBvcnQgIkRvY3VtZW50RnJhZ21lbnQuaCIKQEAgLTU5 Niw3ICs1OTUsNyBAQCBib29sIFBhc3RlYm9hcmQ6Omhhc0RhdGEoKQogICAgIHJldHVybiAhdHlw ZXMuaXNFbXB0eSgpOwogfQogCi1TdHJpbmcgUGFzdGVib2FyZDo6Y29jb2FUeXBlRnJvbUhUTUxD bGlwYm9hcmRUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkKK3N0YXRpYyBTdHJpbmcgY29jb2FUeXBl RnJvbUhUTUxDbGlwYm9hcmRUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkKIHsKICAgICAvLyBodHRw Oi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrL211bHRpcGFnZS9k bmQuaHRtbCNkb20tZGF0YXRyYW5zZmVyLXNldGRhdGEKICAgICBTdHJpbmcgcVR5cGUgPSB0eXBl Lmxvd2VyKCk7CkBAIC02ODAsNyArNjc5LDcgQEAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IGFic29s dXRlVVJMc0Zyb21QYXN0ZWJvYXJkKGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUsIGIKIAog U3RyaW5nIFBhc3RlYm9hcmQ6OnJlYWRTdHJpbmcoY29uc3QgU3RyaW5nJiB0eXBlKQogewotICAg IGNvbnN0IFN0cmluZyYgY29jb2FUeXBlID0gUGFzdGVib2FyZDo6Y29jb2FUeXBlRnJvbUhUTUxD bGlwYm9hcmRUeXBlKHR5cGUpOworICAgIGNvbnN0IFN0cmluZyYgY29jb2FUeXBlID0gY29jb2FU eXBlRnJvbUhUTUxDbGlwYm9hcmRUeXBlKHR5cGUpOwogICAgIFN0cmluZyBjb2NvYVZhbHVlOwog CiAgICAgLy8gR3JhYiB0aGUgdmFsdWUgb2ZmIHRoZSBwYXN0ZWJvYXJkIGNvcnJlc3BvbmRpbmcg dG8gdGhlIGNvY29hVHlwZQpAQCAtNzAzLDQgKzcwMiw3NyBAQCBTdHJpbmcgUGFzdGVib2FyZDo6 cmVhZFN0cmluZyhjb25zdCBTdHJpbmcmIHR5cGUpCiAgICAgcmV0dXJuIFN0cmluZygpOwogfQog CitzdGF0aWMgU3RyaW5nIHV0aVR5cGVGcm9tQ29jb2FUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkK K3sKKyAgICBpZiAoUmV0YWluUHRyPENGU3RyaW5nUmVmPiB1dGlUeXBlID0gYWRvcHRDRihVVFR5 cGVDcmVhdGVQcmVmZXJyZWRJZGVudGlmaWVyRm9yVGFnKGtVVFRhZ0NsYXNzTlNQYm9hcmRUeXBl LCB0eXBlLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIDApKSkgeworICAgICAgICBpZiAoUmV0YWlu UHRyPENGU3RyaW5nUmVmPiBtaW1lVHlwZSA9IGFkb3B0Q0YoVVRUeXBlQ29weVByZWZlcnJlZFRh Z1dpdGhDbGFzcyh1dGlUeXBlLmdldCgpLCBrVVRUYWdDbGFzc01JTUVUeXBlKSkpCisgICAgICAg ICAgICByZXR1cm4gU3RyaW5nKG1pbWVUeXBlLmdldCgpKTsKKyAgICB9CisgICAgcmV0dXJuIFN0 cmluZygpOworfQorCit2b2lkIFBhc3RlYm9hcmQ6OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNv Y29hVHlwZShMaXN0SGFzaFNldDxTdHJpbmc+JiByZXN1bHRUeXBlcywgY29uc3QgU3RyaW5nJiBj b2NvYVR5cGUsIGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUpCit7CisgICAgLy8gVVRJIG1h eSBub3QgZG8gdGhlc2UgcmlnaHQsIHNvIG1ha2Ugc3VyZSB3ZSBnZXQgdGhlIHJpZ2h0LCBwcmVk aWN0YWJsZSByZXN1bHQKKyAgICBpZiAoY29jb2FUeXBlID09IFN0cmluZyhOU1N0cmluZ1Bib2Fy ZFR5cGUpKSB7CisgICAgICAgIHJlc3VsdFR5cGVzLmFkZCgidGV4dC9wbGFpbiIpOworICAgICAg ICByZXR1cm47CisgICAgfQorICAgIGlmIChjb2NvYVR5cGUgPT0gU3RyaW5nKE5TVVJMUGJvYXJk VHlwZSkpIHsKKyAgICAgICAgcmVzdWx0VHlwZXMuYWRkKCJ0ZXh0L3VyaS1saXN0Iik7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKGNvY29hVHlwZSA9PSBTdHJpbmcoTlNGaWxlbmFt ZXNQYm9hcmRUeXBlKSkgeworICAgICAgICAvLyBJZiBmaWxlIGxpc3QgaXMgZW1wdHksIGFkZCBu b3RoaW5nLgorICAgICAgICAvLyBOb3RlIHRoYXQgdGhlcmUgaXMgYSBjaGFuY2UgdGhhdCB0aGUg ZmlsZSBsaXN0IGNvdW50IGNvdWxkIGhhdmUgY2hhbmdlZCBzaW5jZSB3ZSBncmFiYmVkIHRoZSB0 eXBlcyBhcnJheS4KKyAgICAgICAgLy8gSG93ZXZlciwgdGhpcyBpcyBub3QgcmVhbGx5IGFuIGlz c3VlIGZvciB1cyBkb2luZyBhIHNhbml0eSBjaGVjayBoZXJlLgorICAgICAgICBWZWN0b3I8U3Ry aW5nPiBmaWxlTGlzdDsKKyAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRT dHJhdGVneSgpLT5nZXRQYXRobmFtZXNGb3JUeXBlKGZpbGVMaXN0LCBTdHJpbmcoTlNGaWxlbmFt ZXNQYm9hcmRUeXBlKSwgcGFzdGVib2FyZE5hbWUpOworICAgICAgICBpZiAoIWZpbGVMaXN0Lmlz RW1wdHkoKSkgeworICAgICAgICAgICAgLy8gSXQgaXMgdW5rbm93biBpZiBOU0ZpbGVuYW1lc1Bi b2FyZFR5cGUgYWx3YXlzIGltcGxpZXMgTlNVUkxQYm9hcmRUeXBlIGluIENvY29hLAorICAgICAg ICAgICAgLy8gYnV0IE5TRmlsZW5hbWVzUGJvYXJkVHlwZSBzaG91bGQgaW1wbHkgYm90aCAndGV4 dC91cmktbGlzdCcgYW5kICdGaWxlcycKKyAgICAgICAgICAgIHJlc3VsdFR5cGVzLmFkZCgidGV4 dC91cmktbGlzdCIpOworICAgICAgICAgICAgcmVzdWx0VHlwZXMuYWRkKCJGaWxlcyIpOworICAg ICAgICB9CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgU3RyaW5nIHV0aVR5cGUgPSB1dGlU eXBlRnJvbUNvY29hVHlwZShjb2NvYVR5cGUpOworICAgIGlmICghdXRpVHlwZS5pc0VtcHR5KCkp IHsKKyAgICAgICAgcmVzdWx0VHlwZXMuYWRkKHV0aVR5cGUpOworICAgICAgICByZXR1cm47Cisg ICAgfQorICAgIC8vIE5vIG1hcHBpbmcsIGp1c3QgcGFzcyB0aGUgd2hvbGUgc3RyaW5nIHRob3Vn aAorICAgIHJlc3VsdFR5cGVzLmFkZChjb2NvYVR5cGUpOworfQorCitib29sIFBhc3RlYm9hcmQ6 OndyaXRlU3RyaW5nKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBkYXRhKQorewor ICAgIGNvbnN0IFN0cmluZyYgY29jb2FUeXBlID0gY29jb2FUeXBlRnJvbUhUTUxDbGlwYm9hcmRU eXBlKHR5cGUpOworICAgIFN0cmluZyBjb2NvYURhdGEgPSBkYXRhOworCisgICAgaWYgKGNvY29h VHlwZSA9PSBTdHJpbmcoTlNVUkxQYm9hcmRUeXBlKSB8fCBjb2NvYVR5cGUgPT0gU3RyaW5nKGtV VFR5cGVGaWxlVVJMKSkgeworICAgICAgICBOU1VSTCAqdXJsID0gW05TVVJMIFVSTFdpdGhTdHJp bmc6Y29jb2FEYXRhXTsKKyAgICAgICAgaWYgKFt1cmwgaXNGaWxlVVJMXSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgICAgICBWZWN0b3I8U3RyaW5nPiB0eXBlczsKKyAgICAgICAg dHlwZXMuYXBwZW5kKGNvY29hVHlwZSk7CisgICAgICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5w YXN0ZWJvYXJkU3RyYXRlZ3koKS0+c2V0VHlwZXModHlwZXMsIG1fcGFzdGVib2FyZE5hbWUpOwor ICAgICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPnNldFN0 cmluZ0ZvclR5cGUoY29jb2FEYXRhLCBjb2NvYVR5cGUsIG1fcGFzdGVib2FyZE5hbWUpOworCisg ICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIGlmICghY29jb2FUeXBlLmlzRW1wdHko KSkgeworICAgICAgICAvLyBldmVyeXRoaW5nIGVsc2Ugd2Uga25vdyBvZiBnb2VzIG9uIHRoZSBw Ym9hcmQgYXMgYSBzdHJpbmcKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gdHlwZXM7CisgICAgICAg IHR5cGVzLmFwcGVuZChjb2NvYVR5cGUpOworICAgICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+ cGFzdGVib2FyZFN0cmF0ZWd5KCktPmFkZFR5cGVzKHR5cGVzLCBtX3Bhc3RlYm9hcmROYW1lKTsK KyAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5zZXRT dHJpbmdGb3JUeXBlKGNvY29hRGF0YSwgY29jb2FUeXBlLCBtX3Bhc3RlYm9hcmROYW1lKTsKKyAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAgcmV0dXJuIGZhbHNlOworfQorCiB9Cg==