Make compositing mode sticky when RenderView is reused in LayoutTests.

content/shell/renderer/webkit_test_runner.cc

 // Copyright (c) 2012 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.
 
 #include "content/shell/renderer/webkit_test_runner.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
@@ skipping 630 matching lines @@
   if (interfaces->testRunner()->shouldDumpAsAudio()) {
     std::vector<unsigned char> vector_data;
     interfaces->testRunner()->getAudioData(&vector_data);
     Send(new ShellViewHostMsg_AudioDump(routing_id(), vector_data));
   } else {
     Send(new ShellViewHostMsg_TextDump(routing_id(),
                                        proxy()->captureTree(false)));
 
     if (test_config_.enable_pixel_dumping &&
         interfaces->testRunner()->shouldGeneratePixelResults()) {
-      proxy()->CapturePixelsAsync(base::Bind(
-          &WebKitTestRunner::CaptureDumpPixels, base::Unretained(this)));
+      // TODO(danakj): Remove when kForceCompositingMode is everywhere.
+      if (!render_view()->GetWebView()->isAcceleratedCompositingActive()) {
+        SkBitmap snapshot;
+        CopyCanvasToBitmap(proxy()->capturePixels(), &snapshot);
+        CaptureDumpPixels(snapshot);
+      } else {
+        proxy()->CapturePixelsAsync(base::Bind(
+            &WebKitTestRunner::CaptureDumpPixels, base::Unretained(this)));
+      }
       return;
     }
   }
 
   CaptureDumpComplete();
 }
 
-void WebKitTestRunner::CaptureDumpPixels(const SkBitmap& compositor_snapshot) {
-  SkBitmap snapshot = compositor_snapshot;
-
-  CommandLine* cmd = CommandLine::ForCurrentProcess();
-  if (!cmd->HasSwitch(switches::kForceCompositingMode) &&
-      !cmd->HasSwitch(switches::kEnableThreadedCompositing)) {
-    // If the readback fails because we're not in compositing mode, do a
-    // synchronous software readback here. This can go away when we have FCM
-    // always.
-    if (!snapshot.info().fWidth || !snapshot.info().fHeight)
-      CopyCanvasToBitmap(proxy()->capturePixels(), &snapshot);
-  }
-
+void WebKitTestRunner::CaptureDumpPixels(const SkBitmap& snapshot) {
   DCHECK_NE(0, snapshot.info().fWidth);
   DCHECK_NE(0, snapshot.info().fHeight);
 
   SkAutoLockPixels snapshot_lock(snapshot);
   base::MD5Digest digest;
   base::MD5Sum(snapshot.getPixels(), snapshot.getSize(), &digest);
   std::string actual_pixel_hash = base::MD5DigestToBase16(digest);
 
   if (actual_pixel_hash == test_config_.expected_pixel_hash) {
     SkBitmap empty_image;
@@ skipping 67 matching lines @@
 
   leak_detector_->TryLeakDetection(main_frame);
 }
 
 void WebKitTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content