diff --git a/atom/browser/osr/osr_output_device.cc b/atom/browser/osr/osr_output_device.cc index ed444dca756..1dec51c78d7 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 f76b3b28e8c..9ef6dc484aa 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 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 328671f09df..3fe749c477e 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 +std::unique_ptr 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 f8867fbae30..7173335daf5 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 CreateSoftwareOutputDevice( + std::unique_ptr CreateSoftwareOutputDevice( ui::Compositor* compositor) override; bool InstallTransparency();