82497 2012-03-28 12:02:46 -0700 REGRESSION: editing/pasteboard/dataTransfer-setData-getData.html fails on Mac platforms 2012-03-28 17:24:11 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar, LayoutTestFailure, MakingBotsRed P2 Normal --- 1 enrica enrica beidson webkit-bug-importer oldest_to_newest 590227 0 enrica 2012-03-28 12:02:46 -0700 This is very likely a regression caused by http://trac.webkit.org/changeset/111267. This revision fixed the way data is written to the pasteboard for NSURLPboardType. We now need to fix how it is read from the pasteboard in that format. 590229 1 webkit-bug-importer 2012-03-28 12:03:14 -0700 <rdar://problem/11140334> 590263 2 134367 enrica 2012-03-28 12:23:08 -0700 Created attachment 134367 Patch 590276 3 134367 beidson 2012-03-28 12:30:52 -0700 Comment on attachment 134367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134367&action=review > Source/WebCore/platform/mac/ClipboardMac.mm:207 > // Fallback to NSURLPboardType (which is a single URL) > if (availableTypes.contains(String(NSURLPboardType))) { > - platformStrategies()->pasteboardStrategy()->getPathnamesForType(absoluteURLs, String(NSURLPboardType), pasteboardName); > + absoluteURLs.append(platformStrategies()->pasteboardStrategy()->stringForType(String(NSURLPboardType), pasteboardName)); > if (!absoluteURLs.isEmpty()) > return absoluteURLs; It seems that the old code - using getPathnamesForType() - could return anywhere from 0 to many URLs so the absoluteURLs.isEmpty() check was relevant. But the comment suggests that NSURLPboardType should only ever be 1 URL. And - in fact - this new code can only ever return exactly 1 URL. Nuke that unnecessary !absoluteURLs.isEmpty() check! :) 590278 4 beidson 2012-03-28 12:32:06 -0700 And also - did TestWebKitAPI run successfully with this change? 590293 5 134373 enrica 2012-03-28 12:45:17 -0700 Created attachment 134373 Patch2 New patch that addresses reviewer's comments. 590594 6 enrica 2012-03-28 16:43:46 -0700 http://trac.webkit.org/changeset/112473 590626 7 ap 2012-03-28 17:08:40 -0700 Isn't this the same as bug 81125 and its associated radar? 590655 8 beidson 2012-03-28 17:24:11 -0700 (In reply to comment #7) > Isn't this the same as bug 81125 and its associated radar? Seems almost certain that it is 134367 2012-03-28 12:23:08 -0700 2012-03-28 12:30:52 -0700 Patch dataTransfer.txt text/plain 2520 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjQyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAzLTI4ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogZWRpdGlu Zy9wYXN0ZWJvYXJkL2RhdGFUcmFuc2Zlci1zZXREYXRhLWdldERhdGEuaHRtbCBmYWlscyBvbiBN YWMgcGxhdGZvcm1zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODI0OTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExMTQwMzM0PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIHJldmlz aW9uIGNhdXNpbmcgdGhpcyByZWdyZXNzaW9uIGZpeGVkIHRoZSB3YXkgZGF0YSBpcyB3cml0dGVu IHRvIHRoZSBwYXN0ZWJvYXJkIGZvciBOU1VSTFBib2FyZFR5cGUuCisgICAgICAgIFRoaXMgY2hh bmdlIGZpeGVzIHRoZSB3YXkgZGF0YSBpcyByZWFkIGZyb20gdGhlIHBhc3RlYm9hcmQgZm9yIHRo ZSBzYW1lIHBhc3RlYm9hcmQgdHlwZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEZpeGVzIHRo ZSBleGlzdGluZyBvbmUgdGhhdCBmYWlscy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9DbGlw Ym9hcmRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjphYnNvbHV0ZVVSTHNGcm9tUGFzdGVib2Fy ZCk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1BsYXRmb3JtUGFzdGVib2FyZE1hYy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6c3RyaW5nRm9yVHlwZSk6CisKIDIw MTItMDMtMjggIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAg ICAgW2Nocm9taXVtXSBNZWRpYVN0cmVhbSBBUEkgKEpTRVApOiBJbnRyb2R1Y2luZyBXZWJQZWVy Q29ubmVjdGlvbjAwSGFuZGxlcgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0Ns aXBib2FyZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv Q2xpcGJvYXJkTWFjLm1tCShyZXZpc2lvbiAxMTI0MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMDIsNyArMjAyLDcg QEAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IGFic29sdXRlVVJMc0Zyb21QYQogCiAgICAgLy8gRmFs bGJhY2sgdG8gTlNVUkxQYm9hcmRUeXBlICh3aGljaCBpcyBhIHNpbmdsZSBVUkwpCiAgICAgaWYg KGF2YWlsYWJsZVR5cGVzLmNvbnRhaW5zKFN0cmluZyhOU1VSTFBib2FyZFR5cGUpKSkgewotICAg ICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPmdldFBhdGhu YW1lc0ZvclR5cGUoYWJzb2x1dGVVUkxzLCBTdHJpbmcoTlNVUkxQYm9hcmRUeXBlKSwgcGFzdGVi b2FyZE5hbWUpOworICAgICAgICBhYnNvbHV0ZVVSTHMuYXBwZW5kKHBsYXRmb3JtU3RyYXRlZ2ll cygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+c3RyaW5nRm9yVHlwZShTdHJpbmcoTlNVUkxQYm9h cmRUeXBlKSwgcGFzdGVib2FyZE5hbWUpKTsKICAgICAgICAgaWYgKCFhYnNvbHV0ZVVSTHMuaXNF bXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuIGFic29sdXRlVVJMczsKICAgICB9CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1QYXN0ZWJvYXJkTWFjLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVBhc3RlYm9hcmRN YWMubW0JKHJldmlzaW9uIDExMjQwNykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Q bGF0Zm9ybVBhc3RlYm9hcmRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY1LDYgKzY1LDEwIEBA IHZvaWQgUGxhdGZvcm1QYXN0ZWJvYXJkOjpnZXRQYXRobmFtZXNGb3IKIAogU3RyaW5nIFBsYXRm b3JtUGFzdGVib2FyZDo6c3RyaW5nRm9yVHlwZShjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmRUeXBl KQogeworICAgIGlmIChwYXN0ZWJvYXJkVHlwZSA9PSBTdHJpbmcoTlNVUkxQYm9hcmRUeXBlKSkg eworICAgICAgICBOU1VSTCAqdXJsID0gW05TVVJMIFVSTEZyb21QYXN0ZWJvYXJkOm1fcGFzdGVi b2FyZC5nZXQoKV07CisgICAgICAgIHJldHVybiBbdXJsIGFic29sdXRlU3RyaW5nXTsKKyAgICB9 CiAgICAgcmV0dXJuIFttX3Bhc3RlYm9hcmQuZ2V0KCkgc3RyaW5nRm9yVHlwZTpwYXN0ZWJvYXJk VHlwZV07CiB9CiAK 134373 2012-03-28 12:45:17 -0700 2012-03-28 13:50:04 -0700 Patch2 dataTransfer.txt text/plain 2569 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjQyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAzLTI4ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogZWRpdGlu Zy9wYXN0ZWJvYXJkL2RhdGFUcmFuc2Zlci1zZXREYXRhLWdldERhdGEuaHRtbCBmYWlscyBvbiBN YWMgcGxhdGZvcm1zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODI0OTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExMTQwMzM0PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIHJldmlz aW9uIGNhdXNpbmcgdGhpcyByZWdyZXNzaW9uIGZpeGVkIHRoZSB3YXkgZGF0YSBpcyB3cml0dGVu IHRvIHRoZSBwYXN0ZWJvYXJkIGZvciBOU1VSTFBib2FyZFR5cGUuCisgICAgICAgIFRoaXMgY2hh bmdlIGZpeGVzIHRoZSB3YXkgZGF0YSBpcyByZWFkIGZyb20gdGhlIHBhc3RlYm9hcmQgZm9yIHRo ZSBzYW1lIHBhc3RlYm9hcmQgdHlwZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEZpeGVzIHRo ZSBleGlzdGluZyBvbmUgdGhhdCBmYWlscy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9DbGlw Ym9hcmRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjphYnNvbHV0ZVVSTHNGcm9tUGFzdGVib2Fy ZCk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1BsYXRmb3JtUGFzdGVib2FyZE1hYy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6c3RyaW5nRm9yVHlwZSk6CisKIDIw MTItMDMtMjggIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAg ICAgW2Nocm9taXVtXSBNZWRpYVN0cmVhbSBBUEkgKEpTRVApOiBJbnRyb2R1Y2luZyBXZWJQZWVy Q29ubmVjdGlvbjAwSGFuZGxlcgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0Ns aXBib2FyZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv Q2xpcGJvYXJkTWFjLm1tCShyZXZpc2lvbiAxMTI0MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvQ2xpcGJvYXJkTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMDIsOSArMjAyLDgg QEAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IGFic29sdXRlVVJMc0Zyb21QYQogCiAgICAgLy8gRmFs bGJhY2sgdG8gTlNVUkxQYm9hcmRUeXBlICh3aGljaCBpcyBhIHNpbmdsZSBVUkwpCiAgICAgaWYg KGF2YWlsYWJsZVR5cGVzLmNvbnRhaW5zKFN0cmluZyhOU1VSTFBib2FyZFR5cGUpKSkgewotICAg ICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPmdldFBhdGhu YW1lc0ZvclR5cGUoYWJzb2x1dGVVUkxzLCBTdHJpbmcoTlNVUkxQYm9hcmRUeXBlKSwgcGFzdGVi b2FyZE5hbWUpOwotICAgICAgICBpZiAoIWFic29sdXRlVVJMcy5pc0VtcHR5KCkpCi0gICAgICAg ICAgICByZXR1cm4gYWJzb2x1dGVVUkxzOworICAgICAgICBhYnNvbHV0ZVVSTHMuYXBwZW5kKHBs YXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+c3RyaW5nRm9yVHlwZShT dHJpbmcoTlNVUkxQYm9hcmRUeXBlKSwgcGFzdGVib2FyZE5hbWUpKTsKKyAgICAgICAgcmV0dXJu IGFic29sdXRlVVJMczsKICAgICB9CiAKICAgICAvLyBObyBmaWxlIHBhdGhzIG9uIHRoZSBwYXN0 ZWJvYXJkLCByZXR1cm4gbmlsCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxh dGZvcm1QYXN0ZWJvYXJkTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9QbGF0Zm9ybVBhc3RlYm9hcmRNYWMubW0JKHJldmlzaW9uIDExMjQwNykKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVBhc3RlYm9hcmRNYWMubW0JKHdvcmtp bmcgY29weSkKQEAgLTY1LDYgKzY1LDkgQEAgdm9pZCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OmdldFBh dGhuYW1lc0ZvcgogCiBTdHJpbmcgUGxhdGZvcm1QYXN0ZWJvYXJkOjpzdHJpbmdGb3JUeXBlKGNv bnN0IFN0cmluZyYgcGFzdGVib2FyZFR5cGUpCiB7CisgICAgaWYgKHBhc3RlYm9hcmRUeXBlID09 IFN0cmluZyhOU1VSTFBib2FyZFR5cGUpKQorICAgICAgICByZXR1cm4gW1tOU1VSTCBVUkxGcm9t UGFzdGVib2FyZDptX3Bhc3RlYm9hcmQuZ2V0KCldIGFic29sdXRlU3RyaW5nXTsKKwogICAgIHJl dHVybiBbbV9wYXN0ZWJvYXJkLmdldCgpIHN0cmluZ0ZvclR5cGU6cGFzdGVib2FyZFR5cGVdOwog fQogCg==