Changeset 126164 in webkit

Timestamp:

Aug 21, 2012, 9:43:56 AM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/12104508> TextIterator takes O(n^{2) to iterate over n empty blocks
​https://bugs.webkit.org/show_bug.cgi?id=94429}

Reviewed by Sam Weinig.

No new tests, because behavior is unchanged.

• editing/TextIterator.cpp:

(WebCore::TextIterator::shouldRepresentNodeOffsetZero): Enhanced the check for nodes that
cannot contain VisiblePosition to also check for zero-height blocks.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/TextIterator.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-21  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/12104508> TextIterator takes O(n^2) to iterate over n empty blocks
+        https://bugs.webkit.org/show_bug.cgi?id=94429
+
+        Reviewed by Sam Weinig.
+
+        No new tests, because behavior is unchanged.
+
+        * editing/TextIterator.cpp:
+        (WebCore::TextIterator::shouldRepresentNodeOffsetZero): Enhanced the check for nodes that
+        cannot contain VisiblePosition to also check for zero-height blocks.
+
 2012-08-21  'Pavel Feldman'  <pfeldman@chromium.org>
 

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov.
  *
@@ -894 +894 @@
     // Additionally, if the range we are iterating over contains huge sections of unrendered content, 
     // we would create VisiblePositions on every call to this function without this check.
-    if (!m_node->renderer() || m_node->renderer()->style()->visibility() != VISIBLE)
+    if (!m_node->renderer() || m_node->renderer()->style()->visibility() != VISIBLE
+        || (m_node->renderer()->isBlockFlow() && !toRenderBlock(m_node->renderer())->height() && !m_node->hasTagName(bodyTag)))
         return false;
-    
+
     // The startPos.isNotNull() check is needed because the start could be before the body,
     // and in that case we'll get null. We don't want to put in newlines at the start in that case.