Attachment 349400 Details for Bug 189504 – macOS-only patch to see what work needs to be done in other ports

[patch] macOS-only patch to see what work needs to be done in other ports

file_189504.txt (text/plain), 11.94 KB, created by mitz on 2018-09-11 09:41:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: mitz

Created: 2018-09-11 09:41:41 PDT

Size: 11.94 KB

patch

obsolete

>Index: Source/WebCore/editing/Editor.cpp
>===================================================================
>--- Source/WebCore/editing/Editor.cpp	(revision 235856)
>+++ Source/WebCore/editing/Editor.cpp	(working copy)
>@@ -327,6 +327,7 @@ enum class ClipboardEventKind {
>     Cut,
>     Paste,
>     PasteAsPlainText,
>+    PasteAsQuotation,
>     BeforeCopy,
>     BeforeCut,
>     BeforePaste,
>@@ -341,6 +342,7 @@ static AtomicString eventNameForClipboar
>         return eventNames().cutEvent;
>     case ClipboardEventKind::Paste:
>     case ClipboardEventKind::PasteAsPlainText:
>+    case ClipboardEventKind::PasteAsQuotation:
>         return eventNames().pasteEvent;
>     case ClipboardEventKind::BeforeCopy:
>         return eventNames().beforecopyEvent;
>@@ -369,6 +371,7 @@ static Ref<DataTransfer> createDataTrans
>         }
>         FALLTHROUGH;
>     case ClipboardEventKind::Paste:
>+    case ClipboardEventKind::PasteAsQuotation:
>         return DataTransfer::createForCopyAndPaste(document, DataTransfer::StoreMode::Readonly, Pasteboard::createForCopyAndPaste());
>     case ClipboardEventKind::BeforeCopy:
>     case ClipboardEventKind::BeforeCut:
>@@ -1404,7 +1407,7 @@ void Editor::paste(Pasteboard& pasteboar
>     updateMarkersForWordsAffectedByEditing(false);
>     ResourceCacheValidationSuppressor validationSuppressor(document().cachedResourceLoader());
>     if (m_frame.selection().selection().isContentRichlyEditable())
>-        pasteWithPasteboard(&pasteboard, true);
>+        pasteWithPasteboard(&pasteboard, { PasteOption::AllowPlainText });
>     else
>         pasteAsPlainTextWithPasteboard(pasteboard);
> }
>@@ -1419,6 +1422,21 @@ void Editor::pasteAsPlainText()
>     pasteAsPlainTextWithPasteboard(*Pasteboard::createForCopyAndPaste());
> }
> 
>+void Editor::pasteAsQuotation()
>+{
>+    if (!dispatchClipboardEvent(findEventTargetFromSelection(), ClipboardEventKind::PasteAsQuotation))
>+        return;
>+    if (!canPaste())
>+        return;
>+    updateMarkersForWordsAffectedByEditing(false);
>+    ResourceCacheValidationSuppressor validationSuppressor(document().cachedResourceLoader());
>+    auto pasteboard = Pasteboard::createForCopyAndPaste();
>+    if (m_frame.selection().selection().isContentRichlyEditable())
>+        pasteWithPasteboard(pasteboard.get(), { PasteOption::AllowPlainText, PasteOption::AsQuotation });
>+    else
>+        pasteAsPlainTextWithPasteboard(*pasteboard);
>+}
>+
> void Editor::performDelete()
> {
>     if (!canDelete()) {
>Index: Source/WebCore/editing/Editor.h
>===================================================================
>--- Source/WebCore/editing/Editor.h	(revision 235857)
>+++ Source/WebCore/editing/Editor.h	(working copy)
>@@ -129,6 +129,12 @@ public:
>     explicit Editor(Frame&);
>     ~Editor();
> 
>+    enum class PasteOption : uint8_t {
>+        AllowPlainText = 1 << 0,
>+        IgnoreMailBlockquote = 2 << 0,
>+        AsQuotation = 2 << 0,
>+    };
>+
>     WEBCORE_EXPORT EditorClient* client() const;
>     WEBCORE_EXPORT TextCheckerClient* textChecker() const;
> 
>@@ -158,6 +164,7 @@ public:
>     WEBCORE_EXPORT void paste();
>     void paste(Pasteboard&);
>     WEBCORE_EXPORT void pasteAsPlainText();
>+    void pasteAsQuotation();
>     WEBCORE_EXPORT void performDelete();
> 
>     WEBCORE_EXPORT void copyURL(const URL&, const String& title);
>@@ -519,7 +526,7 @@ private:
>     bool canDeleteRange(Range*) const;
>     bool canSmartReplaceWithPasteboard(Pasteboard&);
>     void pasteAsPlainTextWithPasteboard(Pasteboard&);
>-    void pasteWithPasteboard(Pasteboard*, bool allowPlainText, MailBlockquoteHandling = MailBlockquoteHandling::RespectBlockquote);
>+    void pasteWithPasteboard(Pasteboard*, OptionSet<PasteOption>);
>     String plainTextFromPasteboard(const PasteboardPlainText&);
> 
>     void revealSelectionAfterEditingOperation(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded, RevealExtentOption = DoNotRevealExtent);
>Index: Source/WebCore/editing/EditorCommand.cpp
>===================================================================
>--- Source/WebCore/editing/EditorCommand.cpp	(revision 235856)
>+++ Source/WebCore/editing/EditorCommand.cpp	(working copy)
>@@ -926,6 +926,16 @@ static bool executePasteAsPlainText(Fram
>     return true;
> }
> 
>+static bool executePasteAsQuotation(Frame& frame, Event*, EditorCommandSource source, const String&)
>+{
>+    if (source == CommandFromMenuOrKeyBinding) {
>+        UserTypingGestureIndicator typingGestureIndicator(frame);
>+        frame.editor().pasteAsQuotation();
>+    } else
>+        frame.editor().pasteAsQuotation();
>+    return true;
>+}
>+
> static bool executePrint(Frame& frame, Event*, EditorCommandSource, const String&)
> {
>     Page* page = frame.page();
>@@ -1636,6 +1646,7 @@ static const CommandMap& createCommandMa
>         { "Paste", { executePaste, supportedPaste, enabledPaste, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabledPaste } },
>         { "PasteAndMatchStyle", { executePasteAndMatchStyle, supportedPaste, enabledPaste, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabledPaste } },
>         { "PasteAsPlainText", { executePasteAsPlainText, supportedPaste, enabledPaste, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabledPaste } },
>+        { "PasteAsQuotation", { executePasteAsQuotation, supportedPaste, enabledPaste, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabledPaste } },
>         { "Print", { executePrint, supported, enabled, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
>         { "Redo", { executeRedo, supported, enabledRedo, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
>         { "RemoveFormat", { executeRemoveFormat, supported, enabledRangeInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
>Index: Source/WebCore/editing/ios/EditorIOS.mm
>===================================================================
>--- Source/WebCore/editing/ios/EditorIOS.mm	(revision 235856)
>+++ Source/WebCore/editing/ios/EditorIOS.mm	(working copy)
>@@ -225,7 +225,7 @@ RefPtr<DocumentFragment> Editor::webCont
>     return WTFMove(reader.fragment);
> }
> 
>-void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText, MailBlockquoteHandling mailBlockquoteHandling)
>+void Editor::pasteWithPasteboard(Pasteboard* pasteboard, OptionSet<PasteOption> options)
> {
>     RefPtr<Range> range = selectedRange();
>     WebContentReader reader(m_frame, *range, allowPlainText);
>Index: Source/WebCore/editing/mac/EditorMac.mm
>===================================================================
>--- Source/WebCore/editing/mac/EditorMac.mm	(revision 235857)
>+++ Source/WebCore/editing/mac/EditorMac.mm	(working copy)
>@@ -37,9 +37,11 @@
> #import "EditorClient.h"
> #import "Frame.h"
> #import "FrameView.h"
>+#import "HTMLBRElement.h"
> #import "HTMLConverter.h"
> #import "HTMLElement.h"
> #import "HTMLNames.h"
>+#import "HTMLQuoteElement.h"
> #import "LegacyNSPasteboardTypes.h"
> #import "LegacyWebArchive.h"
> #import "Pasteboard.h"
>@@ -77,7 +79,7 @@ void Editor::showColorPanel()
>     [[NSApplication sharedApplication] orderFrontColorPanel:nil];
> }
> 
>-void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText, MailBlockquoteHandling mailBlockquoteHandling)
>+void Editor::pasteWithPasteboard(Pasteboard* pasteboard, OptionSet<PasteOption> options)
> {
>     RefPtr<Range> range = selectedRange();
> 
>@@ -88,10 +90,28 @@ void Editor::pasteWithPasteboard(Pastebo
> #pragma clang diagnostic pop
> 
>     bool chosePlainText;
>-    RefPtr<DocumentFragment> fragment = webContentFromPasteboard(*pasteboard, *range, allowPlainText, chosePlainText);
>+    RefPtr<DocumentFragment> fragment = webContentFromPasteboard(*pasteboard, *range, options.contains(PasteOption::AllowPlainText), chosePlainText);
>+
>+    if (fragment && options.contains(PasteOption::AsQuotation)) {
>+        auto blockQuote = HTMLQuoteElement::create(blockquoteTag, document());
>+        blockQuote->setAttributeWithoutSynchronization(typeAttr, AtomicString("cite"));
>+        blockQuote->setAttributeWithoutSynchronization(classAttr, AtomicString(ApplePasteAsQuotation));
>+
>+        auto childNode = fragment->firstChild();
>+
>+        if (childNode) {
>+            while (childNode) {
>+                blockQuote->appendChild(*childNode);
>+                childNode = fragment->firstChild();
>+            }
>+        } else
>+            blockQuote->appendChild(HTMLBRElement::create(document()));
>+
>+        fragment->appendChild(blockQuote);
>+    }
> 
>     if (fragment && shouldInsertFragment(*fragment, range.get(), EditorInsertAction::Pasted))
>-        pasteAsFragment(fragment.releaseNonNull(), canSmartReplaceWithPasteboard(*pasteboard), false, mailBlockquoteHandling);
>+        pasteAsFragment(fragment.releaseNonNull(), canSmartReplaceWithPasteboard(*pasteboard), false, options.contains(PasteOption::IgnoreMailBlockquote) ? MailBlockquoteHandling::IgnoreBlockquote : MailBlockquoteHandling::RespectBlockquote );
> 
>     client()->setInsertionPasteboard(String());
> }
>@@ -122,7 +142,7 @@ void Editor::readSelectionFromPasteboard
> {
>     Pasteboard pasteboard(pasteboardName);
>     if (m_frame.selection().selection().isContentRichlyEditable())
>-        pasteWithPasteboard(&pasteboard, true);
>+        pasteWithPasteboard(&pasteboard, { PasteOption::AllowPlainText });
>     else
>         pasteAsPlainTextWithPasteboard(pasteboard);
> }
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(revision 235856)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	(working copy)
>@@ -4483,6 +4483,11 @@ - (_WKAttachment *)_insertAttachmentWith
> #endif
> }
> 
>+- (void)_pasteAsQuotation:(id)sender
>+{
>+    _impl->executeEditCommandForSelector(_cmd);
>+}
>+
> - (void)_evaluateJavaScriptWithoutUserGesture:(NSString *)javaScriptString completionHandler:(void (^)(id, NSError *))completionHandler
> {
>     [self _evaluateJavaScript:javaScriptString forceUserGesture:NO completionHandler:completionHandler];
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h	(revision 235856)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h	(working copy)
>@@ -185,6 +185,8 @@ typedef NS_OPTIONS(NSUInteger, _WKRectEd
> - (_WKAttachment *)_insertAttachmentWithFileWrapper:(NSFileWrapper *)fileWrapper contentType:(NSString *)contentType options:(_WKAttachmentDisplayOptions *)options completion:(void(^)(BOOL success))completionHandler WK_API_DEPRECATED_WITH_REPLACEMENT("-_insertAttachmentWithFileWrapper:contentType:completion:", macosx(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
> - (_WKAttachment *)_insertAttachmentWithFileWrapper:(NSFileWrapper *)fileWrapper contentType:(NSString *)contentType completion:(void(^)(BOOL success))completionHandler WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> 
>+- (IBAction)_pasteAsQuotation:(id)sender WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
>+
> #if TARGET_OS_IPHONE
> // DERECATED: The setters of the three following function are deprecated, please use overrideLayoutParameters.
> // Define the smallest size a page take with a regular viewport.
>Index: Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(revision 235856)
>+++ Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(working copy)
>@@ -2596,6 +2596,7 @@ static const SelectorNameMap& selectorEx
>     };
> 
>     static const SelectorAndCommandName names[] = {
>+        { @selector(_pasteAsQuotation:), "PasteAsQuotation"_s },
>         { @selector(insertNewlineIgnoringFieldEditor:), "InsertNewline"_s },
>         { @selector(insertParagraphSeparator:), "InsertNewline"_s },
>         { @selector(insertTabIgnoringFieldEditor:), "InsertTab"_s },

Actions: View | Formatted Diff | Diff

Attachments on bug 189504: 349400 | 349426 | 349432 | 349436 | 349454 | 349574