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

apply fixes

Browse source
This commit is contained in:
gellert 2016-07-27 19:59:01 +02:00
parent 6e1db86a77
commit f90e62a7a5
4 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
atom/browser/osr_output_device.cc
View file

@ -10,23 +10,18 @@
namespace atom {
OffScreenOutputDevice::OffScreenOutputDevice(const OnPaintCallback& callback)
: callback_(callback),
OffScreenOutputDevice::OffScreenOutputDevice(bool transparent,
const OnPaintCallback& callback)
: transparent_(transparent),
callback_(callback),
active_(false) {
DCHECK(!callback_.is_null());
}
OffScreenOutputDevice::~OffScreenOutputDevice() {
std::cout << "~OffScreenOutputDevice" << std::endl;
}
void OffScreenOutputDevice::SetPaintCallback(const OnPaintCallback* callback) {
callback_.reset(callback);
}
OffScreenOutputDevice::~OffScreenOutputDevice() { }
void OffScreenOutputDevice::Resize(
const gfx::Size& pixel_size, float scale_factor) {
std::cout << "Resize" << std::endl;
std::cout << pixel_size.width() << "x" << pixel_size.height() << std::endl;
scale_factor_ = scale_factor;
@ -38,14 +33,15 @@ void OffScreenOutputDevice::Resize(
bitmap_.reset(new SkBitmap);
bitmap_->allocN32Pixels(viewport_pixel_size_.width(),
viewport_pixel_size_.height(),
false);
!transparent_);
if (bitmap_->drawsNothing()) {
std::cout << "drawsNothing" << std::endl;
NOTREACHED();
bitmap_.reset(NULL);
return;
}
bitmap_->eraseARGB(0, 0, 0, 0);
if (transparent_)
bitmap_->eraseARGB(0, 0, 0, 0);
canvas_.reset(new SkCanvas(*bitmap_.get()));
}