[webkit-changes] [226137] trunk

Tue, 19 Dec 2017 13:28:55 -0800

Title: [226137] trunk
Revision
226137
Author
[email protected]
Date
2017-12-19 13:28:33 -0800 (Tue, 19 Dec 2017)

Log Message

Add support for computing the frontmost longest effective marker subrange
https://bugs.webkit.org/show_bug.cgi?id=180985

Reviewed by Dave Hyatt.

Source/WebCore:

Add a new subdivision overlap strategy to return the minimum list of maximal length non-
overlapping subranges. We will make use of this strategy together with an algorithm to
coalesce adjacent subranges with visually indistinct styles to minimize the total number
of drawing commands needed to paint an entire line of text. We are not making use of
this functionality now. We will make use of it to simplify the patch for <https://bugs.webkit.org/show_bug.cgi?id=180984>.

* rendering/MarkerSubrange.cpp:
(WebCore::subdivide):
* rendering/MarkerSubrange.h:

Tools:

Adds a test case to ensure that we compute the minimum list of maximal length non-
overlapping subranges when using strategy OverlapStrategy::FrontmostWithLongestEffectiveRange.

* TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp:
(TestWebKitAPI::TEST):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (226136 => 226137)


--- trunk/Source/WebCore/ChangeLog	2017-12-19 21:22:22 UTC (rev 226136)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 21:28:33 UTC (rev 226137)
@@ -1,3 +1,20 @@
+2017-12-19  Daniel Bates  <[email protected]>
+
+        Add support for computing the frontmost longest effective marker subrange
+        https://bugs.webkit.org/show_bug.cgi?id=180985
+
+        Reviewed by Dave Hyatt.
+
+        Add a new subdivision overlap strategy to return the minimum list of maximal length non-
+        overlapping subranges. We will make use of this strategy together with an algorithm to
+        coalesce adjacent subranges with visually indistinct styles to minimize the total number
+        of drawing commands needed to paint an entire line of text. We are not making use of
+        this functionality now. We will make use of it to simplify the patch for <https://bugs.webkit.org/show_bug.cgi?id=180984>.
+
+        * rendering/MarkerSubrange.cpp:
+        (WebCore::subdivide):
+        * rendering/MarkerSubrange.h:
+
 2017-12-19  Chris Dumez  <[email protected]>
 
         Handle Fetch should wait for the service worker's state to become activated

Modified: trunk/Source/WebCore/rendering/MarkerSubrange.cpp (226136 => 226137)


--- trunk/Source/WebCore/rendering/MarkerSubrange.cpp	2017-12-19 21:22:22 UTC (rev 226136)
+++ trunk/Source/WebCore/rendering/MarkerSubrange.cpp	2017-12-19 21:28:33 UTC (rev 226137)
@@ -67,14 +67,22 @@
     unsigned offsetSoFar = offsets[0].value;
     for (unsigned i = 1; i < numberOfOffsets; ++i) {
         if (offsets[i].value > offsets[i - 1].value) {
-            if (overlapStrategy == OverlapStrategy::Frontmost) {
+            if (overlapStrategy == OverlapStrategy::Frontmost || overlapStrategy == OverlapStrategy::FrontmostWithLongestEffectiveRange) {
                 std::optional<unsigned> frontmost;
                 for (unsigned j = 0; j < i; ++j) {
                     if (!processedSubranges.contains(offsets[j].subrange))
                         frontmost = j;
                 }
-                if (frontmost)
-                    result.append({ offsetSoFar, offsets[i].value, offsets[frontmost.value()].subrange->type, offsets[frontmost.value()].subrange->marker });
+                if (frontmost) {
+                    if (overlapStrategy == OverlapStrategy::FrontmostWithLongestEffectiveRange && !result.isEmpty()) {
+                        auto& previous = result.last();
+                        if (previous.endOffset == offsetSoFar && previous.type == offsets[frontmost.value()].subrange->type && previous.marker == offsets[frontmost.value()].subrange->marker)
+                            previous.endOffset = offsets[i].value;
+                        else
+                            result.append({ offsetSoFar, offsets[i].value, offsets[frontmost.value()].subrange->type, offsets[frontmost.value()].subrange->marker });
+                    } else
+                        result.append({ offsetSoFar, offsets[i].value, offsets[frontmost.value()].subrange->type, offsets[frontmost.value()].subrange->marker });
+                }
             } else {
                 for (unsigned j = 0; j < i; ++j) {
                     if (!processedSubranges.contains(offsets[j].subrange))

Modified: trunk/Source/WebCore/rendering/MarkerSubrange.h (226136 => 226137)


--- trunk/Source/WebCore/rendering/MarkerSubrange.h	2017-12-19 21:22:22 UTC (rev 226136)
+++ trunk/Source/WebCore/rendering/MarkerSubrange.h	2017-12-19 21:28:33 UTC (rev 226137)
@@ -44,6 +44,7 @@
         // FIXME: See <rdar://problem/8933352>. Also, remove the PLATFORM(IOS)-guard.
         DictationPhraseWithAlternatives,
 #endif
+        Selection,
     };
 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
     MarkerSubrange() = default;
@@ -61,7 +62,7 @@
     const RenderedDocumentMarker* marker { nullptr };
 };
 
-enum class OverlapStrategy { None, Frontmost };
+enum class OverlapStrategy { None, Frontmost, FrontmostWithLongestEffectiveRange };
 WEBCORE_EXPORT Vector<MarkerSubrange> subdivide(const Vector<MarkerSubrange>&, OverlapStrategy = OverlapStrategy::None);
 
 }

Modified: trunk/Tools/ChangeLog (226136 => 226137)


--- trunk/Tools/ChangeLog	2017-12-19 21:22:22 UTC (rev 226136)
+++ trunk/Tools/ChangeLog	2017-12-19 21:28:33 UTC (rev 226137)
@@ -1,3 +1,16 @@
+2017-12-19  Daniel Bates  <[email protected]>
+
+        Add support for computing the frontmost longest effective marker subrange
+        https://bugs.webkit.org/show_bug.cgi?id=180985
+
+        Reviewed by Dave Hyatt.
+
+        Adds a test case to ensure that we compute the minimum list of maximal length non-
+        overlapping subranges when using strategy OverlapStrategy::FrontmostWithLongestEffectiveRange.
+
+        * TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp:
+        (TestWebKitAPI::TEST):
+
 2017-12-18  Wenson Hsieh  <[email protected]>
 
         [Attachment Support] The 'webkitattachmentbloburl' attribute should not persist after markup serialization

Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp (226136 => 226137)


--- trunk/Tools/TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp	2017-12-19 21:22:22 UTC (rev 226136)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/MarkerSubrange.cpp	2017-12-19 21:28:33 UTC (rev 226137)
@@ -36,23 +36,25 @@
 std::ostream& operator<<(std::ostream& os, MarkerSubrange::Type type)
 {
     switch (type) {
-    case MarkerSubrange::Unmarked:
-        return os << "Unmarked";
-    case MarkerSubrange::GrammarError:
-        return os << "GrammarError";
     case MarkerSubrange::Correction:
         return os << "Correction";
-    case MarkerSubrange::SpellingError:
-        return os << "SpellingError";
-    case MarkerSubrange::TextMatch:
-        return os << "TextMatch";
     case MarkerSubrange::DictationAlternatives:
         return os << "DictationAlternatives";
 #if PLATFORM(IOS)
-        // FIXME: See <rdar://problem/8933352>. Also, remove the PLATFORM(IOS)-guard.
+    // FIXME: See <rdar://problem/8933352>. Also, remove the PLATFORM(IOS)-guard.
     case MarkerSubrange::DictationPhraseWithAlternatives:
         return os << "DictationPhraseWithAlternatives";
 #endif
+    case MarkerSubrange::GrammarError:
+        return os << "GrammarError";
+    case MarkerSubrange::Selection:
+        return os << "Selection";
+    case MarkerSubrange::SpellingError:
+        return os << "SpellingError";
+    case MarkerSubrange::TextMatch:
+        return os << "TextMatch";
+    case MarkerSubrange::Unmarked:
+        return os << "Unmarked";
     }
 }
 
@@ -175,4 +177,40 @@
         EXPECT_EQ(expectedSubranges[i], results[i]);
 }
 
+TEST(MarkerSubrange, SubdivideGrammarAndSelectionOverlapFrontmost)
+{
+    Vector<MarkerSubrange> subranges {
+        MarkerSubrange { 0, 40, MarkerSubrange::GrammarError },
+        MarkerSubrange { 2, 60, MarkerSubrange::Selection },
+        MarkerSubrange { 50, 60, MarkerSubrange::GrammarError },
+    };
+    Vector<MarkerSubrange> expectedSubranges {
+        MarkerSubrange { 0, 2, MarkerSubrange::GrammarError },
+        MarkerSubrange { 2, 40, MarkerSubrange::Selection },
+        MarkerSubrange { 40, 50, MarkerSubrange::Selection },
+        MarkerSubrange { 50, 60, MarkerSubrange::Selection },
+    };
+    auto results = subdivide(subranges, OverlapStrategy::Frontmost);
+    ASSERT_EQ(expectedSubranges.size(), results.size());
+    for (size_t i = 0; i < expectedSubranges.size(); ++i)
+        EXPECT_EQ(expectedSubranges[i], results[i]);
 }
+
+TEST(MarkerSubrange, SubdivideGrammarAndSelectionOverlapFrontmostWithLongestEffectiveRange)
+{
+    Vector<MarkerSubrange> subranges {
+        MarkerSubrange { 0, 40, MarkerSubrange::GrammarError },
+        MarkerSubrange { 2, 60, MarkerSubrange::Selection },
+        MarkerSubrange { 50, 60, MarkerSubrange::GrammarError },
+    };
+    Vector<MarkerSubrange> expectedSubranges {
+        MarkerSubrange { 0, 2, MarkerSubrange::GrammarError },
+        MarkerSubrange { 2, 60, MarkerSubrange::Selection },
+    };
+    auto results = subdivide(subranges, OverlapStrategy::FrontmostWithLongestEffectiveRange);
+    ASSERT_EQ(expectedSubranges.size(), results.size());
+    for (size_t i = 0; i < expectedSubranges.size(); ++i)
+        EXPECT_EQ(expectedSubranges[i], results[i]);
+}
+
+}

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to