10634 2006-08-29 15:26:48 -0700 -webView:dragDestinationActionMaskForDraggingInfo: is ignored 2006-08-30 09:43:45 -0700 1 1 1 Unclassified WebKit WebKit API 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 0 karl.adam webkit-unassigned mrowe oldest_to_newest 54194 0 karl.adam 2006-08-29 15:26:48 -0700 I've been having problems where some files were accepted as drops on my custom WebView and others were not, after some debugging I've tracked down where it all screws up and am lost on why it does it at all. In WebHTMLView on Line 5906 the line: if (actionMask & WebDragDestinationActionDHTML) ... CHANGES actionMask from it's original value to 0. This shouldn't be happening and I can't figure out why it's happening at all, but stepping through the code several times has done it every single time. After the actionMask has been changed to 0, it of course discards the drag operation since it thinks it's uninterested in the drag and as a result my code waiting on the drop is never called, and the green + icon for copy drags never happens. So basically drags that should be working, fail. 54201 1 mrowe 2006-08-29 15:44:12 -0700 For reference, the line mentioned appears at WebKit/WebView/WebHTMLView.m:5706, not 5906. 54206 2 karl.adam 2006-08-29 15:59:28 -0700 he way I've been able to reproduce the bug so far is by having a subclass of WebView in my application that is it's own delegate and returns WebDragDestinationAny for -webView:dragDestinationActionMaskForDraggingInfo: And Mark row is correct, I mistyped 5906 when I meant 5706. 54214 3 karl.adam 2006-08-29 17:53:22 -0700 After building everything clean and relaunching Xcode, this is not the source of the problem, just a debugging snafu. Instead it seems what initially thought was the problem, is the problem. IN WebNSViewExtras -_web_dragOperationForDraggingInfo: method, [[sender draggingPasteboard] _web_bestURL] is called, and _web_bestURL returns nil if it doesn't know how to display the file type, or handle the schema. So when [WebView canShowFile:] returns NO, it jumps out, and returns nil thus causing the original webDrag method to return NSDragOperationNone and ignore the drag entirely. I'd submit a patch to just remove the check for canShowFile: since a method called web_bestURL: shouldn't be concerned with whether or not the view can show the URL, merely return the most appropriate URL. 54216 4 10311 karl.adam 2006-08-29 19:33:42 -0700 Created attachment 10311 Fix file drags not natively understood by WebKit 54217 5 10311 eric 2006-08-29 19:56:37 -0700 Comment on attachment 10311 Fix file drags not natively understood by WebKit A couple nits. 1. * ChangeLog doesn't need to be in the changelog. (That often happens when you run prepare-ChangeLog twice.) 2. Normally changes require a copyright line. In this case, since these are < 5 line changes, they probably don't. But I just thought I should mention it for the future. 3. Generally WebKit tries to avoid else statements after returns (as they're unnecessary.) _web_dragOperationForDraggingInfo could be written cleaner by simply returning NSDragOperationCopy inside the if block and returning NSDragOperationNone outside. Execution only hits the outer return if it didn't trip the if. Otherwise looks good. I think we should do one more round on this patch to fix the nits. (Since it's your first patch, it's good to be extra picky.) But the substance looks fine. 54233 6 10316 karl.adam 2006-08-30 09:26:34 -0700 Created attachment 10316 Second swipe at drag patch with nits taken care of 54234 7 10316 timothy 2006-08-30 09:34:14 -0700 Comment on attachment 10316 Second swipe at drag patch with nits taken care of This is good. I will take the old ChangeLog and use it. 54235 8 timothy 2006-08-30 09:43:45 -0700 Landed in r16112. 10311 2006-08-29 19:33:42 -0700 2006-08-30 09:26:34 -0700 Fix file drags not natively understood by WebKit WebKit drag.patch text/plain 2110 karl.adam SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwko cmV2aXNpb24gMTYxMDgpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMjYgQEAKKzIwMDYtMDgtMjkgIEthcmwgQWRhbSAgPGthcmxhZGFtQHlhaG9vLWluYy5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBD aGFuZ2VMb2c6CisgICAgICAgICogTWlzYy9XZWJOU1Bhc3RlYm9hcmRFeHRyYXMubToKKyAgICAg ICAgKC1bTlNQYXN0ZWJvYXJkIF93ZWJfYmVzdFVSTF0pOgorICAgICAgICAqIE1pc2MvV2ViTlNW aWV3RXh0cmFzLm06CisgICAgICAgICgtW05TVmlldyBfd2ViX2RyYWdPcGVyYXRpb25Gb3JEcmFn Z2luZ0luZm86XSk6CisKCiAyMDA2LTA4LTI5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW0gSGF0Y2hlcnMgcnViYmVyIHN0YW1wCklu ZGV4OiBXZWJLaXQvTWlzYy9XZWJOU1Bhc3RlYm9hcmRFeHRyYXMubQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvTWlzYy9XZWJOU1Bhc3RlYm9hcmRFeHRyYXMubQkocmV2aXNpb24gMTYxMDMpCisrKyBX ZWJLaXQvTWlzYy9XZWJOU1Bhc3RlYm9hcmRFeHRyYXMubQkod29ya2luZyBjb3B5KQpAQCAtMTYy LDkgKzE2Miw3IEBAIHN0YXRpYyBOU0FycmF5ICpfd3JpdGFibGVUeXBlc0ZvckltYWdlV2kKICAg ICAgICAgICAgIE5TU3RyaW5nICpmaWxlID0gW2ZpbGVzIG9iamVjdEF0SW5kZXg6MF07CiAgICAg ICAgICAgICBCT09MIGlzRGlyZWN0b3J5OwogICAgICAgICAgICAgaWYoW1tOU0ZpbGVNYW5hZ2Vy IGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmZpbGUgaXNEaXJlY3Rvcnk6JmlzRGly ZWN0b3J5XSAmJiAhaXNEaXJlY3RvcnkpewotICAgICAgICAgICAgICAgIGlmIChbV2ViVmlldyBj YW5TaG93RmlsZTpmaWxlXSkgewotICAgICAgICAgICAgICAgICAgICByZXR1cm4gW1tOU1VSTCBm aWxlVVJMV2l0aFBhdGg6ZmlsZV0gX3dlYmtpdF9jYW5vbmljYWxpemVdOwotICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICByZXR1cm4gW1tOU1VSTCBmaWxlVVJMV2l0aFBhdGg6Zmls ZV0gX3dlYmtpdF9jYW5vbmljYWxpemVdOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAg fQpJbmRleDogV2ViS2l0L01pc2MvV2ViTlNWaWV3RXh0cmFzLm0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L01pc2MvV2ViTlNWaWV3RXh0cmFzLm0JKHJldmlzaW9uIDE2MTAzKQorKysgV2ViS2l0L01p c2MvV2ViTlNWaWV3RXh0cmFzLm0JKHdvcmtpbmcgY29weSkKQEAgLTE1MCwxNCArMTUwLDE3IEBA CiAKIC0gKE5TRHJhZ09wZXJhdGlvbilfd2ViX2RyYWdPcGVyYXRpb25Gb3JEcmFnZ2luZ0luZm86 KGlkIDxOU0RyYWdnaW5nSW5mbz4pc2VuZGVyCiB7CisgICAgTlNEcmFnT3BlcmF0aW9uIHJldHVy bk9wZXJhdGlvbiA9IE5TRHJhZ09wZXJhdGlvbk5vbmU7CisgICAgCiAgICAgaWYgKCFbTlNBcHAg bW9kYWxXaW5kb3ddICYmIAogICAgICAgICAhW1tzZWxmIHdpbmRvd10gYXR0YWNoZWRTaGVldF0g JiYKICAgICAgICAgW3NlbmRlciBkcmFnZ2luZ1NvdXJjZV0gIT0gc2VsZiAmJgogICAgICAgICBb W3NlbmRlciBkcmFnZ2luZ1Bhc3RlYm9hcmRdIF93ZWJfYmVzdFVSTF0pIHsKLSAgICAgICAgcmV0 dXJuIE5TRHJhZ09wZXJhdGlvbkNvcHk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgcmV0dXJuIE5T RHJhZ09wZXJhdGlvbk5vbmU7CisKKyAgICAgICAgcmV0dXJuT3BlcmF0aW9uID0gTlNEcmFnT3Bl cmF0aW9uQ29weTsKICAgICB9CisgICAgCisgICAgcmV0dXJuIHJldHVybk9wZXJhdGlvbjsKIH0K IAogLSAodm9pZClfd2ViX0RyYWdJbWFnZUZvckVsZW1lbnQ6KERPTUVsZW1lbnQgKillbGVtZW50 Cg== 10316 2006-08-30 09:26:34 -0700 2006-08-30 09:34:14 -0700 Second swipe at drag patch with nits taken care of WebKit drag take 2.patch text/plain 1311 karl.adam SW5kZXg6IFdlYktpdC9NaXNjL1dlYk5TUGFzdGVib2FyZEV4dHJhcy5tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9NaXNjL1dlYk5TUGFzdGVib2FyZEV4dHJhcy5tCShyZXZpc2lvbiAxNjEwMykKKysr IFdlYktpdC9NaXNjL1dlYk5TUGFzdGVib2FyZEV4dHJhcy5tCSh3b3JraW5nIGNvcHkpCkBAIC0x NjIsOSArMTYyLDcgQEAgc3RhdGljIE5TQXJyYXkgKl93cml0YWJsZVR5cGVzRm9ySW1hZ2VXaQog ICAgICAgICAgICAgTlNTdHJpbmcgKmZpbGUgPSBbZmlsZXMgb2JqZWN0QXRJbmRleDowXTsKICAg ICAgICAgICAgIEJPT0wgaXNEaXJlY3Rvcnk7CiAgICAgICAgICAgICBpZihbW05TRmlsZU1hbmFn ZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6ZmlsZSBpc0RpcmVjdG9yeTomaXNE aXJlY3RvcnldICYmICFpc0RpcmVjdG9yeSl7Ci0gICAgICAgICAgICAgICAgaWYgKFtXZWJWaWV3 IGNhblNob3dGaWxlOmZpbGVdKSB7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBbW05TVVJM IGZpbGVVUkxXaXRoUGF0aDpmaWxlXSBfd2Via2l0X2Nhbm9uaWNhbGl6ZV07Ci0gICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIHJldHVybiBbW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpm aWxlXSBfd2Via2l0X2Nhbm9uaWNhbGl6ZV07CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9CkluZGV4OiBXZWJLaXQvTWlzYy9XZWJOU1ZpZXdFeHRyYXMubQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvTWlzYy9XZWJOU1ZpZXdFeHRyYXMubQkocmV2aXNpb24gMTYxMDMpCisrKyBXZWJLaXQv TWlzYy9XZWJOU1ZpZXdFeHRyYXMubQkod29ya2luZyBjb3B5KQpAQCAtMTU0LDEwICsxNTQsMTEg QEAKICAgICAgICAgIVtbc2VsZiB3aW5kb3ddIGF0dGFjaGVkU2hlZXRdICYmCiAgICAgICAgIFtz ZW5kZXIgZHJhZ2dpbmdTb3VyY2VdICE9IHNlbGYgJiYKICAgICAgICAgW1tzZW5kZXIgZHJhZ2dp bmdQYXN0ZWJvYXJkXSBfd2ViX2Jlc3RVUkxdKSB7CisKICAgICAgICAgcmV0dXJuIE5TRHJhZ09w ZXJhdGlvbkNvcHk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgcmV0dXJuIE5TRHJhZ09wZXJhdGlv bk5vbmU7CiAgICAgfQorICAgIAorICAgIHJldHVybiBOU0RyYWdPcGVyYXRpb25Ob25lOwogfQog CiAtICh2b2lkKV93ZWJfRHJhZ0ltYWdlRm9yRWxlbWVudDooRE9NRWxlbWVudCAqKWVsZW1lbnQK