mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move SoftwareOutputDevice to the viz service display compositor.

Browse source 
https://chromium-review.googlesource.com/677463
This commit is contained in:
Aleksei Kuzmin 2017-12-18 12:31:54 +03:00
parent 4d234e3abc
commit 481c70311a
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/osr/osr_output_device.cc
View file

@ -73,7 +73,7 @@ void OffScreenOutputDevice::EndPaint() {
if (!bitmap_.get()) return;
cc::SoftwareOutputDevice::EndPaint();
viz::SoftwareOutputDevice::EndPaint();
if (active_)
OnPaint(damage_rect_);

6
atom/browser/osr/osr_output_device.h
View file

@ -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;

2
atom/browser/osr/osr_render_widget_host_view.cc
View file

@ -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);

2
atom/browser/osr/osr_render_widget_host_view.h
View file

@ -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();