Merge repaintRects and paintInvalidationObjects in text-based-repaint test results

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

 # 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.
 
 import re
 
 
 def result_contains_repaint_rects(text):
     return isinstance(text, str) and (
         re.search('"repaintRects": \[$', text, re.MULTILINE) != None or
@@ skipping 121 matching lines @@
     context.save();
     if (result.position)
         context.translate(result.position[0], result.position[1]);
     var t = result.transform;
     if (t) {
         var origin = result.transformOrigin || [result.bounds[0] / 2, result.bounds[1] / 2];
         context.translate(origin[0], origin[1]);
         context.transform(t[0][0], t[0][1], t[1][0], t[1][1], t[3][0], t[3][1]);
         context.translate(-origin[0], -origin[1]);
     }
-    if (result.repaintRects)
+    if (result.repaintRects) {
         draw_rects(context, result.repaintRects);
+    } else if (result.paintInvalidations) {
+        var rects = [];
+        for (var i = 0; i < result.paintInvalidations.length; ++i)
+            rects.push(result.paintInvalidations[i].rect);
+        draw_rects(context, rects);
+    }
     if (result.children) {
         for (var i = 0; i < result.children.length; ++i)
             draw_layer_rects(context, result.children[i]);
     }
     context.restore();
 }
 
 var expected_canvas = document.getElementById('expected');
 var actual_canvas = document.getElementById('actual');
 var minimum_repaint_canvas = document.getElementById('minimum-repaint');
@@ skipping 46 matching lines @@
 setInterval(flip, 3000);
 </script>
 </body>
 </html>
 """ % {
         'title': test_name,
         'expected': expected_layer_tree,
         'actual': actual_layer_tree,
         'minimum_repaint': minimum_repaint,
     }