third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay.py - Issue 2087013003: Remove minimum repaint feature in layout test results

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay.py

Issue 2087013003: Remove minimum repaint feature in layout test results (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: - 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/LayoutTests/fast/repaint/resources/text-based-repaint.js ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay.py

index d6fd1c294219938f41d28e53851f3ef4ff5b5a7a..b7683c47ab85002958ef0df48392eb36d4a2c983 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay.py

@@ -6,9 +6,7 @@ import re

def result_contains_repaint_rects(text):

- return isinstance(text, str) and (

- re.search('"paintInvalidations": \[$', text, re.MULTILINE) is not None or

- text.find('Minimum repaint:') != -1)

+ return isinstance(text, str) and re.search(r'"paintInvalidations": \[$', text, re.MULTILINE) is not None

def extract_layer_tree(input_str):

@@ -37,11 +35,6 @@ def generate_repaint_overlay_html(test_name, actual_text, expected_text):

expected_layer_tree = extract_layer_tree(expected_text)

actual_layer_tree = extract_layer_tree(actual_text)

- minimum_repaint = '[]'

- minimum_repaint_match = re.search('Minimum repaint:\n(\[.*\n\])', actual_text, re.DOTALL)

- if minimum_repaint_match:

- minimum_repaint = minimum_repaint_match.group(1)

return """<!DOCTYPE HTML>

<html>

<head>

@@ -64,17 +57,13 @@ def generate_repaint_overlay_html(test_name, actual_text, expected_text):

left: 0;

z-index: 1;

}

- #actual, #minimum-repaint {

+ #actual {

display: none;

}

</style>

</head>

<body>

-<a href="http://crbug.com/381221">Known issues</a><br>

-<label title="See fast/repaint/resources/text-based-repaint.js for how this works">

- <input id="show-minimum-repaint" type="checkbox" onchange="toggle_minimum_repaint(this.checked)">Minimum repaint

-</label>

<label><input id="use-solid-colors" type="checkbox" onchange="toggle_solid_color(this.checked)">Use solid colors</label>

<br>

@@ -83,7 +72,6 @@ def generate_repaint_overlay_html(test_name, actual_text, expected_text):

<br>

<span id='type'>Expected Invalidations</span>

- <canvas id='minimum-repaint' width='2000' height='2000'></canvas>

</div>

@@ -94,28 +82,20 @@ function toggle_test(show_test) {

iframe.style.display = show_test ? 'block' : 'none';

}

-function toggle_minimum_repaint(show_minimum_repaint) {

- document.getElementById('minimum-repaint').style.display = show_minimum_repaint ? 'block' : 'none';

function toggle_solid_color(use_solid_color) {

overlay_opacity = use_solid_color ? 1 : 0.25;

draw_repaint_rects();

- draw_minimum_repaint();

}

function highlight_under_repaint() {

document.getElementById('show-test').checked = false;

toggle_test(false);

- document.getElementById('show-minimum-repaint').checked = true;

- toggle_minimum_repaint(true);

document.getElementById('use-solid-colors').checked = true;

toggle_solid_color(true);

}

var expected = %(expected)s;

var actual = %(actual)s;

-var minimum_repaint = %(minimum_repaint)s;

function rectsEqual(rect1, rect2) {

return rect1[0] == rect2[0] && rect1[1] == rect2[1] && rect1[2] == rect2[2] && rect1[3] == rect2[3];

@@ -156,7 +136,6 @@ function draw_layer_rects(context, result) {

var expected_canvas = document.getElementById('expected');

var actual_canvas = document.getElementById('actual');

-var minimum_repaint_canvas = document.getElementById('minimum-repaint');

function draw_repaint_rects() {

var expected_ctx = expected_canvas.getContext("2d");

@@ -170,14 +149,7 @@ function draw_repaint_rects() {

draw_layer_rects(actual_ctx, actual);

}

-function draw_minimum_repaint() {

- var context = minimum_repaint_canvas.getContext("2d");

- context.fillStyle = 'rgba(0, 0, 0, 1)';

- draw_rects(context, minimum_repaint);

draw_repaint_rects();

-draw_minimum_repaint();

var path = decodeURIComponent(location.search).substr(1);

var iframe = document.createElement('iframe');

@@ -211,5 +183,4 @@ setInterval(flip, 3000);

'title': test_name,

'expected': expected_layer_tree,

'actual': actual_layer_tree,

- 'minimum_repaint': minimum_repaint,

}