From 481c70311a5033639b897f8dd0c70f466753bdbb Mon Sep 17 00:00:00 2001
From: Aleksei Kuzmin <alkuzmin@microsoft.com>
Date: Mon, 18 Dec 2017 12:31:54 +0300
Subject: [PATCH] Move SoftwareOutputDevice to the viz service display
 compositor.

https://chromium-review.googlesource.com/677463
---
 atom/browser/osr/osr_output_device.cc           | 2 +-
 atom/browser/osr/osr_output_device.h            | 6 +++---
 atom/browser/osr/osr_render_widget_host_view.cc | 2 +-
 atom/browser/osr/osr_render_widget_host_view.h  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/atom/browser/osr/osr_output_device.cc b/atom/browser/osr/osr_output_device.cc
index ed444dca75..1dec51c78d 100644
--- a/atom/browser/osr/osr_output_device.cc
+++ b/atom/browser/osr/osr_output_device.cc
@@ -73,7 +73,7 @@ void OffScreenOutputDevice::EndPaint() {
 
   if (!bitmap_.get()) return;
 
-  cc::SoftwareOutputDevice::EndPaint();
+  viz::SoftwareOutputDevice::EndPaint();
 
   if (active_)
     OnPaint(damage_rect_);
diff --git a/atom/browser/osr/osr_output_device.h b/atom/browser/osr/osr_output_device.h
index f76b3b28e8..9ef6dc484a 100644
--- a/atom/browser/osr/osr_output_device.h
+++ b/atom/browser/osr/osr_output_device.h
@@ -6,7 +6,7 @@
 #define ATOM_BROWSER_OSR_OSR_OUTPUT_DEVICE_H_
 
 #include "base/callback.h"
-#include "cc/output/software_output_device.h"
+#include "components/viz/service/display/software_output_device.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
@@ -14,12 +14,12 @@ namespace atom {
 
 typedef base::Callback<void(const gfx::Rect&, const SkBitmap&)> OnPaintCallback;
 
-class OffScreenOutputDevice : public cc::SoftwareOutputDevice {
+class OffScreenOutputDevice : public viz::SoftwareOutputDevice {
  public:
   OffScreenOutputDevice(bool transparent, const OnPaintCallback& callback);
   ~OffScreenOutputDevice();
 
-  // cc::SoftwareOutputDevice:
+  // viz::SoftwareOutputDevice:
   void Resize(const gfx::Size& pixel_size, float scale_factor) override;
   SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override;
   void EndPaint() override;
diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc
index 328671f09d..3fe749c477 100644
--- a/atom/browser/osr/osr_render_widget_host_view.cc
+++ b/atom/browser/osr/osr_render_widget_host_view.cc
@@ -902,7 +902,7 @@ void OffScreenRenderWidgetHostView::OnGuestViewFrameSwapped(
   RegisterGuestViewFrameSwappedCallback(guest_host_view);
 }
 
-std::unique_ptr<cc::SoftwareOutputDevice>
+std::unique_ptr<viz::SoftwareOutputDevice>
   OffScreenRenderWidgetHostView::CreateSoftwareOutputDevice(
     ui::Compositor* compositor) {
   DCHECK_EQ(GetCompositor(), compositor);
diff --git a/atom/browser/osr/osr_render_widget_host_view.h b/atom/browser/osr/osr_render_widget_host_view.h
index f8867fbae3..7173335daf 100644
--- a/atom/browser/osr/osr_render_widget_host_view.h
+++ b/atom/browser/osr/osr_render_widget_host_view.h
@@ -196,7 +196,7 @@ class OffScreenRenderWidgetHostView
       gfx::Point* transformed_point) override;
 
   // ui::CompositorDelegate:
-  std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
+  std::unique_ptr<viz::SoftwareOutputDevice> CreateSoftwareOutputDevice(
       ui::Compositor* compositor) override;
 
   bool InstallTransparency();