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

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

Index: third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
index 1659362fa901a5366159e58a869e5b1d9e984f8b..f4575f00f292ad2f1701aa7cf5cbaaf0ed3222b0 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelectionTest.cpp
@@ -94,6 +94,40 @@ TEST_F(FrameSelectionTest, 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!");