Revert "Remove extraneous frameView->setNeedsLayout() in LayoutPart"

third_party/WebKit/Source/core/editing/FrameSelectionTest.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 "core/editing/FrameSelection.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Text.h"
@@ skipping 76 matching lines @@
     EXPECT_FALSE(selection().isCaretBoundsDirty());
 
     document().body()->removeChild(text);
     document().updateStyleAndLayoutIgnorePendingStylesheets();
     selection().setCaretRectNeedsUpdate();
     EXPECT_TRUE(selection().isCaretBoundsDirty());
     selection().invalidateCaretRect();
     EXPECT_FALSE(selection().isCaretBoundsDirty());
 }
 
+TEST_F(FrameSelectionTest, PaintCaretShouldNotLayout)
+{
+    Text* text = appendTextNode("Hello, World!");
+    document().view()->updateAllLifecyclePhases();
+
+    document().body()->setContentEditable("true", ASSERT_NO_EXCEPTION);
+    document().body()->focus();
+    EXPECT_TRUE(document().body()->focused());
+
+    VisibleSelection validSelection(Position(text, 0), Position(text, 0));
+    selection().setCaretVisible(true);
+    setSelection(validSelection);
+    EXPECT_TRUE(selection().isCaret());
+    EXPECT_TRUE(shouldPaintCaretForTesting());
+
+    int startCount = layoutCount();
+    {
+        // To force layout in next updateLayout calling, widen view.
+        FrameView& frameView = dummyPageHolder().frameView();
+        IntRect frameRect = frameView.frameRect();
+        frameRect.setWidth(frameRect.width() + 1);
+        frameRect.setHeight(frameRect.height() + 1);
+        dummyPageHolder().frameView().setFrameRect(frameRect);
+    }
+    std::unique_ptr<PaintController> paintController = PaintController::create();
+    {
+        GraphicsContext context(*paintController);
+        DrawingRecorder drawingRecorder(context, *dummyPageHolder().frameView().layoutView(), DisplayItem::Caret, LayoutRect::infiniteIntRect());
+        selection().paintCaret(context, LayoutPoint());
+    }
+    paintController->commitNewDisplayItems();
+    EXPECT_EQ(startCount, layoutCount());
+}
+
 TEST_F(FrameSelectionTest, InvalidatePreviousCaretAfterRemovingLastCharacter)
 {
     Text* text = appendTextNode("Hello, World!");
     document().view()->updateAllLifecyclePhases();
 
     document().body()->setContentEditable("true", ASSERT_NO_EXCEPTION);
     document().body()->focus();
     EXPECT_TRUE(document().body()->focused());
 
     selection().setCaretVisible(true);
@@ skipping 171 matching lines @@
     selection().updateIfNeeded();
 
     // TODO(yosin): Once lazy canonicalization implemented, selection.start
     // should be Position(HTML, 0).
     EXPECT_EQ(Position(), selection().start())
         << "updateIfNeeded() makes selection to null.";
     EXPECT_EQ(selection().start(), caretPosition().position());
 }
 
 } // namespace blink