Audit the use of UpdateStyleAndLayoutIgnorePendingStylesheets in FrameSelection::revealSelection

third_party/WebKit/Source/core/editing/Editor.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 119 matching lines @@
 Editor::RevealSelectionScope::RevealSelectionScope(Editor* editor)
     : m_editor(editor)
 {
     ++m_editor->m_preventRevealSelection;
 }
 
 Editor::RevealSelectionScope::~RevealSelectionScope()
 {
     DCHECK(m_editor->m_preventRevealSelection);
     --m_editor->m_preventRevealSelection;
-    if (!m_editor->m_preventRevealSelection)
+    if (!m_editor->m_preventRevealSelection) {
+        // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+        // needs to be audited.  See http://crbug.com/590369 for more details.
+        m_editor->frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
         m_editor->frame().selection().revealSelection(ScrollAlignment::alignToEdgeIfNeeded, RevealExtent);
+    }
 }
 
 // When an event handler has moved the selection outside of a text control
 // we should use the target control's selection for this editing operation.
 VisibleSelection Editor::selectionForCommand(Event* event)
 {
     frame().selection().updateIfNeeded();
     VisibleSelection selection = frame().selection().selection();
     if (!event)
         return selection;
@@ skipping 668 matching lines @@
 
     spellChecker().updateMarkersForWordsAffectedByEditing(isSpaceOrNewline(text[0]));
 
     // Insert the text
     TypingCommand::insertText(*selection.start().document(), text, selection,
         selectInsertedText ? TypingCommand::SelectInsertedText : 0,
         triggeringEvent && triggeringEvent->isComposition() ? TypingCommand::TextCompositionConfirm : TypingCommand::TextCompositionNone);
 
     // Reveal the current selection
     if (LocalFrame* editedFrame = selection.start().document()->frame()) {
-        if (Page* page = editedFrame->page())
-            toLocalFrame(page->focusController().focusedOrMainFrame())->selection().revealSelection(ScrollAlignment::alignCenterIfNeeded);
+        if (Page* page = editedFrame->page()) {
+            LocalFrame* focusedOrMainFrame = toLocalFrame(page->focusController().focusedOrMainFrame());
+
+            // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+            // needs to be audited.  See http://crbug.com/590369 for more details.
+            focusedOrMainFrame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+            focusedOrMainFrame->selection().revealSelection(ScrollAlignment::alignCenterIfNeeded);
+        }
     }
 
     return true;
 }
 
 bool Editor::insertLineBreak()
 {
     if (!canEdit())
         return false;
 
@@ skipping 233 matching lines @@
     MutableStylePropertySet* style = MutableStylePropertySet::create(HTMLQuirksMode);
     style->setProperty(CSSPropertyDirection, direction == LeftToRightWritingDirection ? "ltr" : direction == RightToLeftWritingDirection ? "rtl" : "inherit", false);
     applyParagraphStyleToSelection(style, InputEvent::InputType::SetWritingDirection);
 }
 
 void Editor::revealSelectionAfterEditingOperation(const ScrollAlignment& alignment, RevealExtentOption revealExtentOption)
 {
     if (m_preventRevealSelection)
         return;
 
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
     frame().selection().revealSelection(alignment, revealExtentOption);
 }
 
 void Editor::transpose()
 {
     if (!canEdit())
         return;
 
     VisibleSelection selection = frame().selection().selection();
     if (!selection.isCaret())
@@ skipping 318 matching lines @@
 
 DEFINE_TRACE(Editor)
 {
     visitor->trace(m_frame);
     visitor->trace(m_lastEditCommand);
     visitor->trace(m_undoStack);
     visitor->trace(m_mark);
 }
 
 } // namespace blink