116418 2013-05-19 16:36:26 -0700 [Mac] Improve string use in PasteboardMac 2013-05-19 17:04:28 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 891074 0 darin 2013-05-19 16:36:26 -0700 [Mac] Improve string use in PasteboardMac 891076 1 202245 darin 2013-05-19 16:39:09 -0700 Created attachment 202245 Patch 891089 2 darin 2013-05-19 17:04:28 -0700 Committed r150358: <http://trac.webkit.org/changeset/150358> 202245 2013-05-19 16:39:09 -0700 2013-05-19 16:47:31 -0700 Patch bug-116418-20130519163759.patch text/plain 7093 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjQ3OTNhMzM1OWQwYzI3 Y2UyYzUyOTc1ZGQ2ZDkxNDlkYTEzYzA3YS4uMjM4MTI3YWViNzY0MWY5YjNmMjRmZWI3MThkYjZj M2JhMDk5ZWU2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTA1LTE5ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBbTWFjXSBJbXByb3ZlIHN0cmlu ZyB1c2UgaW4gUGFzdGVib2FyZE1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE2NDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRGlkIGEgQmVuIFBvdWxhaW4gYWxsIG92ZXIgdGhpcyBmaWxlLgorCisg ICAgICAgICogcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW06CisgICAgICAgIChXZWJDb3Jl OjpQYXN0ZWJvYXJkOjpwbGFpblRleHQpOiBBZGQgdGhlIG5ld2xpbmUgc2VwYXJhdGVseSB0byB0 aGUgc3RyaW5nIGJ1aWxkZXIuCisgICAgICAgIFByZXBlbmRpbmcgaXQgdG8gdGhlIHN0cmluZyBm aXJzdCBqdXN0IGRvZXMgbW9yZSBhbGxvY2F0aW9ucyBmb3Igbm8gZ29vZCByZWFzb24uCisgICAg ICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpkb2N1bWVudEZyYWdtZW50KTogVXNlIGVtcHR5U3Ry aW5nKCkgaW5zdGVhZCBvZiAiIiBhbmQgdXNlCisgICAgICAgIEFTQ0lJTGl0ZXJhbCB3aGVyZSBh cHByb3ByaWF0ZS4KKyAgICAgICAgKFdlYkNvcmU6OmNvY29hVHlwZUZyb21IVE1MQ2xpcGJvYXJk VHlwZSk6IE1vcmUgQVNDSUlMaXRlcmFsLgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6 Y2xlYXIpOiBVc2UgZWFybHkgcmV0dXJuIGluc3RlYWQgb2YgYSBuZXN0ZWQgaWYgaGVyZS4KKyAg ICAgICAgVXNlIGVtcHR5U3RyaW5nKCkgaW5zdGVhZCBvZiAiIi4KKyAgICAgICAgKFdlYkNvcmU6 OmFkZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZSk6IE1vcmUgQVNDSUlMaXRlcmFsLgor CisyMDEzLTA1LTE5ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKwogICAgICAgICBV c2UgRWxlbWVudCBpbnN0ZWFkIG9mIE5vZGUgaW4gRHJhZ1N0YXRlLCBhbHNvIHJlZG8gRHJhZ1N0 YXRlIHN0cnVjdAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE2NDExCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0 ZWJvYXJkTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMu bW0KaW5kZXggMWRkNGE2MGU5ODJmNzg5NzMyZjBhZjBlYmVjYWM4NDM1NGVhZDBmNC4uMDM4OTIz MWNkNjZiMmE0MzlhZGVhNDQzYWE2MWVlZGU4YThjYWUyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0KQEAgLTM5MCw4ICszOTAsMTEgQEAgU3RyaW5n IFBhc3RlYm9hcmQ6OnBsYWluVGV4dChGcmFtZSogZnJhbWUpCiAgICAgICAgIFZlY3RvcjxTdHJp bmc+IHBhdGhuYW1lczsKICAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRT dHJhdGVneSgpLT5nZXRQYXRobmFtZXNGb3JUeXBlKHBhdGhuYW1lcywgTlNGaWxlbmFtZXNQYm9h cmRUeXBlLCBtX3Bhc3RlYm9hcmROYW1lKTsKICAgICAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVy OwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBhdGhuYW1lcy5zaXplKCk7IGkrKykK LSAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGkgPyAiXG4iICsgcGF0aG5hbWVzW2ldIDogcGF0 aG5hbWVzW2ldKTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwYXRobmFtZXMuc2l6 ZSgpOyBpKyspIHsKKyAgICAgICAgICAgIGlmIChpKQorICAgICAgICAgICAgICAgIGJ1aWxkZXIu YXBwZW5kKCdcbicpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQocGF0aG5hbWVzW2ldKTsK KyAgICAgICAgfQogICAgICAgICBzdHJpbmcgPSBidWlsZGVyLnRvU3RyaW5nKCk7CiAgICAgICAg IHJldHVybiBbc3RyaW5nIHByZWNvbXBvc2VkU3RyaW5nV2l0aENhbm9uaWNhbE1hcHBpbmddOwog ICAgIH0KQEAgLTU1NCw3ICs1NTcsNyBAQCBQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IFBh c3RlYm9hcmQ6OmRvY3VtZW50RnJhZ21lbnQoRnJhbWUqIGZyYW1lLCBQYXNzUmVmUAogICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGlmIChbSFRNTFN0cmluZyBsZW5ndGhdICE9IDAg JiYKLSAgICAgICAgICAgIChmcmFnbWVudCA9IGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cChmcmFt ZS0+ZG9jdW1lbnQoKSwgSFRNTFN0cmluZywgIiIsIERpc2FsbG93U2NyaXB0aW5nQW5kUGx1Z2lu Q29udGVudCkpKQorICAgICAgICAgICAgKGZyYWdtZW50ID0gY3JlYXRlRnJhZ21lbnRGcm9tTWFy a3VwKGZyYW1lLT5kb2N1bWVudCgpLCBIVE1MU3RyaW5nLCBlbXB0eVN0cmluZygpLCBEaXNhbGxv d1NjcmlwdGluZ0FuZFBsdWdpbkNvbnRlbnQpKSkKICAgICAgICAgICAgIHJldHVybiBmcmFnbWVu dC5yZWxlYXNlKCk7CiAgICAgfQogCkBAIC01NjcsMTUgKzU3MCwxNSBAQCBQYXNzUmVmUHRyPERv Y3VtZW50RnJhZ21lbnQ+IFBhc3RlYm9hcmQ6OmRvY3VtZW50RnJhZ21lbnQoRnJhbWUqIGZyYW1l LCBQYXNzUmVmUAogICAgICAgICByZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOwogCiAgICAgaWYg KHR5cGVzLmNvbnRhaW5zKFN0cmluZyhOU1RJRkZQYm9hcmRUeXBlKSkgJiYKLSAgICAgICAgKGZy YWdtZW50ID0gZG9jdW1lbnRGcmFnbWVudFdpdGhJbWFnZVJlc291cmNlKGZyYW1lLCBBcmNoaXZl UmVzb3VyY2U6OmNyZWF0ZShwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5 KCktPmJ1ZmZlckZvclR5cGUoTlNUSUZGUGJvYXJkVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSksIHVu aXF1ZVVSTFdpdGhSZWxhdGl2ZVBhcnQoQCJpbWFnZS50aWZmIiksICJpbWFnZS90aWZmIiwgIiIs ICIiKSkpKQorICAgICAgICAoZnJhZ21lbnQgPSBkb2N1bWVudEZyYWdtZW50V2l0aEltYWdlUmVz b3VyY2UoZnJhbWUsIEFyY2hpdmVSZXNvdXJjZTo6Y3JlYXRlKHBsYXRmb3JtU3RyYXRlZ2llcygp LT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+YnVmZmVyRm9yVHlwZShOU1RJRkZQYm9hcmRUeXBlLCBt X3Bhc3RlYm9hcmROYW1lKSwgdW5pcXVlVVJMV2l0aFJlbGF0aXZlUGFydChAImltYWdlLnRpZmYi KSwgQVNDSUlMaXRlcmFsKCJpbWFnZS90aWZmIiksIGVtcHR5U3RyaW5nKCksIGVtcHR5U3RyaW5n KCkpKSkpCiAgICAgICAgIHJldHVybiBmcmFnbWVudC5yZWxlYXNlKCk7CiAKICAgICBpZiAodHlw ZXMuY29udGFpbnMoU3RyaW5nKE5TUERGUGJvYXJkVHlwZSkpICYmCi0gICAgICAgIChmcmFnbWVu dCA9IGRvY3VtZW50RnJhZ21lbnRXaXRoSW1hZ2VSZXNvdXJjZShmcmFtZSwgQXJjaGl2ZVJlc291 cmNlOjpjcmVhdGUocGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5i dWZmZXJGb3JUeXBlKE5TUERGUGJvYXJkVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSkuZ2V0KCksIHVu aXF1ZVVSTFdpdGhSZWxhdGl2ZVBhcnQoQCJhcHBsaWNhdGlvbi5wZGYiKSwgImFwcGxpY2F0aW9u L3BkZiIsICIiLCAiIikpKSkKKyAgICAgICAgKGZyYWdtZW50ID0gZG9jdW1lbnRGcmFnbWVudFdp dGhJbWFnZVJlc291cmNlKGZyYW1lLCBBcmNoaXZlUmVzb3VyY2U6OmNyZWF0ZShwbGF0Zm9ybVN0 cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPmJ1ZmZlckZvclR5cGUoTlNQREZQYm9h cmRUeXBlLCBtX3Bhc3RlYm9hcmROYW1lKS5nZXQoKSwgdW5pcXVlVVJMV2l0aFJlbGF0aXZlUGFy dChAImFwcGxpY2F0aW9uLnBkZiIpLCBBU0NJSUxpdGVyYWwoImFwcGxpY2F0aW9uL3BkZiIpLCBl bXB0eVN0cmluZygpLCBlbXB0eVN0cmluZygpKSkpKQogICAgICAgICByZXR1cm4gZnJhZ21lbnQu cmVsZWFzZSgpOwogCiAgICAgaWYgKHR5cGVzLmNvbnRhaW5zKFN0cmluZyhrVVRUeXBlUE5HKSkg JiYKLSAgICAgICAgKGZyYWdtZW50ID0gZG9jdW1lbnRGcmFnbWVudFdpdGhJbWFnZVJlc291cmNl KGZyYW1lLCBBcmNoaXZlUmVzb3VyY2U6OmNyZWF0ZShwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFz dGVib2FyZFN0cmF0ZWd5KCktPmJ1ZmZlckZvclR5cGUoU3RyaW5nKGtVVFR5cGVQTkcpLCBtX3Bh c3RlYm9hcmROYW1lKSwgdW5pcXVlVVJMV2l0aFJlbGF0aXZlUGFydChAImltYWdlLnBuZyIpLCAi aW1hZ2UvcG5nIiwgIiIsICIiKSkpKQorICAgICAgICAoZnJhZ21lbnQgPSBkb2N1bWVudEZyYWdt ZW50V2l0aEltYWdlUmVzb3VyY2UoZnJhbWUsIEFyY2hpdmVSZXNvdXJjZTo6Y3JlYXRlKHBsYXRm b3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+YnVmZmVyRm9yVHlwZShTdHJp bmcoa1VUVHlwZVBORyksIG1fcGFzdGVib2FyZE5hbWUpLCB1bmlxdWVVUkxXaXRoUmVsYXRpdmVQ YXJ0KEAiaW1hZ2UucG5nIiksIEFTQ0lJTGl0ZXJhbCgiaW1hZ2UvcG5nIiksIGVtcHR5U3RyaW5n KCksIGVtcHR5U3RyaW5nKCkpKSkpCiAgICAgICAgIHJldHVybiBmcmFnbWVudC5yZWxlYXNlKCk7 CiAKICAgICBpZiAodHlwZXMuY29udGFpbnMoU3RyaW5nKE5TVVJMUGJvYXJkVHlwZSkpKSB7CkBA IC02MjAsOSArNjIzLDkgQEAgc3RhdGljIFN0cmluZyBjb2NvYVR5cGVGcm9tSFRNTENsaXBib2Fy ZFR5cGUoY29uc3QgU3RyaW5nJiB0eXBlKQogICAgIFN0cmluZyBxVHlwZSA9IHR5cGUubG93ZXIo KTsKIAogICAgIGlmIChxVHlwZSA9PSAidGV4dCIpCi0gICAgICAgIHFUeXBlID0gInRleHQvcGxh aW4iOworICAgICAgICBxVHlwZSA9IEFTQ0lJTGl0ZXJhbCgidGV4dC9wbGFpbiIpOwogICAgIGlm IChxVHlwZSA9PSAidXJsIikKLSAgICAgICAgcVR5cGUgPSAidGV4dC91cmktbGlzdCI7CisgICAg ICAgIHFUeXBlID0gQVNDSUlMaXRlcmFsKCJ0ZXh0L3VyaS1saXN0Iik7CiAKICAgICAvLyBJZ25v cmUgYW55IHRyYWlsaW5nIGNoYXJzZXQgLSBKUyBzdHJpbmdzIGFyZSBVbmljb2RlLCB3aGljaCBl bmNhcHN1bGF0ZXMgdGhlIGNoYXJzZXQgaXNzdWUKICAgICBpZiAocVR5cGUgPT0gInRleHQvcGxh aW4iIHx8IHFUeXBlLnN0YXJ0c1dpdGgoInRleHQvcGxhaW47IikpCkBAIC02NTAsOCArNjUzLDkg QEAgc3RhdGljIFN0cmluZyBjb2NvYVR5cGVGcm9tSFRNTENsaXBib2FyZFR5cGUoY29uc3QgU3Ry aW5nJiB0eXBlKQogdm9pZCBQYXN0ZWJvYXJkOjpjbGVhcihjb25zdCBTdHJpbmcmIHR5cGUpCiB7 CiAgICAgU3RyaW5nIGNvY29hVHlwZSA9IGNvY29hVHlwZUZyb21IVE1MQ2xpcGJvYXJkVHlwZSh0 eXBlKTsKLSAgICBpZiAoIWNvY29hVHlwZS5pc0VtcHR5KCkpCi0gICAgICAgIHBsYXRmb3JtU3Ry YXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+c2V0U3RyaW5nRm9yVHlwZSgiIiwgY29j b2FUeXBlLCBtX3Bhc3RlYm9hcmROYW1lKTsKKyAgICBpZiAoY29jb2FUeXBlLmlzRW1wdHkoKSkK KyAgICAgICAgcmV0dXJuOworICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3Ry YXRlZ3koKS0+c2V0U3RyaW5nRm9yVHlwZShlbXB0eVN0cmluZygpLCBjb2NvYVR5cGUsIG1fcGFz dGVib2FyZE5hbWUpOwogfQogCiBzdGF0aWMgVmVjdG9yPFN0cmluZz4gYWJzb2x1dGVVUkxzRnJv bVBhc3RlYm9hcmRGaWxlbmFtZXMoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgYm9vbCBv bmx5Rmlyc3RVUkwgPSBmYWxzZSkKQEAgLTczNCwxMSArNzM4LDExIEBAIHN0YXRpYyB2b2lkIGFk ZEhUTUxDbGlwYm9hcmRUeXBlc0ZvckNvY29hVHlwZShMaXN0SGFzaFNldDxTdHJpbmc+JiByZXN1 bHRUeXBlcywKIHsKICAgICAvLyBVVEkgbWF5IG5vdCBkbyB0aGVzZSByaWdodCwgc28gbWFrZSBz dXJlIHdlIGdldCB0aGUgcmlnaHQsIHByZWRpY3RhYmxlIHJlc3VsdAogICAgIGlmIChjb2NvYVR5 cGUgPT0gU3RyaW5nKE5TU3RyaW5nUGJvYXJkVHlwZSkpIHsKLSAgICAgICAgcmVzdWx0VHlwZXMu YWRkKCJ0ZXh0L3BsYWluIik7CisgICAgICAgIHJlc3VsdFR5cGVzLmFkZChBU0NJSUxpdGVyYWwo InRleHQvcGxhaW4iKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKGNvY29hVHlw ZSA9PSBTdHJpbmcoTlNVUkxQYm9hcmRUeXBlKSkgewotICAgICAgICByZXN1bHRUeXBlcy5hZGQo InRleHQvdXJpLWxpc3QiKTsKKyAgICAgICAgcmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgi dGV4dC91cmktbGlzdCIpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoY29jb2FU eXBlID09IFN0cmluZyhOU0ZpbGVuYW1lc1Bib2FyZFR5cGUpKSB7CkBAIC03NTAsOCArNzU0LDgg QEAgc3RhdGljIHZvaWQgYWRkSFRNTENsaXBib2FyZFR5cGVzRm9yQ29jb2FUeXBlKExpc3RIYXNo U2V0PFN0cmluZz4mIHJlc3VsdFR5cGVzLAogICAgICAgICBpZiAoIWZpbGVMaXN0LmlzRW1wdHko KSkgewogICAgICAgICAgICAgLy8gSXQgaXMgdW5rbm93biBpZiBOU0ZpbGVuYW1lc1Bib2FyZFR5 cGUgYWx3YXlzIGltcGxpZXMgTlNVUkxQYm9hcmRUeXBlIGluIENvY29hLAogICAgICAgICAgICAg Ly8gYnV0IE5TRmlsZW5hbWVzUGJvYXJkVHlwZSBzaG91bGQgaW1wbHkgYm90aCAndGV4dC91cmkt bGlzdCcgYW5kICdGaWxlcycKLSAgICAgICAgICAgIHJlc3VsdFR5cGVzLmFkZCgidGV4dC91cmkt bGlzdCIpOwotICAgICAgICAgICAgcmVzdWx0VHlwZXMuYWRkKCJGaWxlcyIpOworICAgICAgICAg ICAgcmVzdWx0VHlwZXMuYWRkKEFTQ0lJTGl0ZXJhbCgidGV4dC91cmktbGlzdCIpKTsKKyAgICAg ICAgICAgIHJlc3VsdFR5cGVzLmFkZChBU0NJSUxpdGVyYWwoIkZpbGVzIikpOwogICAgICAgICB9 CiAgICAgICAgIHJldHVybjsKICAgICB9Cg==