third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp - Issue 2034363002: Update document marker rects lazily in frame

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2034363002: Update document marker rects lazily in frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix test Created 4 years, 6 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/markers/RenderedDocumentMarker.h » ('j') | no next file with comments »
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 423aa7648f8e781cf773b08d675c7a339fbe8aee..62a53a017d7dac7b353068bb1d10d919f9a9660b 100644

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

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

@@ -205,14 +205,11 @@ TEST_F(DocumentMarkerControllerTest, NodeWillBeRemovedBySetInnerHTML)

TEST_F(DocumentMarkerControllerTest, UpdateRenderedRects)

{

- IntRect invalidRect(RenderedDocumentMarker::create(DocumentMarker(0, 0, false))->renderedRect());

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

Element* div = toElement(document().body()->firstChild());

markNodeContents(div);

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

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

- EXPECT_NE(invalidRect, renderedRects[0]);

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

document().updateStyleAndLayout();

@@ -223,14 +220,11 @@ TEST_F(DocumentMarkerControllerTest, UpdateRenderedRects)

TEST_F(DocumentMarkerControllerTest, UpdateRenderedRectsForComposition)

{

- IntRect invalidRect(RenderedDocumentMarker::create(DocumentMarker(0, 0, false))->renderedRect());

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

Element* div = toElement(document().body()->firstChild());

markNodeContentsWithComposition(div);

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

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

- EXPECT_NE(invalidRect, renderedRects[0]);

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

document().updateStyleAndLayout();

@@ -241,8 +235,6 @@ TEST_F(DocumentMarkerControllerTest, UpdateRenderedRectsForComposition)

TEST_F(DocumentMarkerControllerTest, CompositionMarkersNotMerged)

{

- IntRect invalidRect(RenderedDocumentMarker::create(DocumentMarker(0, 0, false))->renderedRect());

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

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

document().updateStyleAndLayout();