FrameSelection::updateApperance for caret should not cause layout.

Source/core/html/HTMLTextFormControlElementTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/html/HTMLTextFormControlElement.h"
 
 #include "core/dom/Position.h"
 #include "core/dom/Text.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/SpellChecker.h"
 #include "core/editing/VisibleSelection.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLBRElement.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/loader/EmptyClients.h"
 #include "core/page/SpellCheckerClient.h"
 #include "core/rendering/RenderTreeAsText.h"
 #include "core/testing/DummyPageHolder.h"
+#include "core/testing/UnitTestHelpers.h"
 #include "wtf/OwnPtr.h"
 #include <gtest/gtest.h>
 
 using namespace blink;
 
 namespace {
 
 class HTMLTextFormControlElementTest : public ::testing::Test {
 protected:
     virtual void SetUp() OVERRIDE;
@@ skipping 67 matching lines @@
 
     textControl().setInnerEditorValue("Hello, text form.");
     EXPECT_EQ(0, textControl().selectionStart());
     EXPECT_EQ(0, textControl().selectionEnd());
 
     textControl().setSelectionRange(1, 3);
     EXPECT_EQ(1, textControl().selectionStart());
     EXPECT_EQ(3, textControl().selectionEnd());
 }
 
-TEST_F(HTMLTextFormControlElementTest, FrameSelectionLocalCaretRectDoesNotCauseLayout)
-{
-    input().focus();
-    input().setValue("Hello, input form.");
-    FrameSelection& frameSelection = document().frame()->selection();
-    frameSelection.setCaretRectNeedsUpdate();
-
-    forceLayoutFlag();
-    int startLayoutCount = layoutCount();
-    frameSelection.localCaretRect();
-    EXPECT_EQ(startLayoutCount, layoutCount());
-}
-
-TEST_F(HTMLTextFormControlElementTest, SetSameSelectionRangeDoesNotCauseLayout)
+TEST_F(HTMLTextFormControlElementTest, SetSelectionRangeDoesNotCauseLayout)
 {
     input().focus();
     input().setValue("Hello, input form.");
     input().setSelectionRange(1, 1);
     FrameSelection& frameSelection = document().frame()->selection();
+    forceLayoutFlag();
+    frameSelection.updateLocalCaretRect();
     LayoutRect oldCaretRect = frameSelection.localCaretRectWithoutUpdateForTesting();
     EXPECT_FALSE(oldCaretRect.isEmpty());
-
-    forceLayoutFlag();
     int startLayoutCount = layoutCount();
     input().setSelectionRange(1, 1);
     EXPECT_EQ(startLayoutCount, layoutCount());
-
+    frameSelection.updateLocalCaretRect();
     LayoutRect newCaretRect = frameSelection.localCaretRectWithoutUpdateForTesting();
     EXPECT_EQ(oldCaretRect, newCaretRect);
+
+    forceLayoutFlag();
+    frameSelection.updateLocalCaretRect();
+    oldCaretRect = frameSelection.localCaretRectWithoutUpdateForTesting();
+    EXPECT_FALSE(oldCaretRect.isEmpty());
+    startLayoutCount = layoutCount();
+    input().setSelectionRange(2, 2);
+    EXPECT_EQ(startLayoutCount, layoutCount());
+    frameSelection.updateLocalCaretRect();
+    newCaretRect = frameSelection.localCaretRectWithoutUpdateForTesting();
+    EXPECT_NE(oldCaretRect, newCaretRect);
 }
 
 typedef Position (*PositionFunction)(const Position&);
 typedef VisiblePosition(*VisblePositionFunction)(const VisiblePosition&);
 
 void testFunctionEquivalence(const Position& position, PositionFunction positionFunction, VisblePositionFunction visibleFunction)
 {
     VisiblePosition visiblePosition(position);
     VisiblePosition expected = visibleFunction(visiblePosition);
     VisiblePosition actual = VisiblePosition(positionFunction(position));
     EXPECT_EQ(expected, actual);
 }
 
 static VisiblePosition startOfWord(const VisiblePosition& position)
 {
     return startOfWord(position, LeftWordIfOnBoundary);
 }
 
 static VisiblePosition endOfWord(const VisiblePosition& position)
 {
     return endOfWord(position, RightWordIfOnBoundary);
 }
 
 void testBoundary(HTMLDocument& document, HTMLTextFormControlElement& textControl)
 {
     for (unsigned i = 0; i < textControl.innerEditorValue().length(); i++) {
         textControl.setSelectionRange(i, i);
         Position position = document.frame()->selection().start();
-        SCOPED_TRACE(testing::Message() << "offset " << position.deprecatedEditingOffset() << " of " << nodePositionAsStringForTesting(position.deprecatedNode()).ascii().data());
+        SCOPED_TRACE(::testing::Message() << "offset " << position.deprecatedEditingOffset() << " of " << nodePositionAsStringForTesting(position.deprecatedNode()).ascii().data());
         {
             SCOPED_TRACE("HTMLTextFormControlElement::startOfWord");
             testFunctionEquivalence(position, HTMLTextFormControlElement::startOfWord, startOfWord);
         }
         {
             SCOPED_TRACE("HTMLTextFormControlElement::endOfWord");
             testFunctionEquivalence(position, HTMLTextFormControlElement::endOfWord, endOfWord);
         }
         {
             SCOPED_TRACE("HTMLTextFormControlElement::startOfSentence");
@@ skipping 46 matching lines @@
     ASSERT_EQ(3, input->selectionStart());
 
     OwnPtr<SpellChecker> spellChecker(SpellChecker::create(page().frame()));
     forceLayoutFlag();
     int startCount = layoutCount();
     spellChecker->respondToChangedSelection(oldSelection, FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle);
     EXPECT_EQ(startCount, layoutCount());
 }
 
 }