Revert 162559 - [content shell] implement testRunner.display

For layout tests, we only generate frames at defined points (when the test finishes, and when e.g. testRunner.display() is invoked). For each frame, we must only paint the union of all invalidated rects since the last frame.

To achieve this, we forward paint related callbacks from the WebWidgetClient interface to the RenderViewObserver.

With that WebKitTestRunner can mimick the exact behavior of DRT.

BUG=111316,156762
TEST=repaint tests pass

Review URL: https://codereview.chromium.org/11187020

TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/11194074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162878 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 24 insertions, 156 deletions

diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index 5ea181a..3a2532d 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -90,6 +90,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kAllowFileAccessFromFiles);
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kForceCompositingMode);
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kUseGL, gfx::kGLImplementationOSMesaName);
     CommandLine::ForCurrentProcess()->AppendSwitch(
diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc
index c813edd..45446e4 100644
--- a/content/shell/webkit_test_runner.cc
+++ b/content/shell/webkit_test_runner.cc
@@ -4,8 +4,6 @@
 
 #include "content/shell/webkit_test_runner.h"
 
-#include <cmath>
-
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
@@ -13,6 +11,7 @@
 #include "content/shell/shell_messages.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ -99,6 +98,18 @@ std::string DumpFrameScrollPosition(WebFrame* frame, bool recursive) {
   return result;
 }
 
+bool PaintViewIntoCanvas(WebView* view, skia::PlatformCanvas& canvas) {
+  view->layout();
+  const WebSize& size = view->size();
+
+  if (!canvas.initialize(size.width, size.height, true))
+    return false;
+
+  view->paint(webkit_glue::ToWebCanvas(&canvas),
+              WebRect(0, 0, size.width, size.height));
+  return true;
+}
+
 #if !defined(OS_MACOSX)
 void MakeBitmapOpaque(SkBitmap* bitmap) {
   SkAutoLockPixels lock(*bitmap);
@@ -111,8 +122,12 @@ void MakeBitmapOpaque(SkBitmap* bitmap) {
 }
 #endif
 
-void CopyCanvasToBitmap(skia::PlatformCanvas* canvas, SkBitmap* snapshot) {
-  SkDevice* device = skia::GetTopDevice(*canvas);
+void CaptureSnapshot(WebView* view, SkBitmap* snapshot) {
+  skia::PlatformCanvas canvas;
+  if (!PaintViewIntoCanvas(view, canvas))
+    return;
+
+  SkDevice* device = skia::GetTopDevice(canvas);
 
   const SkBitmap& bitmap = device->accessBitmap(false);
   bitmap.copyTo(snapshot, SkBitmap::kARGB_8888_Config);
@@ -127,8 +142,7 @@ void CopyCanvasToBitmap(skia::PlatformCanvas* canvas, SkBitmap* snapshot) {
 }  // namespace
 
 WebKitTestRunner::WebKitTestRunner(RenderView* render_view)
-    : RenderViewObserver(render_view),
-      RenderViewObserverTracker<WebKitTestRunner>(render_view) {
+    : RenderViewObserver(render_view) {
 }
 
 WebKitTestRunner::~WebKitTestRunner() {
@@ -156,32 +170,6 @@ bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-void WebKitTestRunner::DidInvalidateRect(const WebRect& rect) {
-  UpdatePaintRect(rect);
-}
-
-void WebKitTestRunner::DidScrollRect(int dx, int dy, const WebRect& rect) {
-  DidInvalidateRect(rect);
-}
-
-void WebKitTestRunner::DidRequestScheduleComposite() {
-  const WebSize& size = render_view()->GetWebView()->size();
-  WebRect rect(0, 0, size.width, size.height);
-  DidInvalidateRect(rect);
-}
-
-void WebKitTestRunner::DidRequestScheduleAnimation() {
-  DidRequestScheduleComposite();
-}
-
-void WebKitTestRunner::Display() {
-  const WebSize& size = render_view()->GetWebView()->size();
-  WebRect rect(0, 0, size.width, size.height);
-  UpdatePaintRect(rect);
-  PaintInvalidatedRegion();
-  DisplayRepaintMask();
-}
-
 void WebKitTestRunner::OnCaptureTextDump(bool as_text,
                                          bool printing,
                                          bool recursive) {
@@ -203,8 +191,7 @@ void WebKitTestRunner::OnCaptureTextDump(bool as_text,
 void WebKitTestRunner::OnCaptureImageDump(
     const std::string& expected_pixel_hash) {
   SkBitmap snapshot;
-  PaintInvalidatedRegion();
-  CopyCanvasToBitmap(GetCanvas(), &snapshot);
+  CaptureSnapshot(render_view()->GetWebView(), &snapshot);
 
   SkAutoLockPixels snapshot_lock(snapshot);
   base::MD5Digest digest;
@@ -236,84 +223,4 @@ void WebKitTestRunner::OnCaptureImageDump(
       routing_id(), actual_pixel_hash, snapshot));
 }
 
-skia::PlatformCanvas* WebKitTestRunner::GetCanvas() {
-  if (canvas_)
-    return canvas_.get();
-
-  WebView* view = render_view()->GetWebView();
-  const WebSize& size = view->size();
-  float device_scale_factor = view->deviceScaleFactor();
-  canvas_.reset(new skia::PlatformCanvas);
-  canvas_->initialize(std::ceil(device_scale_factor * size.width),
-                      std::ceil(device_scale_factor * size.height),
-                      true);
-  return canvas_.get();
-}
-
-void WebKitTestRunner::UpdatePaintRect(const WebRect& rect) {
-  // Update paint_rect_ to the smallest rectangle that covers both rect and
-  // paint_rect_.
-  if (rect.isEmpty())
-    return;
-  if (paint_rect_.isEmpty()) {
-    paint_rect_ = rect;
-    return;
-  }
-  int left = std::min(paint_rect_.x, rect.x);
-  int top = std::min(paint_rect_.y, rect.y);
-  int right = std::max(paint_rect_.x + paint_rect_.width, rect.x + rect.width);
-  int bottom = std::max(paint_rect_.y + paint_rect_.height,
-                        rect.y + rect.height);
-  paint_rect_ = WebRect(left, top, right - left, bottom - top);
-}
-
-void WebKitTestRunner::PaintRect(const WebRect& rect) {
-  WebView* view = render_view()->GetWebView();
-  float device_scale_factor = view->deviceScaleFactor();
-  int scaled_x = device_scale_factor * rect.x;
-  int scaled_y = device_scale_factor * rect.y;
-  int scaled_width = std::ceil(device_scale_factor * rect.width);
-  int scaled_height = std::ceil(device_scale_factor * rect.height);
-  // TODO(jochen): Verify that the scaling is correct once the HiDPI tests
-  // actually work.
-  WebRect device_rect(scaled_x, scaled_y, scaled_width, scaled_height);
-  view->paint(webkit_glue::ToWebCanvas(GetCanvas()), device_rect);
-}
-
-void WebKitTestRunner::PaintInvalidatedRegion() {
-  WebView* view = render_view()->GetWebView();
-  view->animate(0.0);
-  view->layout();
-  const WebSize& widget_size = view->size();
-  WebRect client_rect(0, 0, widget_size.width, widget_size.height);
-
-  // Paint the canvas if necessary. Allow painting to generate extra rects
-  // for the first two calls. This is necessary because some WebCore rendering
-  // objects update their layout only when painted.
-  for (int i = 0; i < 3; ++i) {
-    // Make sure that paint_rect_ is always inside the RenderView's visible
-    // area.
-    int left = std::max(paint_rect_.x, client_rect.x);
-    int top = std::max(paint_rect_.y, client_rect.y);
-    int right = std::min(paint_rect_.x + paint_rect_.width,
-                         client_rect.x + client_rect.width);
-    int bottom = std::min(paint_rect_.y + paint_rect_.height,
-                          client_rect.y + client_rect.height);
-    if (left >= right || top >= bottom)
-      paint_rect_ = WebRect();
-    else
-      paint_rect_ = WebRect(left, top, right - left, bottom - top);
-    if (paint_rect_.isEmpty())
-      continue;
-    WebRect rect(paint_rect_);
-    paint_rect_ = WebRect();
-    PaintRect(rect);
-  }
-  CHECK(paint_rect_.isEmpty());
-}
-
-void WebKitTestRunner::DisplayRepaintMask() {
-  GetCanvas()->drawARGB(167, 0, 0, 0);
-}
-
 }  // namespace content
diff --git a/content/shell/webkit_test_runner.h b/content/shell/webkit_test_runner.h
index eb2584f..539ed09 100644
--- a/content/shell/webkit_test_runner.h
+++ b/content/shell/webkit_test_runner.h
@@ -5,20 +5,12 @@
 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
 
-#include "base/memory/scoped_ptr.h"
 #include "content/public/renderer/render_view_observer.h"
-#include "content/public/renderer/render_view_observer_tracker.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
-
-namespace skia {
-class PlatformCanvas;
-}
 
 namespace content {
 
 // This is the renderer side of the webkit test runner.
-class WebKitTestRunner : public RenderViewObserver,
-                         public RenderViewObserverTracker<WebKitTestRunner> {
+class WebKitTestRunner : public RenderViewObserver {
  public:
   explicit WebKitTestRunner(RenderView* render_view);
   virtual ~WebKitTestRunner();
@@ -27,29 +19,12 @@ class WebKitTestRunner : public RenderViewObserver,
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE;
   virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE;
-  virtual void DidInvalidateRect(const WebKit::WebRect& rect) OVERRIDE;
-  virtual void DidScrollRect(int dx,
-                             int dy,
-                             const WebKit::WebRect& rect) OVERRIDE;
-  virtual void DidRequestScheduleComposite() OVERRIDE;
-  virtual void DidRequestScheduleAnimation() OVERRIDE;
-
-  void Display();
 
  private:
   // Message handlers.
   void OnCaptureTextDump(bool as_text, bool printing, bool recursive);
   void OnCaptureImageDump(const std::string& expected_pixel_hash);
 
-  skia::PlatformCanvas* GetCanvas();
-  void UpdatePaintRect(const WebKit::WebRect& rect);
-  void PaintRect(const WebKit::WebRect& rect);
-  void PaintInvalidatedRegion();
-  void DisplayRepaintMask();
-
-  scoped_ptr<skia::PlatformCanvas> canvas_;
-  WebKit::WebRect paint_rect_;
-
   DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);
 };
 
diff --git a/content/shell/webkit_test_runner.js b/content/shell/webkit_test_runner.js
index 2891bf5..8865ec9 100644
--- a/content/shell/webkit_test_runner.js
+++ b/content/shell/webkit_test_runner.js
@@ -9,7 +9,6 @@ var eventSender = eventSender || {};
 var textInputController = textInputController || {};
 
 (function() {
-  native function Display();
   native function GetWorkerThreadCount();
   native function NotifyDone();
   native function OverridePreference();
@@ -53,7 +52,6 @@ var textInputController = textInputController || {};
         "setShouldStayOnPageAfterHandlingBeforeUnload",
         {value: SetShouldStayOnPageAfterHandlingBeforeUnload});
     Object.defineProperty(this, "waitUntilDone", {value: SetWaitUntilDone});
-    Object.defineProperty(this, "display", {value: Display});
   }
   TestRunner.prototype = DefaultHandler("testRunner");
   testRunner = new TestRunner();
diff --git a/content/shell/webkit_test_runner_bindings.cc b/content/shell/webkit_test_runner_bindings.cc
index 15235357..6d1eb6f 100644
--- a/content/shell/webkit_test_runner_bindings.cc
+++ b/content/shell/webkit_test_runner_bindings.cc
@@ -7,7 +7,6 @@
 #include "base/string_piece.h"
 #include "content/public/renderer/render_view.h"
 #include "content/shell/shell_messages.h"
-#include "content/shell/webkit_test_runner.h"
 #include "grit/shell_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ -43,17 +42,6 @@ RenderView* GetCurrentRenderView() {
   return render_view;
 }
 
-v8::Handle<v8::Value> Display(const v8::Arguments& args) {
-  RenderView* view = GetCurrentRenderView();
-  if (!view)
-    return v8::Undefined();
-  WebKitTestRunner* runner = WebKitTestRunner::Get(view);
-  if (!runner)
-    return v8::Undefined();
-  runner->Display();
-  return v8::Undefined();
-}
-
 v8::Handle<v8::Value> NotifyDone(const v8::Arguments& args) {
   RenderView* view = GetCurrentRenderView();
   if (!view)
@@ -159,8 +147,6 @@ WebKitTestRunnerBindings::~WebKitTestRunnerBindings() {
 
 v8::Handle<v8::FunctionTemplate>
 WebKitTestRunnerBindings::GetNativeFunction(v8::Handle<v8::String> name) {
-  if (name->Equals(v8::String::New("Display")))
-    return v8::FunctionTemplate::New(Display);
   if (name->Equals(v8::String::New("NotifyDone")))
     return v8::FunctionTemplate::New(NotifyDone);
   if (name->Equals(v8::String::New("SetDumpAsText")))