Remove software paint path from WebTestProxy

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 80 matching lines @@
 namespace content {
 
 namespace {
 
 void InvokeTaskHelper(void* context) {
   WebTask* task = reinterpret_cast<WebTask*>(context);
   task->run();
   delete task;
 }
 
-#if !defined(OS_MACOSX)
-void MakeBitmapOpaque(SkBitmap* bitmap) {
-  SkAutoLockPixels lock(*bitmap);
-  DCHECK_EQ(bitmap->config(), SkBitmap::kARGB_8888_Config);
-  for (int y = 0; y < bitmap->height(); ++y) {
-    uint32_t* row = bitmap->getAddr32(0, y);
-    for (int x = 0; x < bitmap->width(); ++x)
-      row[x] |= 0xFF000000;  // Set alpha bits to 1.
-  }
-}
-#endif
-
-void CopyCanvasToBitmap(SkCanvas* canvas,  SkBitmap* snapshot) {
-  SkBaseDevice* device = skia::GetTopDevice(*canvas);
-  const SkBitmap& bitmap = device->accessBitmap(false);
-  const bool success = bitmap.copyTo(snapshot, kPMColor_SkColorType);
-  DCHECK(success);
-
-#if !defined(OS_MACOSX)
-  // Only the expected PNGs for Mac have a valid alpha channel.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableOverlayFullscreenVideo))
-    MakeBitmapOpaque(snapshot);
-#endif
-}
-
 class SyncNavigationStateVisitor : public RenderViewVisitor {
  public:
   SyncNavigationStateVisitor() {}
   virtual ~SyncNavigationStateVisitor() {}
 
   virtual bool Visit(RenderView* render_view) OVERRIDE {
     SyncNavigationState(render_view);
     return true;
   }
  private:
@@ skipping 505 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()) {
-      // 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)));
-      }
+      CHECK(render_view()->GetWebView()->isAcceleratedCompositingActive());
+      proxy()->CapturePixelsAsync(base::Bind(
+          &WebKitTestRunner::CaptureDumpPixels, base::Unretained(this)));
       return;
     }
   }
 
   CaptureDumpComplete();
 }
 
 void WebKitTestRunner::CaptureDumpPixels(const SkBitmap& snapshot) {
   DCHECK_NE(0, snapshot.info().fWidth);
   DCHECK_NE(0, snapshot.info().fHeight);
@@ skipping 75 matching lines @@
 
   leak_detector_->TryLeakDetection(main_frame);
 }
 
 void WebKitTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content