Changeset 196249 in webkit

Timestamp:

Feb 8, 2016 5:41:47 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Indent inline box test fails due to assertion in VisibleSelection::selectionFromContentsOfNode()
​https://bugs.webkit.org/show_bug.cgi?id=153824

Patch by Adrien Plazas <​aplazas@igalia.com> on 2016-02-08
Reviewed by Michael Catanzaro.

• editing/markup.cpp:

(WebCore::highestAncestorToWrapMarkup):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/markup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-08  Adrien Plazas  <aplazas@igalia.com>
+
+        Indent inline box test fails due to assertion in VisibleSelection::selectionFromContentsOfNode()
+        https://bugs.webkit.org/show_bug.cgi?id=153824
+
+        Reviewed by Michael Catanzaro.
+
+        * editing/markup.cpp:
+        (WebCore::highestAncestorToWrapMarkup):
+
 2016-02-07  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/editing/markup.cpp

@@ -539 +539 @@
 
         if (Node* parentListNode = enclosingNodeOfType(firstPositionInOrBeforeNode(range->firstNode()), isListItem)) {
-            if (WebCore::areRangesEqual(VisibleSelection::selectionFromContentsOfNode(parentListNode).toNormalizedRange().get(), range)) {
+            if (!editingIgnoresContent(parentListNode) && WebCore::areRangesEqual(VisibleSelection::selectionFromContentsOfNode(parentListNode).toNormalizedRange().get(), range)) {
                 specialCommonAncestor = parentListNode->parentNode();
                 while (specialCommonAncestor && !isListElement(specialCommonAncestor))