diff --git a/atom/browser/osr_output_device.cc b/atom/browser/osr_output_device.cc index 8e6b5b02a9dd..21b7991d9c92 100644 --- a/atom/browser/osr_output_device.cc +++ b/atom/browser/osr_output_device.cc @@ -1,18 +1,17 @@ -// Copyright (c) 2013 GitHub, Inc. +// Copyright (c) 2016 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. #include "atom/browser/osr_output_device.h" -#include #include "third_party/skia/include/core/SkDevice.h" #include "ui/gfx/skia_util.h" namespace atom { OffScreenOutputDevice::OffScreenOutputDevice(bool transparent, - const OnPaintCallback& callback) - : transparent_(transparent), + const OnPaintCallback& callback): + transparent_(transparent), callback_(callback), active_(false) { DCHECK(!callback_.is_null()); @@ -21,9 +20,7 @@ OffScreenOutputDevice::OffScreenOutputDevice(bool transparent, OffScreenOutputDevice::~OffScreenOutputDevice() { } void OffScreenOutputDevice::Resize( - const gfx::Size& pixel_size, float scale_factor) { - std::cout << pixel_size.width() << "x" << pixel_size.height() << std::endl; - + const gfx::Size& pixel_size, float scale_factor) { scale_factor_ = scale_factor; if (viewport_pixel_size_ == pixel_size) return; @@ -47,7 +44,6 @@ void OffScreenOutputDevice::Resize( } SkCanvas* OffScreenOutputDevice::BeginPaint(const gfx::Rect& damage_rect) { - // std::cout << "BeginPaint" << std::endl; DCHECK(canvas_.get()); DCHECK(bitmap_.get()); @@ -57,8 +53,6 @@ SkCanvas* OffScreenOutputDevice::BeginPaint(const gfx::Rect& damage_rect) { } void OffScreenOutputDevice::EndPaint() { - // std::cout << "EndPaint" << std::endl; - DCHECK(canvas_.get()); DCHECK(bitmap_.get()); @@ -75,7 +69,6 @@ void OffScreenOutputDevice::SetActive(bool active) { return; active_ = active; - // Call OnPaint immediately if deactivated while a damage rect is pending. if (!active_ && !pending_damage_rect_.IsEmpty()) OnPaint(pending_damage_rect_); } diff --git a/atom/browser/osr_output_device.h b/atom/browser/osr_output_device.h index 1940b417d053..a593f3a3829b 100644 --- a/atom/browser/osr_output_device.h +++ b/atom/browser/osr_output_device.h @@ -1,4 +1,4 @@ -// Copyright (c) 2013 GitHub, Inc. +// Copyright (c) 2016 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. @@ -9,7 +9,6 @@ #include "cc/output/software_output_device.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "base/callback.h" namespace atom { diff --git a/atom/browser/osr_render_widget_host_view.cc b/atom/browser/osr_render_widget_host_view.cc index 89023d41b3d5..0c1d6c27da19 100644 --- a/atom/browser/osr_render_widget_host_view.cc +++ b/atom/browser/osr_render_widget_host_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2013 GitHub, Inc. +// Copyright (c) 2016 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. @@ -26,14 +26,10 @@ #include "cc/scheduler/delay_based_time_source.h" #include "content/public/browser/browser_thread.h" -#include - const float kDefaultScaleFactor = 1.0; const int kFrameRetryLimit = 2; -// const int kResizeLockTimeoutMs = 67; - namespace atom { class AtomCopyFrameGenerator { diff --git a/atom/browser/osr_render_widget_host_view.h b/atom/browser/osr_render_widget_host_view.h index feb7ec4a6ca1..3463c2b801b4 100644 --- a/atom/browser/osr_render_widget_host_view.h +++ b/atom/browser/osr_render_widget_host_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2013 GitHub, Inc. +// Copyright (c) 2016 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. diff --git a/atom/browser/osr_render_widget_host_view_mac.mm b/atom/browser/osr_render_widget_host_view_mac.mm index 6dc50d2ff0db..d538bb6d93ec 100644 --- a/atom/browser/osr_render_widget_host_view_mac.mm +++ b/atom/browser/osr_render_widget_host_view_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2013 GitHub, Inc. +// Copyright (c) 2016 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. diff --git a/atom/browser/osr_render_widget_host_view_win.cc b/atom/browser/osr_render_widget_host_view_win.cc index f90d1cf676dd..285f4212c8ff 100644 --- a/atom/browser/osr_render_widget_host_view_win.cc +++ b/atom/browser/osr_render_widget_host_view_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2013 GitHub, Inc. +// Copyright (c) 2016 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. diff --git a/atom/browser/osr_web_contents_view.cc b/atom/browser/osr_web_contents_view.cc index fde98ba9c55a..4d03f5ed9e51 100644 --- a/atom/browser/osr_web_contents_view.cc +++ b/atom/browser/osr_web_contents_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2013 GitHub, Inc. +// Copyright (c) 2016 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. diff --git a/atom/browser/osr_web_contents_view.h b/atom/browser/osr_web_contents_view.h index 16774fd72027..efab017fd90b 100644 --- a/atom/browser/osr_web_contents_view.h +++ b/atom/browser/osr_web_contents_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2013 GitHub, Inc. +// Copyright (c) 2016 GitHub, Inc. // Use of this source code is governed by the MIT license that can be // found in the LICENSE file.