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

renames to bytesPerPixel and use nullptr

Browse source
This commit is contained in:
gellert 2016-08-03 19:39:23 +02:00
commit ca16132268
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_web_contents.cc
View file

@ -1354,7 +1354,7 @@ void WebContents::OnPaint(const gfx::Rect& dirty_rect,
mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate()); mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate());
dict.Set("width", bitmap_size.width()); dict.Set("width", bitmap_size.width());
dict.Set("height", bitmap_size.height()); dict.Set("height", bitmap_size.height());
dict.Set("pixel", pixel_size); dict.Set("bytesPerPixel", pixel_size);
if (!buffer.IsEmpty()) if (!buffer.IsEmpty())
Emit("paint", dirty_rect, buffer.ToLocalChecked(), dict); Emit("paint", dirty_rect, buffer.ToLocalChecked(), dict);

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

@ -381,11 +381,11 @@ OffScreenRenderWidgetHostView::~OffScreenRenderWidgetHostView() {
#endif #endif
if (copy_frame_generator_.get()) if (copy_frame_generator_.get())
copy_frame_generator_.reset(NULL); copy_frame_generator_.reset(nullptr);
delegated_frame_host_.reset(NULL); delegated_frame_host_.reset(nullptr);
compositor_.reset(NULL); compositor_.reset(nullptr);
root_layer_.reset(NULL); root_layer_.reset(nullptr);
} }
void OffScreenRenderWidgetHostView::OnBeginFrameTimerTick() { void OffScreenRenderWidgetHostView::OnBeginFrameTimerTick() {

2
docs/api/web-contents.md
View file

@ -471,7 +471,7 @@ Returns:
* `bitmapSize` Object * `bitmapSize` Object
* `width` Number - the width of the whole bitmap * `width` Number - the width of the whole bitmap
* `height` Number - the height of the whole bitmap * `height` Number - the height of the whole bitmap
* `pixel` Number - The number of bytes per pixel * `bytesPerPixel` Number - The number of bytes per pixel in the bitmap
Emitted when a new frame is generated. Only the dirty area is passed in the Emitted when a new frame is generated. Only the dirty area is passed in the
buffer. buffer.