169289 2017-03-07 10:44:29 -0800 Rewrite the DRT Pasteboard implementation to use UTIs and WTF types 2017-03-07 11:28:04 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 1284402 0 andersca 2017-03-07 10:44:29 -0800 Rewrite the DRT Pasteboard implementation to use UTIs and WTF types 1284406 1 303677 andersca 2017-03-07 10:47:03 -0800 Created attachment 303677 Patch 1284416 2 commit-queue 2017-03-07 10:59:15 -0800 Attachment 303677 did not pass style-queue: ERROR: Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.mm:232: Extra space in capture list. [whitespace/brackets] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1284440 3 andersca 2017-03-07 11:28:04 -0800 Committed r213529: <http://trac.webkit.org/changeset/213529> 303677 2017-03-07 10:47:03 -0800 2017-03-07 10:58:12 -0800 Patch bug-169289-20170307104702.patch text/plain 7263 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNTIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTJjMWUyZTJkZGM0ZmNmMWY2MWM2MmI2MTBlM2M3M2Jl ZGM1OWNiYS4uYjJiNjM2ODM2NjZiZmFjMDRmZWUwMjA2NWYyYjU4ZTcwYmZiM2Y0NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE3LTAzLTA3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisK KyAgICAgICAgUmV3cml0ZSB0aGUgRFJUIFBhc3RlYm9hcmQgaW1wbGVtZW50YXRpb24gdG8gdXNl IFVUSXMgYW5kIFdURiB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY5Mjg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWVQYXN0ZWJvYXJk Lm1tOgorICAgICAgICAoLVtMb2NhbFBhc3RlYm9hcmQgaW5pdFdpdGhOYW1lOl0pOgorICAgICAg ICAoLVtMb2NhbFBhc3RlYm9hcmQgbmFtZV0pOgorICAgICAgICAoLVtMb2NhbFBhc3RlYm9hcmQg ZGVjbGFyZVR5cGVzOm93bmVyOl0pOgorICAgICAgICAoaXNVVEkpOgorICAgICAgICAodG9VVEkp OgorICAgICAgICAoLVtMb2NhbFBhc3RlYm9hcmQgYWRkVHlwZXM6b3duZXI6XSk6CisgICAgICAg ICgtW0xvY2FsUGFzdGVib2FyZCBjaGFuZ2VDb3VudF0pOgorICAgICAgICAoLVtMb2NhbFBhc3Rl Ym9hcmQgdHlwZXNdKToKKyAgICAgICAgKC1bTG9jYWxQYXN0ZWJvYXJkIGF2YWlsYWJsZVR5cGVG cm9tQXJyYXk6XSk6CisgICAgICAgICgtW0xvY2FsUGFzdGVib2FyZCBzZXREYXRhOmZvclR5cGU6 XSk6CisgICAgICAgICgtW0xvY2FsUGFzdGVib2FyZCBkYXRhRm9yVHlwZTpdKToKKyAgICAgICAg KC1bTG9jYWxQYXN0ZWJvYXJkIHdyaXRlT2JqZWN0czpdKToKKyAgICAgICAgKC1bTG9jYWxQYXN0 ZWJvYXJkIGRlYWxsb2NdKTogRGVsZXRlZC4KKwogMjAxNy0wMy0wNyAgWW91ZW5uIEZhYmxldCAg PHlvdWVubmZAZ21haWwuY29tPgogCiAgICAgICAgIFczQyBpbXBvcnRlciBzaG91bGQgYmUgYWJs ZSB0byB1cGRhdGUgdGhlIGltcG9ydCBleHBlY3RhdGlvbnMgZmlsZQpkaWZmIC0tZ2l0IGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlUGFzdGVib2FyZC5tbSBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZVBhc3RlYm9hcmQubW0KaW5kZXggNzZi MTBmMzdkNGFjNjBlOTU3YjZlYjdmYTZhM2FhZDM2YjhiY2MyYy4uYWQ1MWRkNDk3Y2QyOTQyMTk3 MDM2M2Q0NmQxOGYzZjExZDJiZTAwNiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL0R1bXBSZW5kZXJUcmVlUGFzdGVib2FyZC5tbQorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9tYWMvRHVtcFJlbmRlclRyZWVQYXN0ZWJvYXJkLm1tCkBAIC0zNywxNCArMzcsMTYgQEAKIAog I2ltcG9ydCA8V2ViS2l0L1dlYlR5cGVzSW50ZXJuYWwuaD4KICNpbXBvcnQgPHd0Zi9Bc3NlcnRp b25zLmg+CisjaW1wb3J0IDx3dGYvSGFzaE1hcC5oPgorI2ltcG9ydCA8d3RmL0xpc3RIYXNoU2V0 Lmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKIEBpbnRlcmZhY2UgTG9jYWxQYXN0ZWJv YXJkIDogTlNQYXN0ZWJvYXJkIHsKLSAgICBOU011dGFibGVBcnJheSAqdHlwZXNBcnJheTsKLSAg ICBOU011dGFibGVTZXQgKnR5cGVzU2V0OwotICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKmRhdGFC eVR5cGU7Ci0gICAgTlNJbnRlZ2VyIGNoYW5nZUNvdW50OwotICAgIE5TU3RyaW5nICpwYXN0ZWJv YXJkTmFtZTsKKyAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9wYXN0ZWJvYXJkTmFtZTsKKyAgICBO U0ludGVnZXIgX2NoYW5nZUNvdW50OworCisgICAgTGlzdEhhc2hTZXQ8UmV0YWluUHRyPE5TU3Ry aW5nPiwgV1RGOjpSZXRhaW5QdHJPYmplY3RIYXNoPE5TU3RyaW5nPj4gX3R5cGVzOworICAgIEhh c2hNYXA8UmV0YWluUHRyPE5TU3RyaW5nPiwgUmV0YWluUHRyPE5TRGF0YT4sIFdURjo6UmV0YWlu UHRyT2JqZWN0SGFzaDxOU1N0cmluZz4sIFdURjo6UmV0YWluUHRyT2JqZWN0SGFzaFRyYWl0czxO U1N0cmluZz4+IF9kYXRhOwogfQogCiAtKGlkKWluaXRXaXRoTmFtZTooTlNTdHJpbmcgKiluYW1l OwpAQCAtOTgsMjUgKzEwMCwxNSBAQCBzdGF0aWMgTlNNdXRhYmxlRGljdGlvbmFyeSAqbG9jYWxQ YXN0ZWJvYXJkczsKICAgICBzZWxmID0gW3N1cGVyIGluaXRdOwogICAgIGlmICghc2VsZikKICAg ICAgICAgcmV0dXJuIG5pbDsKLSAgICB0eXBlc0FycmF5ID0gW1tOU011dGFibGVBcnJheSBhbGxv Y10gaW5pdF07Ci0gICAgdHlwZXNTZXQgPSBbW05TTXV0YWJsZVNldCBhbGxvY10gaW5pdF07Ci0g ICAgZGF0YUJ5VHlwZSA9IFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF07Ci0gICAg cGFzdGVib2FyZE5hbWUgPSBbbmFtZSBjb3B5XTsKLSAgICByZXR1cm4gc2VsZjsKLX0KIAotLSAo dm9pZClkZWFsbG9jCi17Ci0gICAgW3R5cGVzQXJyYXkgcmVsZWFzZV07Ci0gICAgW3R5cGVzU2V0 IHJlbGVhc2VdOwotICAgIFtkYXRhQnlUeXBlIHJlbGVhc2VdOwotICAgIFtwYXN0ZWJvYXJkTmFt ZSByZWxlYXNlXTsKLSAgICBbc3VwZXIgZGVhbGxvY107CisgICAgX3Bhc3RlYm9hcmROYW1lID0g YWRvcHROUyhbbmFtZSBjb3B5XSk7CisKKyAgICByZXR1cm4gc2VsZjsKIH0KIAogLSAoTlNTdHJp bmcgKiluYW1lCiB7Ci0gICAgcmV0dXJuIHBhc3RlYm9hcmROYW1lOworICAgIHJldHVybiBfcGFz dGVib2FyZE5hbWUuZ2V0KCk7CiB9CiAKIC0gKHZvaWQpcmVsZWFzZUdsb2JhbGx5CkBAIC0xMjUs NjggKzExNyw4NCBAQCBzdGF0aWMgTlNNdXRhYmxlRGljdGlvbmFyeSAqbG9jYWxQYXN0ZWJvYXJk czsKIAogLSAoTlNJbnRlZ2VyKWRlY2xhcmVUeXBlczooTlNBcnJheSAqKW5ld1R5cGVzIG93bmVy OihpZCluZXdPd25lcgogewotICAgIFt0eXBlc0FycmF5IHJlbW92ZUFsbE9iamVjdHNdOwotICAg IFt0eXBlc1NldCByZW1vdmVBbGxPYmplY3RzXTsKLSAgICBbZGF0YUJ5VHlwZSByZW1vdmVBbGxP YmplY3RzXTsKKyAgICBfdHlwZXMuY2xlYXIoKTsKKyAgICBfZGF0YS5jbGVhcigpOworCiAgICAg cmV0dXJuIFtzZWxmIGFkZFR5cGVzOm5ld1R5cGVzIG93bmVyOm5ld093bmVyXTsKIH0KIAorc3Rh dGljIGJvb2wgaXNVVEkoTlNTdHJpbmcgKnR5cGUpCit7CisgICAgcmV0dXJuIFVUVHlwZUlzRHlu YW1pYygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpdHlwZSkgfHwgVVRUeXBlSXNEZWNsYXJlZCgoX19i cmlkZ2UgQ0ZTdHJpbmdSZWYpdHlwZSk7Cit9CisKK3N0YXRpYyBSZXRhaW5QdHI8TlNTdHJpbmc+ IHRvVVRJKE5TU3RyaW5nICp0eXBlKQoreworICAgIGlmIChpc1VUSSh0eXBlKSkgeworICAgICAg ICAvLyBUaGlzIGlzIGFscmVhZHkgYW4gVVRJLgorICAgICAgICByZXR1cm4gYWRvcHROUyhbdHlw ZSBjb3B5XSk7CisgICAgfQorCisgICAgcmV0dXJuIGFkb3B0TlMoKF9fYnJpZGdlIE5TU3RyaW5n ICopVVRUeXBlQ3JlYXRlUHJlZmVycmVkSWRlbnRpZmllckZvclRhZyhrVVRUYWdDbGFzc05TUGJv YXJkVHlwZSwgKF9fYnJpZGdlIENGU3RyaW5nUmVmKXR5cGUsIG51bGxwdHIpKTsKK30KKwogLSAo TlNJbnRlZ2VyKWFkZFR5cGVzOihOU0FycmF5ICopbmV3VHlwZXMgb3duZXI6KGlkKW5ld093bmVy CiB7Ci0gICAgdW5zaWduZWQgY291bnQgPSBbbmV3VHlwZXMgY291bnRdOwotICAgIHVuc2lnbmVk IGk7Ci0gICAgZm9yIChpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgTlNTdHJpbmcg KnR5cGUgPSBbbmV3VHlwZXMgb2JqZWN0QXRJbmRleDppXTsKLSAgICAgICAgTlNTdHJpbmcgKnNl dFR5cGUgPSBbdHlwZXNTZXQgbWVtYmVyOnR5cGVdOwotICAgICAgICBpZiAoIXNldFR5cGUpIHsK LSAgICAgICAgICAgIHNldFR5cGUgPSBbdHlwZSBjb3B5XTsKLSAgICAgICAgICAgIFt0eXBlc0Fy cmF5IGFkZE9iamVjdDpzZXRUeXBlXTsKLSAgICAgICAgICAgIFt0eXBlc1NldCBhZGRPYmplY3Q6 c2V0VHlwZV07Ci0gICAgICAgICAgICBbc2V0VHlwZSByZWxlYXNlXTsKLSAgICAgICAgfQorICAg IGZvciAoTlNTdHJpbmcgKnR5cGUgaW4gbmV3VHlwZXMpIHsKKyAgICAgICAgX3R5cGVzLmFkZCh0 b1VUSSh0eXBlKSk7CisKICAgICAgICAgaWYgKG5ld093bmVyICYmIFtuZXdPd25lciByZXNwb25k c1RvU2VsZWN0b3I6QHNlbGVjdG9yKHBhc3RlYm9hcmQ6cHJvdmlkZURhdGFGb3JUeXBlOildKQot ICAgICAgICAgICAgW25ld093bmVyIHBhc3RlYm9hcmQ6c2VsZiBwcm92aWRlRGF0YUZvclR5cGU6 c2V0VHlwZV07CisgICAgICAgICAgICBbbmV3T3duZXIgcGFzdGVib2FyZDpzZWxmIHByb3ZpZGVE YXRhRm9yVHlwZTp0eXBlXTsKICAgICB9Ci0gICAgcmV0dXJuICsrY2hhbmdlQ291bnQ7CisKKyAg ICByZXR1cm4gKytfY2hhbmdlQ291bnQ7CiB9CiAKIC0gKE5TSW50ZWdlciljaGFuZ2VDb3VudAog ewotICAgIHJldHVybiBjaGFuZ2VDb3VudDsKKyAgICByZXR1cm4gX2NoYW5nZUNvdW50OwogfQog CiAtIChOU0FycmF5ICopdHlwZXMKIHsKLSAgICByZXR1cm4gdHlwZXNBcnJheTsKKyAgICBhdXRv IHR5cGVzID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XSk7CisKKyAgICBm b3IgKGNvbnN0IGF1dG8mIHR5cGUgOiBfdHlwZXMpIHsKKyAgICAgICAgW3R5cGVzIGFkZE9iamVj dDp0eXBlLmdldCgpXTsKKworICAgICAgICAvLyBJbmNsdWRlIHRoZSBwYXN0ZWJvYXJkIHR5cGUg YXMgd2VsbC4KKyAgICAgICAgaWYgKGF1dG8gcGFzdGVib2FyZFR5cGUgPSBhZG9wdE5TKChfX2Jy aWRnZSBOU1N0cmluZyAqKVVUVHlwZUNvcHlQcmVmZXJyZWRUYWdXaXRoQ2xhc3MoKENGU3RyaW5n UmVmKXR5cGUuZ2V0KCksIGtVVFRhZ0NsYXNzTlNQYm9hcmRUeXBlKSkpCisgICAgICAgICAgICBb dHlwZXMgYWRkT2JqZWN0OnBhc3RlYm9hcmRUeXBlLmdldCgpXTsKKyAgICB9CisKKyAgICByZXR1 cm4gdHlwZXMuYXV0b3JlbGVhc2UoKTsKIH0KIAogLSAoTlNTdHJpbmcgKilhdmFpbGFibGVUeXBl RnJvbUFycmF5OihOU0FycmF5ICopdHlwZXMKIHsKLSAgICB1bnNpZ25lZCBjb3VudCA9IFt0eXBl cyBjb3VudF07Ci0gICAgdW5zaWduZWQgaTsKLSAgICBmb3IgKGkgPSAwOyBpIDwgY291bnQ7ICsr aSkgewotICAgICAgICBOU1N0cmluZyAqdHlwZSA9IFt0eXBlcyBvYmplY3RBdEluZGV4OmldOwot ICAgICAgICBOU1N0cmluZyAqc2V0VHlwZSA9IFt0eXBlc1NldCBtZW1iZXI6dHlwZV07Ci0gICAg ICAgIGlmIChzZXRUeXBlKQotICAgICAgICAgICAgcmV0dXJuIHNldFR5cGU7CisgICAgZm9yIChO U1N0cmluZyAqdHlwZSBpbiB0eXBlcykgeworICAgICAgICBpZiAoX3R5cGVzLmNvbnRhaW5zKHR5 cGUpKQorICAgICAgICAgICAgcmV0dXJuIHR5cGU7CiAgICAgfQorCiAgICAgcmV0dXJuIG5pbDsK IH0KIAogLSAoQk9PTClzZXREYXRhOihOU0RhdGEgKilkYXRhIGZvclR5cGU6KE5TU3RyaW5nICop ZGF0YVR5cGUKIHsKLSAgICBpZiAoZGF0YSA9PSBuaWwpCi0gICAgICAgIGRhdGEgPSBbTlNEYXRh IGRhdGFdOwotICAgIGlmICghW3R5cGVzU2V0IGNvbnRhaW5zT2JqZWN0OmRhdGFUeXBlXSkKKyAg ICBhdXRvIHV0aSA9IHRvVVRJKGRhdGFUeXBlKTsKKworICAgIGlmICghX3R5cGVzLmNvbnRhaW5z KHV0aSkpCiAgICAgICAgIHJldHVybiBOTzsKLSAgICBbZGF0YUJ5VHlwZSBzZXRPYmplY3Q6ZGF0 YSBmb3JLZXk6ZGF0YVR5cGVdOwotICAgICsrY2hhbmdlQ291bnQ7CisKKyAgICBfZGF0YS5zZXQo V1RGTW92ZSh1dGkpLCBkYXRhID8gZGF0YSA6IFtOU0RhdGEgZGF0YV0pOworICAgICsrX2NoYW5n ZUNvdW50OwogICAgIHJldHVybiBZRVM7CiB9CiAKIC0gKE5TRGF0YSAqKWRhdGFGb3JUeXBlOihO U1N0cmluZyAqKWRhdGFUeXBlCiB7Ci0gICAgcmV0dXJuIFtkYXRhQnlUeXBlIG9iamVjdEZvcktl eTpkYXRhVHlwZV07CisgICAgcmV0dXJuIF9kYXRhLmdldCh0b1VUSShkYXRhVHlwZSkpLmdldCgp OwogfQogCiAtIChCT09MKXNldFByb3BlcnR5TGlzdDooaWQpcHJvcGVydHlMaXN0IGZvclR5cGU6 KE5TU3RyaW5nICopZGF0YVR5cGUKQEAgLTIxOSwxOCArMjI3LDEzIEBAIHN0YXRpYyBOU011dGFi bGVEaWN0aW9uYXJ5ICpsb2NhbFBhc3RlYm9hcmRzOwogewogICAgIGZvciAoaWQgPE5TUGFzdGVi b2FyZFdyaXRpbmc+IG9iamVjdCBpbiBvYmplY3RzKSB7CiAgICAgICAgIGZvciAoTlNTdHJpbmcg KnR5cGUgaW4gW29iamVjdCB3cml0YWJsZVR5cGVzRm9yUGFzdGVib2FyZDpzZWxmXSkgewotICAg ICAgICAgICAgYXV0byBwYXN0ZWJvYXJkVHlwZSA9IF57Ci0gICAgICAgICAgICAgICAgaWYgKFVU VHlwZUlzRHluYW1pYygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpdHlwZSkpCi0gICAgICAgICAgICAg ICAgICAgIHJldHVybiBhZG9wdE5TKChfX2JyaWRnZSBOU1N0cmluZyAqKVVUVHlwZUNvcHlQcmVm ZXJyZWRUYWdXaXRoQ2xhc3MoKF9fYnJpZGdlIENGU3RyaW5nUmVmKXR5cGUsIGtVVFRhZ0NsYXNz TlNQYm9hcmRUeXBlKSk7Ci0KLSAgICAgICAgICAgICAgICByZXR1cm4gcmV0YWluUHRyKHR5cGUp OwotICAgICAgICAgICAgfSgpOworICAgICAgICAgICAgQVNTRVJUKFVUVHlwZUlzRGVjbGFyZWQo KF9fYnJpZGdlIENGU3RyaW5nUmVmKXR5cGUpIHx8IFVUVHlwZUlzRHluYW1pYygoX19icmlkZ2Ug Q0ZTdHJpbmdSZWYpdHlwZSkpOwogCi0gICAgICAgICAgICBbc2VsZiBhZGRUeXBlczpAWyBwYXN0 ZWJvYXJkVHlwZS5nZXQoKSBdIG93bmVyOnNlbGZdOworICAgICAgICAgICAgW3NlbGYgYWRkVHlw ZXM6QFsgdHlwZSBdIG93bmVyOnNlbGZdOwogCiAgICAgICAgICAgICBpZCBwcm9wZXJ0eUxpc3Qg PSBbb2JqZWN0IHBhc3RlYm9hcmRQcm9wZXJ0eUxpc3RGb3JUeXBlOnR5cGVdOwogICAgICAgICAg ICAgaWYgKFtwcm9wZXJ0eUxpc3QgaXNLaW5kT2ZDbGFzczpOU0RhdGEuY2xhc3NdKQotICAgICAg ICAgICAgICAgIFtzZWxmIHNldERhdGE6cHJvcGVydHlMaXN0IGZvclR5cGU6cGFzdGVib2FyZFR5 cGUuZ2V0KCldOworICAgICAgICAgICAgICAgIFtzZWxmIHNldERhdGE6cHJvcGVydHlMaXN0IGZv clR5cGU6dHlwZV07CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CiAgICAgICAgIH0K