third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp - Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

Unified Diff: third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp ('k') | third_party/WebKit/Source/core/editing/serializers/Serialization.cpp » ('j') | third_party/WebKit/Source/core/testing/Internals.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp

diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp

index 6e88c2999708471ec74516b61fcd70e5b0ca9280..423aa7648f8e781cf773b08d675c7a339fbe8aee 100644

--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp

+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp

@@ -72,7 +72,7 @@ void DocumentMarkerControllerTest::markNodeContents(Node* node)

{

// Force layoutObjects to be created; TextIterator, which is used in

// DocumentMarkerControllerTest::addMarker(), needs them.

- document().updateLayout();

+ document().updateStyleAndLayout();

auto range = EphemeralRange::rangeOfContents(*node);

markerController().addMarker(range.startPosition(), range.endPosition(), DocumentMarker::Spelling);

}

@@ -81,7 +81,7 @@ void DocumentMarkerControllerTest::markNodeContentsWithComposition(Node* node)

{

// Force layoutObjects to be created; TextIterator, which is used in

// DocumentMarkerControllerTest::addMarker(), needs them.

- document().updateLayout();

+ document().updateStyleAndLayout();

auto range = EphemeralRange::rangeOfContents(*node);

markerController().addCompositionMarker(range.startPosition(), range.endPosition(), Color::black, false, Color::black);

}

@@ -215,7 +215,7 @@ TEST_F(DocumentMarkerControllerTest, UpdateRenderedRects)

EXPECT_NE(invalidRect, renderedRects[0]);

div->setAttribute(HTMLNames::styleAttr, "margin: 200px");

- document().updateLayout();

+ document().updateStyleAndLayout();

Vector<IntRect> newRenderedRects = markerController().renderedRectsForMarkers(DocumentMarker::Spelling);

EXPECT_EQ(1u, newRenderedRects.size());

EXPECT_NE(renderedRects[0], newRenderedRects[0]);

@@ -233,7 +233,7 @@ TEST_F(DocumentMarkerControllerTest, UpdateRenderedRectsForComposition)

EXPECT_NE(invalidRect, renderedRects[0]);

div->setAttribute(HTMLNames::styleAttr, "margin: 200px");

- document().updateLayout();

+ document().updateStyleAndLayout();

Vector<IntRect> newRenderedRects = markerController().renderedRectsForMarkers(DocumentMarker::Composition);

EXPECT_EQ(1u, newRenderedRects.size());

EXPECT_NE(renderedRects[0], newRenderedRects[0]);

@@ -245,7 +245,7 @@ TEST_F(DocumentMarkerControllerTest, CompositionMarkersNotMerged)

setBodyInnerHTML("<div style='margin: 100px'>foo</div>");

Node* text = document().body()->firstChild()->firstChild();

- document().updateLayout();

+ document().updateStyleAndLayout();

markerController().addCompositionMarker(Position(text, 0), Position(text, 1), Color::black, false, Color::black);

markerController().addCompositionMarker(Position(text, 1), Position(text, 3), Color::black, true, Color::black);