36848 2010-03-30 13:21:27 -0700 Menu items appropriate only for rich-content editing can appear in plain-text contexts 2010-03-30 15:47:47 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 1 sullivan sullivan oldest_to_newest 206147 0 sullivan 2010-03-30 13:21:27 -0700 In Radar as 7362913. To reproduce: 1. Launch Safari 2. Paste this into the URL field, and hit enter: data:text/html,%3Cinput%20type=%22password%22%3E 3. Right-click the password field The context menu shows "Import Image" and "Capture Selection from Screen" context menu items, which don't make sense for a password field. 206150 1 52075 sullivan 2010-03-30 13:25:59 -0700 Created attachment 52075 Patch that does returns self for non-string content only if _canEditRichly is true Based on a patch by Peter Ammon in the associated radar. 206155 2 52075 mitz 2010-03-30 13:36:58 -0700 Comment on attachment 52075 Patch that does returns self for non-string content only if _canEditRichly is true > Index: WebKit/mac/ChangeLog > =================================================================== > --- WebKit/mac/ChangeLog (revision 56805) > +++ WebKit/mac/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2010-03-30 John Sullivan <sullivan@apple.com> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=36848 > + <rdar://problem/7362913> > + Menu items appropriate only for rich-content editing can appear in plain-text contexts > + > + * WebView/WebHTMLView.mm: > + (-[WebHTMLView validRequestorForSendType:returnType:]): > + Don't return self for non-string content if _canEditRichly is false. > + > 2010-03-29 Alexey Proskuryakov <ap@apple.com> > > Reviewed by Darin Adler. > Index: WebKit/mac/WebView/WebHTMLView.mm > =================================================================== > --- WebKit/mac/WebView/WebHTMLView.mm (revision 56664) > +++ WebKit/mac/WebView/WebHTMLView.mm (working copy) > @@ -2539,7 +2539,13 @@ - (BOOL)readSelectionFromPasteboard:(NSP > - (id)validRequestorForSendType:(NSString *)sendType returnType:(NSString *)returnType > { > BOOL isSendTypeOK = !sendType || ([[self pasteboardTypesForSelection] containsObject:sendType] && [self _hasSelection]); > - BOOL isReturnTypeOK = !returnType || ([[[self class] _insertablePasteboardTypes] containsObject:returnType] && [self _isEditable]); > + BOOL isReturnTypeOK = NO; > + if (!returnType) Weird indentation. 206158 3 sullivan 2010-03-30 13:38:44 -0700 Committed in http://trac.webkit.org/changeset/56806 206223 4 ap 2010-03-30 15:47:47 -0700 See also: bug 8714. 52075 2010-03-30 13:25:59 -0700 2010-03-30 13:36:57 -0700 Patch that does returns self for non-string content only if _canEditRichly is true 36848_patch.txt text/plain 1960 sullivan SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NjgwNSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMtMzAgIEpvaG4gU3VsbGl2YW4gIDxzdWxs aXZhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2ODQ4Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MzYyOTEzPgorICAgICAgICBNZW51IGl0ZW1zIGFwcHJv cHJpYXRlIG9ubHkgZm9yIHJpY2gtY29udGVudCBlZGl0aW5nIGNhbiBhcHBlYXIgaW4gcGxhaW4t dGV4dCBjb250ZXh0cworCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAg ICAgKC1bV2ViSFRNTFZpZXcgdmFsaWRSZXF1ZXN0b3JGb3JTZW5kVHlwZTpyZXR1cm5UeXBlOl0p OgorICAgICAgICBEb24ndCByZXR1cm4gc2VsZiBmb3Igbm9uLXN0cmluZyBjb250ZW50IGlmIF9j YW5FZGl0UmljaGx5IGlzIGZhbHNlLgorCiAyMDEwLTAzLTI5ICBBbGV4ZXkgUHJvc2t1cnlha292 ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRl eDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gNTY2NjQpCisrKyBXZWJLaXQv bWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTI1MzksNyArMjUz OSwxMyBAQCAtIChCT09MKXJlYWRTZWxlY3Rpb25Gcm9tUGFzdGVib2FyZDooTlNQCiAtIChpZCl2 YWxpZFJlcXVlc3RvckZvclNlbmRUeXBlOihOU1N0cmluZyAqKXNlbmRUeXBlIHJldHVyblR5cGU6 KE5TU3RyaW5nICopcmV0dXJuVHlwZQogewogICAgIEJPT0wgaXNTZW5kVHlwZU9LID0gIXNlbmRU eXBlIHx8IChbW3NlbGYgcGFzdGVib2FyZFR5cGVzRm9yU2VsZWN0aW9uXSBjb250YWluc09iamVj dDpzZW5kVHlwZV0gJiYgW3NlbGYgX2hhc1NlbGVjdGlvbl0pOwotICAgIEJPT0wgaXNSZXR1cm5U eXBlT0sgPSAhcmV0dXJuVHlwZSB8fCAoW1tbc2VsZiBjbGFzc10gX2luc2VydGFibGVQYXN0ZWJv YXJkVHlwZXNdIGNvbnRhaW5zT2JqZWN0OnJldHVyblR5cGVdICYmIFtzZWxmIF9pc0VkaXRhYmxl XSk7CisgICAgICAgIEJPT0wgaXNSZXR1cm5UeXBlT0sgPSBOTzsKKyAgICBpZiAoIXJldHVyblR5 cGUpCisgICAgICAgIGlzUmV0dXJuVHlwZU9LID0gWUVTOworICAgIGVsc2UgaWYgKFtbW3NlbGYg Y2xhc3NdIF9pbnNlcnRhYmxlUGFzdGVib2FyZFR5cGVzXSBjb250YWluc09iamVjdDpyZXR1cm5U eXBlXSAmJiBbc2VsZiBfaXNFZGl0YWJsZV0pIHsKKyAgICAgICAgLy8gV2UgY2FuIGluc2VydCBz dHJpbmdzIGluIGFueSBlZGl0YWJsZSBjb250ZXh0LiAgV2UgY2FuIGluc2VydCBvdGhlciB0eXBl cywgbGlrZSBpbWFnZXMsIG9ubHkgaW4gcmljaCBlZGl0IGNvbnRleHRzLgorICAgICAgICBpc1Jl dHVyblR5cGVPSyA9IFtyZXR1cm5UeXBlIGlzRXF1YWxUb1N0cmluZzpOU1N0cmluZ1Bib2FyZFR5 cGVdIHx8IFtzZWxmIF9jYW5FZGl0UmljaGx5XTsKKyAgICB9CiAgICAgaWYgKGlzU2VuZFR5cGVP SyAmJiBpc1JldHVyblR5cGVPSykKICAgICAgICAgcmV0dXJuIHNlbGY7CiAgICAgcmV0dXJuIFtb c2VsZiBuZXh0UmVzcG9uZGVyXSB2YWxpZFJlcXVlc3RvckZvclNlbmRUeXBlOnNlbmRUeXBlIHJl dHVyblR5cGU6cmV0dXJuVHlwZV07Cg==