Move createAppHighlightRangeData into AppHighlightStorage source file

https://bugs.webkit.org/show_bug.cgi?id=219834

Reviewed by Devin Rousso.

The createAppHighlightRangeData function was defined statically in AppHighlightListData.cpp
but was only used in AppHighlightStorage.cpp. Moved the static functions from the former
into the later.

Additionally added forward declarations in the AppHighlightStorage header.

This allows the highlight module to compile with non-unified sources.

* Modules/highlight/AppHighlightListData.cpp:
(WebCore::computePathIndex): Deleted.
(WebCore::createNodePathComponent): Deleted.
(WebCore::makeNodePath): Deleted.
(WebCore::createAppHiglightRangeData): Deleted.
* Modules/highlight/AppHighlightStorage.cpp:
(WebCore::computePathIndex):
(WebCore::createNodePathComponent):
(WebCore::makeNodePath):
(WebCore::createAppHighlightRangeData):
(WebCore::AppHighlightStorage::createAppHighlightListData):
* Modules/highlight/AppHighlightStorage.h:


Identifier: 232413@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270750 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: donny-dont

Source/WebCore/ChangeLog

@@ -1,3 +1,31 @@
+2020-12-13  Don Olmstead  <don.olmstead@sony.com>
+
+        Move createAppHighlightRangeData into AppHighlightStorage source file
+        https://bugs.webkit.org/show_bug.cgi?id=219834
+
+        Reviewed by Devin Rousso.
+
+        The createAppHighlightRangeData function was defined statically in AppHighlightListData.cpp
+        but was only used in AppHighlightStorage.cpp. Moved the static functions from the former
+        into the later.
+
+        Additionally added forward declarations in the AppHighlightStorage header.
+
+        This allows the highlight module to compile with non-unified sources.
+
+        * Modules/highlight/AppHighlightListData.cpp:
+        (WebCore::computePathIndex): Deleted.
+        (WebCore::createNodePathComponent): Deleted.
+        (WebCore::makeNodePath): Deleted.
+        (WebCore::createAppHiglightRangeData): Deleted.
+        * Modules/highlight/AppHighlightStorage.cpp:
+        (WebCore::computePathIndex):
+        (WebCore::createNodePathComponent):
+        (WebCore::makeNodePath):
+        (WebCore::createAppHighlightRangeData):
+        (WebCore::AppHighlightStorage::createAppHighlightListData):
+        * Modules/highlight/AppHighlightStorage.h:
+
 2020-12-13  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][IFC] Offset the content logical left by the word-spacing value

Source/WebCore/Modules/highlight/AppHighlightListData.cpp

@@ -39,48 +39,6 @@
 
 namespace WebCore {
 
-static unsigned computePathIndex(const Node& node)
-{
-    String nodeName = node.nodeName();
-    unsigned index = 0;
-    for (auto* previousSibling = node.previousSibling(); previousSibling; previousSibling = previousSibling->previousSibling()) {
-        if (previousSibling->nodeName() == nodeName)
-            index++;
-    }
-    return index;
-}
-
-static AppHighlightRangeData::NodePathComponent createNodePathComponent(const Node& node)
-{
-    return {
-        is<Element>(node) ? downcast<Element>(node).getIdAttribute().string() : nullString(),
-        node.nodeName(),
-        is<CharacterData>(node) ? downcast<CharacterData>(node).data() : nullString(),
-        computePathIndex(node)
-    };
-}
-
-static AppHighlightRangeData::NodePath makeNodePath(RefPtr<Node>&& node)
-{
-    AppHighlightRangeData::NodePath components;
-    auto body = node->document().body();
-    for (auto ancestor = node; ancestor && ancestor != body; ancestor = ancestor->parentNode())
-        components.append(createNodePathComponent(*ancestor));
-    components.reverse();
-    return { components };
-}
-
-static AppHighlightRangeData createAppHiglightRangeData(const StaticRange& range)
-{
-    return {
-        plainText(range),
-        makeNodePath(&range.startContainer()),
-        range.startOffset(),
-        makeNodePath(&range.endContainer()),
-        range.endOffset()
-    };
-}
-
 AppHighlightListData AppHighlightListData::create(const SharedBuffer& buffer)
 {
     auto decoder = buffer.decoder();

Source/WebCore/Modules/highlight/AppHighlightStorage.cpp

@@ -160,6 +160,48 @@ static Optional<SimpleRange> findRange(const AppHighlightRangeData& range, Docum
     return findRangeBySearchingText(range, document);
 }
 
+static unsigned computePathIndex(const Node& node)
+{
+    String nodeName = node.nodeName();
+    unsigned index = 0;
+    for (auto* previousSibling = node.previousSibling(); previousSibling; previousSibling = previousSibling->previousSibling()) {
+        if (previousSibling->nodeName() == nodeName)
+            index++;
+    }
+    return index;
+}
+
+static AppHighlightRangeData::NodePathComponent createNodePathComponent(const Node& node)
+{
+    return {
+        is<Element>(node) ? downcast<Element>(node).getIdAttribute().string() : nullString(),
+        node.nodeName(),
+        is<CharacterData>(node) ? downcast<CharacterData>(node).data() : nullString(),
+        computePathIndex(node)
+    };
+}
+
+static AppHighlightRangeData::NodePath makeNodePath(RefPtr<Node>&& node)
+{
+    AppHighlightRangeData::NodePath components;
+    auto body = node->document().body();
+    for (auto ancestor = node; ancestor && ancestor != body; ancestor = ancestor->parentNode())
+        components.append(createNodePathComponent(*ancestor));
+    components.reverse();
+    return { components };
+}
+
+static AppHighlightRangeData createAppHighlightRangeData(const StaticRange& range)
+{
+    return {
+        plainText(range),
+        makeNodePath(&range.startContainer()),
+        range.startOffset(),
+        makeNodePath(&range.endContainer()),
+        range.endOffset()
+    };
+}
+
 AppHighlightStorage::AppHighlightStorage(Document& document)
     : m_document(makeWeakPtr(document))
 {
@@ -175,7 +217,7 @@ AppHighlightListData AppHighlightStorage::createAppHighlightListData()
     if (auto appHighlightRegister = m_document->appHighlightRegisterIfExists()) {
         for (auto& highlight : appHighlightRegister->map()) {
             for (auto& rangeData : highlight.value->rangesData())
-                data.append(createAppHiglightRangeData(rangeData->range));
+                data.append(createAppHighlightRangeData(rangeData->range));
         }
     }
 

Source/WebCore/Modules/highlight/AppHighlightStorage.h

@@ -35,6 +35,9 @@
 namespace WebCore {
 
 class AppHighlightListData;
+class AppHighlightRangeData;
+class Document;
+class SharedBuffer;
 
 class AppHighlightStorage : RefCounted<AppHighlightStorage> {
     WTF_MAKE_FAST_ALLOCATED;