Changeset 236612 in webkit

Timestamp:

Sep 28, 2018 2:08:54 PM (6 years ago)

Author:

rniwa@webkit.org

Message:

Rename createMarkup to serializePreservingVisualAppearance
​https://bugs.webkit.org/show_bug.cgi?id=190086

Reviewed by Wenson Hsieh.

Source/WebCore:

Renamed the function to clarify what it does. Also removed the unused Range::toHTML.

• dom/Range.cpp:

(WebCore::Range::toHTML const): Deleted.

• dom/Range.h:
• editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::moveParagraphs):

• editing/cocoa/EditorCocoa.mm:

(WebCore::Editor::selectionInHTMLFormat):

• editing/gtk/EditorGtk.cpp:

(WebCore::Editor::writeSelectionToPasteboard):

• editing/markup.cpp:

(WebCore::serializePreservingVisualAppearance):
(WebCore::createMarkup): Deleted.

• editing/markup.h:
• editing/wpe/EditorWPE.cpp:

(WebCore::Editor::writeSelectionToPasteboard):

• loader/archive/cf/LegacyWebArchive.cpp:

(WebCore::LegacyWebArchive::create):
(WebCore::LegacyWebArchive::createFromSelection):

• platform/win/PasteboardWin.cpp:

(WebCore::Pasteboard::writeRangeToDataObject):

Source/WebKit:

• WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:

(WebKit::WebEditorClient::updateGlobalSelection):

Source/WebKitLegacy/mac:

• DOM/WebDOMOperations.mm:

(-[DOMRange markupString]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Range.cpp (modified) (1 diff)
• WebCore/dom/Range.h (modified) (1 diff)
• WebCore/editing/CompositeEditCommand.cpp (modified) (1 diff)
• WebCore/editing/cocoa/EditorCocoa.mm (modified) (1 diff)
• WebCore/editing/gtk/EditorGtk.cpp (modified) (1 diff)
• WebCore/editing/markup.cpp (modified) (1 diff)
• WebCore/editing/markup.h (modified) (1 diff)
• WebCore/editing/wpe/EditorWPE.cpp (modified) (1 diff)
• WebCore/loader/archive/cf/LegacyWebArchive.cpp (modified) (2 diffs)
• WebCore/platform/win/PasteboardWin.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp (modified) (1 diff)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/DOM/WebDOMOperations.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Rename createMarkup to serializePreservingVisualAppearance
+        https://bugs.webkit.org/show_bug.cgi?id=190086
+
+        Reviewed by Wenson Hsieh.
+
+        Renamed the function to clarify what it does. Also removed the unused Range::toHTML.
+
+        * dom/Range.cpp:
+        (WebCore::Range::toHTML const): Deleted.
+        * dom/Range.h:
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::moveParagraphs):
+        * editing/cocoa/EditorCocoa.mm:
+        (WebCore::Editor::selectionInHTMLFormat):
+        * editing/gtk/EditorGtk.cpp:
+        (WebCore::Editor::writeSelectionToPasteboard):
+        * editing/markup.cpp:
+        (WebCore::serializePreservingVisualAppearance):
+        (WebCore::createMarkup): Deleted.
+        * editing/markup.h:
+        * editing/wpe/EditorWPE.cpp:
+        (WebCore::Editor::writeSelectionToPasteboard):
+        * loader/archive/cf/LegacyWebArchive.cpp:
+        (WebCore::LegacyWebArchive::create):
+        (WebCore::LegacyWebArchive::createFromSelection):
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::writeRangeToDataObject):
+
 2018-09-28  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/dom/Range.cpp

@@ -951 +951 @@
 
     return builder.toString();
-}
-
-String Range::toHTML() const
-{
-    return createMarkup(*this);
 }
 

trunk/Source/WebCore/dom/Range.h

@@ -85 +85 @@
     WEBCORE_EXPORT String toString() const;
 
-    String toHTML() const;
     WEBCORE_EXPORT String text() const;
 

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -1445 +1445 @@
     // This used to use a ternary for initialization, but that confused some versions of GCC, see bug 37912
     if (startOfParagraphToMove != endOfParagraphToMove)
-        fragment = createFragmentFromMarkup(document(), createMarkup(*range, nullptr, AnnotateForInterchange::No, ConvertBlocksToInlines::Yes), emptyString());
+        fragment = createFragmentFromMarkup(document(), serializePreservingVisualAppearance(*range, nullptr, AnnotateForInterchange::No, ConvertBlocksToInlines::Yes), emptyString());
 
     // A non-empty paragraph's style is moved when we copy and move it.  We don't move 

trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm

@@ -77 +77 @@
 {
     if (auto range = selectedRange())
-        return createMarkup(*range, nullptr, AnnotateForInterchange::Yes, ConvertBlocksToInlines::No, ResolveURLs::YesExcludingLocalFileURLsForPrivacy);
+        return serializePreservingVisualAppearance(*range, nullptr, AnnotateForInterchange::Yes, ConvertBlocksToInlines::No, ResolveURLs::YesExcludingLocalFileURLsForPrivacy);
     return { };
 }

trunk/Source/WebCore/editing/gtk/EditorGtk.cpp

@@ -147 +147 @@
     pasteboardContent.canSmartCopyOrDelete = canSmartCopyOrDelete();
     pasteboardContent.text = selectedTextForDataTransfer();
-    pasteboardContent.markup = createMarkup(*selectedRange(), nullptr, AnnotateForInterchange::Yes, ConvertBlocksToInlines::No, ResolveURLs::YesExcludingLocalFileURLsForPrivacy);
+    pasteboardContent.markup = serializePreservingVisualAppearance(*selectedRange(), nullptr, AnnotateForInterchange::Yes, ConvertBlocksToInlines::No, ResolveURLs::YesExcludingLocalFileURLsForPrivacy);
     pasteboard.write(pasteboardContent);
 }

trunk/Source/WebCore/editing/markup.cpp

@@ -845 +845 @@
 }
 
-String createMarkup(const Range& range, Vector<Node*>* nodes, AnnotateForInterchange annotate, ConvertBlocksToInlines convertBlocksToInlines, ResolveURLs urlsToReslve)
+String serializePreservingVisualAppearance(const Range& range, Vector<Node*>* nodes, AnnotateForInterchange annotate, ConvertBlocksToInlines convertBlocksToInlines, ResolveURLs urlsToReslve)
 {
     return createMarkupInternal(range.ownerDocument(), range, nodes, annotate, convertBlocksToInlines, urlsToReslve, MSOListMode::DoNotPreserve);

trunk/Source/WebCore/editing/markup.h

@@ -70 +70 @@
 enum class ResolveURLs : uint8_t { No, Yes, YesExcludingLocalFileURLsForPrivacy };
 enum class ConvertBlocksToInlines : uint8_t { No, Yes };
-WEBCORE_EXPORT String createMarkup(const Range&, Vector<Node*>* = nullptr, AnnotateForInterchange = AnnotateForInterchange::No, ConvertBlocksToInlines = ConvertBlocksToInlines::No, ResolveURLs = ResolveURLs::No);
+WEBCORE_EXPORT String serializePreservingVisualAppearance(const Range&, Vector<Node*>* = nullptr, AnnotateForInterchange = AnnotateForInterchange::No, ConvertBlocksToInlines = ConvertBlocksToInlines::No, ResolveURLs = ResolveURLs::No);
 
 enum class SerializedNodes : uint8_t { SubtreeIncludingNode, SubtreesOfChildren };
 enum class SerializationSyntax : uint8_t { HTML, XML };
 WEBCORE_EXPORT String serializeFragment(const Node&, SerializedNodes, Vector<Node*>* = nullptr, ResolveURLs = ResolveURLs::No, Vector<QualifiedName>* tagNamesToSkip = nullptr, SerializationSyntax = SerializationSyntax::HTML);
-WEBCORE_EXPORT String serializeFragmentWithDocType(const Node&);
 
 String urlToMarkup(const URL&, const String& title);

trunk/Source/WebCore/editing/wpe/EditorWPE.cpp

@@ -65 +65 @@
     PasteboardWebContent pasteboardContent;
     pasteboardContent.text = selectedTextForDataTransfer();
-    pasteboardContent.markup = createMarkup(*selectedRange(), nullptr, AnnotateForInterchange::Yes, ConvertBlocksToInlines::No, ResolveURLs::YesExcludingLocalFileURLsForPrivacy);
+    pasteboardContent.markup = serializePreservingVisualAppearance(*selectedRange(), nullptr, AnnotateForInterchange::Yes, ConvertBlocksToInlines::No, ResolveURLs::YesExcludingLocalFileURLsForPrivacy);
     pasteboard.write(pasteboardContent);
 }

trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp

@@ -461 +461 @@
     // FIXME: This is always "for interchange". Is that right?
     Vector<Node*> nodeList;
-    String markupString = documentTypeString(document) + createMarkup(*range, &nodeList, AnnotateForInterchange::Yes);
+    String markupString = documentTypeString(document) + serializePreservingVisualAppearance(*range, &nodeList, AnnotateForInterchange::Yes);
     return create(markupString, *frame, nodeList, nullptr);
 }
@@ -556 +556 @@
     Vector<Node*> nodeList;
     if (auto selectionRange = frame->selection().toNormalizedRange())
-        builder.append(createMarkup(*selectionRange, &nodeList, AnnotateForInterchange::Yes));
+        builder.append(serializePreservingVisualAppearance(*selectionRange, &nodeList, AnnotateForInterchange::Yes));
 
     auto archive = create(builder.toString(), *frame, nodeList, nullptr);

trunk/Source/WebCore/platform/win/PasteboardWin.cpp

@@ -445 +445 @@
 
     Vector<char> data;
-    markupToCFHTML(createMarkup(selectedRange, nullptr, AnnotateForInterchange::Yes),
+    markupToCFHTML(serializePreservingVisualAppearance(selectedRange, nullptr, AnnotateForInterchange::Yes),
         selectedRange.startContainer().document().url().string(), data);
     medium.hGlobal = createGlobalData(data);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Rename createMarkup to serializePreservingVisualAppearance
+        https://bugs.webkit.org/show_bug.cgi?id=190086
+
+        Reviewed by Wenson Hsieh.
+
+        * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
+        (WebKit::WebEditorClient::updateGlobalSelection):
+
 2018-09-28  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp

@@ -127 +127 @@
     pasteboardContent.canSmartCopyOrDelete = false;
     pasteboardContent.text = range->text();
-    pasteboardContent.markup = createMarkup(*range, nullptr, AnnotateForInterchange::Yes, ConvertBlocksToInlines::No, ResolveURLs::YesExcludingLocalFileURLsForPrivacy);
+    pasteboardContent.markup = serializePreservingVisualAppearance(*range, nullptr, AnnotateForInterchange::Yes, ConvertBlocksToInlines::No, ResolveURLs::YesExcludingLocalFileURLsForPrivacy);
     Pasteboard::createForGlobalSelection()->write(pasteboardContent);
 }

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2018-09-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Rename createMarkup to serializePreservingVisualAppearance
+        https://bugs.webkit.org/show_bug.cgi?id=190086
+
+        Reviewed by Wenson Hsieh.
+
+        * DOM/WebDOMOperations.mm:
+        (-[DOMRange markupString]):
+
 2018-09-28  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKitLegacy/mac/DOM/WebDOMOperations.mm

@@ -196 +196 @@
 {
     auto& range = *core(self);
-    return String { documentTypeString(range.startContainer().document()) + createMarkup(range, nullptr, AnnotateForInterchange::Yes) };
+    return String { documentTypeString(range.startContainer().document()) + serializePreservingVisualAppearance(range, nullptr, AnnotateForInterchange::Yes) };
 }