Audit the use of updateStyleAndLayoutIgnorePendingStylesheets in plainText

third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

Index: third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
index f9a54e515331fbbfcf5f83fb2b2fa379f6ef930c..4c84660ec10b88c91e58108624bcf6a42c9fcd37 100644
--- a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
+++ b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
@@ -1178,10 +1178,7 @@ static String createPlainText(const EphemeralRangeTemplate<Strategy>& range, Tex
     if (range.isNull())
         return emptyString();
 
-
-    // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.
-    // see http://crbug.com/590369 for more details.
-    range.startPosition().document()->updateStyleAndLayoutIgnorePendingStylesheets();
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(range.startPosition().document()->lifecycle());
 
     TextIteratorAlgorithm<Strategy> it(range.startPosition(), range.endPosition(), behavior);
 
@@ -1210,12 +1207,6 @@ String plainText(const EphemeralRange& range, TextIteratorBehaviorFlags behavior
 
 String plainText(const EphemeralRangeInFlatTree& range, TextIteratorBehaviorFlags behavior)
 {
-    // TODO(xiaochengh): Move this check and the DisallowTransitionScope to
-    // |createPlainText| after we have ensured that both versions of |plainText|
-    // are called with clean layout.
-    if (range.isNull())
-        return emptyString();
-    DocumentLifecycle::DisallowTransitionScope disallowTransition(range.startPosition().document()->lifecycle());
     return createPlainText<EditingInFlatTreeStrategy>(range, behavior);
 }