Remove unused WebTestProxy paint/canvas code

content/shell/renderer/test_runner/web_test_proxy.cc

 // Copyright 2014 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/web_test_proxy.h"
 
 #include <cctype>
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
@@ skipping 294 matching lines @@
   if (m_speechRecognizer.get()) m_speechRecognizer->setDelegate(delegate);
 }
 
 WebView* WebTestProxyBase::GetWebView() const {
   DCHECK(web_widget_);
   // TestRunner does not support popup widgets. So |web_widget|_ is always a
   // WebView.
   return static_cast<WebView*>(web_widget_);
 }
 
-void WebTestProxyBase::DidForceResize() {
-  InvalidateAll();
-  DiscardBackingStore();
-}
-
 void WebTestProxyBase::Reset() {
-  paint_rect_ = WebRect();
-  canvas_.reset();
-  is_painting_ = false;
   animate_scheduled_ = false;
   resource_identifier_map_.clear();
   log_console_output_ = true;
   if (m_midiClient.get()) m_midiClient->resetMock();
 }
 
 WebSpellCheckClient* WebTestProxyBase::GetSpellCheckClient() const {
   return spellcheck_.get();
 }
 
@@ skipping 87 matching lines @@
                bitmap.info().fWidth, "y", bitmap.info().fHeight);
   SkCanvas canvas(bitmap);
   DrawSelectionRect(&canvas);
   DCHECK(!composite_and_readback_callbacks_.empty());
   composite_and_readback_callbacks_.front().Run(bitmap);
   composite_and_readback_callbacks_.pop_front();
 }
 
 void WebTestProxyBase::CapturePixelsForPrinting(
     const base::Callback<void(const SkBitmap&)>& callback) {
-  // TODO(enne): get rid of stateful canvas().
   web_widget_->layout();
-  PaintPagesWithBoundaries();
-  DrawSelectionRect(GetCanvas());
-  SkBaseDevice* device = skia::GetTopDevice(*GetCanvas());
+
+  WebSize pageSizeInPixels = web_widget_->size();
+  WebFrame* webFrame = GetWebView()->mainFrame();
+
+  int pageCount = webFrame->printBegin(pageSizeInPixels);

[danakj, 2014/05/15 14:34:33]

page_count, etc. if is_opaque is going to be chrome style (I approve) let's fix
everything in this method now

[enne (OOO), 2014/05/15 17:10:33]

How about I just fix up this whole file afterwards?

[danakj, 2014/05/15 17:11:02]

Yes, please. :)

+  int totalHeight = pageCount * (pageSizeInPixels.height + 1) - 1;
+
+  bool is_opaque = false;
+  skia::RefPtr<SkCanvas> canvas(skia::AdoptRef(skia::TryCreateBitmapCanvas(
+      pageSizeInPixels.width, totalHeight, is_opaque)));
+  if (canvas.get())

[danakj, 2014/05/15 14:34:33]

nit: no .get() needed

[enne (OOO), 2014/05/15 17:10:33]

Done.

+    webFrame->printPagesWithBoundaries(canvas.get(), pageSizeInPixels);
+  webFrame->printEnd();
+
+  DrawSelectionRect(canvas.get());
+  SkBaseDevice* device = skia::GetTopDevice(*canvas.get());

[danakj, 2014/05/15 14:34:33]

nit: no .get() needed

[enne (OOO), 2014/05/15 17:10:33]

Done.

   const SkBitmap& bitmap = device->accessBitmap(false);
   callback.Run(bitmap);
 }
 
 void WebTestProxyBase::CapturePixelsAsync(
     const base::Callback<void(const SkBitmap&)>& callback) {
   TRACE_EVENT0("shell", "WebTestProxyBase::CapturePixelsAsync");
 
   DCHECK(web_widget_->isAcceleratedCompositingActive());
   DCHECK(!callback.is_null());
 
   if (test_interfaces_->testRunner()->isPrinting()) {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE, base::Bind(&WebTestProxyBase::CapturePixelsForPrinting,
                               base::Unretained(this), callback));
     return;
   }
 
   composite_and_readback_callbacks_.push_back(callback);
   web_widget_->compositeAndReadbackAsync(this);
 }
 
 void WebTestProxyBase::SetLogConsoleOutput(bool enabled) {
   log_console_output_ = enabled;
 }
 
-void WebTestProxyBase::PaintPagesWithBoundaries() {
-  DCHECK(!is_painting_);
-  DCHECK(GetCanvas());
-  is_painting_ = true;
-
-  WebSize pageSizeInPixels = web_widget_->size();
-  WebFrame* webFrame = GetWebView()->mainFrame();
-
-  int pageCount = webFrame->printBegin(pageSizeInPixels);
-  int totalHeight = pageCount * (pageSizeInPixels.height + 1) - 1;
-
-  SkCanvas* testCanvas =
-      skia::TryCreateBitmapCanvas(pageSizeInPixels.width, totalHeight, false);
-  if (testCanvas) {
-    DiscardBackingStore();
-    canvas_.reset(testCanvas);
-  } else {
-    webFrame->printEnd();
-    return;
-  }
-
-  webFrame->printPagesWithBoundaries(GetCanvas(), pageSizeInPixels);
-  webFrame->printEnd();
-
-  is_painting_ = false;
-}
-
-SkCanvas* WebTestProxyBase::GetCanvas() {
-  if (canvas_.get()) return canvas_.get();
-  WebSize widgetSize = web_widget_->size();
-  float deviceScaleFactor = GetWebView()->deviceScaleFactor();
-  int scaledWidth = static_cast<int>(
-      ceil(static_cast<float>(widgetSize.width) * deviceScaleFactor));
-  int scaledHeight = static_cast<int>(
-      ceil(static_cast<float>(widgetSize.height) * deviceScaleFactor));
-  // We're allocating the canvas to be non-opaque (third parameter), so we
-  // don't end up with uninitialized memory if a layout test doesn't damage
-  // the entire view.
-  canvas_.reset(skia::CreateBitmapCanvas(scaledWidth, scaledHeight, false));
-  return canvas_.get();
-}
-
 void WebTestProxyBase::DidDisplayAsync(const base::Closure& callback,
                                        const SkBitmap& bitmap) {
   // Verify we actually composited.
   CHECK_NE(0, bitmap.info().fWidth);
   CHECK_NE(0, bitmap.info().fHeight);
   if (!callback.is_null()) callback.Run();
 }
 
 void WebTestProxyBase::DisplayAsyncThen(const base::Closure& callback) {
   TRACE_EVENT0("shell", "WebTestProxyBase::DisplayAsyncThen");
 
   CHECK(web_widget_->isAcceleratedCompositingActive());
   CapturePixelsAsync(base::Bind(&WebTestProxyBase::DidDisplayAsync,
                                 base::Unretained(this), callback));
 }
 
-void WebTestProxyBase::DiscardBackingStore() { canvas_.reset(); }
-
 WebMIDIClientMock* WebTestProxyBase::GetMIDIClientMock() {
   if (!m_midiClient.get()) m_midiClient.reset(new WebMIDIClientMock);
   return m_midiClient.get();
 }
 
 MockWebSpeechRecognizer* WebTestProxyBase::GetSpeechRecognizerMock() {
   if (!m_speechRecognizer.get()) {
     m_speechRecognizer.reset(new MockWebSpeechRecognizer());
     m_speechRecognizer->setDelegate(delegate_);
   }
   return m_speechRecognizer.get();
 }
 
-void WebTestProxyBase::DidInvalidateRect(const WebRect& rect) {
-  // paint_rect_ = paint_rect_ U rect
-  if (rect.isEmpty()) return;
-  if (paint_rect_.isEmpty()) {
-    paint_rect_ = rect;
-    return;
-  }
-  int left = min(paint_rect_.x, rect.x);
-  int top = min(paint_rect_.y, rect.y);
-  int right = max(paint_rect_.x + paint_rect_.width, rect.x + rect.width);
-  int bottom = max(paint_rect_.y + paint_rect_.height, rect.y + rect.height);
-  paint_rect_ = WebRect(left, top, right - left, bottom - top);
+void WebTestProxyBase::ScheduleComposite() {

[danakj, 2014/05/15 14:34:33]

If this does nothing can it go away?

 }
 
-void WebTestProxyBase::DidScrollRect(int, int, const WebRect& clipRect) {
-  DidInvalidateRect(clipRect);
-}
-
-void WebTestProxyBase::InvalidateAll() {
-  paint_rect_ = WebRect(0, 0, INT_MAX, INT_MAX);
-}
-
-void WebTestProxyBase::ScheduleComposite() { InvalidateAll(); }
-
 void WebTestProxyBase::ScheduleAnimation() {
   if (!test_interfaces_->testRunner()->TestIsRunning()) return;
 
   if (!animate_scheduled_) {
     animate_scheduled_ = true;
     delegate_->postDelayedTask(
         new HostMethodTask(this, &WebTestProxyBase::AnimateNow), 1);
   }
 }
 
 void WebTestProxyBase::AnimateNow() {
   if (animate_scheduled_) {
     animate_scheduled_ = false;
     web_widget_->animate(0.0);
     web_widget_->layout();
   }
 }
 
-bool WebTestProxyBase::IsCompositorFramePending() const {
-  return animate_scheduled_ || !paint_rect_.isEmpty();
-}
-
-void WebTestProxyBase::Show(WebNavigationPolicy) { InvalidateAll(); }
-
-void WebTestProxyBase::SetWindowRect(const WebRect& rect) {
-  InvalidateAll();
-  DiscardBackingStore();
-}
-
-void WebTestProxyBase::DidAutoResize(const WebSize&) { InvalidateAll(); }
-
 void WebTestProxyBase::PostAccessibilityEvent(const blink::WebAXObject& obj,
                                               blink::WebAXEvent event) {
   // Only hook the accessibility events occured during the test run.
   // This check prevents false positives in WebLeakDetector.
   // The pending tasks in browser/renderer message queue may trigger
   // accessibility events,
   // and AccessibilityController will hold on to their target nodes if we don't
   // ignore them here.
   if (!test_interfaces_->testRunner()->TestIsRunning()) return;
 
@@ skipping 584 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 (web_widget_) web_widget_->confirmComposition();
 }
 
 }  // namespace content