Rename paint data structures

components/test_runner/pixel_dump.cc

 // Copyright 2016 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 "components/test_runner/pixel_dump.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "components/test_runner/layout_test_runtime_flags.h"
 // FIXME: Including platform_canvas.h here is a layering violation.
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebMockClipboard.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ skipping 33 matching lines @@
   void didCompositeAndReadback(const SkBitmap& bitmap) override;
 
  private:
   base::Callback<void(const SkBitmap&)> callback_;
   SkBitmap main_bitmap_;
   bool wait_for_popup_;
   gfx::Point popup_position_;
 };
 
 void DrawSelectionRect(const PixelsDumpRequest& dump_request,
-                       SkCanvas* canvas) {
+                       cc::PaintCanvas* canvas) {
   // See if we need to draw the selection bounds rect. Selection bounds
   // rect is the rect enclosing the (possibly transformed) selection.
   // The rect should be drawn after everything is laid out and painted.
   if (!dump_request.layout_test_runtime_flags.dump_selection_rect())
     return;
   // If there is a selection rect - draw a red 1px border enclosing rect
   blink::WebRect wr = dump_request.web_view->mainFrame()->selectionBoundsRect();
   if (wr.isEmpty())
     return;
   // Render a red rectangle bounding selection rect
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setColor(0xFFFF0000);  // Fully opaque red
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setFlags(SkPaint::kAntiAlias_Flag);
+  paint.setStyle(cc::PaintFlags::kStroke_Style);
+  paint.setAntiAlias(true);
   paint.setStrokeWidth(1.0f);
   SkIRect rect;  // Bounding rect
   rect.set(wr.x, wr.y, wr.x + wr.width, wr.y + wr.height);
   canvas->drawIRect(rect, paint);
 }
 
 void CapturePixelsForPrinting(std::unique_ptr<PixelsDumpRequest> dump_request) {
   dump_request->web_view->updateAllLifecyclePhases();
 
   blink::WebSize page_size_in_pixels = dump_request->web_view->size();
   blink::WebFrame* web_frame = dump_request->web_view->mainFrame();
 
   int page_count = web_frame->printBegin(page_size_in_pixels);
   int totalHeight = page_count * (page_size_in_pixels.height + 1) - 1;
 
   bool is_opaque = false;
-  std::unique_ptr<SkCanvas> canvas = skia::TryCreateBitmapCanvas(
+  std::unique_ptr<cc::PaintCanvas> canvas = skia::TryCreateBitmapCanvas(

[danakj, 2017/01/20 23:34:14]

this looks like a type mismatch? also noting that this is printing so hm

[enne (OOO), 2017/01/24 01:51:28]

Yeah, I was trying to avoid changing too much logic here.  I rewrote this using
SkBitmap and tryAllocN32Pixels.

       page_size_in_pixels.width, totalHeight, is_opaque);
   if (!canvas) {
     LOG(ERROR) << "Failed to create canvas width="
                << page_size_in_pixels.width << " height=" << totalHeight;
     dump_request->callback.Run(SkBitmap());
     return;
   }
   web_frame->printPagesWithBoundaries(canvas.get(), page_size_in_pixels);
   web_frame->printEnd();
 
@@ skipping 21 matching lines @@
     return;
   }
   SkCanvas canvas(main_bitmap_);
   canvas.drawBitmap(bitmap, popup_position_.x(), popup_position_.y());
   callback_.Run(main_bitmap_);
   delete this;
 }
 
 void DidCapturePixelsAsync(std::unique_ptr<PixelsDumpRequest> dump_request,
                            const SkBitmap& bitmap) {
-  SkCanvas canvas(bitmap);
+  cc::PaintCanvas canvas(bitmap);
   DrawSelectionRect(*dump_request, &canvas);
   if (!dump_request->callback.is_null())
     dump_request->callback.Run(bitmap);
 }
 
 }  // namespace
 
 void DumpPixelsAsync(blink::WebView* web_view,
                      const LayoutTestRuntimeFlags& layout_test_runtime_flags,
                      float device_scale_factor_for_test,
@@ skipping 47 matching lines @@
 
   blink::WebImage image = static_cast<blink::WebMockClipboard*>(
                               blink::Platform::current()->clipboard())
                               ->readRawImage(blink::WebClipboard::Buffer());
   const SkBitmap& bitmap = image.getSkBitmap();
   SkAutoLockPixels autoLock(bitmap);
   callback.Run(bitmap);
 }
 
 }  // namespace test_runner