Make compositing mode sticky when RenderView is reused in LayoutTests.

content/shell/renderer/test_runner/WebTestProxy.cpp

 // Copyright 2013 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/test_runner/WebTestProxy.h"
 
 #include <cctype>
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
@@ skipping 478 matching lines @@
   SkCanvas canvas(bitmap);
   DrawSelectionRect(&canvas);
   DCHECK(!m_compositeAndReadbackCallback.is_null());
   base::ResetAndReturn(&m_compositeAndReadbackCallback).Run(bitmap);
 }
 
 void WebTestProxyBase::CapturePixelsAsync(
     base::Callback<void(const SkBitmap&)> callback) {
   TRACE_EVENT0("shell", "WebTestProxyBase::CapturePixelsAsync");
 
-  // Do a layout here because it might leave compositing mode! x.x
-  // TODO(danakj): Remove this when we have kForceCompositingMode everywhere.
-  webWidget()->layout();
-
-  if (!webWidget()->isAcceleratedCompositingActive()) {
-    TRACE_EVENT0("shell",
-                 "WebTestProxyBase::CapturePixelsAsync "
-                 "isAcceleratedCompositingActive false");
-    callback.Run(SkBitmap());
-    return;
-  }
-
+  DCHECK(webWidget()->isAcceleratedCompositingActive());
   DCHECK(!callback.is_null());
   DCHECK(m_compositeAndReadbackCallback.is_null());
   m_compositeAndReadbackCallback = callback;
   webWidget()->compositeAndReadbackAsync(this);
 }
 
 void WebTestProxyBase::setLogConsoleOutput(bool enabled)
 {
     m_logConsoleOutput = enabled;
 }
@@ skipping 785 matching lines @@
 
 void WebTestProxyBase::resetInputMethod()
 {
     // If a composition text exists, then we need to let the browser process
     // to cancel the input method's ongoing composition session.
     if (m_webWidget)
         m_webWidget->confirmComposition();
 }
 
 }  // namespace content