Changeset 57110 in webkit

Timestamp:

Apr 5, 2010 6:45:31 PM (14 years ago)

Author:

mrowe@apple.com

Message:

Roll out r56989 as it introduced crashes in Mail.
<​http://webkit.org/b/37115> / <rdar://problem/7829331>

Reviewed by Adele Peterson.

• dom/Position.cpp:

(WebCore::Position::isCandidate):

• dom/PositionIterator.cpp:

(WebCore::PositionIterator::isCandidate):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Position.cpp (modified) (1 diff)
• dom/PositionIterator.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-05  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Adele Peterson.
+
+        Roll out r56989 as it introduced crashes in Mail.
+        <http://webkit.org/b/37115> / <rdar://problem/7829331>
+
+        * dom/Position.cpp:
+        (WebCore::Position::isCandidate):
+        * dom/PositionIterator.cpp:
+        (WebCore::PositionIterator::isCandidate):
+
 2010-04-05  Darin Adler  <darin@apple.com>
 

trunk/WebCore/dom/Position.cpp

@@ -726 +726 @@
 bool Position::isCandidate() const
 {
-    return PositionIterator(*this).isCandidate();
+    if (isNull())
+        return false;
+        
+    RenderObject *renderer = node()->renderer();
+    if (!renderer)
+        return false;
+    
+    if (renderer->style()->visibility() != VISIBLE)
+        return false;
+
+    if (renderer->isBR())
+        return m_offset == 0 && !nodeIsUserSelectNone(node()->parent());
+
+    if (renderer->isText())
+        return inRenderedText() && !nodeIsUserSelectNone(node());
+
+    if (isTableElement(node()) || editingIgnoresContent(node()))
+        return (atFirstEditingPositionForNode() || atLastEditingPositionForNode()) && !nodeIsUserSelectNone(node()->parent());
+
+    if (m_anchorNode->hasTagName(htmlTag))
+        return false;
+        
+    if (renderer->isBlockFlow()) {
+        if (toRenderBlock(renderer)->height() || m_anchorNode->hasTagName(bodyTag)) {
+            if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer))
+                return atFirstEditingPositionForNode() && !Position::nodeIsUserSelectNone(node());
+            return m_anchorNode->isContentEditable() && !Position::nodeIsUserSelectNone(node()) && atEditingBoundary();
+        }
+    } else
+        return m_anchorNode->isContentEditable() && !Position::nodeIsUserSelectNone(node()) && atEditingBoundary();
+
+    return false;
 }
 

trunk/WebCore/dom/PositionIterator.cpp

@@ -163 +163 @@
             return m_anchorNode->isContentEditable() && !Position::nodeIsUserSelectNone(m_anchorNode) && Position(*this).atEditingBoundary();
         }
-    } else 
-        return m_anchorNode->isContentEditable() && !Position::nodeIsUserSelectNone(m_anchorNode) && Position(*this).atEditingBoundary();
+    }
 
     return false;