Changeset 25311 in webkit

Timestamp:

Aug 29, 2007, 5:32:10 PM (18 years ago)

Author:

darin

Message:

Reviewed by Adele.

• editing/htmlediting.cpp: (WebCore::avoidIntersectionWithNode): Fix an assert that was firing for me all the time when doing editing operations.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/htmlediting.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-29  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adele.
+
+        * editing/htmlediting.cpp: (WebCore::avoidIntersectionWithNode):
+        Fix an assert that was firing for me all the time when doing editing operations.
+
 2007-08-29  Anders Carlsson <andersca@apple.com>
 

trunk/WebCore/editing/htmlediting.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -889 +889 @@
     ASSERT(startContainer);
     ASSERT(endContainer);
-    ASSERT(node->parent());
+    ASSERT(!node || node->parentNode());
 
     if (startContainer == node || startContainer->isDescendantOf(node)) {
-        startContainer = node->parent();
+        startContainer = node->parentNode();
         startOffset = node->nodeIndex();
     }
     if (endContainer == node || endContainer->isDescendantOf(node)) {
-        endContainer = node->parent();
+        endContainer = node->parentNode();
         endOffset = node->nodeIndex();
     }
@@ -913 +913 @@
     ASSERT(base);
     ASSERT(extent);
-    ASSERT(node->parent());
+    ASSERT(!node || node->parentNode());
     
     if (base == node || base->isDescendantOf(node))
-        updatedSelection.setBase(Position(node->parent(), node->nodeIndex()));
+        updatedSelection.setBase(Position(node->parentNode(), node->nodeIndex()));
     
     if (extent == node || extent->isDescendantOf(node))
-        updatedSelection.setExtent(Position(node->parent(), node->nodeIndex()));
+        updatedSelection.setExtent(Position(node->parentNode(), node->nodeIndex()));
         
     return updatedSelection;