Make WebTestProxy handle printing + compositing mode

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 48 matching lines @@
         : WebMethodTask<WebTestProxyBase>(object)
         , m_callback(callback)
     { }
 
     virtual void runIfValid() OVERRIDE { (m_object->*m_callback)(); }
 
 private:
     CallbackMethodType m_callback;
 };
 
-class ClosureTask : public WebMethodTask<WebTestProxyBase> {
- public:
-  ClosureTask(WebTestProxyBase* object, base::Closure callback)
-      : WebMethodTask<WebTestProxyBase>(object), m_callback(callback) {}
-
-  virtual void runIfValid() OVERRIDE {
-    if (!m_callback.is_null())
-      m_callback.Run();
-  }
-
- private:
-  base::Closure m_callback;
-};
-
 void printFrameDescription(WebTestDelegate* delegate, WebFrame* frame)
 {
     string name8 = frame->uniqueName().utf8();
     if (frame == frame->view()->mainFrame()) {
         if (!name8.length()) {
             delegate->printMessage("main frame");
             return;
         }
         delegate->printMessage(string("main frame \"") + name8 + "\"");
         return;
@@ skipping 393 matching lines @@
                bitmap.info().fWidth,
                "y",
                bitmap.info().fHeight);
   SkCanvas canvas(bitmap);
   DrawSelectionRect(&canvas);
   DCHECK(!m_compositeAndReadbackCallbacks.empty());
   m_compositeAndReadbackCallbacks.front().Run(bitmap);
   m_compositeAndReadbackCallbacks.pop_front();
 }
 
+void WebTestProxyBase::CapturePixelsForPrinting(
+    base::Callback<void(const SkBitmap&)> callback) {
+  // TODO(enne): get rid of stateful canvas().
+  webWidget()->layout();
+  paintPagesWithBoundaries();
+  DrawSelectionRect(canvas());
+  SkBaseDevice* device = skia::GetTopDevice(*canvas());
+  const SkBitmap& bitmap = device->accessBitmap(false);
+  callback.Run(bitmap);
+}
+
 void WebTestProxyBase::CapturePixelsAsync(
     base::Callback<void(const SkBitmap&)> callback) {
   TRACE_EVENT0("shell", "WebTestProxyBase::CapturePixelsAsync");
 
   DCHECK(webWidget()->isAcceleratedCompositingActive());
   DCHECK(!callback.is_null());
+
+  if (m_testInterfaces->testRunner()->isPrinting()) {
+    base::MessageLoopProxy::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&WebTestProxyBase::CapturePixelsForPrinting,
+                   base::Unretained(this),
+                   callback));
+    return;
+  }
+
   m_compositeAndReadbackCallbacks.push_back(callback);
   webWidget()->compositeAndReadbackAsync(this);
 }
 
 void WebTestProxyBase::setLogConsoleOutput(bool enabled)
 {
     m_logConsoleOutput = enabled;
 }
 
 void WebTestProxyBase::paintRect(const WebRect& rect)
@@ skipping 104 matching lines @@
 }
 
 void WebTestProxyBase::displayAsyncThen(base::Closure callback) {
   TRACE_EVENT0("shell", "WebTestProxyBase::displayAsyncThen");
 
   // TODO(danakj): Remove when we have kForceCompositingMode everywhere.
   if (!webWidget()->isAcceleratedCompositingActive()) {
     TRACE_EVENT0("shell",
                  "WebTestProxyBase::displayAsyncThen "
                  "isAcceleratedCompositingActive false");
-    m_delegate->postTask(
-        new ClosureTask(this,
-                        base::Bind(&WebTestProxyBase::DisplayForSoftwareMode,
-                                   base::Unretained(this),
-                                   callback)));
+    base::MessageLoopProxy::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&WebTestProxyBase::DisplayForSoftwareMode,
+                   base::Unretained(this),
+                   callback));
     return;
   }
 
   CapturePixelsAsync(base::Bind(
       &WebTestProxyBase::DidDisplayAsync, base::Unretained(this), callback));
 }
 
 void WebTestProxyBase::discardBackingStore()
 {
     m_canvas.reset();
@@ skipping 671 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