Reviewed by Kevin.

	<rdar://problem/3759209> REGRESSION (Mail): assertion failure when all of marked text deleted at start of document

        * kwq/KWQKHTMLPart.mm:
        (KWQKHTMLPart::setMarkedRange): Allow any empty range, even if
	it's not in a text node, since in this case it won't matter and
	weird things can happen when all marked text is removed, there
	might not be any text nodes.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 32475852c4611faa46d5cfb126f179e90e901b24..7ef016241d735764fb8328f16b7d6f264958345b 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-09-07  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Kevin.
+
+       <rdar://problem/3759209> REGRESSION (Mail): assertion failure when all of marked text deleted at start of document
+       
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::setMarkedRange): Allow any empty range, even if
+       it's not in a text node, since in this case it won't matter and
+       weird things can happen when all marked text is removed, there
+       might not be any text nodes.
+
 2004-09-07  David Hyatt  <hyatt@apple.com>
 
        Initial text-decoration CSS3 work for editing.  Just gets the properties and values parsed.

diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index e918316d2519b8860d6284ac5a32173190835671..804a836f93bedc1939227685d64c21a4d754fa77 100644 (file)
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -3903,7 +3903,7 @@ DOM::Range KWQKHTMLPart::markedRange() const
 void KWQKHTMLPart::setMarkedRange(const DOM::Range &range)
 {
     ASSERT(!range.handle() || range.startContainer() == range.endContainer());
-    ASSERT(!range.handle() || range.startContainer().nodeType() == Node::TEXT_NODE);
+    ASSERT(!range.handle() || range.startOffset() == range.endOffset() || range.startContainer().nodeType() == Node::TEXT_NODE);
 
     if (m_markedRange.handle() && xmlDocImpl() 
        && m_markedRange.startContainer().handle()->renderer()) {