Revert FCM text-based-repaint change and rebaselines

LayoutTests/fast/repaint/resources/text-based-repaint.js

 // Asynchronous tests should manually call finishRepaintTest at the appropriate time.
 window.testIsAsync = false;
 window.outputRepaintRects = true;
 
 function runRepaintTest()
 {
     if (!window.testRunner || !window.internals) {
         setTimeout(repaintTest, 100);
         return;
     }
 
-    window.internals.settings.setForceCompositingMode(true);
-
     if (window.enablePixelTesting)
         testRunner.dumpAsTextWithPixelResults();
     else
         testRunner.dumpAsText();
 
     if (window.testIsAsync)
         testRunner.waitUntilDone();
 
     forceStyleRecalc();
 
@@ skipping 18 matching lines @@
         document.body.offsetTop;
     else if (document.documentElement)
         document.documentElement.offsetTop;
 }
 
 function finishRepaintTest()
 {
     // Force a style recalc.
     forceStyleRecalc();
 
-    var repaintRects = window.internals.layerTreeAsText(document, window.internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
+    var repaintRects = window.internals.repaintRectsAsText(document);
 
     internals.stopTrackingRepaints(document);
 
     if (window.outputRepaintRects) {
         if (document.body) {
             var root = document.body;
         } else if (document.documentElement) {
             var root = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
             document.documentElement.appendChild(root);
         }
         var pre = document.createElementNS('http://www.w3.org/1999/xhtml', 'pre');
         // Make this element appear in text dumps, but try to avoid affecting
         // output pixels (being visible, creating overflow, &c).
         pre.style.opacity = 0;
         pre.textContent += repaintRects;
         root.appendChild(pre);
     }
 
     if (window.afterTest)
         window.afterTest();
 
     if (window.testIsAsync)
         testRunner.notifyDone();
 }